From 7d1b29a413faac9a1b1f1a1c5f5d4915b29bbcfb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 18 Oct 2016 14:25:11 +0530 Subject: [PATCH 1/3] [fix] [import] ignore if time missing while file import --- frappe/core/page/data_import_tool/importer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index 53d5b35db4..094f5143c1 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -115,7 +115,10 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, d[fieldname] = getdate(parse_date(d[fieldname])) if d[fieldname] else None elif fieldtype == "Datetime": if d[fieldname]: - _date, _time = d[fieldname].split() + if " " in d[fieldname]: + _date, _time = d[fieldname].split() + else: + _date, _time = d[fieldname], '00:00:00' _date = parse_date(d[fieldname]) d[fieldname] = get_datetime(_date + " " + _time) else: From 9789da957e3f988546780ec79244b454a179db1d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 18 Oct 2016 14:54:17 +0530 Subject: [PATCH 2/3] [fix] change data property in _dashboard.py files to get_data to make it translate friendly --- frappe/model/meta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index aeb61f9c2b..012f99d94a 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -270,7 +270,7 @@ class Meta(Document): `[doctype]_dashboard.py` file in the doctype folder''' try: module = load_doctype_module(self.name, suffix='_dashboard') - data = frappe._dict(module.data) + data = frappe._dict(module.get_data()) except ImportError: data = frappe._dict() From cefd823e7322dd0d91a57c66fe493e7b8698630d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 18 Oct 2016 15:54:05 +0600 Subject: [PATCH 3/3] bumped to version 7.0.45 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 8ee6fbcbd9..16654a4be4 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.44" +__version__ = "7.0.45" local = Local()