schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary (#21837)

Browse Source 
* fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report

* fix: Add future payment filter in AR/AP summary

* fix: Show unallocated future payments only till current creation date

* fix: Remove extra query

* fix: Remove debug

* fix: Condition
This commit is contained in:
Deepesh Garg
2020-05-27 12:46:12 +05:30
committed by GitHub
parent a18c896a56
commit ed2c1803df
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -559,6 +559,14 @@ class ReceivablePayableReport(object):
conditions, values = self.prepare_conditions()
order_by = self.get_order_by_condition()
if self.filters.show_future_payments:
values.insert(2, self.filters.report_date)
date_condition = """AND (posting_date <= %s
OR (against_voucher IS NULL AND DATE(creation) <= %s))"""
else:
date_condition = "AND posting_date <=%s"
if self.filters.get(scrub(self.party_type)):
select_fields = "debit_in_account_currency as debit, credit_in_account_currency as credit"
else:
@@ -574,9 +582,8 @@ class ReceivablePayableReport(object):
docstatus < 2
and party_type=%s
and (party is not null and party != '')
and posting_date <= %s
{1} {2}"""
.format(select_fields, conditions, order_by), values, as_dict=True)
{1} {2} {3}"""
.format(select_fields, date_condition, conditions, order_by), values, as_dict=True)
def get_sales_invoices_or_customers_based_on_sales_person(self):
if self.filters.get("sales_person"):