schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters

Browse Source
This commit is contained in:
Deepesh Garg
2020-11-25 14:51:11 +05:30
parent 6b9dda5f3e 6b57cf3285
commit 1a4390de44
244 changed files with 4883 additions and 2442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,18 +137,18 @@ 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);
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' && d.account_head) {
frappe.model.set_value(cdt, cdn, "description", d.account_head.split(' - ')[0]);
}
}