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

Merge pull request #567 from nabinhait/v4-hotfix

Browse source 
fixes in get_values
This commit is contained in:
Pratik Vyas 2014-06-02 14:34:30 +05:30
commit 2354f06a2f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/core/doctype/customize_form/customize_form.py
View file

@ -205,14 +205,14 @@ class CustomizeForm(Document):
if existing_property_setter:
frappe.delete_doc("Property Setter", existing_property_setter)
def get_existing_property_value(self, property, fieldname=None):
def get_existing_property_value(self, property_name, fieldname=None):
# check if there is any need to make property setter!
if fieldname:
property_value = frappe.db.get_value("DocField", {"parent": self.doc_type,
"fieldname": fieldname}, property)
"fieldname": fieldname}, property_name)
else:
try:
property_value = frappe.db.get_value("DocType", self.doc_type, property)
property_value = frappe.db.get_value("DocType", self.doc_type, property_name)
except Exception, e:
if e.args[0]==1054:
property_value = None

2
frappe/database.py
View file

@ -376,7 +376,7 @@ class Database:
fl.append(f)
else:
fl.append("`" + f + "`")
fl = ", ".join(fields)
fl = ", ".join(fl)
else:
fl = fields
if fields=="*":