odoo-addon-account-reconcile-oca 17.0.1.5.8__py3-none-any.whl → 18.0.1.0.1__py3-none-any.whl

odoo/addons/account_reconcile_oca/tests/test_account_reconcile.py

@@ -1,3 +1,4 @@
+from odoo import Command
 from odoo.tests import Form, tagged
 
 from odoo.addons.account_reconcile_model_oca.tests.common import (
@@ -12,9 +13,9 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         return {**cls.env.context, "_test_account_reconcile_oca": True}
 
     @classmethod
-    def setUpClass(cls, chart_template_ref=None):
-        super().setUpClass(chart_template_ref=chart_template_ref)
-        cls.env = cls.env(context=cls._setup_context())
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
         cls.acc_bank_stmt_model = cls.env["account.bank.statement"]
         cls.acc_bank_stmt_line_model = cls.env["account.bank.statement.line"]
         cls.bank_journal_usd.suspense_account_id = (
@@ -28,7 +29,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             .search(
                 [
                     ("account_type", "=", "asset_current"),
-                    ("company_id", "=", cls.env.company.id),
+                    ("company_ids", "in", cls.env.company.id),
                 ],
                 limit=1,
             )
@@ -40,7 +41,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             .search(
                 [
                     ("account_type", "=", "asset_receivable"),
-                    ("company_id", "=", cls.env.company.id),
+                    ("company_ids", "in", cls.env.company.id),
                 ],
                 limit=1,
             )
@@ -52,7 +53,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             .search(
                 [
                     ("account_type", "=", "equity"),
-                    ("company_id", "=", cls.env.company.id),
+                    ("company_ids", "in", cls.env.company.id),
                 ],
                 limit=1,
             )
@@ -63,7 +64,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             .search(
                 [
                     ("account_type", "=", "asset_non_current"),
-                    ("company_id", "=", cls.env.company.id),
+                    ("company_ids", "in", cls.env.company.id),
                 ],
                 limit=1,
             )
@@ -73,23 +74,19 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         cls.move_1 = cls.env["account.move"].create(
             {
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": cls.current_assets_account.id,
                             "name": "DEMO",
                             "credit": 100,
-                        },
+                        }
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": cls.non_current_assets_account.id,
                             "name": "DEMO",
                             "debit": 100,
-                        },
+                        }
                     ),
                 ]
             }
@@ -98,23 +95,19 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         cls.move_2 = cls.env["account.move"].create(
             {
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": cls.non_current_assets_account.id,
                             "name": "DEMO",
                             "credit": 50,
-                        },
+                        }
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": cls.equity_account.id,
                             "name": "DEMO",
                             "debit": 50,
-                        },
+                        }
                     ),
                 ]
             }
@@ -123,23 +116,19 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         cls.move_3 = cls.env["account.move"].create(
             {
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": cls.non_current_assets_account.id,
                             "name": "DEMO",
                             "credit": 50,
-                        },
+                        }
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": cls.equity_account.id,
                             "name": "DEMO",
                             "debit": 50,
-                        },
+                        }
                     ),
                 ]
             }
@@ -216,24 +205,20 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         move_1 = self.env["account.move"].create(
             {
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": self.current_assets_account.id,
                             "name": "DEMO",
                             "credit": 100,
-                        },
+                        }
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": self.asset_receivable_account.id,
                             "partner_id": self.env.user.partner_id.id,
                             "name": "DEMO",
                             "debit": 100,
-                        },
+                        }
                     ),
                 ]
             }
@@ -243,24 +228,20 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         move_2 = self.env["account.move"].create(
             {
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": self.current_assets_account.id,
                             "name": "DEMO",
                             "debit": 100,
-                        },
+                        }
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": self.asset_receivable_account.id,
                             "partner_id": self.env.company.partner_id.id,
                             "name": "DEMO",
                             "credit": 100,
-                        },
+                        }
                     ),
                 ]
             }
@@ -277,24 +258,20 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         move_3 = self.env["account.move"].create(
             {
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": self.current_assets_account.id,
                             "name": "DEMO",
                             "debit": 100,
-                        },
+                        }
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "account_id": self.asset_receivable_account.id,
                             "partner_id": self.env.user.partner_id.id,
                             "name": "DEMO",
                             "credit": 100,
-                        },
+                        }
                     ),
                 ]
             }

odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py

@@ -1,5 +1,6 @@
 import time
 
+from odoo import Command
 from odoo.tests import Form, tagged
 
 from odoo.addons.account_reconcile_model_oca.tests.common import (
@@ -14,8 +15,8 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         return {**cls.env.context, "_test_account_reconcile_oca": True}
 
     @classmethod
-    def setUpClass(cls, chart_template_ref=None):
-        super().setUpClass(chart_template_ref=chart_template_ref)
+    def setUpClass(cls):
+        super().setUpClass()
         cls.env = cls.env(context=cls._setup_context())
         # Auto-disable reconciliation model created automatically with
         # generate_account_reconcile_model() to avoid side effects in tests
@@ -39,7 +40,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         cls.current_assets_account = cls.env["account.account"].search(
             [
                 ("account_type", "=", "asset_current"),
-                ("company_id", "=", cls.env.company.id),
+                ("company_ids", "in", cls.env.company.id),
             ],
             limit=1,
         )
@@ -51,7 +52,9 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
                 "rule_type": "writeoff_button",
                 "match_partner": True,
                 "match_partner_ids": [],
-                "line_ids": [(0, 0, {"account_id": cls.current_assets_account.id})],
+                "line_ids": [
+                    Command.create({"account_id": cls.current_assets_account.id})
+                ],
             }
         )
         cls.tax_10 = cls.env["account.tax"].create(
@@ -190,7 +193,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             f.add_account_move_line_id = receivable1
             self.assertFalse(f.add_account_move_line_id)
             self.assertTrue(f.can_reconcile)
-            f.manual_reference = "account.move.line;%s" % receivable1.id
+            f.manual_reference = f"account.move.line;{receivable1.id}"
             self.assertEqual(-50, f.manual_amount)
         self.assertEqual(2, len(bank_stmt_line.reconcile_data_info["data"]))
         bank_stmt_line.button_manual_reference_full_paid()
@@ -199,7 +202,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             bank_stmt_line,
             view="account_reconcile_oca.bank_statement_line_form_reconcile_view",
         ) as f:
-            f.manual_reference = "account.move.line;%s" % receivable1.id
+            f.manual_reference = f"account.move.line;{receivable1.id}"
             self.assertEqual(-100, f.manual_amount)
 
     def test_reconcile_invoice_unreconcile(self):
@@ -303,12 +306,12 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             f.add_account_move_line_id = receivable1
             self.assertFalse(f.add_account_move_line_id)
             self.assertTrue(f.can_reconcile)
-            f.manual_reference = "account.move.line;%s" % receivable1.id
+            f.manual_reference = f"account.move.line;{receivable1.id}"
             self.assertEqual(f.manual_amount, -100)
             f.manual_amount = -70
             self.assertFalse(f.can_reconcile)
             f.add_account_move_line_id = receivable2
-            f.manual_reference = "account.move.line;%s" % receivable2.id
+            f.manual_reference = f"account.move.line;{receivable2.id}"
             self.assertEqual(f.manual_amount, -30)
             self.assertTrue(f.can_reconcile)
         self.assertEqual(inv1.amount_residual_signed, 100)
@@ -366,12 +369,12 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             f.add_account_move_line_id = receivable1
             self.assertFalse(f.add_account_move_line_id)
             self.assertTrue(f.can_reconcile)
-            f.manual_reference = "account.move.line;%s" % receivable1.id
+            f.manual_reference = f"account.move.line;{receivable1.id}"
             self.assertEqual(f.manual_amount, 100)
             f.manual_amount = 70
             self.assertFalse(f.can_reconcile)
             f.add_account_move_line_id = receivable2
-            f.manual_reference = "account.move.line;%s" % receivable2.id
+            f.manual_reference = f"account.move.line;{receivable2.id}"
             self.assertEqual(f.manual_amount, 30)
             self.assertTrue(f.can_reconcile)
         self.assertEqual(inv1.amount_residual_signed, -100)
