Merge branch 'shf_rename' of github.com:webnotes/wnframework into shf_rename

This commit is contained in:
Rushabh Mehta 2012-05-03 17:33:37 +05:30
commit ff25dfac46
2 changed files with 7 additions and 4 deletions

View file

@ -736,4 +736,4 @@ def getsingle(doctype):
"""get single doc as dict"""
dataset = webnotes.conn.sql("select field, value from tabSingles where doctype=%s", doctype)
return dict(dataset)

View file

@ -67,7 +67,10 @@ def get_link_fields(doctype):
#=================================================================================
def get_table_fields(doctype):
return webnotes.conn.sql("select options, fieldname from tabDocField \
where parent='%s' and fieldtype='Table'" % doctype, as_list=1)
child_tables = [[d[0], d[1]] for d in webnotes.conn.sql("select options, fieldname from tabDocField \
where parent='%s' and fieldtype='Table'" % doctype, as_list=1)]
custom_child_tables = [[d[0], d[1]] for d in webnotes.conn.sql("select options, fieldname from `tabCustom Field` \
where dt='%s' and fieldtype='Table'" % doctype, as_list=1)]
return child_tables + custom_child_tables