From e8ba2b1576a6f46cc34d8fbfc87bd83aa8117be5 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Tue, 5 Aug 2025 13:24:49 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/public/js/controllers/taxes_and_totals.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index a985e5faef5..be503a45d56 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -932,14 +932,6 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { var me = this; var payment_status = true; if(this.frm.doc.is_pos && (update_paid_amount===undefined || update_paid_amount)) { -<<<<<<< HEAD - let r = await frappe.db.get_value("POS Profile", this.frm.doc.pos_profile, "disable_grand_total_to_default_mop"); - - if (r.message.disable_grand_total_to_default_mop) { - return; - } -======= ->>>>>>> 871b8473fa (fix: remove api call to set default payments) $.each(this.frm.doc['payments'] || [], function(index, data) { if(data.default && payment_status && total_amount_to_pay > 0) {