fix: Resolve conflicts
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 7288357..7a48fbd 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -272,16 +272,12 @@
});
}
-<<<<<<< HEAD
calculate_shipping_charges() {
-=======
- calculate_shipping_charges: function() {
// Do not apply shipping rule for POS
if (this.frm.doc.is_pos) {
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"]);
if (frappe.meta.get_docfield(this.frm.doc.doctype, "shipping_rule", this.frm.doc.name)) {
this.shipping_rule();