CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-07 12:33:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Bank Reconciliation Statement Report Company Filter

Browse Source 
(cherry picked from commit 50c92034ba)
This commit is contained in:
creative-paramu
2024-12-27 17:54:20 +05:30
committed by ruthra kumar
parent 21a83c508a
commit 622bfa6633
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
View File

@@ -142,7 +142,8 @@ def get_journal_entries(filters):
where jvd.parent = jv.name and jv.docstatus=1 where jvd.parent = jv.name and jv.docstatus=1
and jvd.account = %(account)s and jv.posting_date <= %(report_date)s and jvd.account = %(account)s and jv.posting_date <= %(report_date)s
and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s
and ifnull(jv.is_opening, 'No') = 'No'""", and ifnull(jv.is_opening, 'No') = 'No'
and jv.company = %(company)s """,
filters, filters,
as_dict=1, as_dict=1,
) )
@@ -163,6 +164,7 @@ def get_payment_entries(filters):
(paid_from=%(account)s or paid_to=%(account)s) and docstatus=1 (paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
and posting_date <= %(report_date)s and posting_date <= %(report_date)s
and ifnull(clearance_date, '4000-01-01') > %(report_date)s and ifnull(clearance_date, '4000-01-01') > %(report_date)s
and company = %(company)s
""", """,
filters, filters,
as_dict=1, as_dict=1,
@@ -181,6 +183,7 @@ def get_pos_entries(filters):
sip.account=%(account)s and si.docstatus=1 and sip.parent = si.name sip.account=%(account)s and si.docstatus=1 and sip.parent = si.name
and account.name = sip.account and si.posting_date <= %(report_date)s and and account.name = sip.account and si.posting_date <= %(report_date)s and
ifnull(sip.clearance_date, '4000-01-01') > %(report_date)s ifnull(sip.clearance_date, '4000-01-01') > %(report_date)s
and si.company = %(company)s
order by order by
si.posting_date ASC, si.name DESC si.posting_date ASC, si.name DESC
""", """,