nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show draft future payments as well

Browse Source
This commit is contained in:
Nabin Hait
2019-09-11 18:40:31 +05:30
committed by GitHub
parent 3dc8941be7
commit d225f5993b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,7 +364,7 @@ class ReceivablePayableReport(object):
on on
(ref.parent = payment_entry.name) (ref.parent = payment_entry.name)
where where
payment_entry.docstatus = 1 payment_entry.docstatus < 2
and payment_entry.posting_date > %s and payment_entry.posting_date > %s
and payment_entry.party_type = %s and payment_entry.party_type = %s
""", (self.filters.report_date, self.party_type), as_dict=1) """, (self.filters.report_date, self.party_type), as_dict=1)
@@ -389,7 +389,7 @@ class ReceivablePayableReport(object):
on on
(jea.parent = je.name) (jea.parent = je.name)
where where
je.docstatus = 1 je.docstatus < 2
and je.posting_date > %s and je.posting_date > %s
and jea.party_type = %s and jea.party_type = %s
and jea.reference_name is not null and jea.reference_name != '' and jea.reference_name is not null and jea.reference_name != ''
@@ -685,4 +685,4 @@ class ReceivablePayableReport(object):
'datasets': rows 'datasets': rows
}, },
"type": 'percentage' "type": 'percentage'
} }