vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix _cast_result

Browse source
This commit is contained in:
Achilles Rasquinha 2018-04-02 14:23:20 +05:30
parent 614359e347
commit 496a63f07f
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/model/document.py
View file

@ -602,9 +602,10 @@ class Document(BaseDocument):
self._action = "save"
if not self.get('__islocal'):
if self.meta.issingle:
modified = frappe.db.get_values_from_single(["modified"], "", self.doctype)
modified = frappe.db.sql('''select value from tabSingles
where doctype=%s and field='modified' for update''', self.doctype)
modified = modified and modified[0][0]
if modified and modified != self._original_modified:
if modified and modified != cstr(self._original_modified):
conflict = True
else:
tmp = frappe.db.sql("""select modified, docstatus from `tab{0}`

4
frappe/model/utils/__init__.py
View file

@ -15,8 +15,8 @@ STANDARD_FIELD_CONVERSION_MAP = {
'name': 'Link',
'owner': 'Data',
'idx': 'Int',
'creation': 'Datetime',
'modified': 'Datetime',
'creation': 'Data',
'modified': 'Data',
'modified_by': 'Data',
'_user_tags': 'Data',
'_liked_by': 'Data',