nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45157 from frappe/mergify/bp/version-15-hotfix/pr-45154

Browse Source 
fix: possible deadlock while using auto reconciliation (backport #45154)
This commit is contained in:
ruthra kumar
2025-01-08 10:05:34 +05:30
committed by GitHub
parent c45f22c776 36dbb867ed
commit 19dc9975dd
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
{ {
"actions": [], "actions": [],
"autoname": "format:ACC-PPR-{#####}", "autoname": "format:ACC-PPR-{#####}",
"beta": 1,
"creation": "2023-03-30 21:28:39.793927", "creation": "2023-03-30 21:28:39.793927",
"default_view": "List", "default_view": "List",
"doctype": "DocType", "doctype": "DocType",
@@ -158,7 +157,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2024-08-27 14:48:56.715320", "modified": "2025-01-08 08:22:14.798085",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Payment Reconciliation", "name": "Process Payment Reconciliation",
@@ -192,4 +191,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"title_field": "company" "title_field": "company"
} }

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

@@ -212,7 +212,7 @@ def trigger_reconciliation_for_queued_docs():
unique_filters = set() unique_filters = set()
queue_size = 5 queue_size = 5
fields = ["company", "party_type", "party", "receivable_payable_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 = () filters = ()

3
erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
View File

@@ -1,7 +1,6 @@
{ {
"actions": [], "actions": [],
"autoname": "format:PPR-LOG-{##}", "autoname": "format:PPR-LOG-{##}",
"beta": 1,
"creation": "2023-03-13 15:00:09.149681", "creation": "2023-03-13 15:00:09.149681",
"default_view": "List", "default_view": "List",
"doctype": "DocType", "doctype": "DocType",
@@ -110,7 +109,7 @@
"in_create": 1, "in_create": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2023-11-02 11:32:12.254018", "modified": "2025-01-08 08:22:19.104975",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Payment Reconciliation Log", "name": "Process Payment Reconciliation Log",