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

minor fix in account and account utils (#14432)

Browse Source
This commit is contained in:
Zarrar 2018-06-11 11:21:17 +05:30 committed by Nabin Hait
parent 65994210f6
commit 88a90ff3b5
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,14 +20,16 @@ class Account(NestedSet):
self.set_onload("can_freeze_account", True) self.set_onload("can_freeze_account", True)
def autoname(self): def autoname(self):
self.name = get_account_autoname(self.account_number, self.account_name, self.company) from erpnext.accounts.utils import get_doc_name_autoname
self.name = get_doc_name_autoname(self.account_number, self.account_name, None, self.company)
def validate(self): def validate(self):
from erpnext.accounts.utils import validate_field_number
if frappe.local.flags.allow_unverified_charts: if frappe.local.flags.allow_unverified_charts:
return return
self.validate_parent() self.validate_parent()
self.validate_root_details() self.validate_root_details()
validate_account_number(self.name, self.account_number, self.company) validate_field_number("Account", self.name, self.account_number, self.company, "account_number")
self.validate_group_or_ledger() self.validate_group_or_ledger()
self.set_root_and_report_type() self.set_root_and_report_type()
self.validate_mandatory() self.validate_mandatory()

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

@ -14,7 +14,6 @@ class CostCenter(NestedSet):
self.name = self.cost_center_name.strip() + ' - ' + \ self.name = self.cost_center_name.strip() + ' - ' + \
frappe.db.get_value("Company", self.company, "abbr") frappe.db.get_value("Company", self.company, "abbr")
def validate(self): def validate(self):
self.validate_mandatory() self.validate_mandatory()

5
erpnext/accounts/utils.py
View File

@ -805,11 +805,12 @@ def validate_field_number(doctype_name, name, field_value, company, field_name):
def get_doc_name_autoname(field_value, doc_title, name, company): def get_doc_name_autoname(field_value, doc_title, name, 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 company: if name:
name_split=name.split("-") name_split=name.split("-")
parts = [doc_title.strip(), name_split[len(name_split)-1].strip()] parts = [doc_title.strip(), name_split[len(name_split)-1].strip()]
else: else:
parts = [doc_title.strip()] abbr = frappe.db.get_value("Company", company, ["abbr"], as_dict=True)
parts = [doc_title.strip(), abbr.abbr]
if cstr(field_value).strip(): if cstr(field_value).strip():
parts.insert(0, cstr(field_value).strip()) parts.insert(0, cstr(field_value).strip())
return ' - '.join(parts) return ' - '.join(parts)