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

Merge pull request #49879 from diptanilsaha/bank_reco_si_pay_ref

Browse Source 
fix(bank reconciliation tool): show reference no for sales invoice and enabled auto reconcile for sales invoices
This commit is contained in:
Diptanil Saha
2025-10-06 12:37:20 +05:30
committed by GitHub
parent 72b4aa1aac 3bbca629c6
commit 69cb2ca839
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
View File

@@ -409,7 +409,7 @@ def start_auto_reconcile(
for transaction in bank_transactions: for transaction in bank_transactions:
linked_payments = get_linked_payments( linked_payments = get_linked_payments(
transaction.name, transaction.name,
["payment_entry", "journal_entry"], ["payment_entry", "journal_entry", "sales_invoice"],
from_date, from_date,
to_date, to_date,
filter_by_reference_date, filter_by_reference_date,
@@ -666,7 +666,7 @@ def get_matching_queries(
queries.append(query) queries.append(query)
if transaction.deposit > 0.0 and "sales_invoice" in document_types: if transaction.deposit > 0.0 and "sales_invoice" in document_types:
query = get_si_matching_query(exact_match, currency, common_filters) query = get_si_matching_query(exact_match, currency, common_filters, transaction)
queries.append(query) queries.append(query)
if transaction.withdrawal > 0.0: if transaction.withdrawal > 0.0:
@@ -854,11 +854,14 @@ def get_je_matching_query(
return query return query
def get_si_matching_query(exact_match, currency, common_filters): def get_si_matching_query(exact_match, currency, common_filters, transaction):
# get matching sales invoice query # get matching sales invoice query
si = frappe.qb.DocType("Sales Invoice") si = frappe.qb.DocType("Sales Invoice")
sip = frappe.qb.DocType("Sales Invoice Payment") sip = frappe.qb.DocType("Sales Invoice Payment")
ref_condition = sip.reference_no == transaction.reference_number
ref_rank = frappe.qb.terms.Case().when(ref_condition, 1).else_(0)
amount_equality = sip.amount == common_filters.amount amount_equality = sip.amount == common_filters.amount
amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0) amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
amount_condition = amount_equality if exact_match else sip.amount > 0.0 amount_condition = amount_equality if exact_match else sip.amount > 0.0
@@ -871,11 +874,11 @@ def get_si_matching_query(exact_match, currency, common_filters):
.join(si) .join(si)
.on(sip.parent == si.name) .on(sip.parent == si.name)
.select( .select(
(party_rank + amount_rank + 1).as_("rank"), (ref_rank + party_rank + amount_rank + 1).as_("rank"),
ConstantColumn("Sales Invoice").as_("doctype"), ConstantColumn("Sales Invoice").as_("doctype"),
si.name, si.name,
sip.amount.as_("paid_amount"), sip.amount.as_("paid_amount"),
ConstantColumn("").as_("reference_no"), sip.reference_no,
ConstantColumn("").as_("reference_date"), ConstantColumn("").as_("reference_date"),
si.customer.as_("party"), si.customer.as_("party"),
ConstantColumn("Customer").as_("party_type"), ConstantColumn("Customer").as_("party_type"),
@@ -889,6 +892,9 @@ def get_si_matching_query(exact_match, currency, common_filters):
.where(si.currency == currency) .where(si.currency == currency)
) )
if frappe.flags.auto_reconcile_vouchers is True:
query = query.where(ref_condition)
return query return query