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

Allow advance JV payments in Accounts Receivable/Payable

Browse Source
This commit is contained in:
ankitjavalkarwork 2014-10-10 13:13:39 +05:30
parent b7e5ad0a31
commit ff231b5e62
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/report/accounts_payable/accounts_payable.py
View File

@ -30,7 +30,8 @@ def execute(filters=None):
data = [] data = []
for gle in entries: for gle in entries:
if cstr(gle.against_voucher) == gle.voucher_no or not gle.against_voucher \ if cstr(gle.against_voucher) == gle.voucher_no or not gle.against_voucher \
or [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date: or [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date \
or (gle.against_voucher_type == "Purchase Order"):
voucher_details = voucher_detail_map.get(gle.voucher_type, {}).get(gle.voucher_no, {}) voucher_details = voucher_detail_map.get(gle.voucher_type, {}).get(gle.voucher_no, {})
invoiced_amount = gle.credit > 0 and gle.credit or 0 invoiced_amount = gle.credit > 0 and gle.credit or 0

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

@ -80,6 +80,9 @@ class AccountsReceivableReport(object):
# advance # advance
(not gle.against_voucher) or (not gle.against_voucher) or
# against sales order
(gle.against_voucher_type == "Sales Order") or
# sales invoice # sales invoice
(gle.against_voucher==gle.voucher_no and gle.debit > 0) or (gle.against_voucher==gle.voucher_no and gle.debit > 0) or