odoo-addon-account-reconcile-oca 17.0.1.5.3__py3-none-any.whl → 17.0.1.5.4__py3-none-any.whl

odoo/addons/account_reconcile_oca/README.rst

@@ -7,7 +7,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:25a85af43d834abf67306c2d7fa108d6ecc44f76300ab92e54cc982f8cfe9334
+   !! source digest: sha256:7b48f8462e4b43596a339d2203f3f4566d5576b9f949ab75dca7f35d781d08c1
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/account_reconcile_oca/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Account Reconcile Oca",
     "summary": """
         Reconcile addons for Odoo CE accounting""",
-    "version": "17.0.1.5.3",
+    "version": "17.0.1.5.4",
     "license": "AGPL-3",
     "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
     "maintainers": ["etobella"],

odoo/addons/account_reconcile_oca/models/account_account_reconcile.py

@@ -163,7 +163,11 @@ class AccountAccountReconcile(models.Model):
         amount = 0.0
         for line_id in counterparts:
             lines = self._get_reconcile_line(
-                self.env["account.move.line"].browse(line_id), "other", True, amount
+                self.env["account.move.line"].browse(line_id),
+                "other",
+                is_counterpart=True,
+                max_amount=amount,
+                move=True,
             )
             new_data["data"] += lines
             amount += sum(line["amount"] for line in lines)

odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py

@@ -8,7 +8,8 @@ from dateutil.relativedelta import relativedelta
 
 from odoo import Command, _, api, fields, models, tools
 from odoo.exceptions import UserError
-from odoo.tools import float_is_zero
+from odoo.fields import first
+from odoo.tools import float_compare, float_is_zero
 
 
 class AccountBankStatementLine(models.Model):
@@ -178,6 +179,18 @@ class AccountBankStatementLine(models.Model):
             )._default_reconcile_data()
         self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)
 
+    def _get_amount_currency(self, line, dest_curr):
+        if line["line_currency_id"] == dest_curr.id:
+            amount = line["currency_amount"]
+        else:
+            amount = self.company_id.currency_id._convert(
+                line["amount"],
+                dest_curr,
+                self.company_id,
+                self.date,
+            )
+        return amount
+
     @api.onchange("add_account_move_line_id")
     def _onchange_add_account_move_line_id(self):
         if self.add_account_move_line_id:
@@ -185,9 +198,10 @@ class AccountBankStatementLine(models.Model):
             new_data = []
             is_new_line = True
             pending_amount = 0.0
+            currency = self._get_reconcile_currency()
             for line in data:
                 if line["kind"] != "suspense":
-                    pending_amount += line["amount"]
+                    pending_amount += self._get_amount_currency(line, currency)
                 if self.add_account_move_line_id.id in line.get(
                     "counterpart_line_ids", []
                 ):
@@ -196,7 +210,11 @@ class AccountBankStatementLine(models.Model):
                     new_data.append(line)
             if is_new_line:
                 reconcile_auxiliary_id, lines = self._get_reconcile_line(
-                    self.add_account_move_line_id, "other", True, pending_amount
+                    self.add_account_move_line_id,
+                    "other",
+                    is_counterpart=True,
+                    max_amount=currency.round(pending_amount),
+                    move=True,
                 )
                 new_data += lines
             self.reconcile_data_info = self._recompute_suspense_line(
@@ -210,9 +228,11 @@ class AccountBankStatementLine(models.Model):
     def _recompute_suspense_line(self, data, reconcile_auxiliary_id, manual_reference):
         can_reconcile = True
         total_amount = 0
+        currency_amount = 0
         new_data = []
         suspense_line = False
         counterparts = []
+        suspense_currency = self.foreign_currency_id or self.currency_id
         for line in data:
             if line.get("counterpart_line_ids"):
                 counterparts += line["counterpart_line_ids"]
@@ -224,10 +244,29 @@ class AccountBankStatementLine(models.Model):
             if line["kind"] != "suspense":
                 new_data.append(line)
                 total_amount += line["amount"]
+                if not line.get("is_exchange_counterpart"):
+                    # case of statement line with foreign_currency
+                    if (
+                        line["kind"] == "liquidity"
+                        and line["line_currency_id"] != suspense_currency.id
+                    ):
+                        currency_amount += self.amount_currency
+                    elif (
+                        line.get("currency_amount")
+                        and line.get("line_currency_id") == suspense_currency.id
+                    ):
+                        currency_amount += line.get("currency_amount")
+                    else:
+                        currency_amount += self.company_id.currency_id._convert(
+                            line["amount"],
+                            suspense_currency,
+                            self.company_id,
+                            self.date,
+                        )
             else:
                 suspense_line = line
         if not float_is_zero(
-            total_amount, precision_digits=self.currency_id.decimal_places
+            total_amount, precision_digits=self.company_id.currency_id.decimal_places
         ):
             can_reconcile = False
             if suspense_line:
@@ -236,6 +275,7 @@ class AccountBankStatementLine(models.Model):
                         "amount": -total_amount,
                         "credit": total_amount if total_amount > 0 else 0.0,
                         "debit": -total_amount if total_amount < 0 else 0.0,
+                        "currency_amount": -currency_amount,
                     }
                 )
             else:
@@ -261,8 +301,8 @@ class AccountBankStatementLine(models.Model):
                     "debit": -total_amount if total_amount < 0 else 0.0,
                     "kind": "suspense",
                     "currency_id": self.company_id.currency_id.id,
-                    "line_currency_id": self.company_id.currency_id.id,
-                    "currency_amount": -total_amount,
+                    "line_currency_id": suspense_currency.id,
+                    "currency_amount": -currency_amount,
                 }
                 reconcile_auxiliary_id += 1
             new_data.append(suspense_line)
@@ -282,11 +322,37 @@ class AccountBankStatementLine(models.Model):
             )
             or self.manual_account_id.id != line["account_id"][0]
             or self.manual_name != line["name"]
-            or (self.manual_partner_id and self.manual_partner_id.display_name or False)
+            or (
+                self.manual_partner_id
+                and [self.manual_partner_id.id, self.manual_partner_id.display_name]
+                or [False, False]
+            )
             != line.get("partner_id")
             or self.analytic_distribution != line.get("analytic_distribution", False)
         )
 
