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

Merge pull request #31286 from SolufyPrivateLimited/solufy_rec_pay_report

Browse Source 
fix: Added total of future amount, Remaining Balance in Payable and Receivable reports
This commit is contained in:
Deepesh Garg 2022-07-27 08:26:16 +05:30 committed by GitHub
commit 1e3918d637
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,11 @@ frappe.query_reports["Accounts Payable"] = {
"label": __("Tax Id"), "label": __("Tax Id"),
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1 "hidden": 1
},
{
"fieldname": "show_future_payments",
"label": __("Show Future Payments"),
"fieldtype": "Check",
} }
], ],

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

@ -164,6 +164,8 @@ class ReceivablePayableReport(object):
"range3", "range3",
"range4", "range4",
"range5", "range5",
"future_amount",
"remaining_balance"
] ]
def get_voucher_balance(self, ple): def get_voucher_balance(self, ple):
@ -545,7 +547,7 @@ class ReceivablePayableReport(object):
jea.party, jea.party,
jea.party_type, jea.party_type,
je.posting_date as future_date, je.posting_date as future_date,
sum({0}) as future_amount, sum('{0}') as future_amount,
je.cheque_no as future_ref je.cheque_no as future_ref
from from
`tabJournal Entry` as je inner join `tabJournal Entry Account` as jea `tabJournal Entry` as je inner join `tabJournal Entry Account` as jea