nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49470 from aerele/bank-clearance-tax-calculation

Browse Source 
fix(bank clearance): use base total taxes and charges if exists

(cherry picked from commit 302ff49b7f)
This commit is contained in:
Ravibharathi
2025-09-22 11:26:56 +05:30
committed by Mergify
parent 9914d20127
commit 81824320db
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/accounts/doctype/bank_clearance/bank_clearance.py
View File

@@ -137,8 +137,10 @@ def get_payment_entries_for_bank_clearance(
entries = [] entries = []
condition = "" condition = ""
pe_condition = ""
if not include_reconciled_entries: if not include_reconciled_entries:
condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')" condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
pe_condition = "and (pe.clearance_date IS NULL or pe.clearance_date='0000-00-00')"
journal_entries = frappe.db.sql( journal_entries = frappe.db.sql(
f""" f"""
@@ -163,19 +165,20 @@ def get_payment_entries_for_bank_clearance(
payment_entries = frappe.db.sql( payment_entries = frappe.db.sql(
f""" f"""
select select
"Payment Entry" as payment_document, name as payment_entry, "Payment Entry" as payment_document, pe.name as payment_entry,
reference_no as cheque_number, reference_date as cheque_date, pe.reference_no as cheque_number, pe.reference_date as cheque_date,
if(paid_from=%(account)s, paid_amount + total_taxes_and_charges, 0) as credit, if(pe.paid_from=%(account)s, pe.paid_amount + if(pe.payment_type = 'Pay' and c.default_currency = pe.paid_from_account_currency, pe.base_total_taxes_and_charges, pe.total_taxes_and_charges) , 0) as credit,
if(paid_from=%(account)s, 0, received_amount + total_taxes_and_charges) as debit, if(pe.paid_from=%(account)s, 0, pe.received_amount + pe.total_taxes_and_charges) as debit,
posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date, pe.posting_date, ifnull(pe.party,if(pe.paid_from=%(account)s,pe.paid_to,pe.paid_from)) as against_account, pe.clearance_date,
if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency if(pe.paid_to=%(account)s, pe.paid_to_account_currency, pe.paid_from_account_currency) as account_currency
from `tabPayment Entry` from `tabPayment Entry` as pe
join `tabCompany` c on c.name = pe.company
where where
(paid_from=%(account)s or paid_to=%(account)s) and docstatus=1 (pe.paid_from=%(account)s or pe.paid_to=%(account)s) and pe.docstatus=1
and posting_date >= %(from)s and posting_date <= %(to)s and pe.posting_date >= %(from)s and pe.posting_date <= %(to)s
{condition} {pe_condition}
order by order by
posting_date ASC, name DESC pe.posting_date ASC, pe.name DESC
""", """,
{ {
"account": account, "account": account,