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

fix: correcting description field in taxes and charges for accounts that have account number + account name

Browse Source
This commit is contained in:
pateljannat 2020-11-05 16:24:33 +05:30
parent da878c43fc
commit 403822afb3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/public/js/controllers/accounts.js
View File

@ -146,18 +146,21 @@ cur_frm.cscript.account_head = function(doc, cdt, cdn) {
if(!d.charge_type && d.account_head){
frappe.msgprint(__("Please select Charge Type first"));
frappe.model.set_value(cdt, cdn, "account_head", "");
} else if(d.account_head && d.charge_type!=="Actual") {
} else if(d.account_head) {
frappe.call({
type:"GET",
method: "erpnext.controllers.accounts_controller.get_tax_rate",
args: {"account_head":d.account_head},
callback: function(r) {
frappe.model.set_value(cdt, cdn, "rate", r.message.tax_rate || 0);
frappe.model.set_value(cdt, cdn, "description", r.message.account_name);
if(d.charge_type!=="Actual"){
frappe.model.set_value(cdt, cdn, "rate", r.message.tax_rate || 0);
frappe.model.set_value(cdt, cdn, "description", r.message.account_name);
}
else if(d.charge_type == 'Actual'){
frappe.model.set_value(cdt, cdn, "description", r.message.account_name);
}
}
})
} else if (d.charge_type == 'Actual' && d.account_head) {
frappe.model.set_value(cdt, cdn, "description", d.account_head.split(' - ')[0]);
}
}