nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55544 from frappe/mergify/bp/version-15-hotfix/pr-54979

Browse Source 
fix(ppr): make default_advance_account optional (backport #54979)
This commit is contained in:
ruthra kumar
2026-06-02 16:48:42 +05:30
committed by GitHub
parent 35b4ada3e2 7200c22890
commit c65d768020
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
View File

@@ -151,13 +151,13 @@
"label": "Default Advance Account", "label": "Default Advance Account",
"mandatory_depends_on": "doc.party_type", "mandatory_depends_on": "doc.party_type",
"options": "Account", "options": "Account",
"reqd": 1 "reqd": 0
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2025-01-08 08:22:14.798085", "modified": "2026-05-16 11:43:12.758685",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Payment Reconciliation", "name": "Process Payment Reconciliation",

7
erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
View File

@@ -23,7 +23,7 @@ class ProcessPaymentReconciliation(Document):
bank_cash_account: DF.Link | None bank_cash_account: DF.Link | None
company: DF.Link company: DF.Link
cost_center: DF.Link | None cost_center: DF.Link | None
default_advance_account: DF.Link default_advance_account: DF.Link | None
error_log: DF.LongText | None error_log: DF.LongText | None
from_invoice_date: DF.Date | None from_invoice_date: DF.Date | None
from_payment_date: DF.Date | None from_payment_date: DF.Date | None
@@ -215,10 +215,7 @@ def trigger_reconciliation_for_queued_docs():
fields = ["company", "party_type", "party", "receivable_payable_account", "default_advance_account"] fields = ["company", "party_type", "party", "receivable_payable_account", "default_advance_account"]
def get_filters_as_tuple(fields, doc): def get_filters_as_tuple(fields, doc):
filters = () return tuple(doc.get(x) or "" for x in fields)
for x in fields:
filters += tuple(doc.get(x))
return filters
for x in all_queued: for x in all_queued:
doc = frappe.get_doc("Process Payment Reconciliation", x) doc = frappe.get_doc("Process Payment Reconciliation", x)