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

fixes in renaming account, supplier, customer; fixes in accounts browser; fixes in customer address contact fetching in opportunity

Browse Source
This commit is contained in:
Anand Doshi
2012-12-03 15:45:03 +05:30
parent 346c832475
commit ef6a76f8aa
5 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ class DocType:
def validate_root_details(self):
#does not exists parent
if webnotes.conn.exists("Account", self.doc.name):
if not self.doc.get_value("Account", self.doc.name, "parent_account"):
if not webnotes.conn.get_value("Account", self.doc.name, "parent_account"):
webnotes.msgprint("Root cannot be edited.", raise_exception=1)
def convert_group_to_ledger(self):
@@ -182,10 +182,13 @@ class DocType:
def on_rename(self,newdn,olddn):
company_abbr = sql("select tc.abbr from `tabAccount` ta, `tabCompany` tc where ta.company = tc.name and ta.name=%s", olddn)[0][0]
newdnchk = newdn.split(" - ")
parts = newdn.split(" - ")
if newdnchk[-1].lower() != company_abbr.lower():
msgprint("Please add company abbreviation <b>%s</b>" %(company_abbr), raise_exception=1)
else:
account_name = " - ".join(newdnchk[:-1])
sql("update `tabAccount` set account_name = '%s' where name = '%s'" %(account_name,olddn))
if parts[-1].lower() != company_abbr.lower():
parts.append(company_abbr)
account_name = " - ".join(parts[:-1])
sql("update `tabAccount` set account_name = '%s' where name = '%s'" % \
(account_name,olddn))
return " - ".join(parts)

16
accounts/page/accounts_browser/accounts_browser.js
View File

@@ -38,6 +38,7 @@ pscript['onload_Accounts Browser'] = function(wrapper){
.change(function() {
var ctype = wn.get_route()[1] || 'Account';
erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(), wrapper);
pscript.set_title(wrapper, ctype, $(this).val());
})
.appendTo(wrapper.appframe.$w.find('.appframe-toolbar'));
@@ -60,16 +61,23 @@ pscript['onload_Accounts Browser'] = function(wrapper){
});
}
pscript.set_title = function(wrapper, ctype, val) {
if(val) {
wrapper.appframe.set_title('Chart of '+ctype+'s' + " - " + cstr(val));
} else {
wrapper.appframe.set_title('Chart of '+ctype+'s');
}
}
pscript['onshow_Accounts Browser'] = function(wrapper){
// set route
var ctype = wn.get_route()[1] || 'Account';
wrapper.appframe.set_title('Chart of '+ctype+'s');
if(erpnext.account_chart && erpnext.account_chart.ctype != ctype) {
wrapper.$company_select.change();
}
}
pscript.set_title(wrapper, ctype);
}
erpnext.AccountsChart = Class.extend({