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

merge new modules, install in stable

Browse source
This commit is contained in:
Rushabh Mehta 2011-07-26 15:25:09 +05:30
parent d9087a8ae1
commit 541c42b4fa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cgi-bin/webnotes/utils/transfer.py
View file

@ -194,7 +194,7 @@ class UpdateDocType(UpdateDocumentMerge):
def get_id(self, d): def get_id(self, d):
key = d.fieldname and 'fieldname' or 'label' key = d.fieldname and 'fieldname' or 'label'
if key in d.fields: if d.fields.get(key):
return webnotes.conn.sql("""select name, options, permlevel, reqd, print_hide, hidden return webnotes.conn.sql("""select name, options, permlevel, reqd, print_hide, hidden
from tabDocField where %s=%s and parent=%s""" % (key, '%s', '%s'), (d.fields[key], d.parent)) from tabDocField where %s=%s and parent=%s""" % (key, '%s', '%s'), (d.fields[key], d.parent))