Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added PDC from journal entry in AR report (#12844)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-02-12 11:55:07 +05:30 committed by Nabin Hait
parent 0aeeb7e02c
commit 6e7e70c977
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,6 +394,21 @@ def get_pdc_details(party_type):
group by pref.reference_name""", party_type, as_dict=1): group by pref.reference_name""", party_type, as_dict=1):
pdc_details.setdefault(pdc.invoice_no, pdc) pdc_details.setdefault(pdc.invoice_no, pdc)
for pdc in frappe.db.sql("""
select
jea.reference_name as invoice_no, jea.party, jea.party_type,
max(je.cheque_date) as pdc_date, sum(ifnull(je.total_amount,0)) as pdc_amount,
GROUP_CONCAT(je.cheque_no SEPARATOR ', ') as pdc_ref
from
`tabJournal Entry` as je inner join `tabJournal Entry Account` as jea
on
(jea.parent = je.name)
where
je.docstatus = 0 and je.cheque_date > je.posting_date
and jea.party_type = %s
group by jea.reference_name""", party_type, as_dict=1):
pdc_details.setdefault(pdc.invoice_no, pdc)
return pdc_details return pdc_details
def get_dn_details(party_type): def get_dn_details(party_type):