From 8e3636ff53636b1b79ee0207321e7c2bc5bb59ed Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 18:44:56 +0530 Subject: [PATCH] fix: don't set default payment amount in case of invoice return (backport #35645) (#35648) * fix: don't set default payment amount in case of invoice return (#35645) (cherry picked from commit 79483cc90eb71fa82d645b2cf54d9731502cf6c7) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js * chore: fixing conflict --------- Co-authored-by: Anand Baburajan --- erpnext/public/js/controllers/taxes_and_totals.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 7ea12a86b8a..0bd24fc8f86 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -764,11 +764,13 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ precision("base_grand_total") ); } - this.frm.doc.payments.find(pay => { - if (pay.default) { - pay.amount = total_amount_to_pay; - } - }); + if(!this.frm.doc.is_return){ + this.frm.doc.payments.find(payment => { + if (payment.default) { + payment.amount = total_amount_to_pay; + } + }); + } this.frm.refresh_fields(); },