@@ -430,7 +433,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         bank statement.
         """
         self.rule.line_ids.write(
-            {"tax_ids": [(4, self.tax_10.id)], "force_tax_included": True}
+            {"tax_ids": [Command.link(self.tax_10.id)], "force_tax_included": True}
         )
         bank_stmt = self.acc_bank_stmt_model.create(
             {
@@ -541,7 +544,9 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
                 "match_label": "contains",
                 "match_label_param": "DEMO WRITEOFF",
                 "auto_reconcile": True,
-                "line_ids": [(0, 0, {"account_id": self.current_assets_account.id})],
+                "line_ids": [
+                    Command.create({"account_id": self.current_assets_account.id})
+                ],
             }
         )
 
@@ -617,7 +622,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             .move_id
         )
         bank_stmt_line.unreconcile_bank_line()
-        self.assertTrue(reconcile_move.reversal_move_id)
+        self.assertTrue(reconcile_move.reversal_move_ids)
         self.assertFalse(bank_stmt_line.is_reconciled)
 
     def test_reconcile_model_with_foreign_currency(self):
@@ -709,13 +714,13 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             f.add_account_move_line_id = receivable1
             self.assertTrue(f.can_reconcile)
         self.assertFalse(bank_stmt_line.is_reconciled)
-        self.assertFalse(bank_stmt_line.to_check)
+        self.assertTrue(bank_stmt_line.checked)
         bank_stmt_line.action_to_check()
         self.assertTrue(bank_stmt_line.is_reconciled)
-        self.assertTrue(bank_stmt_line.to_check)
+        self.assertFalse(bank_stmt_line.checked)
         bank_stmt_line.action_checked()
         self.assertTrue(bank_stmt_line.is_reconciled)
-        self.assertFalse(bank_stmt_line.to_check)
+        self.assertTrue(bank_stmt_line.checked)
 
     def test_reconcile_invoice_to_check_not_reconciled(self):
         """
@@ -740,13 +745,13 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             }
         )
         self.assertFalse(bank_stmt_line.is_reconciled)
-        self.assertFalse(bank_stmt_line.to_check)
+        self.assertTrue(bank_stmt_line.checked)
         bank_stmt_line.action_to_check()
         self.assertFalse(bank_stmt_line.is_reconciled)
-        self.assertTrue(bank_stmt_line.to_check)
+        self.assertFalse(bank_stmt_line.checked)
         bank_stmt_line.action_checked()
         self.assertFalse(bank_stmt_line.is_reconciled)
-        self.assertFalse(bank_stmt_line.to_check)
+        self.assertTrue(bank_stmt_line.checked)
 
     # Testing widget
 
@@ -821,7 +826,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             f.add_account_move_line_id = receivable1
             self.assertFalse(f.add_account_move_line_id)
             self.assertTrue(f.can_reconcile)
-            f.manual_reference = "account.move.line;%s" % receivable1.id
+            f.manual_reference = f"account.move.line;{receivable1.id}"
             self.assertEqual(f.manual_amount, -100)
             f.manual_delete = True
             self.assertFalse(f.can_reconcile)
@@ -897,7 +902,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
         ) as f:
             self.assertFalse(f.can_reconcile)
             self.assertFalse(f.partner_id)
-            f.manual_reference = "account.move.line;%s" % liquidity_lines.id
+            f.manual_reference = f"account.move.line;{liquidity_lines.id}"
             f.manual_partner_id = inv1.partner_id
             f.save()
             self.assertEqual(f.partner_id, inv1.partner_id)
@@ -1051,12 +1056,12 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
     def test_partner_name_with_parent(self):
         parent_partner = self.env["res.partner"].create(
             {
-                "name": "test",
+                "name": "test_account_reconcile_oca",
             }
         )
         child_partner = self.env["res.partner"].create(
             {
-                "name": "test",
+                "name": "test_account_reconcile_oca",
                 "parent_id": parent_partner.id,
                 "type": "delivery",
             }
@@ -1072,7 +1077,6 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
                 "name": "test",
             }
         )
-
         self.invoice_matching_models.active = True
         self.invoice_matching_models.match_text_location_label = False
         bank_stmt_line = self.acc_bank_stmt_line_model.create(
@@ -1083,10 +1087,9 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
                 "amount": 100,
                 "date": time.strftime("%Y-07-15"),
                 "payment_ref": "test",
-                "partner_name": "test",
+                "partner_name": "test_account_reconcile_oca",
             }
         )
-
         bkstmt_data = bank_stmt_line.reconcile_data_info
         self.assertEqual(len(bkstmt_data["counterparts"]), 1)
         self.assertEqual(
@@ -1368,7 +1371,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             )
             # 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_reference = f"account.move.line;{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)
