From 265f7ce092167bda4415e4263e0313ec9cbde481 Mon Sep 17 00:00:00 2001
From: diptanilsaha <diptanil@frappe.io>
Date: Tue, 5 Aug 2025 15:58:53 +0530
Subject: [PATCH] refactor(pos): set/reset grand total to default mode of
 payment

---
 .../selling/page/point_of_sale/pos_payment.js | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/erpnext/selling/page/point_of_sale/pos_payment.js b/erpnext/selling/page/point_of_sale/pos_payment.js
index 242a49b536b..5c4efff1dc5 100644
--- a/erpnext/selling/page/point_of_sale/pos_payment.js
+++ b/erpnext/selling/page/point_of_sale/pos_payment.js
@@ -450,10 +450,11 @@ erpnext.PointOfSale.Payment = class {
 	}
 
 	render_payment_section() {
+		this.grand_total_to_default_mop();
 		this.render_payment_mode_dom();
 		this.make_invoice_field_dialog();
 		this.update_totals_section();
-		this.set_grand_total_to_default_mop();
+		this.focus_on_default_mop();
 	}
 
 	after_render() {
@@ -497,6 +498,17 @@ erpnext.PointOfSale.Payment = class {
 		}
 	}
 
+	grand_total_to_default_mop() {
+		if (this.set_gt_to_default_mop) return;
+		const doc = this.events.get_frm().doc;
+		const payments = doc.payments;
+		payments.forEach((p) => {
+			if (p.default) {
+				frappe.model.set_value(p.doctype, p.name, "amount", 0);
+			}
+		});
+	}
+
 	render_payment_mode_dom() {
 		const doc = this.events.get_frm().doc;
 		const payments = doc.payments;
@@ -557,6 +569,7 @@ erpnext.PointOfSale.Payment = class {
 	}
 
 	focus_on_default_mop() {
+		if (!this.set_gt_to_default_mop) return;
 		const doc = this.events.get_frm().doc;
 		const payments = doc.payments;
 		payments.forEach((p) => {
@@ -711,12 +724,6 @@ erpnext.PointOfSale.Payment = class {
 			.toLowerCase();
 	}
 
-	set_grand_total_to_default_mop() {
-		if (this.set_gt_to_default_mop) {
-			this.focus_on_default_mop();
-		}
-	}
-
 	validate_reqd_invoice_fields() {
 		if (this.invoice_fields.length === 0) return true;
 		const doc = this.events.get_frm().doc;