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

Merge branch '1310' of github.com:webnotes/erpnext into 1310

Browse Source
This commit is contained in:
Nabin Hait 2013-11-27 17:28:46 +05:30
commit b8f3a3e828
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.py
View File

@ -21,7 +21,7 @@ def execute(filters=None):
d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]
if d.against_invoice:
row += get_ageing_data(against_invoice_date, d.posting_date, d.credit or -1*d.debit)
row += get_ageing_data(d.posting_date, against_invoice_date, d.credit or -1*d.debit)
else:
row += ["", "", "", "", ""]
@ -74,4 +74,4 @@ def get_si_posting_date_map():
for t in webnotes.conn.sql("""select name, posting_date from `tabSales Invoice`"""):
si_posting_date_map[t[0]] = t[1]
return si_posting_date_map
return si_posting_date_map

4
accounts/report/payment_made_with_ageing/payment_made_with_ageing.py
View File

@ -21,7 +21,7 @@ def execute(filters=None):
d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]
if d.against_voucher:
row += get_ageing_data(against_voucher_date, d.posting_date, d.debit or -1*d.credit)
row += get_ageing_data(d.posting_date, against_voucher_date, d.debit or -1*d.credit)
else:
row += ["", "", "", "", ""]
@ -73,4 +73,4 @@ def get_pi_posting_date_map():
for t in webnotes.conn.sql("""select name, posting_date from `tabPurchase Invoice`"""):
pi_posting_date_map[t[0]] = t[1]
return pi_posting_date_map
return pi_posting_date_map