From b4053ee0d81002bf602b11566289ee9080de2d3b Mon Sep 17 00:00:00 2001 From: Abdeali Chharchhoda Date: Mon, 8 Dec 2025 18:51:21 +0530 Subject: [PATCH 1/2] fix: ensure payment request button only shows for submitted invoices (cherry picked from commit f26ee9e5462d7e0561407dd1d2997089cc1616bd) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js --- .../accounts/doctype/purchase_invoice/purchase_invoice.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index 9a831598328..60b5c6ae851 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -126,8 +126,13 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. } } +<<<<<<< HEAD if (doc.outstanding_amount > 0 && !cint(doc.is_return) && !doc.on_hold) { cur_frm.add_custom_button( +======= + if (doc.docstatus == 1 && doc.outstanding_amount > 0 && !cint(doc.is_return) && !doc.on_hold) { + this.frm.add_custom_button( +>>>>>>> f26ee9e546 (fix: ensure payment request button only shows for submitted invoices) __("Payment Request"), function () { me.make_payment_request(); From af067d1c00f32b5a6b829484bf868f7c00fd4289 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Tue, 9 Dec 2025 17:17:27 +0530 Subject: [PATCH 2/2] chore: resolve conflict --- .../accounts/doctype/purchase_invoice/purchase_invoice.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index 60b5c6ae851..2e7e0314aba 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -126,13 +126,8 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying. } } -<<<<<<< HEAD - if (doc.outstanding_amount > 0 && !cint(doc.is_return) && !doc.on_hold) { - cur_frm.add_custom_button( -======= if (doc.docstatus == 1 && doc.outstanding_amount > 0 && !cint(doc.is_return) && !doc.on_hold) { this.frm.add_custom_button( ->>>>>>> f26ee9e546 (fix: ensure payment request button only shows for submitted invoices) __("Payment Request"), function () { me.make_payment_request();