From a39bc626c705a7f3be88dea2a67801b0891b57d6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 6 Oct 2025 12:17:57 +0530 Subject: [PATCH] fix: resolved conflict --- erpnext/public/js/controllers/taxes_and_totals.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 2b0427ee345..d8c81b726ee 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -76,16 +76,10 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { // Update paid amount on return/debit note creation if ( -<<<<<<< HEAD - this.frm.doc.doctype === "Purchase Invoice" - && this.frm.doc.is_return - && (this.frm.doc.grand_total > this.frm.doc.paid_amount) -======= this.frm.doc.doctype === "Purchase Invoice" && this.frm.doc.is_return && this.frm.doc.grand_total < 0 && this.frm.doc.grand_total > this.frm.doc.paid_amount ->>>>>>> dcbcc596f2 (fix: Set paid amount automatically only if return entry validated and has negative grand total (#49829)) ) { this.frm.doc.paid_amount = flt(this.frm.doc.grand_total, precision("grand_total")); }