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

Merge pull request #38036 from frappe/mergify/bp/version-15-hotfix/pr-38004

Browse Source 
fix: handling of exchange rate journals in AR/AP (backport #38004)
This commit is contained in:
ruthra kumar 2023-11-10 11:59:06 +05:30 committed by GitHub
commit ddb1a7643a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 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

@ -176,12 +176,18 @@ frappe.query_reports["Accounts Receivable"] = {
"label": __("Show Remarks"), "label": __("Show Remarks"),
"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) {

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

@ -279,11 +279,20 @@ class ReceivablePayableReport(object):
row.invoice_grand_total = row.invoiced row.invoice_grand_total = row.invoiced
if (abs(row.outstanding) > 1.0 / 10**self.currency_precision) and ( must_consider = False
(abs(row.outstanding_in_account_currency) > 1.0 / 10**self.currency_precision) if self.filters.get("for_revaluation_journals"):
or (row.voucher_no in self.err_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 (
(abs(row.outstanding_in_account_currency) > 1.0 / 10**self.currency_precision)
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: