nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rename] [fix] merge should be passed to on_rename method of controller for further processing

Browse Source
This commit is contained in:
Anand Doshi
2013-05-09 12:45:18 +05:30
parent 4f8a81ca97
commit bddd5d9b0c
8 changed files with 73 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/account/account.py
View File

@@ -187,7 +187,7 @@ class DocType:
sql("""delete from `tabGL Entry` where account = %s and
ifnull(is_cancelled, 'No') = 'Yes'""", self.doc.name)
def on_rename(self, new, old):
def on_rename(self, new, old, merge=False):
company_abbr = webnotes.conn.get_value("Company", self.doc.company, "abbr")
parts = new.split(" - ")

2
accounts/doctype/cost_center/cost_center.py
View File

@@ -87,7 +87,7 @@ class DocType(DocTypeNestedSet):
self.validate_mandatory()
self.validate_budget_details()
def on_rename(self, new, old):
def on_rename(self, new, old, merge=False):
company_abbr = webnotes.conn.get_value("Company", self.doc.company_name, "abbr")
parts = new.split(" - ")