Sfoglia il codice sorgente

Merge branch 'hotfix'

version-14
Nabin Hait 8 anni fa
parent
commit
9def17fa6b
3 ha cambiato i file con 6 aggiunte e 3 eliminazioni
  1. +1
    -1
      frappe/__init__.py
  2. +4
    -1
      frappe/core/page/data_import_tool/importer.py
  3. +1
    -1
      frappe/model/meta.py

+ 1
- 1
frappe/__init__.py Vedi File

@@ -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()



+ 4
- 1
frappe/core/page/data_import_tool/importer.py Vedi File

@@ -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:


+ 1
- 1
frappe/model/meta.py Vedi File

@@ -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()



Caricamento…
Annulla
Salva