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

fix: new logic for handling revaluation journals

Browse Source
This commit is contained in:
ruthra kumar 2023-11-10 09:49:55 +05:30
parent 922fffda1f
commit 1d8fcd66e6
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,12 +181,18 @@ frappe.query_reports["Accounts Receivable"] = {
"label": __("In Party Currency"), "label": __("In Party Currency"),
"fieldtype": "Check", "fieldtype": "Check",
}, },
{
"fieldname": "for_revaluation_journals",
"label": __("Revaluation Journals"),
"fieldtype": "Check",
},
{ {
"fieldname": "ignore_accounts", "fieldname": "ignore_accounts",
"label": __("Group by Voucher"), "label": __("Group by Voucher"),
"fieldtype": "Check", "fieldtype": "Check",
} }
], ],
"formatter": function(value, row, column, data, default_formatter) { "formatter": function(value, row, column, data, default_formatter) {

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

@ -283,11 +283,20 @@ class ReceivablePayableReport(object):
row.invoice_grand_total = row.invoiced row.invoice_grand_total = row.invoiced
must_consider = False
if self.filters.get("for_revaluation_journals"):
if (abs(row.outstanding) > 1.0 / 10**self.currency_precision) or (
(abs(row.outstanding_in_account_currency) > 1.0 / 10**self.currency_precision)
):
must_consider = True
else:
if (abs(row.outstanding) > 1.0 / 10**self.currency_precision) and ( if (abs(row.outstanding) > 1.0 / 10**self.currency_precision) and (
(abs(row.outstanding_in_account_currency) > 1.0 / 10**self.currency_precision) (abs(row.outstanding_in_account_currency) > 1.0 / 10**self.currency_precision)
or (row.voucher_no in self.err_journals) or (row.voucher_no in self.err_journals)
): ):
must_consider = True
if must_consider:
# non-zero oustanding, we must consider this row # non-zero oustanding, we must consider this row
if self.is_invoice(row) and self.filters.based_on_payment_terms: if self.is_invoice(row) and self.filters.based_on_payment_terms: