From e8e9fd9f0c0aee8c596a45cabbc06d163f3bc14a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 3 May 2012 16:22:19 +0530 Subject: [PATCH] fixes in get_child_fields included custom child tables --- py/webnotes/model/doc.py | 2 +- py/webnotes/model/meta.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/py/webnotes/model/doc.py b/py/webnotes/model/doc.py index 18497a9745..7cbe1ac4c3 100755 --- a/py/webnotes/model/doc.py +++ b/py/webnotes/model/doc.py @@ -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) - \ No newline at end of file + diff --git a/py/webnotes/model/meta.py b/py/webnotes/model/meta.py index def753e9bc..f35a77d7e5 100644 --- a/py/webnotes/model/meta.py +++ b/py/webnotes/model/meta.py @@ -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