nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19835 from deepeshgarg007/accounts_payable_terms_v12

Browse Source 
feat: Accounts Payable report based on payment terms
This commit is contained in:
Deepesh Garg
2019-12-06 19:41:27 +05:30
committed by GitHub
parent d16ef54665 dabb303358
commit 80dfb9f834
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/accounts_payable/accounts_payable.js
View File

@@ -100,6 +100,11 @@ frappe.query_reports["Accounts Payable"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Supplier Group" "options": "Supplier Group"
}, },
{
"fieldname":"based_on_payment_terms",
"label": __("Based On Payment Terms"),
"fieldtype": "Check",
},
{ {
"fieldname":"tax_id", "fieldname":"tax_id",
"label": __("Tax Id"), "label": __("Tax Id"),

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

@@ -330,7 +330,7 @@ class ReceivablePayableReport(object):
self.append_payment_term(row, d, term) self.append_payment_term(row, d, term)
def append_payment_term(self, row, d, term): def append_payment_term(self, row, d, term):
if self.filters.get("customer") and d.currency == d.party_account_currency: if (self.filters.get("customer") or self.filters.get("supplier")) and d.currency == d.party_account_currency:
invoiced = d.payment_amount invoiced = d.payment_amount
else: else:
invoiced = flt(flt(d.payment_amount) * flt(d.conversion_rate), self.currency_precision) invoiced = flt(flt(d.payment_amount) * flt(d.conversion_rate), self.currency_precision)