mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 07:54:46 +00:00
Merge pull request #42385 from frappe/mergify/bp/version-15-hotfix/pr-42374
fix: Show the rows in AR/AP report where outstanding equals to 0.01 (backport #42374)
This commit is contained in:
@@ -288,13 +288,13 @@ class ReceivablePayableReport:
|
|||||||
|
|
||||||
must_consider = False
|
must_consider = False
|
||||||
if self.filters.get("for_revaluation_journals"):
|
if self.filters.get("for_revaluation_journals"):
|
||||||
if (abs(row.outstanding) > 0.0 / 10**self.currency_precision) or (
|
if (abs(row.outstanding) >= 0.0 / 10**self.currency_precision) or (
|
||||||
abs(row.outstanding_in_account_currency) > 0.0 / 10**self.currency_precision
|
abs(row.outstanding_in_account_currency) >= 0.0 / 10**self.currency_precision
|
||||||
):
|
):
|
||||||
must_consider = True
|
must_consider = True
|
||||||
else:
|
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
|
must_consider = True
|
||||||
|
|||||||
@@ -955,3 +955,32 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase):
|
|||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
expected_data, [row.invoiced, row.outstanding, row.remaining_balance, row.future_amount]
|
expected_data, [row.invoiced, row.outstanding, row.remaining_balance, row.future_amount]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_accounts_receivable_output_for_minor_outstanding(self):
|
||||||
|
"""
|
||||||
|
AR/AP should report miniscule outstanding of 0.01. Or else there will be slight difference with General Ledger/Trial Balance
|
||||||
|
"""
|
||||||
|
filters = {
|
||||||
|
"company": self.company,
|
||||||
|
"report_date": today(),
|
||||||
|
"range1": 30,
|
||||||
|
"range2": 60,
|
||||||
|
"range3": 90,
|
||||||
|
"range4": 120,
|
||||||
|
}
|
||||||
|
|
||||||
|
# check invoice grand total and invoiced column's value for 3 payment terms
|
||||||
|
si = self.create_sales_invoice(no_payment_schedule=True)
|
||||||
|
|
||||||
|
pe = get_payment_entry("Sales Invoice", si.name, bank_account=self.cash, party_amount=99.99)
|
||||||
|
pe.paid_from = self.debit_to
|
||||||
|
pe.save().submit()
|
||||||
|
report = execute(filters)
|
||||||
|
|
||||||
|
expected_data_after_payment = [100, 100, 99.99, 0.01]
|
||||||
|
self.assertEqual(len(report[1]), 1)
|
||||||
|
row = report[1][0]
|
||||||
|
self.assertEqual(
|
||||||
|
expected_data_after_payment,
|
||||||
|
[row.invoice_grand_total, row.invoiced, row.paid, row.outstanding],
|
||||||
|
)
|
||||||
|
|||||||
@@ -254,7 +254,6 @@ erpnext.patches.v13_0.reset_corrupt_defaults
|
|||||||
erpnext.patches.v13_0.create_accounting_dimensions_for_asset_repair
|
erpnext.patches.v13_0.create_accounting_dimensions_for_asset_repair
|
||||||
erpnext.patches.v15_0.delete_taxjar_doctypes
|
erpnext.patches.v15_0.delete_taxjar_doctypes
|
||||||
erpnext.patches.v15_0.delete_ecommerce_doctypes
|
erpnext.patches.v15_0.delete_ecommerce_doctypes
|
||||||
erpnext.patches.v15_0.create_asset_depreciation_schedules_from_assets
|
|
||||||
erpnext.patches.v14_0.update_reference_due_date_in_journal_entry
|
erpnext.patches.v14_0.update_reference_due_date_in_journal_entry
|
||||||
erpnext.patches.v15_0.saudi_depreciation_warning
|
erpnext.patches.v15_0.saudi_depreciation_warning
|
||||||
erpnext.patches.v15_0.delete_saudi_doctypes
|
erpnext.patches.v15_0.delete_saudi_doctypes
|
||||||
@@ -264,6 +263,7 @@ execute:frappe.rename_doc("Report", "TDS Payable Monthly", "Tax Withholding Deta
|
|||||||
erpnext.patches.v14_0.update_proprietorship_to_individual
|
erpnext.patches.v14_0.update_proprietorship_to_individual
|
||||||
|
|
||||||
[post_model_sync]
|
[post_model_sync]
|
||||||
|
erpnext.patches.v15_0.create_asset_depreciation_schedules_from_assets
|
||||||
execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
|
execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
|
||||||
erpnext.patches.v14_0.update_posting_datetime_and_dropped_indexes #22-02-2024
|
erpnext.patches.v14_0.update_posting_datetime_and_dropped_indexes #22-02-2024
|
||||||
erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
|
erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
|
||||||
|
|||||||
Reference in New Issue
Block a user