odoo-addon-account-reconcile-oca 17.0.1.2.6__py3-none-any.whl → 17.0.1.3.0.1__py3-none-any.whl

odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py

@@ -60,6 +60,19 @@ class AccountBankStatementLine(models.Model):
             "Percentage Analytic"
         ),
     )
+    manual_in_currency = fields.Boolean(readonly=True, store=False, prefetch=False)
+    manual_in_currency_id = fields.Many2one(
+        "res.currency", readonly=True, store=False, prefetch=False
+    )
+    manual_amount_in_currency = fields.Monetary(
+        store=False,
+        default=False,
+        prefetch=False,
+        currency_field="manual_in_currency_id",
+    )
+    manual_exchange_counterpart = fields.Boolean(
+        store=False,
+    )
     manual_model_id = fields.Many2one(
         "account.reconcile.model",
         check_company=True,
@@ -176,26 +189,19 @@ class AccountBankStatementLine(models.Model):
                 else:
                     new_data.append(line)
             if is_new_line:
-                new_data.append(
-                    self._get_reconcile_line(
-                        self.add_account_move_line_id, "other", True, pending_amount
-                    )
+                reconcile_auxiliary_id, lines = self._get_reconcile_line(
+                    self.add_account_move_line_id, "other", True, pending_amount
                 )
+                new_data += lines
             self.reconcile_data_info = self._recompute_suspense_line(
                 new_data,
                 self.reconcile_data_info["reconcile_auxiliary_id"],
                 self.manual_reference,
-                exchange_recompute=True,
             )
             self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)
             self.add_account_move_line_id = False
 
-    def _recompute_suspense_line(
-        self, data, reconcile_auxiliary_id, manual_reference, exchange_recompute=False
-    ):
-        reconcile_auxiliary_id = self._compute_exchange_rate(
-            data, reconcile_auxiliary_id, exchange_recompute=exchange_recompute
-        )
+    def _recompute_suspense_line(self, data, reconcile_auxiliary_id, manual_reference):
         can_reconcile = True
         total_amount = 0
         new_data = []
@@ -275,15 +281,29 @@ class AccountBankStatementLine(models.Model):
         self.ensure_one()
         data = self.reconcile_data_info.get("data", [])
         new_data = []
+        related_move_line_id = False
+        for line in data:
+            if line.get("reference") == self.manual_reference:
+                related_move_line_id = line.get("id")
+                break
         for line in data:
+            if (
+                self.manual_delete
+                and related_move_line_id
+                and line.get("original_exchange_line_id") == related_move_line_id
+            ):
+                # We should remove the related exchange rate line
+                continue
             if line["reference"] == self.manual_reference:
                 if self.manual_delete:
                     self.update(
                         {
-                            "manual_delete": False,
                             "manual_reference": False,
                             "manual_account_id": False,
                             "manual_amount": False,
+                            "manual_exchange_counterpart": False,
+                            "manual_in_currency_id": False,
+                            "manual_in_currency": False,
                             "manual_name": False,
                             "manual_partner_id": False,
                             "manual_line_id": False,
@@ -293,6 +313,7 @@ class AccountBankStatementLine(models.Model):
                             "manual_original_amount": False,
                             "manual_currency_id": False,
                             "analytic_distribution": False,
+                            "manual_amount_in_currency": False,
                         }
                     )
                     continue
@@ -300,11 +321,22 @@ class AccountBankStatementLine(models.Model):
                     self.manual_account_id = line["account_id"][0]
                     self.manual_amount = line["amount"]
                     self.manual_currency_id = line["currency_id"]
+                    self.manual_in_currency_id = line.get("line_currency_id")
+                    self.manual_in_currency = line.get("line_currency_id") and line[
+                        "currency_id"
+                    ] != line.get("line_currency_id")
+                    self.manual_amount_in_currency = line.get("currency_amount")
                     self.manual_name = line["name"]
+                    self.manual_exchange_counterpart = line.get(
+                        "is_exchange_counterpart", False
+                    )
                     self.manual_partner_id = (
                         line.get("partner_id") and line["partner_id"][0]
                     )
-                    self.manual_line_id = line["id"]
+                    manual_line = (
+                        self.env["account.move.line"].browse(line["id"]).exists()
+                    )
+                    self.manual_line_id = manual_line
                     self.analytic_distribution = line.get("analytic_distribution", {})
                     if self.manual_line_id:
                         self.manual_move_id = self.manual_line_id.move_id
@@ -312,6 +344,7 @@ class AccountBankStatementLine(models.Model):
                     self.manual_kind = line["kind"]
                     self.manual_original_amount = line.get("original_amount", 0.0)
             new_data.append(line)
+        self.update({"manual_delete": False})
         self.reconcile_data_info = self._recompute_suspense_line(
             new_data,
             self.reconcile_data_info["reconcile_auxiliary_id"],
@@ -319,6 +352,17 @@ class AccountBankStatementLine(models.Model):
         )
         self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)
 
