Merge PR #694 into 16.0

Signed-off-by etobella
OCA · Jan 3, 2025 · 5f110cb · 5f110cb
2 parents 3e6180f + f0ae2f0
commit 5f110cb
Show file tree

Hide file tree

Showing 7 changed files with 405 additions and 91 deletions.
diff --git a/account_reconcile_analytic_tag/models/account_reconcile_abstract.py b/account_reconcile_analytic_tag/models/account_reconcile_abstract.py
@@ -6,15 +6,7 @@
 class AccountReconcileAbstract(models.AbstractModel):
     _inherit = "account.reconcile.abstract"
 
-    def _get_reconcile_line(
-        self, line, kind, is_counterpart=False, max_amount=False, from_unreconcile=False
-    ):
-        vals = super()._get_reconcile_line(
-            line=line,
-            kind=kind,
-            is_counterpart=is_counterpart,
-            max_amount=max_amount,
-            from_unreconcile=from_unreconcile,
-        )
+    def _get_reconcile_line(self, line, kind, **kwargs):
+        vals = super()._get_reconcile_line(line, kind, **kwargs)
         vals[0]["manual_analytic_tag_ids"] = [(6, 0, line.analytic_tag_ids.ids)]
         return vals
diff --git a/account_reconcile_oca/models/account_account_reconcile.py b/account_reconcile_oca/models/account_account_reconcile.py
@@ -164,7 +164,11 @@ def _recompute_data(self, data):
         for line_id in counterparts:
             max_amount = amount if line_id == counterparts[-1] else 0
             lines = self._get_reconcile_line(
-                self.env["account.move.line"].browse(line_id), "other", True, max_amount
+                self.env["account.move.line"].browse(line_id),
+                "other",
+                is_counterpart=True,
+                max_amount=max_amount,
+                move=True,
             )
             new_data["data"] += lines
             amount += sum(line["amount"] for line in lines)