@@ -1377,7 +1380,7 @@ class TestReconciliationWidget(TestAccountReconciliationCommon):
             # 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"]
+            f.manual_reference = f"account.move.line;{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)

odoo/addons/account_reconcile_oca/views/account_account.xml

@@ -2,13 +2,12 @@
 <!-- Copyright 2023 Dixmit
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record model="ir.ui.view" id="view_account_list">
-        <field name="name">account.account.tree (in account_reconcile_oca)</field>
+        <field name="name">account.account.list (in account_reconcile_oca)</field>
         <field name="model">account.account</field>
         <field name="inherit_id" ref="account.view_account_list" />
         <field name="arch" type="xml">
-            <tree position="inside">
+            <list position="inside">
                 <button
                     type="action"
                     name="%(account_reconcile_oca.account_account_account_account_reconcile_act_window)s"
@@ -16,8 +15,7 @@
                     class="float-end btn-secondary"
                     invisible="reconcile == False"
                 />
-            </tree>
+            </list>
         </field>
     </record>
-
 </odoo>

odoo/addons/account_reconcile_oca/views/account_account_reconcile.xml

@@ -2,7 +2,6 @@
 <!-- Copyright 2023 Dixmit
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record model="ir.ui.view" id="account_account_reconcile_form_view">
         <field
             name="name"
@@ -36,7 +35,7 @@
                 <field name="is_reconciled" invisible="1" />
                 <group>
                     <group>
-                    <field name="partner_id" />
+                        <field name="partner_id" />
                     </group>
                     <group>
                         <field name="account_id" />
@@ -58,7 +57,7 @@
                             name="add_account_move_line_id"
                             widget="account_reconcile_oca_match"
                             domain="[('parent_state', '=', 'posted'), ('amount_residual', '!=', 0), ('account_id', '=', account_id)]"
-                            context="{'search_default_partner_id': partner_id, 'tree_view_ref': 'account_reconcile_oca.account_move_line_tree_reconcile_view', 'search_view_ref': 'account_reconcile_oca.account_move_line_search_reconcile_view'}"
+                            context="{'search_default_partner_id': partner_id, 'list_view_ref': 'account_reconcile_oca.account_move_line_tree_reconcile_view', 'search_view_ref': 'account_reconcile_oca.account_move_line_search_reconcile_view'}"
                         />
                     </page>
                 </notebook>
@@ -82,15 +81,15 @@
     <record model="ir.ui.view" id="account_account_reconcile_tree_view">
         <field
             name="name"
-        >account.account.reconcile.tree (in account_reconcile_oca)</field>
+        >account.account.reconcile.list (in account_reconcile_oca)</field>
         <field name="model">account.account.reconcile</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <!-- TODO -->
                 <field name="id" />
                 <field name="account_id" />
                 <field name="partner_id" />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -102,17 +101,12 @@
         <field name="arch" type="xml">
             <kanban js_class="reconcile">
                 <templates>
-                    <t t-name="kanban-box">
-                        <div
-                            t-attf-class="oe_kanban_card oe_kanban_global_click"
-                            style="width:100%"
-                        >
-                            <div>
-                                <field name="account_id" />
-                            </div>
-                            <div>
-                                <field name="partner_id" />
-                            </div>
+                    <t t-name="card">
+                        <div>
+                            <field name="account_id" />
+                        </div>
+                        <div>
+                            <field name="partner_id" />
                         </div>
                     </t>
                 </templates>
@@ -161,9 +155,8 @@
 
     <record model="ir.ui.menu" id="account_account_reconcile_menu">
         <field name="name">Reconcile</field>
-        <field name="parent_id" ref="account.menu_finance_entries_actions" />
+        <field name="parent_id" ref="account.menu_finance_entries" />
         <field name="action" ref="account_account_reconcile_act_window" />
-        <field name="sequence" eval="10" />
+        <field name="sequence" eval="140" />
     </record>
-
 </odoo>

odoo/addons/account_reconcile_oca/views/account_bank_statement.xml

@@ -2,7 +2,6 @@
 <!-- Copyright 2023 Dixmit
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="account_bank_statement_form_edit" model="ir.ui.view">
         <field name="name">Edit Bank statement</field>
         <field name="model">account.bank.statement</field>
@@ -27,7 +26,6 @@
                         <field name="line_ids" invisible="1" />
                     </group>
                 </sheet>
-
             </form>
         </field>
     </record>