+    @api.onchange("manual_amount_in_currency")
+    def _onchange_manual_amount_in_currency(self):
+        if self.manual_line_id.exists() and self.manual_line_id:
+            self.manual_amount = self.manual_in_currency_id._convert(
+                self.manual_amount_in_currency,
+                self.company_id.currency_id,
+                self.company_id,
+                self.manual_line_id.date,
+            )
+        self._onchange_manual_reconcile_vals()
+
     @api.onchange(
         "manual_account_id",
         "manual_partner_id",
@@ -364,6 +408,23 @@ class AccountBankStatementLine(models.Model):
                     )
                     if line["kind"] == "liquidity":
                         self._update_move_partner()
+            if self.manual_line_id and self.manual_line_id.id == line.get(
+                "original_exchange_line_id"
+            ):
+                # Now, we should edit the amount of the exchange rate
+                amount = self._get_exchange_rate_amount(
+                    self.manual_amount,
+                    self.manual_amount_in_currency,
+                    self.manual_line_id.currency_id,
+                    self.manual_line_id,
+                )
+                line.update(
+                    {
+                        "amount": amount,
+                        "credit": -amount if amount < 0 else 0.0,
+                        "debit": amount if amount > 0 else 0.0,
+                    }
+                )
             new_data.append(line)
         self.reconcile_data_info = self._recompute_suspense_line(
             new_data,
@@ -377,7 +438,7 @@ class AccountBankStatementLine(models.Model):
             return
         self.partner_id = self.manual_partner_id
 
-    @api.depends("reconcile_data")
+    @api.depends("reconcile_data", "is_reconciled")
     def _compute_reconcile_data_info(self):
         for record in self:
             if record.reconcile_data:
@@ -451,49 +512,15 @@ class AccountBankStatementLine(models.Model):
             new_data.append(new_line)
         return new_data, reconcile_auxiliary_id
 
-    def _compute_exchange_rate(
-        self, data, reconcile_auxiliary_id, exchange_recompute=False
-    ):
-        if not exchange_recompute:
-            return reconcile_auxiliary_id
-        foreign_currency = (
-            self.currency_id != self.company_id.currency_id
-            or self.foreign_currency_id
-            or any(line["currency_id"] != line["line_currency_id"] for line in data)
-        )
-        if not foreign_currency or self.is_reconciled:
-            return reconcile_auxiliary_id
-        currency = self.journal_id.currency_id or self.company_id.currency_id
-        amount = sum(d.get("net_amount", 0) for d in data)
-        if not currency.is_zero(amount):
-            account = self.company_id.expense_currency_exchange_account_id
-            if amount > 0:
-                account = self.company_id.income_currency_exchange_account_id
-            data.append(
-                {
-                    "reference": "reconcile_auxiliary;%s" % reconcile_auxiliary_id,
-                    "id": False,
-                    "account_id": [account.id, account.display_name],
-                    "partner_id": False,
-                    "date": fields.Date.to_string(self.date),
-                    "name": self.payment_ref or self.name,
-                    "amount": -amount,
-                    "net_amount": -amount,
-                    "credit": amount if amount > 0 else 0.0,
-                    "debit": -amount if amount < 0 else 0.0,
-                    "kind": "other",
-                    "currency_id": self.currency_id.id,
-                    "line_currency_id": self.currency_id.id,
-                    "currency_amount": -amount,
-                }
-            )
-            reconcile_auxiliary_id += 1
-        return reconcile_auxiliary_id
-
     def _default_reconcile_data(self, from_unreconcile=False):
         liquidity_lines, suspense_lines, other_lines = self._seek_for_lines()
-        data = [self._get_reconcile_line(line, "liquidity") for line in liquidity_lines]
+        data = []
         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
+            )
+            data += lines
         if not from_unreconcile:
             res = (
                 self.env["account.reconcile.model"]
@@ -508,30 +535,31 @@ class AccountBankStatementLine(models.Model):
                         data, res["model"], reconcile_auxiliary_id
                     ),
                     self.manual_reference,
-                    exchange_recompute=True,
                 )
             elif res and res.get("amls"):
                 amount = self.amount_total_signed
                 for line in res.get("amls", []):
-                    line_data = self._get_reconcile_line(
-                        line, "other", is_counterpart=True, max_amount=amount
+                    reconcile_auxiliary_id, line_data = self._get_reconcile_line(
+                        line,
+                        "other",
+                        is_counterpart=True,
+                        max_amount=amount,
+                        reconcile_auxiliary_id=reconcile_auxiliary_id,
                     )
-                    amount -= line_data.get("amount")
-                    data.append(line_data)
+                    amount -= sum(line.get("amount") for line in line_data)
+                    data += line_data
                 return self._recompute_suspense_line(
                     data,
                     reconcile_auxiliary_id,
                     self.manual_reference,
-                    exchange_recompute=True,
                 )
+        for line in other_lines:
+            reconcile_auxiliary_id, lines = self._get_reconcile_line(
+                line, "other", from_unreconcile=from_unreconcile
+            )
+            data += lines
         return self._recompute_suspense_line(
-            data
-            + [
-                self._get_reconcile_line(
-                    line, "other", from_unreconcile=from_unreconcile
-                )
-                for line in other_lines
-            ],
+            data,
             reconcile_auxiliary_id,
             self.manual_reference,
         )
@@ -544,9 +572,9 @@ class AccountBankStatementLine(models.Model):
         self.ensure_one()
         self.reconcile_mode = self.journal_id.reconcile_mode
         result = getattr(self, "_reconcile_bank_line_%s" % self.reconcile_mode)(
-            self.reconcile_data_info["data"]
+            self._prepare_reconcile_line_data(self.reconcile_data_info["data"])
         )
-        self.reconcile_data_info = False
+        self.reconcile_data = False
         return result
 
     def _reconcile_bank_line_edit(self, data):
@@ -722,10 +750,12 @@ class AccountBankStatementLine(models.Model):
             if not res:
                 continue
             liquidity_lines, suspense_lines, other_lines = record._seek_for_lines()
-            data = [
-                record._get_reconcile_line(line, "liquidity")
-                for line in liquidity_lines
-            ]
+            data = []
+            for line in liquidity_lines:
+                reconcile_auxiliary_id, lines = record._get_reconcile_line(
+                    line, "liquidity"
+                )
+                data += lines
             reconcile_auxiliary_id = 1
             if res.get("status", "") == "write_off":
                 data = record._recompute_suspense_line(
@@ -733,29 +763,55 @@ class AccountBankStatementLine(models.Model):
                         data, res["model"], reconcile_auxiliary_id
                     ),
                     self.manual_reference,
-                    exchange_recompute=True,
                 )
             elif res.get("amls"):
                 amount = self.amount
                 for line in res.get("amls", []):
-                    line_data = record._get_reconcile_line(
+                    reconcile_auxiliary_id, line_datas = record._get_reconcile_line(
                         line, "other", is_counterpart=True, max_amount=amount
                     )
-                    amount -= line_data.get("amount")
-                    data.append(line_data)
+                    amount -= sum(line_data.get("amount") for line_data in line_datas)
+                    data += line_datas
                 data = record._recompute_suspense_line(
                     data,
                     reconcile_auxiliary_id,
                     self.manual_reference,
-                    exchange_recompute=True,
                 )
             if not data.get("can_reconcile"):
                 continue
             getattr(
                 record, "_reconcile_bank_line_%s" % record.journal_id.reconcile_mode
-            )(data["data"])
+            )(self._prepare_reconcile_line_data(data["data"]))
         return result
 
+    def _prepare_reconcile_line_data(self, lines):
+        new_lines = []
+        reverse_lines = {}
+        for line in lines:
+            if not line.get("id") and not line.get("original_exchange_line_id"):
+                new_lines.append(line)
+            elif not line.get("original_exchange_line_id"):
+                reverse_lines[line["id"]] = line
+        for line in lines:
+            if line.get("original_exchange_line_id"):
+                reverse_lines[line["original_exchange_line_id"]].update(
+                    {
+                        "amount": reverse_lines[line["original_exchange_line_id"]][
+                            "amount"
+                        ]
+                        + line["amount"],
+                        "credit": reverse_lines[line["original_exchange_line_id"]][
+                            "credit"
+                        ]
+                        + line["credit"],
+                        "debit": reverse_lines[line["original_exchange_line_id"]][
+                            "debit"
+                        ]
+                        + line["debit"],
+                    }
+                )
+        return new_lines + list(reverse_lines.values())
+
     def button_manual_reference_full_paid(self):
         self.ensure_one()
         if not self.reconcile_data_info["manual_reference"]:
@@ -768,14 +824,14 @@ class AccountBankStatementLine(models.Model):
             if line["reference"] == manual_reference and line.get("id"):
                 total_amount = -line["amount"] + line["original_amount_unsigned"]
                 original_amount = line["original_amount_unsigned"]
-                new_data.append(
-                    self._get_reconcile_line(
-                        self.env["account.move.line"].browse(line["id"]),
-                        "other",
-                        is_counterpart=True,
-                        max_amount=original_amount,
-                    )
+                reconcile_auxiliary_id, lines = self._get_reconcile_line(
+                    self.env["account.move.line"].browse(line["id"]),
+                    "other",
+                    is_counterpart=True,
+                    reconcile_auxiliary_id=reconcile_auxiliary_id,
+                    max_amount=original_amount,
                 )
+                new_data += lines
                 new_data.append(
                     {
                         "reference": "reconcile_auxiliary;%s" % reconcile_auxiliary_id,
@@ -800,7 +856,6 @@ class AccountBankStatementLine(models.Model):
             new_data,
             reconcile_auxiliary_id,
             self.manual_reference,
-            exchange_recompute=True,
         )
         self.can_reconcile = self.reconcile_data_info.get("can_reconcile", False)
 
@@ -815,18 +870,86 @@ class AccountBankStatementLine(models.Model):
         self.move_id.to_check = False
 
     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,
+        reconcile_auxiliary_id=False,
     ):
-        vals = super()._get_reconcile_line(
+        new_vals = super()._get_reconcile_line(
             line,
             kind,
             is_counterpart=is_counterpart,
             max_amount=max_amount,
             from_unreconcile=from_unreconcile,
         )
-        if vals["partner_id"] is False and self.partner_name:
-            vals["partner_id"] = (False, self.partner_name)
-        return vals
+        rates = []
+        for vals in new_vals:
+            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 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(
+                currency_amount,
+                self.company_id.currency_id,
+                self.company_id,
+                self.date,
+            )
+            - amount
+        )
+
+    def _compute_exchange_rate(
+        self,
+        vals,
+        line,
+        reconcile_auxiliary_id,
+    ):
+        foreign_currency = (
+            self.currency_id != self.company_id.currency_id
+            or self.foreign_currency_id
+            or vals["currency_id"] != vals["line_currency_id"]
+        )
+        if not foreign_currency or self.is_reconciled:
+            return reconcile_auxiliary_id, False
+        currency = self.env["res.currency"].browse(vals["line_currency_id"])
+        amount = self._get_exchange_rate_amount(
+            vals.get("amount", 0), vals.get("currency_amount", 0), currency, line
+        )
+        if currency.is_zero(amount):
+            return reconcile_auxiliary_id, False
+        account = self.company_id.expense_currency_exchange_account_id
+        if amount < 0:
+            account = self.company_id.income_currency_exchange_account_id
+        data = {
+            "is_exchange_counterpart": True,
+            "original_exchange_line_id": line.id,
+            "reference": "reconcile_auxiliary;%s" % reconcile_auxiliary_id,
+            "id": False,
+            "account_id": account.name_get()[0],
+            "partner_id": False,
+            "date": fields.Date.to_string(self.date),
+            "name": self.payment_ref or self.name,
+            "amount": amount,
+            "net_amount": amount,
+            "credit": -amount if amount < 0 else 0.0,
+            "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,
+        }
+        reconcile_auxiliary_id += 1
+        return reconcile_auxiliary_id, data
 
     def add_statement(self):
         self.ensure_one()

odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py

@@ -38,33 +38,30 @@ class AccountReconcileAbstract(models.AbstractModel):
     ):
         date = self.date if "date" in self._fields else line.date
         original_amount = amount = net_amount = line.debit - line.credit
-        amount_currency = self.company_id.currency_id
         if is_counterpart:
-            amount = line.amount_residual_currency or line.amount_residual
-            amount_currency = line.currency_id or self.company_id.currency_id
-            original_amount = net_amount = line.amount_residual
+            currency_amount = -line.amount_residual_currency or line.amount_residual
+            amount = -line.amount_residual
+            currency = line.currency_id or self.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, amount_currency, self.company_id, line.date
+                    max_amount, currency, self.company_id, date
                 )
-                if amount > currency_max_amount > 0:
+                if (
+                    -currency_amount > currency_max_amount > 0
+                    or -currency_amount < currency_max_amount < 0
+                ):
                     amount = currency_max_amount
-                    net_amount = max_amount
-                if amount < currency_max_amount < 0:
-                    amount = currency_max_amount
-                    net_amount = max_amount
-            amount = -amount
-            original_amount = -original_amount
-            net_amount = -net_amount
+                    net_amount = -max_amount
+                    currency_amount = -amount
+                    amount = currency._convert(
+                        currency_amount,
+                        self.company_id.currency_id,
+                        self.company_id,
+                        date,
+                    )
         else:
-            amount_currency = line.currency_id
-            amount = self.company_id.currency_id._convert(
-                amount, amount_currency, self.company_id, date
-            )
-        currency_amount = amount
-        amount = amount_currency._convert(
-            amount, self.company_id.currency_id, self.company_id, date
-        )
+            currency_amount = line.amount_currency
         vals = {
             "reference": "account.move.line;%s" % line.id,
             "id": line.id,
@@ -101,4 +98,4 @@ class AccountReconcileAbstract(models.AbstractModel):
             vals["original_amount_unsigned"] = original_amount
         if is_counterpart:
             vals["counterpart_line_ids"] = line.ids
-        return vals
+        return [vals]

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:223a415f11a6e89566fdec656377f5e439236dc333a3207f5a3290d8699bf39c
+!! source digest: sha256:88b6b066ad75c60faa27b6558ead2c5bf920b1e5f1baf6e5b1414a4361cd5d63
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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

@@ -32,6 +32,7 @@ export class AccountReconcileDataWidget extends Component {
             });
             data[line].amount_currency_format = formatMonetary(
                 data[line].currency_amount,
+                undefined,
                 {
                     currencyId: data[line].line_currency_id,
                 }
@@ -51,6 +52,7 @@ export class AccountReconcileDataWidget extends Component {
         return data;
     }
     onTrashLine(ev, line) {
+        ev.stopPropagation();
         this.props.record.update({
             manual_reference: line.reference,
             manual_delete: true,