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

chore: Rename function to validate conflicting methods and properties

Browse source 
(cherry picked from commit 255a959a3e)
This commit is contained in:
Gavin D'souza 2021-01-04 10:41:18 +05:30 • committed by mergify-bot
parent 1154753a6f
commit f7f400985b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/doctype/doctype.py
View file

@ -1174,7 +1174,7 @@ def make_module_and_roles(doc, perm_fieldname="permissions"):
else:
raise
def check_if_fieldname_conflicts_with_methods(doctype, fieldname):
def check_if_fieldname_conflicts_with_properties_and_methods(doctype, fieldname):
doc = frappe.get_doc({"doctype": doctype})
available_objects = [x for x in dir(doc) if isinstance(x, str)]
property_list = [

4
frappe/custom/doctype/custom_field/custom_field.py
View file

@ -64,8 +64,8 @@ class CustomField(Document):
self.translatable = 0
if not self.flags.ignore_validate:
from frappe.core.doctype.doctype.doctype import check_if_fieldname_conflicts_with_methods
check_if_fieldname_conflicts_with_methods(self.dt, self.fieldname)
from frappe.core.doctype.doctype.doctype import check_if_fieldname_conflicts_with_properties_and_methods
check_if_fieldname_conflicts_with_properties_and_methods(self.dt, self.fieldname)
def on_update(self):
if not frappe.flags.in_setup_wizard: