Merge PR #603 into 14.0

Signed-off-by pedrobaeza
OCA · Nov 6, 2023 · 2c946e8 · 2c946e8
2 parents 39c1079 + ba9809f
commit 2c946e8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/account_reconciliation_widget/models/account_bank_statement.py b/account_reconciliation_widget/models/account_bank_statement.py
@@ -1,5 +1,6 @@
 from odoo import _, fields, models
 from odoo.exceptions import UserError
+from odoo.tools import float_is_zero
 
 
 class AccountBankStatement(models.Model):
@@ -195,7 +196,26 @@ def _create_counterpart_and_new_aml(
             aml_dict["partner_id"] = self.partner_id.id
             aml_dict["statement_line_id"] = self.id
             self._prepare_move_line_for_currency(aml_dict, date)
-
+        # Adjust latest counterpart move debit/credit if currency amount is balanced
+        # but company amount is not
+        if self.currency_id != self.company_currency_id:
+            all_amls = to_create + [liquidity_aml_dict]
+            balance_currency = sum([x["amount_currency"] for x in all_amls])
+            balance = sum([x["debit"] - x["credit"] for x in all_amls])
+            if float_is_zero(
+                balance_currency, precision_rounding=self.currency_id.rounding
+            ) and not float_is_zero(
+                balance, precision_rounding=self.company_currency_id.rounding
+            ):
+                aml_dict = to_create[-1]
+                if aml_dict["debit"]:
+                    aml_dict["debit"] = self.company_currency_id.round(
+                        aml_dict["debit"] - balance
+                    )
+                else:
+                    aml_dict["credit"] = self.company_currency_id.round(
+                        aml_dict["credit"] + balance
+                    )
         # Create write-offs
         wo_aml = self.env["account.move.line"]
         for aml_dict in new_aml_dicts:

diff --git a/account_reconciliation_widget/models/reconciliation_widget.py b/account_reconciliation_widget/models/reconciliation_widget.py
@@ -332,7 +332,10 @@ def get_bank_statement_data(self, bank_statement_line_ids, srch_domain=None):
             domain += srch_domain
         bank_statement_lines = self.env["account.bank.statement.line"].search(domain)
 
-        results = self.get_bank_statement_line_data(bank_statement_lines.ids)
+        results = self.get_bank_statement_line_data(
+            bank_statement_lines.ids,
+            excluded_ids=bank_statement_lines.move_id.line_ids.ids,
+        )
         bank_statement_lines_left = self.env["account.bank.statement.line"].browse(
             [line["st_line"]["id"] for line in results["lines"]]
         )