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

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg 2022-04-09 19:53:40 +05:30 committed by GitHub
parent 631545aa32
commit e30cc8422c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,16 +272,12 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}); });
} }
<<<<<<< HEAD
calculate_shipping_charges() { calculate_shipping_charges() {
=======
calculate_shipping_charges: function() {
// Do not apply shipping rule for POS // Do not apply shipping rule for POS
if (this.frm.doc.is_pos) { if (this.frm.doc.is_pos) {
return; return;
} }
>>>>>>> c0ebcfb393 (fix: Do not apply shipping rule for POS transactions)
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)) { if (frappe.meta.get_docfield(this.frm.doc.doctype, "shipping_rule", this.frm.doc.name)) {
this.shipping_rule(); this.shipping_rule();