merge new modules, install in stable

This commit is contained in:
Rushabh Mehta 2011-07-26 15:25:09 +05:30
parent d9087a8ae1
commit 541c42b4fa

View file

@ -194,7 +194,7 @@ class UpdateDocType(UpdateDocumentMerge):
def get_id(self, d):
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
from tabDocField where %s=%s and parent=%s""" % (key, '%s', '%s'), (d.fields[key], d.parent))