nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge] merge with master

Browse Source
This commit is contained in:
Rushabh Mehta
2013-05-24 16:09:13 +05:30
parent 9b10e362f7 7cd49529f4
commit 126f2c62f2
120 changed files with 1431 additions and 712 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(" - ")