+    def _check_reconcile_data_changed(self):
+        self.ensure_one()
+        data = self.reconcile_data_info.get("data", [])
+        liquidity_lines, _suspense_lines, _other_lines = self._seek_for_lines()
+        move_amount_cur = sum(liquidity_lines.mapped("amount_currency"))
+        move_credit = sum(liquidity_lines.mapped("credit"))
+        move_debit = sum(liquidity_lines.mapped("debit"))
+        stmt_amount_curr = stmt_debit = stmt_credit = 0.0
+        for line_data in data:
+            if line_data["kind"] != "liquidity":
+                continue
+            stmt_amount_curr += line_data["currency_amount"]
+            stmt_debit += line_data["debit"]
+            stmt_credit += line_data["credit"]
+        prec = self.currency_id.rounding
+        return (
+            float_compare(move_amount_cur, move_amount_cur, precision_rounding=prec)
+            != 0
+            or float_compare(move_credit, stmt_credit, precision_rounding=prec) != 0
+            or float_compare(move_debit, stmt_debit, precision_rounding=prec) != 0
+        )
+
     def _get_manual_delete_vals(self):
         return {
             "manual_reference": False,
@@ -362,7 +428,11 @@ class AccountBankStatementLine(models.Model):
 
     @api.onchange("manual_amount_in_currency")
     def _onchange_manual_amount_in_currency(self):
-        if self.manual_line_id.exists() and self.manual_line_id:
+        if (
+            self.manual_line_id.exists()
+            and self.manual_line_id
+            and self.manual_kind != "liquidity"
+        ):
             self.manual_amount = self.manual_in_currency_id._convert(
                 self.manual_amount_in_currency,
                 self.company_id.currency_id,
@@ -372,7 +442,7 @@ class AccountBankStatementLine(models.Model):
         self._onchange_manual_reconcile_vals()
 
     def _get_manual_reconcile_vals(self):
-        return {
+        vals = {
             "name": self.manual_name,
             "partner_id": (
                 self.manual_partner_id
@@ -390,6 +460,19 @@ class AccountBankStatementLine(models.Model):
             "debit": self.manual_amount if self.manual_amount > 0 else 0.0,
             "analytic_distribution": self.analytic_distribution,
         }
+        liquidity_lines, _suspense_lines, _other_lines = self._seek_for_lines()
+        if self.manual_line_id and self.manual_line_id.id not in liquidity_lines.ids:
+            vals.update(
+                {
+                    "currency_amount": self.manual_currency_id._convert(
+                        self.manual_amount,
+                        self.manual_in_currency_id,
+                        self.company_id,
+                        self.manual_line_id.date,
+                    ),
+                }
+            )
+        return vals
 
     @api.onchange(
         "manual_account_id",
@@ -472,6 +555,8 @@ class AccountBankStatementLine(models.Model):
     def _reconcile_data_by_model(self, data, reconcile_model, reconcile_auxiliary_id):
         new_data = []
         liquidity_amount = 0.0
+        currency = self._get_reconcile_currency()
+        currency_amount = False
         for line_data in data:
             if line_data["kind"] == "suspense":
                 continue
@@ -484,8 +569,18 @@ class AccountBankStatementLine(models.Model):
             new_line = line.copy()
             amount = line.get("balance")
             if self.foreign_currency_id:
-                amount = self.foreign_currency_id.compute(
-                    amount, self.journal_id.currency_id or self.company_currency_id
+                amount = self.foreign_currency_id._convert(
+                    amount,
+                    self.journal_id.currency_id or self.company_currency_id,
+                    self.company_id,
+                    self.date,
+                )
+            if currency != self.company_id.currency_id:
+                currency_amount = self.company_id.currency_id._convert(
+                    amount,
+                    currency,
+                    self.company_id,
+                    self.date,
                 )
             new_line.update(
                 {
@@ -502,9 +597,9 @@ class AccountBankStatementLine(models.Model):
                         .display_name,
                     ],
                     "date": fields.Date.to_string(self.date),
-                    "line_currency_id": self.company_id.currency_id.id,
+                    "line_currency_id": currency.id,
                     "currency_id": self.company_id.currency_id.id,
-                    "currency_amount": amount,
+                    "currency_amount": currency_amount or amount,
                     "name": line.get("name") or self.payment_ref,
                 }
             )
@@ -525,7 +620,10 @@ class AccountBankStatementLine(models.Model):
         reconcile_auxiliary_id = 1
         for line in liquidity_lines:
             reconcile_auxiliary_id, lines = self._get_reconcile_line(
-                line, "liquidity", reconcile_auxiliary_id=reconcile_auxiliary_id
+                line,
+                "liquidity",
+                reconcile_auxiliary_id=reconcile_auxiliary_id,
+                move=True,
             )
             data += lines
         if not from_unreconcile:
@@ -551,6 +649,7 @@ class AccountBankStatementLine(models.Model):
                     self.manual_reference,
                 )
             elif res and res.get("amls"):
+                # TODO should be signed in currency get_reconcile_currency
                 amount = self.amount_total_signed
                 for line in res.get("amls", []):
                     reconcile_auxiliary_id, line_data = self._get_reconcile_line(
@@ -570,16 +669,89 @@ class AccountBankStatementLine(models.Model):
                     self.manual_reference,
                 )
         for line in other_lines:
-            reconcile_auxiliary_id, lines = self._get_reconcile_line(
-                line, "other", from_unreconcile=from_unreconcile
-            )
-            data += lines
+            partial_lines = self._all_partials_lines(line) if from_unreconcile else []
+            if partial_lines:
+                for reconciled_line in (
+                    partial_lines.debit_move_id + partial_lines.credit_move_id - line
+                ):
+                    if (
+                        reconciled_line.move_id.journal_id
+                        == self.company_id.currency_exchange_journal_id
+                    ):
+                        reconcile_auxiliary_id, lines = self._get_reconcile_line(
+                            reconciled_line.move_id.line_ids - reconciled_line,
+                            "other",
+                            from_unreconcile=False,
+                            move=True,
+                        )
+                        data += lines
+                        continue
+                    partial = partial_lines.filtered(
+                        lambda r, line=reconciled_line: r.debit_move_id == line
+                        or r.credit_move_id == line
+                    )
+                    partial_amount = sum(
+                        partial.filtered(
+                            lambda r, line=reconciled_line: r.credit_move_id == line
+                        ).mapped("amount")
+                    ) - sum(
+                        partial.filtered(
+                            lambda r, line=reconciled_line: r.debit_move_id == line
+                        ).mapped("amount")
+                    )
+                    reconcile_auxiliary_id, lines = self._get_reconcile_line(
+                        reconciled_line,
+                        "other",
+                        from_unreconcile={
+                            "amount": partial_amount,
+                            "credit": partial_amount > 0 and partial_amount,
+                            "debit": partial_amount < 0 and -partial_amount,
+                            "currency_amount": sum(
+                                partial.filtered(
+                                    lambda r, line=reconciled_line: r.credit_move_id
+                                    == line
+                                ).mapped("credit_amount_currency")
+                            )
+                            - sum(
+                                partial.filtered(
+                                    lambda r, line=reconciled_line: r.debit_move_id
+                                    == line
+                                ).mapped("debit_amount_currency")
+                            ),
+                        },
+                        move=True,
+                    )
+                    data += lines
+            else:
+                reconcile_auxiliary_id, lines = self._get_reconcile_line(
+                    line, "other", from_unreconcile=False
+                )
+                data += lines
+
         return self._recompute_suspense_line(
             data,
             reconcile_auxiliary_id,
             self.manual_reference,
         )
 
+    def _all_partials_lines(self, lines):
+        reconciliation_lines = lines.filtered(
+            lambda x: x.account_id.reconcile
+            or x.account_id.account_type in ("asset_cash", "liability_credit_card")
+        )
+        current_lines = reconciliation_lines
+        current_partials = self.env["account.partial.reconcile"]
+        partials = self.env["account.partial.reconcile"]
+        while current_lines:
+            current_partials = (
+                current_lines.matched_debit_ids + current_lines.matched_credit_ids
+            ) - current_partials
+            current_lines = (
+                current_partials.debit_move_id + current_partials.credit_move_id
+            ) - current_lines
+            partials += current_partials
+        return partials
+
     def clean_reconcile(self):
         self.reconcile_data_info = self._default_reconcile_data()
         self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)
@@ -734,12 +906,13 @@ class AccountBankStatementLine(models.Model):
             to_reverse._reverse_moves(default_values_list, cancel=True)
 
     def _reconcile_move_line_vals(self, line, move_id=False):
-        return {
+        vals = {
             "move_id": move_id or self.move_id.id,
             "account_id": line["account_id"][0],
             "partner_id": line.get("partner_id") and line["partner_id"][0],
             "credit": line["credit"],
             "debit": line["debit"],
+            "currency_id": line.get("line_currency_id", self.company_id.currency_id.id),
             "tax_ids": line.get("tax_ids", []),
             "tax_tag_ids": line.get("tax_tag_ids", []),
             "group_tax_id": line.get("group_tax_id"),
@@ -748,6 +921,11 @@ class AccountBankStatementLine(models.Model):
             "name": line.get("name"),
             "reconcile_model_id": line.get("reconcile_model_id"),
         }
+        if line.get("line_currency_id") and line["currency_id"] != line.get(
+            "line_currency_id"
+        ):
+            vals["amount_currency"] = line["currency_amount"]
+        return vals
 
     @api.model_create_multi
     def create(self, mvals):
@@ -771,7 +949,9 @@ class AccountBankStatementLine(models.Model):
             data = []
             for line in liquidity_lines:
                 reconcile_auxiliary_id, lines = record._get_reconcile_line(
-                    line, "liquidity"
+                    line,
+                    "liquidity",
+                    move=True,
                 )
                 data += lines
             reconcile_auxiliary_id = 1
@@ -783,10 +963,10 @@ class AccountBankStatementLine(models.Model):
                     self.manual_reference,
                 )
             elif res.get("amls"):
-                amount = self.amount
+                amount = self.amount_currency or self.amount
                 for line in res.get("amls", []):
                     reconcile_auxiliary_id, line_datas = record._get_reconcile_line(
-                        line, "other", is_counterpart=True, max_amount=amount
+                        line, "other", is_counterpart=True, max_amount=amount, move=True
                     )
                     amount -= sum(line_data.get("amount") for line_data in line_datas)
                     data += line_datas
@@ -802,6 +982,67 @@ class AccountBankStatementLine(models.Model):
             )(self._prepare_reconcile_line_data(data["data"]))
         return result
 
+    def _synchronize_to_moves(self, changed_fields):
+        """We want to avoid to change stuff (mainly amounts ) in accounting entries
+        when some changes happen in the reconciliation widget. The only change
+        (among the fields triggering the synchronization) possible from the
+        reconciliation widget is the partner_id field.
+
+        So, in case of change on partner_id field we do not call super but make
+        only the required change (relative to partner) on accounting entries.
+
+        And if something else changes, we then re-define reconcile_data_info to
+        make the data consistent (for example, if debit/credit has changed by
+        applying a different rate or even if there was a correction on statement
+        line amount).
+        """
+        if self._context.get("skip_account_move_synchronization"):
+            return
+        if "partner_id" in changed_fields and not any(
+            field_name in changed_fields
+            for field_name in (
+                "payment_ref",
+                "amount",
+                "amount_currency",
+                "foreign_currency_id",
+                "currency_id",
+            )
+        ):
+            for st_line in self.with_context(skip_account_move_synchronization=True):
+                (
+                    liquidity_lines,
+                    suspense_lines,
+                    _other_lines,
+                ) = st_line._seek_for_lines()
+                line_vals = {"partner_id": st_line.partner_id}
+                line_ids_commands = [(1, liquidity_lines.id, line_vals)]
+                if suspense_lines:
+                    line_ids_commands.append((1, suspense_lines.id, line_vals))
+                st_line_vals = {"line_ids": line_ids_commands}
+                if st_line.move_id.partner_id != st_line.partner_id:
+                    st_line_vals["partner_id"] = st_line.partner_id.id
+                st_line.move_id.write(st_line_vals)
+        else:
+            super()._synchronize_to_moves(changed_fields=changed_fields)
+
+        if not any(
+            field_name in changed_fields
+            for field_name in (
+                "payment_ref",
+                "amount",
+                "amount_currency",
+                "foreign_currency_id",
+                "currency_id",
+                "partner_id",
+            )
+        ):
+            return
+        # reset reconcile_data_info if amounts are not consistent anymore with the
+        # amounts of the accounting entries
+        for st_line in self:
+            if st_line._check_reconcile_data_changed():
+                st_line.reconcile_data_info = st_line._default_reconcile_data()
+
     def _prepare_reconcile_line_data(self, lines):
         new_lines = []
         reverse_lines = {}
@@ -848,6 +1089,7 @@ class AccountBankStatementLine(models.Model):
                     is_counterpart=True,
                     reconcile_auxiliary_id=reconcile_auxiliary_id,
                     max_amount=original_amount,
+                    move=True,
                 )
                 new_data += lines
                 new_data.append(
@@ -895,6 +1137,7 @@ class AccountBankStatementLine(models.Model):
         max_amount=False,
         from_unreconcile=False,
         reconcile_auxiliary_id=False,
+        move=False,
     ):
         new_vals = super()._get_reconcile_line(
             line,
@@ -902,29 +1145,48 @@ class AccountBankStatementLine(models.Model):
             is_counterpart=is_counterpart,
             max_amount=max_amount,
             from_unreconcile=from_unreconcile,
+            move=move,
         )
         rates = []
         for vals in new_vals:
+            rate = False
             if vals["partner_id"] is False:
                 vals["partner_id"] = (False, self.partner_name)
-            reconcile_auxiliary_id, rate = self._compute_exchange_rate(
-                vals, line, reconcile_auxiliary_id
-            )
+            if vals.get("kind") not in ("suspense", "liquidity"):
+                reconcile_auxiliary_id, rate = self._compute_exchange_rate(
+                    vals, line, reconcile_auxiliary_id
+                )
             if rate:
                 rates.append(rate)
         new_vals += rates
         return reconcile_auxiliary_id, new_vals
 
     def _get_exchange_rate_amount(self, amount, currency_amount, currency, line):
-        return (
-            currency._convert(
+        if self.foreign_currency_id == currency:
+            # take real rate of statement line to compute the exchange rate gain/loss
+            real_rate = self.amount / self.amount_currency
+            to_amount_journal_currency = currency_amount * real_rate
+            to_amount_company_currency = self.currency_id._convert(
+                to_amount_journal_currency,
+                self.company_id.currency_id,
+                self.company_id,
+                self.date,
+            )
+            to_amount = self.company_id.currency_id.round(to_amount_company_currency)
+        elif self.currency_id == currency and not self.foreign_currency_id:
+            liquidity_lines, _suspense_lines, _other_lines = self._seek_for_lines()
+            real_rate = (
+                first(liquidity_lines).balance / first(liquidity_lines).amount_currency
+            )
+            to_amount = self.company_id.currency_id.round(currency_amount * real_rate)
+        else:
+            to_amount = currency._convert(
                 currency_amount,
                 self.company_id.currency_id,
                 self.company_id,
                 self.date,
             )
-            - amount
-        )
+        return self.company_id.currency_id.round(to_amount - amount)
 
     def _compute_exchange_rate(
         self,
@@ -963,8 +1225,8 @@ class AccountBankStatementLine(models.Model):
             "debit": amount if amount > 0 else 0.0,
             "kind": "other",
             "currency_id": self.company_id.currency_id.id,
-            "line_currency_id": self.company_id.currency_id.id,
-            "currency_amount": amount,
+            "line_currency_id": currency.id,
+            "currency_amount": 0,
         }
         reconcile_auxiliary_id += 1
         return reconcile_auxiliary_id, data
@@ -991,3 +1253,10 @@ class AccountBankStatementLine(models.Model):
             "split_line_id": self.id,
         }
         return action
+
+    def _get_reconcile_currency(self):
+        return (
+            self.foreign_currency_id
+            or self.journal_id.currency_id
+            or self.company_id.currency_id
+        )

odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py

@@ -33,24 +33,46 @@ class AccountReconcileAbstract(models.AbstractModel):
         related="company_id.currency_id", string="Company Currency"
     )
 
