schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18349 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary

Browse Source 
feat: added payment terms filter in the accounts payable summary
This commit is contained in:
Deepesh Garg
2019-07-16 08:39:50 +05:30
committed by GitHub
parent b4cf29391b f6060fa5f2
commit a2c9c9505c
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,12 @@ frappe.query_reports["Accounts Payable"] = {
} }
} }
}, },
{
"fieldname":"payment_terms_template",
"label": __("Payment Terms Template"),
"fieldtype": "Link",
"options": "Payment Terms Template"
},
{ {
"fieldname":"supplier_group", "fieldname":"supplier_group",
"label": __("Supplier Group"), "label": __("Supplier Group"),

6
erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
View File

@@ -63,6 +63,12 @@ frappe.query_reports["Accounts Payable Summary"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Supplier" "options": "Supplier"
}, },
{
"fieldname":"payment_terms_template",
"label": __("Payment Terms Template"),
"fieldtype": "Link",
"options": "Payment Terms Template"
},
{ {
"fieldname":"supplier_group", "fieldname":"supplier_group",
"label": __("Supplier Group"), "label": __("Supplier Group"),

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

@@ -540,6 +540,10 @@ class ReceivablePayableReport(object):
where supplier_group=%s)""") where supplier_group=%s)""")
values.append(self.filters.get("supplier_group")) values.append(self.filters.get("supplier_group"))
if self.filters.get("payment_terms_template"):
conditions.append("party in (select name from tabSupplier where payment_terms=%s)")
values.append(self.filters.get("payment_terms_template"))
accounts = [d.name for d in frappe.get_all("Account", accounts = [d.name for d in frappe.get_all("Account",
filters={"account_type": account_type, "company": self.filters.company})] filters={"account_type": account_type, "company": self.filters.company})]
conditions.append("account in (%s)" % ','.join(['%s'] *len(accounts))) conditions.append("account in (%s)" % ','.join(['%s'] *len(accounts)))