nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sider issues

Browse Source 
(cherry picked from commit e7b4204c35)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
This commit is contained in:
Subin Tom
2021-11-16 20:39:58 +05:30
committed by mergify-bot
parent 9e1fd09a64
commit facaa9cc39
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
this.initialize_taxes(); this.initialize_taxes();
this.determine_exclusive_rate(); this.determine_exclusive_rate();
this.calculate_net_total(); this.calculate_net_total();
calculate_shipping_charges(); this.calculate_shipping_charges();
this.calculate_taxes(); this.calculate_taxes();
this.manipulate_grand_total_for_inclusive_tax(); this.manipulate_grand_total_for_inclusive_tax();
this.calculate_totals(); this.calculate_totals();
@@ -265,15 +265,20 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
me.frm.doc.net_total += item.net_amount; me.frm.doc.net_total += item.net_amount;
me.frm.doc.base_net_total += item.base_net_amount; me.frm.doc.base_net_total += item.base_net_amount;
}); });
}
}
calculate_shipping_charges() { calculate_shipping_charges() {
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
<<<<<<< HEAD <<<<<<< HEAD
}, },
======= =======
if(frappe.meta.get_docfield(this.frm.doc.doctype,"shipping_rule",this.frm.doc.name)) { if(frappe.meta.get_docfield(this.frm.doc.doctype,"shipping_rule",this.frm.doc.name)) {
this.shipping_rule() this.shipping_rule()
=======
if (frappe.meta.get_docfield(this.frm.doc.doctype, "shipping_rule", this.frm.doc.name)) {
this.shipping_rule();
>>>>>>> e7b4204c35 (fix: sider issues)
} }
} }
>>>>>>> c78b8b7897 (fix: Shipping Rule picking up old net_rate) >>>>>>> c78b8b7897 (fix: Shipping Rule picking up old net_rate)