Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: abbreviation issue on renaming cost center

Browse Source
This commit is contained in:
Nabin Hait 2022-09-15 12:09:18 +05:30
parent 97977cdb4b
commit af21a11e1e
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ class Account(NestedSet):
def autoname(self): def autoname(self):
from erpnext.accounts.utils import get_autoname_with_number from erpnext.accounts.utils import get_autoname_with_number
self.name = get_autoname_with_number(self.account_number, self.account_name, None, self.company) self.name = get_autoname_with_number(self.account_number, self.account_name, self.company)
def validate(self): def validate(self):
from erpnext.accounts.utils import validate_field_number from erpnext.accounts.utils import validate_field_number

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

@ -16,7 +16,7 @@ class CostCenter(NestedSet):
from erpnext.accounts.utils import get_autoname_with_number from erpnext.accounts.utils import get_autoname_with_number
self.name = get_autoname_with_number( self.name = get_autoname_with_number(
self.cost_center_number, self.cost_center_name, None, self.company self.cost_center_number, self.cost_center_name, self.company
) )
def validate(self): def validate(self):

14
erpnext/accounts/utils.py
View File

@ -1037,7 +1037,7 @@ def update_cost_center(docname, cost_center_name, cost_center_number, company, m
frappe.db.set_value("Cost Center", docname, "cost_center_name", cost_center_name.strip()) frappe.db.set_value("Cost Center", docname, "cost_center_name", cost_center_name.strip())
new_name = get_autoname_with_number(cost_center_number, cost_center_name, docname, company) new_name = get_autoname_with_number(cost_center_number, cost_center_name, company)
if docname != new_name: if docname != new_name:
frappe.rename_doc("Cost Center", docname, new_name, force=1, merge=merge) frappe.rename_doc("Cost Center", docname, new_name, force=1, merge=merge)
return new_name return new_name
@ -1060,16 +1060,14 @@ def validate_field_number(doctype_name, docname, number_value, company, field_na
) )
def get_autoname_with_number(number_value, doc_title, name, company): def get_autoname_with_number(number_value, doc_title, company):
"""append title with prefix as number and suffix as company's abbreviation separated by '-'""" """append title with prefix as number and suffix as company's abbreviation separated by '-'"""
if name: company_abbr = frappe.get_cached_value("Company", company, "abbr")
name_split = name.split("-") parts = [doc_title.strip(), company_abbr]
parts = [doc_title.strip(), name_split[len(name_split) - 1].strip()]
else:
abbr = frappe.get_cached_value("Company", company, ["abbr"], as_dict=True)
parts = [doc_title.strip(), abbr.abbr]
if cstr(number_value).strip(): if cstr(number_value).strip():
parts.insert(0, cstr(number_value).strip()) parts.insert(0, cstr(number_value).strip())
return " - ".join(parts) return " - ".join(parts)