From 7a7cc315239a9f4c566e8a91a7ba35f2cbfd84ec Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Sat, 16 May 2026 11:48:18 +0530 Subject: [PATCH 1/2] fix(ppr): make default_advance_account optional (cherry picked from commit 4b1d369ac6123e025adb35f46eb851c7388f821a) --- .../process_payment_reconciliation.json | 4 ++-- .../process_payment_reconciliation.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json index 08c7d8247ac..fabb2e32164 100644 --- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json +++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json @@ -151,13 +151,13 @@ "label": "Default Advance Account", "mandatory_depends_on": "doc.party_type", "options": "Account", - "reqd": 1 + "reqd": 0 } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2025-01-08 08:22:14.798085", + "modified": "2026-05-16 11:43:12.758685", "modified_by": "Administrator", "module": "Accounts", "name": "Process Payment Reconciliation", diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py index 4f6741f17cd..7023b64b35c 100644 --- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py +++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py @@ -218,10 +218,7 @@ def trigger_reconciliation_for_queued_docs(): fields = ["company", "party_type", "party", "receivable_payable_account", "default_advance_account"] def get_filters_as_tuple(fields, doc): - filters = () - for x in fields: - filters += tuple(doc.get(x)) - return filters + return tuple(doc.get(x) or "" for x in fields) for x in all_queued: doc = frappe.get_doc("Process Payment Reconciliation", x) From 0bbc493213f1c34ff7308d9658ff4fd64795636f Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Sat, 16 May 2026 12:09:59 +0530 Subject: [PATCH 2/2] fix: update default_advance_account type (cherry picked from commit 30b9e113035824253d4eab199f0eea63612d9938) --- .../process_payment_reconciliation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py index 7023b64b35c..91eaf67d083 100644 --- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py +++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py @@ -23,7 +23,7 @@ class ProcessPaymentReconciliation(Document): bank_cash_account: DF.Link | None company: DF.Link cost_center: DF.Link | None - default_advance_account: DF.Link + default_advance_account: DF.Link | None error_log: DF.LongText | None from_invoice_date: DF.Date | None from_payment_date: DF.Date | None