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

[script report] accounts payable migrated to new style

Browse Source
This commit is contained in:
Nabin Hait 2013-04-23 15:53:33 +05:30
parent 5494b181ac
commit b2972dca98
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
accounts/report/accounts_payable/accounts_payable.py
View File

@ -13,7 +13,7 @@ def execute(filters=None):
account_supplier_type_map = get_account_supplier_type_map() account_supplier_type_map = get_account_supplier_type_map()
pi_map = get_pi_map() pi_map = get_pi_map()
# Age of the invoice on this date # Age of the invoice on this date
age_on = getdate(filters.get("report_date")) > getdate(nowdate()) \ age_on = getdate(filters.get("report_date")) > getdate(nowdate()) \
and nowdate() or filters.get("report_date") and nowdate() or filters.get("report_date")
@ -24,8 +24,13 @@ def execute(filters=None):
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:
due_date = (gle.voucher_type == "Purchase Invoice") \ if gle.voucher_type == "Purchase Invoice":
and pi_map.get(gle.voucher_no).get("due_date") or "" pi_info = pi_map.get(gle.voucher_no)
due_date = pi_info.get("due_date")
bill_no = pi_info.get("bill_no")
bill_date = pi_info.get("bill_date")
else:
due_date = bill_no = bill_date = ""
invoiced_amount = gle.credit > 0 and gle.credit or 0 invoiced_amount = gle.credit > 0 and gle.credit or 0
paid_amount = get_paid_amount(gle, filters.get("report_date") or nowdate(), paid_amount = get_paid_amount(gle, filters.get("report_date") or nowdate(),
@ -34,9 +39,8 @@ def execute(filters=None):
if abs(flt(outstanding_amount)) > 0.01: if abs(flt(outstanding_amount)) > 0.01:
row = [gle.posting_date, gle.account, gle.voucher_type, gle.voucher_no, row = [gle.posting_date, gle.account, gle.voucher_type, gle.voucher_no,
gle.remarks, account_supplier_type_map.get(gle.account), due_date, gle.remarks, account_supplier_type_map.get(gle.account), due_date, bill_no,
pi_map.get("bill_no"), pi_map.get("bill_date"), invoiced_amount, bill_date, invoiced_amount, paid_amount, outstanding_amount]
paid_amount, outstanding_amount]
# Ageing # Ageing
if filters.get("ageing_based_on") == "Due Date": if filters.get("ageing_based_on") == "Due Date":