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

Fetch details from Journal Entry in Accounts Payable report (#14495)

Browse Source 
* Fetch bill_no, bill_date from Journal Entry

* Fix as per suggestion

* Fetch details only if bill_no exists
This commit is contained in:
Shreya Shah 2018-06-13 16:33:06 +05:30 committed by Nabin Hait
parent 46c8ccc6a8
commit 3d73a6f7f2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,10 @@ class ReceivablePayableReport(object):
if party_type == "Supplier": if party_type == "Supplier":
for pi in frappe.db.sql("""select name, due_date, bill_no, bill_date for pi in frappe.db.sql("""select name, due_date, bill_no, bill_date
from `tabPurchase Invoice` where docstatus=1""", as_dict=1): from `tabPurchase Invoice` where docstatus = 1
union
select name, due_date, bill_no, bill_date from `tabJournal Entry`
where docstatus = 1 and bill_no is not NULL""", as_dict=1):
voucher_details.setdefault(pi.name, pi) voucher_details.setdefault(pi.name, pi)
return voucher_details return voucher_details