+    def _get_reconcile_currency(self):
+        return self.currency_id or self.company_id._currency_id
+
     def _get_reconcile_line(
-        self, line, kind, is_counterpart=False, max_amount=False, from_unreconcile=False
+        self,
+        line,
+        kind,
+        is_counterpart=False,
+        max_amount=False,
+        from_unreconcile=False,
+        move=False,
     ):
         date = self.date if "date" in self._fields else line.date
         original_amount = amount = net_amount = line.debit - line.credit
+        line_currency = line.currency_id
         if is_counterpart:
             currency_amount = -line.amount_residual_currency or line.amount_residual
             amount = -line.amount_residual
-            currency = line.currency_id or self.company_id.currency_id
+            currency = line.currency_id or line.company_id.currency_id
             original_amount = net_amount = -line.amount_residual
             if max_amount:
-                currency_max_amount = self.company_id.currency_id._convert(
-                    max_amount, currency, self.company_id, date
-                )
+                dest_currency = self._get_reconcile_currency()
+                if currency == dest_currency:
+                    real_currency_amount = currency_amount
+                elif self.company_id.currency_id == dest_currency:
+                    real_currency_amount = amount
+                else:
+                    real_currency_amount = self.company_id.currency_id._convert(
+                        amount,
+                        dest_currency,
+                        self.company_id,
+                        date,
+                    )
                 if (
-                    -currency_amount > currency_max_amount > 0
-                    or -currency_amount < currency_max_amount < 0
+                    -real_currency_amount > max_amount > 0
+                    or -real_currency_amount < max_amount < 0
                 ):
