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

fix: Shipping Rule picking up old net_rate

Browse Source
This commit is contained in:
Subin Tom 2021-11-09 14:46:45 +05:30
parent 07a3be6f61
commit c78b8b7897
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/controllers/taxes_and_totals.js
View File

@ -268,6 +268,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}); });
frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]); frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]);
if(frappe.meta.get_docfield(this.frm.doc.doctype,"shipping_rule",this.frm.doc.name)) {
this.shipping_rule()
}
} }
add_taxes_from_item_tax_template(item_tax_map) { add_taxes_from_item_tax_template(item_tax_map) {

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

@ -1085,16 +1085,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
return this.frm.call({ return this.frm.call({
doc: this.frm.doc, doc: this.frm.doc,
method: "apply_shipping_rule", method: "apply_shipping_rule",
callback: function(r) {
if(!r.exc) {
me.calculate_taxes_and_totals();
}
}
}).fail(() => this.frm.set_value('shipping_rule', '')); }).fail(() => this.frm.set_value('shipping_rule', ''));
} }
else {
me.calculate_taxes_and_totals();
}
} }
set_margin_amount_based_on_currency(exchange_rate) { set_margin_amount_based_on_currency(exchange_rate) {