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

fix: Shipping Rule picking up old net_rate

Browse Source 
(cherry picked from commit c78b8b7897)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
#	erpnext/public/js/controllers/transaction.js
This commit is contained in:
Subin Tom
2021-11-09 14:46:45 +05:30
committed by mergify-bot
parent 16ce9dfa12
commit e65a720810
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,14 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
}); });
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"]);
<<<<<<< HEAD
}, },
=======
if(frappe.meta.get_docfield(this.frm.doc.doctype,"shipping_rule",this.frm.doc.name)) {
this.shipping_rule()
}
}
>>>>>>> c78b8b7897 (fix: Shipping Rule picking up old net_rate)
add_taxes_from_item_tax_template: function(item_tax_map) { add_taxes_from_item_tax_template: function(item_tax_map) {
let me = this; let me = this;

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

@@ -1065,17 +1065,16 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
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', ''));
} }
<<<<<<< HEAD
else { else {
me.calculate_taxes_and_totals(); me.calculate_taxes_and_totals();
} }
}, },
=======
}
>>>>>>> c78b8b7897 (fix: Shipping Rule picking up old net_rate)
set_margin_amount_based_on_currency: function(exchange_rate) { set_margin_amount_based_on_currency: function(exchange_rate) {
if (in_list(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Purchase Invoice", "Purchase Order", "Purchase Receipt"]), this.frm.doc.doctype) { if (in_list(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Purchase Invoice", "Purchase Order", "Purchase Receipt"]), this.frm.doc.doctype) {