+                    currency_max_amount = self._get_reconcile_currency()._convert(
+                        max_amount, currency, self.company_id, date
+                    )
                     amount = currency_max_amount
                     net_amount = -max_amount
                     currency_amount = -amount
@@ -61,8 +83,11 @@ class AccountReconcileAbstract(models.AbstractModel):
                         date,
                     )
         else:
-            currency_amount = line.amount_currency
+            currency_amount = self.amount_currency or self.amount
+            line_currency = self._get_reconcile_currency()
         vals = {
+            "move_id": move and line.move_id.id,
+            "move": move and line.move_id.name,
             "reference": "account.move.line;%s" % line.id,
             "id": line.id,
             "account_id": [line.account_id.id, line.account_id.display_name],
@@ -76,7 +101,7 @@ class AccountReconcileAbstract(models.AbstractModel):
             "amount": amount,
             "net_amount": amount - net_amount,
             "currency_id": self.company_id.currency_id.id,
-            "line_currency_id": line.currency_id.id,
+            "line_currency_id": line_currency.id,
             "currency_amount": currency_amount,
             "analytic_distribution": line.analytic_distribution,
             "kind": kind,
@@ -84,11 +109,11 @@ class AccountReconcileAbstract(models.AbstractModel):
         if from_unreconcile:
             vals.update(
                 {
-                    "id": False,
-                    "counterpart_line_ids": (
-                        line.matched_debit_ids.mapped("debit_move_id")
-                        | line.matched_credit_ids.mapped("credit_move_id")
-                    ).ids,
+                    "credit": vals["debit"] and from_unreconcile["debit"],
+                    "debit": vals["credit"] and from_unreconcile["credit"],
+                    "amount": from_unreconcile["amount"],
+                    "net_amount": from_unreconcile["amount"],
+                    "currency_amount": from_unreconcile["currency_amount"],
                 }
             )
         if not float_is_zero(

odoo/addons/account_reconcile_oca/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:25a85af43d834abf67306c2d7fa108d6ecc44f76300ab92e54cc982f8cfe9334
+!! source digest: sha256:7b48f8462e4b43596a339d2203f3f4566d5576b9f949ab75dca7f35d781d08c1
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/17.0/account_reconcile_oca"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-reconcile-17-0/account-reconcile-17-0-account_reconcile_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon allows to reconcile bank statements and account marked as

odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js

@@ -2,12 +2,15 @@
 import {formatDate, parseDate} from "@web/core/l10n/dates";
 import {formatMonetary} from "@web/views/fields/formatters";
 import {registry} from "@web/core/registry";
+import {useService} from "@web/core/utils/hooks";
 
 const {Component} = owl;
 
 export class AccountReconcileDataWidget extends Component {
     setup() {
         super.setup(...arguments);
+        this.orm = useService("orm");
+        this.action = useService("action");
         this.foreignCurrency =
             this.props &&
             this.props.record &&
@@ -70,6 +73,15 @@ export class AccountReconcileDataWidget extends Component {
         });
         this.env.bus.trigger("RECONCILE_PAGE_NAVIGATE", triggerEv);
     }
+    async openMove(ev, moveId) {
+        ev.preventDefault();
+        ev.stopPropagation();
+        console.log(moveId);
+        const action = await this.orm.call("account.move", "get_formview_action", [
+            [moveId],
+        ]);
+        this.action.doAction(action);
+    }
 }
 AccountReconcileDataWidget.template = "account_reconcile_oca.ReconcileDataWidget";
 

odoo/addons/account_reconcile_oca/static/src/xml/reconcile.xml

@@ -114,7 +114,18 @@
                         t-on-click="(ev) => this.selectReconcileLine(ev, reconcile_line)"
                         t-att-class="'o_reconcile_widget_line ' + reconcile_line.kind + (props.record.data.manual_reference == reconcile_line.reference ? ' selected ' :  ' ')"
                     >
-                        <td t-esc="reconcile_line.account_id[1]" />
+                        <td>
+                            <div t-esc="reconcile_line.account_id[1]" />
+                            <div t-if="reconcile_line.move_id">
+                                <a
+                                    t-att-href="'/web#id=' + reconcile_line.move_id + '&amp;view_type=form&amp;model=account.move'"
+                                    class="o_form_uri"
+                                    t-on-click="(ev) => this.openMove(ev, reconcile_line.move_id)"
+                                >
+                                    <small t-esc="reconcile_line.move" />
+                                </a>
+                            </div>
+                        </td>
                         <td>
                             <span
                                 t-esc="reconcile_line.partner_id[1]"

odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py

@@ -91,7 +91,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         inv1 = self.create_invoice(currency_id=self.currency_usd_id, invoice_amount=100)
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -119,6 +118,42 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             self.assertFalse(f.add_account_move_line_id)
             self.assertTrue(f.can_reconcile)
 
+    def test_manual_line_with_currency(self):
+        bank_stmt = self.acc_bank_stmt_model.create(
+            {
+                "journal_id": self.bank_journal_euro.id,
+                "date": time.strftime("%Y-07-15"),
+                "name": "test",
+            }
+        )
+        bank_stmt_line = self.acc_bank_stmt_line_model.create(
+            {
+                "name": "testLine",
+                "journal_id": self.bank_journal_euro.id,
+                "statement_id": bank_stmt.id,
+                "amount": 50,
+                "amount_currency": 100,
+                "foreign_currency_id": self.currency_usd_id,
+                "date": time.strftime("%Y-07-15"),
+            }
+        )
+        receivable_acc = self.company_data["default_account_receivable"]
+        with Form(
+            bank_stmt_line,
+            view="account_reconcile_oca.bank_statement_line_form_reconcile_view",
+        ) as f:
+            self.assertFalse(f.can_reconcile)
+            f.manual_reference = "reconcile_auxiliary;1"
+            f.manual_account_id = receivable_acc
+            self.assertTrue(f.can_reconcile)
+        bank_stmt_line.reconcile_bank_line()
+        receivable_line = bank_stmt_line.line_ids.filtered(
+            lambda line: line.account_id == receivable_acc
+        )
+        self.assertEqual(receivable_line.currency_id.id, self.currency_usd_id)
+        self.assertEqual(receivable_line.amount_currency, -100)
+        self.assertEqual(receivable_line.balance, -50)
+
     def test_reconcile_invoice_reconcile_full(self):
         """
         We want to test the reconcile widget for bank statements on invoices.
@@ -130,7 +165,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -179,7 +213,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -242,7 +275,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -306,7 +338,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -360,7 +391,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         """
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -404,7 +434,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -459,7 +488,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -519,7 +547,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
 
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -549,7 +576,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -594,6 +620,57 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         self.assertTrue(reconcile_move.reversal_move_id)
         self.assertFalse(bank_stmt_line.is_reconciled)
 
+    def test_reconcile_model_with_foreign_currency(self):
+        """
+        We want to test what happens when we select a reconcile model to fill a
+        bank statement with a foreign currency.
+        """
+        bank_stmt = self.acc_bank_stmt_model.create(
+            {
+                "journal_id": self.bank_journal_usd.id,
+                "date": time.strftime("%Y-07-15"),
+                "name": "test",
+            }
+        )
+        bank_stmt_line = self.acc_bank_stmt_line_model.create(
+            {
+                "name": "testLine",
+                "journal_id": self.bank_journal_usd.id,
+                "statement_id": bank_stmt.id,
+                "amount": 100,
+                "date": time.strftime("%Y-07-15"),
+            }
+        )
+        with Form(
+            bank_stmt_line,
+            view="account_reconcile_oca.bank_statement_line_form_reconcile_view",
+        ) as f:
+            self.assertFalse(f.can_reconcile)
+            f.manual_model_id = self.rule
+            self.assertTrue(f.can_reconcile)
+        number_of_lines = len(bank_stmt_line.reconcile_data_info["data"])
+        bank_stmt_line.reconcile_bank_line()
+        self.assertEqual(
+            number_of_lines, len(bank_stmt_line.reconcile_data_info["data"])
+        )
+        self.assertEqual(2, len(bank_stmt_line.move_id.line_ids))
+        self.assertTrue(
+            bank_stmt_line.move_id.line_ids.filtered(
+                lambda r: r.account_id == self.current_assets_account
+            )
+        )
+        expected_amount = bank_stmt_line._get_reconcile_currency()._convert(
+            bank_stmt_line.amount,
+            bank_stmt_line.company_id.currency_id,
+            bank_stmt_line.company_id,
+            bank_stmt_line.date,
+        )
+        self.assertEqual(
+            bank_stmt_line.move_id.line_ids[0].amount_currency, bank_stmt_line.amount
+        )
+        self.assertEqual(bank_stmt_line.move_id.line_ids[0].debit, expected_amount)
+        self.assertEqual(bank_stmt_line.move_id.line_ids[1].credit, expected_amount)
+
     # Testing to check functionality
 
     def test_reconcile_invoice_to_check_reconciled(self):
@@ -607,7 +684,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -649,7 +725,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         """
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -684,7 +759,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -722,7 +796,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -763,7 +836,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -804,7 +876,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -828,6 +899,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             self.assertFalse(f.partner_id)
             f.manual_reference = "account.move.line;%s" % liquidity_lines.id
             f.manual_partner_id = inv1.partner_id
+            f.save()
             self.assertEqual(f.partner_id, inv1.partner_id)
         bank_stmt_line.clean_reconcile()
         # As we have set a partner, the cleaning should assign the invoice automatically
@@ -840,7 +912,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         """
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -891,7 +962,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         """
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -934,7 +1004,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
 
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -998,7 +1067,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
 
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_euro.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -1032,7 +1100,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         inv1 = self.create_invoice(currency_id=self.currency_usd_id, invoice_amount=100)
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_usd.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -1071,45 +1138,50 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
 
     def test_journal_foreign_currency_change(self):
+        cny = self.env.ref("base.CNY")
+        cny.write({"active": True})
+        cny_journal = self.env["account.journal"].create(
+            {
+                "name": "Bank CNY",
+                "type": "bank",
+                "currency_id": cny.id,
+            }
+        )
         self.env["res.currency.rate"].create(
             {
-                "currency_id": self.env.ref("base.EUR").id,
-                "name": time.strftime("%Y-07-14"),
-                "rate": 1.15,
+                "name": time.strftime("%Y-09-10"),
+                "currency_id": cny.id,
+                "inverse_company_rate": 0.125989013758,
+            }
+        )
+        self.env["res.currency.rate"].create(
+            {
+                "name": time.strftime("%Y-09-09"),
+                "currency_id": cny.id,
+                "inverse_company_rate": 0.126225969731,
             }
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
-                "journal_id": self.bank_journal_usd.id,
-                "date": time.strftime("%Y-07-15"),
+                "journal_id": cny_journal.id,
+                "date": time.strftime("%Y-09-10"),
                 "name": "test",
             }
         )
         bank_stmt_line = self.acc_bank_stmt_line_model.create(
             {
                 "name": "testLine",
-                "journal_id": self.bank_journal_usd.id,
+                "journal_id": cny_journal.id,
                 "statement_id": bank_stmt.id,
-                "amount": 100,
-                "date": time.strftime("%Y-07-15"),
+                "amount": 259200,
+                "date": time.strftime("%Y-09-10"),
             }
         )
-        with Form(
-            bank_stmt_line,
-            view="account_reconcile_oca.bank_statement_line_form_reconcile_view",
-        ) as f:
-            line = f.reconcile_data_info["data"][0]
-            self.assertEqual(
-                line["currency_amount"],
-                100,
-            )
-        self.env["res.currency.rate"].create(
-            {
-                "currency_id": self.env.ref("base.EUR").id,
-                "name": time.strftime("%Y-07-15"),
-                "rate": 1.2,
-            }
+        inv1 = self._create_invoice(
+            currency_id=cny.id,
+            invoice_amount=259200,
+            date_invoice=time.strftime("%Y-09-09"),
+            auto_validate=True,
         )
         with Form(
             bank_stmt_line,
@@ -1118,8 +1190,17 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             line = f.reconcile_data_info["data"][0]
             self.assertEqual(
                 line["currency_amount"],
-                100,
+                259200,
             )
+            f.add_account_move_line_id = inv1.line_ids.filtered(
+                lambda line: line.account_id.account_type == "asset_receivable"
+            )
+            self.assertTrue(f.can_reconcile)
+        self.assertEqual(len(bank_stmt_line.reconcile_data_info["data"]), 3)
+        exchange_line = bank_stmt_line.reconcile_data_info["data"][-1]
+        self.assertEqual(exchange_line["amount"], 61.42)
+        bank_stmt_line.reconcile_bank_line()
+        self.assertEqual(inv1.payment_state, "paid")
 
     def test_invoice_foreign_currency_change(self):
         self.env["res.currency.rate"].create(
@@ -1144,7 +1225,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
-                "company_id": self.env.ref("base.main_company").id,
                 "journal_id": self.bank_journal_usd.id,
                 "date": time.strftime("%Y-07-15"),
                 "name": "test",
@@ -1222,3 +1302,90 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             .account_type,
             "liability_payable",
         )
+
+    def test_invoice_foreign_currency_late_change_of_rate(self):
+        # Test we can reconcile lines in foreign currency even if the rate was updated
+        # late in odoo, meaning the statement line was created and the rate was updated
+        # in odoo after that.
+        self.env["res.currency.rate"].create(
+            {
+                "currency_id": self.env.ref("base.USD").id,
+                "name": time.strftime("%Y-07-14"),
+                "rate": 1.15,
+            }
+        )
+        self.env["res.currency.rate"].create(
+            {
+                "currency_id": self.env.ref("base.USD").id,
+                "name": time.strftime("%Y-07-15"),
+                "rate": 1.2,
+            }
+        )
+        inv1 = self._create_invoice(
+            currency_id=self.currency_usd_id,
+            invoice_amount=100,
+            date_invoice=time.strftime("%Y-07-14"),
+            auto_validate=True,
+        )
+        bank_stmt = self.acc_bank_stmt_model.create(
+            {
+                "journal_id": self.bank_journal_usd.id,
+                "date": time.strftime("%Y-07-15"),
+                "name": "test",
+            }
+        )
+        bank_stmt_line = self.acc_bank_stmt_line_model.create(
+            {
+                "name": "testLine",
+                "journal_id": self.bank_journal_usd.id,
+                "statement_id": bank_stmt.id,
+                "amount": 100,
+                "date": time.strftime("%Y-07-16"),
+            }
+        )
+        # rate of 07-16 is create after the statement line, meaning the rate of the
+        # statement line is the one of the 07-15
+        self.env["res.currency.rate"].create(
+            {
+                "currency_id": self.env.ref("base.USD").id,
+                "name": time.strftime("%Y-07-16"),
+                "rate": 1.25,
+            }
+        )
+        liquidity_lines, suspense_lines, other_lines = bank_stmt_line._seek_for_lines()
+        with Form(
+            bank_stmt_line,
+            view="account_reconcile_oca.bank_statement_line_form_reconcile_view",
+        ) as f:
+            line = f.reconcile_data_info["data"][0]
+            self.assertEqual(
+                line["currency_amount"],
+                100,
+            )
+            self.assertEqual(
+                line["amount"],
+                83.33,
+            )
+            # check that adding a partner does not recompute the amounts on accounting
+            # entries, but is still synchronized with accounting entries
+            f.manual_reference = "account.move.line;%s" % liquidity_lines.id
+            f.manual_partner_id = inv1.partner_id
+            self.assertEqual(f.partner_id, inv1.partner_id)
+            self.assertEqual(liquidity_lines.debit, 83.33)
+            f.save()
+            # check liquidity line did not recompute debit with the new rate with
+            # partner change
+            self.assertEqual(liquidity_lines.debit, 83.33)
+            self.assertEqual(liquidity_lines.partner_id, inv1.partner_id)
+            f.manual_reference = "account.move.line;%s" % line["id"]
+            # simulate click on statement line, check amount does not recompute
+            f.manual_partner_id = inv1.partner_id
+            self.assertEqual(f.manual_amount, 83.33)
+            # check currency amount is still fine
+            self.assertEqual(f.reconcile_data_info["data"][0]["currency_amount"], 100)
+            f.add_account_move_line_id = inv1.line_ids.filtered(
+                lambda line: line.account_id.account_type == "asset_receivable"
+            )
+            self.assertEqual(3, len(f.reconcile_data_info["data"]))
+            self.assertTrue(f.can_reconcile)
+            self.assertEqual(f.reconcile_data_info["data"][-1]["amount"], 3.63)

{odoo_addon_account_reconcile_oca-17.0.1.5.3.dist-info → odoo_addon_account_reconcile_oca-17.0.1.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_reconcile_oca
-Version: 17.0.1.5.3
+Version: 17.0.1.5.4
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-account_reconcile_model_oca>=17.0dev,<17.1dev
 Requires-Dist: odoo-addon-account_statement_base>=17.0dev,<17.1dev
@@ -24,7 +24,7 @@ Account Reconcile Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:25a85af43d834abf67306c2d7fa108d6ecc44f76300ab92e54cc982f8cfe9334
+   !! source digest: sha256:7b48f8462e4b43596a339d2203f3f4566d5576b9f949ab75dca7f35d781d08c1
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_account_reconcile_oca-17.0.1.5.3.dist-info → odoo_addon_account_reconcile_oca-17.0.1.5.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/account_reconcile_oca/README.rst,sha256=OmB1sidJ_RcCKQiCwdUpFYd5v7sBalxb8a1kKGSCIlU,3703
+odoo/addons/account_reconcile_oca/README.rst,sha256=9cy5LDNzoKV5x490CP1NpNXtrF5WhMnIdaJqMh_ASfo,3703
 odoo/addons/account_reconcile_oca/__init__.py,sha256=vqRYeBgCVZMpZhYvILSxVsNLC9V7zDnvxMnKU8RQP94,55
-odoo/addons/account_reconcile_oca/__manifest__.py,sha256=qKdy4crOTlbRjwXq71ptSEu7mpbxwEvEKz-QsVgGCzs,1865
+odoo/addons/account_reconcile_oca/__manifest__.py,sha256=P_Rw_ev5GFEAaW_MBlIAdxHwW7z1wvpqKdUDmJJDZQU,1865
 odoo/addons/account_reconcile_oca/hooks.py,sha256=SfJ-GlIGYL1kf8xhQs5qDqwNnE8S9Gs-5dP3vOD-IMM,182
 odoo/addons/account_reconcile_oca/demo/demo.xml,sha256=6k0uK-H1aBiyogVNhQMQfFGL5zUfUGV2M-sSV6LHeUs,204
 odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot,sha256=RnxHPjPpQk_qZs4ZHFvH13KDHnqQO-ppgcUnULeZxwo,25700
@@ -17,12 +17,12 @@ odoo/addons/account_reconcile_oca/i18n/tr.po,sha256=jdrItgYAt4JAEpwbuSuy2vAq-Si_
 odoo/addons/account_reconcile_oca/i18n/zh.po,sha256=i7HjN44XrHzZ-qIG994NXgaEvjYU10Cw0Jcp7HQGAWk,25765
 odoo/addons/account_reconcile_oca/i18n/zh_CN.po,sha256=gHrxzsXR_B6rbs_0iU8_-9doeTZwiy-HmPtFoiiZJ3s,27504
 odoo/addons/account_reconcile_oca/models/__init__.py,sha256=28wbZjUZa30uHQY10BMJtKQ_BqJgwLQMQvB9uv0H_fY,282
-odoo/addons/account_reconcile_oca/models/account_account_reconcile.py,sha256=ndgMwziMe2GsqEucoH0vZMqVmubgBcajJahh1LcNK9s,6709
+odoo/addons/account_reconcile_oca/models/account_account_reconcile.py,sha256=j5tTL1RvlDIYAjrVNf7kt1tf58-TzFL7iqocSfMjo9g,6811
 odoo/addons/account_reconcile_oca/models/account_bank_statement.py,sha256=CFqlLLtmTqmt5yH3v_pkUfkZezSb1nEhBTu2J5gCjxM,1034
-odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=0Hnz98yjtOA1Vf23lmZYFSpX1iWHan-9CIc7YdmvXEA,39877
+odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=CjZvCNLgki-d5g-DHX3TtzmbgKd2TcQ0Ln9_GRf2PSM,51781
 odoo/addons/account_reconcile_oca/models/account_journal.py,sha256=PXXoGnByO7ve9_G09tnn95HKJoLvXM1pDxHDdd7bpU4,1359
 odoo/addons/account_reconcile_oca/models/account_move_line.py,sha256=PfdU6cfrKjKMqL_qGqNdyPUWg-frGQ6nR5uCoYtW38M,1212
-odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py,sha256=I23ZF31OvY5EqtfNHfm2Pir3JJ3z5CaYjEFr1OZ8oWI,3983
+odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py,sha256=vtQX3yQqUslslTny7QSbbrh0u4vfsCG4p5MAKHAOlyA,5011
 odoo/addons/account_reconcile_oca/models/res_company.py,sha256=IaSLPwHJZre5RYPVW8V6mnSoxltS_w0GUN1Ev-cfcB4,354
 odoo/addons/account_reconcile_oca/models/res_config_settings.py,sha256=AuenxX0UfqYWWP-QvtB0irSf_JuWVh4a9QylPfl-Lxc,325
 odoo/addons/account_reconcile_oca/readme/CONTRIBUTORS.md,sha256=subC7gWq_kRC_nJfLRfrI_IXlNoGgWaq9Es5qXuMa1w,16
@@ -31,7 +31,7 @@ odoo/addons/account_reconcile_oca/readme/ROADMAP.md,sha256=fxR8QnC8BkHyODdPScpgJ
 odoo/addons/account_reconcile_oca/readme/USAGE.md,sha256=yNLGo35X7TW2TLyJqHU-gdQiXazW8Iu59rI0dpa4WjM,365
 odoo/addons/account_reconcile_oca/security/ir.model.access.csv,sha256=XfN2EKOoChlEDonVd5DtodVAQyRbShiJ8nrXx6EwNmM,339
 odoo/addons/account_reconcile_oca/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/account_reconcile_oca/static/description/index.html,sha256=TLpztMdREtvemnGpBSHZUWykkj_xJHY58TY25Ja-HR0,13790
+odoo/addons/account_reconcile_oca/static/description/index.html,sha256=dr22xFUNNb6Hu-T4XpmXmHq6NCPkzVK6EGPDU-zxL08,13790
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js,sha256=k85Scd4skR5y56TvFVEqB_uf7vCD9Y7RpInETuNBAc8,4891
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_kanban_record.esm.js,sha256=ewNK1VQgFZWccTiyJMKYkOG6KtbHHVnI2pdNy9kjkig,467
 odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_renderer.esm.js,sha256=9NSr3iZ7H_QGTpixW5D4WEJuD_u4KRpdYwRmKqcML_k,2117
@@ -46,14 +46,14 @@ odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_mo
 odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_renderer.esm.js,sha256=TwiLpAbPJtr9VDZs8ZDIVFoieiogueHnpw0n0a1P_Kk,605
 odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_view.esm.js,sha256=TFHNQB-A2wyBlfUHXpqKBt_-ICY0pbO90n4ao9dCVBI,510
 odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_chatter_field.esm.js,sha256=w8vDPCCovRJRKYZtp1XnlWGNGXDfvoJYuttKF-jpTHw,902
-odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js,sha256=YrWCTvLIZqAE1McQMDVKqgIoJIZA1r1hAaxfd3l4Ulo,2920
+odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js,sha256=-m-It4krr0hLeRoM7VtiOdy7ZsutJPxokCY7HZRjfD8,3335
 odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_move_line_widget.esm.js,sha256=G5lbsagkTYErqNlPvhW0vfljQWRKI4eI5spDlH3_emk,3772
 odoo/addons/account_reconcile_oca/static/src/js/widgets/selection_badge_uncheck.esm.js,sha256=yFqG5t4wKA47k-wUMzPuDZ1AvILft6_hucGOz2YHWGE,836
 odoo/addons/account_reconcile_oca/static/src/scss/reconcile.scss,sha256=b6clO2yWT91dEdTE3RcdORFE6dNqqzsXz3S0Rc5afZU,2318
-odoo/addons/account_reconcile_oca/static/src/xml/reconcile.xml,sha256=hnXWp6pYXbAGf9EjmZaGDb4GHe1CBLGZMbbwbz0WuaY,8637
+odoo/addons/account_reconcile_oca/static/src/xml/reconcile.xml,sha256=zrLcG1bVWDwjm3PzrStw8MgX9IaTtANDBLVF3X51-ms,9266
 odoo/addons/account_reconcile_oca/tests/__init__.py,sha256=8JhP4auByShS8Z_Ik5dShMuWdh1kBlYP_DLI4Ku8XWA,79
 odoo/addons/account_reconcile_oca/tests/test_account_reconcile.py,sha256=MP5M-NsVhMoYiU675hr1nsvZRRK-4e5KUYMCCKTUHB8,10807
-odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=jy8F3hWd85x_1tBgPlT84PvfTrqFXLQogx_Dwv-wXEo,47041
+odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py,sha256=km7zs8uO6wabfryrsg8VLd5yT0AhkRaI0nI_MHOx-Es,53449
 odoo/addons/account_reconcile_oca/views/account_account.xml,sha256=0RiPmzfRUj54oMYKWM7mLnZL-5IhI5W8fiRruHL0SYc,866
 odoo/addons/account_reconcile_oca/views/account_account_reconcile.xml,sha256=2FKosNTl4hVC_yVq8uRzZvMMrXyEttK_YTsdnV8o0NI,7016
 odoo/addons/account_reconcile_oca/views/account_bank_statement.xml,sha256=QrjQZ3OTsnbopdLnnsFaZ0f7ncLkOUbtVj9osXdxw5k,2436
@@ -62,7 +62,7 @@ odoo/addons/account_reconcile_oca/views/account_journal.xml,sha256=T5tZ5Ev0psYp7
 odoo/addons/account_reconcile_oca/views/account_move.xml,sha256=BnvchVpOJ31M-kCoe6AHDxHMfrEEgJTPPysxguX3xgE,975
 odoo/addons/account_reconcile_oca/views/account_move_line.xml,sha256=Kr_ET1IAat3B8UoW6VPQO3q88JLVdE5-5jpb13ioCbY,5405
 odoo/addons/account_reconcile_oca/views/res_config_settings.xml,sha256=PxIqWILg_L_ahR-SDlDWEqWDJKNumPRifFAGF0BG57E,807
-odoo_addon_account_reconcile_oca-17.0.1.5.3.dist-info/METADATA,sha256=5e0AIOCQUtjdrfq5VsUxmdHuhDbgJgBgwO2ehMoFBII,4388
-odoo_addon_account_reconcile_oca-17.0.1.5.3.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
-odoo_addon_account_reconcile_oca-17.0.1.5.3.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_account_reconcile_oca-17.0.1.5.3.dist-info/RECORD,,
+odoo_addon_account_reconcile_oca-17.0.1.5.4.dist-info/METADATA,sha256=484jst0lJuJFJm_rjELbKOiImdmhPSM3v1gpSqNf3m4,4388
+odoo_addon_account_reconcile_oca-17.0.1.5.4.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
+odoo_addon_account_reconcile_oca-17.0.1.5.4.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_account_reconcile_oca-17.0.1.5.4.dist-info/RECORD,,