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

Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times

Browse Source 
fix: Taxes and charges table not clear the existing rows if the template is changed
This commit is contained in:
Nabin Hait 2019-04-12 11:02:37 +05:30 committed by GitHub
commit 165e92ad5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 310 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

435
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

File diff suppressed because it is too large Load Diff

11
erpnext/public/js/controllers/transaction.js
View File

@ -1389,14 +1389,17 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
args: { args: {
"master_doctype": frappe.meta.get_docfield(this.frm.doc.doctype, "taxes_and_charges", "master_doctype": frappe.meta.get_docfield(this.frm.doc.doctype, "taxes_and_charges",
this.frm.doc.name).options, this.frm.doc.name).options,
"master_name": this.frm.doc.taxes_and_charges, "master_name": this.frm.doc.taxes_and_charges
}, },
callback: function(r) { callback: function(r) {
if(!r.exc) { if(!r.exc) {
for (let tax of r.message) { me.frm.set_value("taxes", r.message);
me.frm.add_child("taxes", tax);
if(me.frm.doc.shipping_rule) {
me.frm.script_manager.trigger("shipping_rule");
} else {
me.calculate_taxes_and_totals();
} }
me.calculate_taxes_and_totals();
} }
} }
}); });