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

get the default value of check field if none, for insert / update

Browse source
This commit is contained in:
Nabin Hait 2016-10-19 14:20:41 +05:30
parent 01e1a87c5a
commit b2908df91b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frappe/model/base_document.py
View file

@ -189,8 +189,13 @@ class BaseDocument(object):
df = self.meta.get_field(fieldname)
if df:
if df.fieldtype=="Check" and (not isinstance(d[fieldname], int) or d[fieldname] > 1):
d[fieldname] = 1 if cint(d[fieldname]) else 0
if df.fieldtype=="Check":
if (not isinstance(d[fieldname], int) or d[fieldname] > 1):
d[fieldname] = 1 if cint(d[fieldname]) else 0
# get the default value if none, for insert / update
elif d[fieldname]==None:
d[fieldname] = df.get('default')
elif df.fieldtype=="Int" and not isinstance(d[fieldname], int):
d[fieldname] = cint(d[fieldname])
@ -208,10 +213,6 @@ class BaseDocument(object):
if isinstance(d[fieldname], list) and df.fieldtype != 'Table':
frappe.throw(_('Value for {0} cannot be a list').format(_(df.label)))
# get the default value if none, for insert / update
if d[fieldname]==None and df.get('default'):
d[fieldname] = df.get('default')
return d
def init_valid_columns(self):