odoo-addon-contract 18.0.2.0.8__py3-none-any.whl → 18.0.2.0.10__py3-none-any.whl

odoo/addons/contract/README.rst

@@ -11,7 +11,7 @@ Recurring - Contracts Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a643d8e9740ea79099b147dcd5310757734569ef271a9790c8a5a58bfb8f1cec
+   !! source digest: sha256:4f24d5a0544622601f21bd74ba692382ebb4a1c14375972bbea81e8fc86c1b71
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

odoo/addons/contract/__manifest__.py

@@ -11,7 +11,7 @@
 
 {
     "name": "Recurring - Contracts Management",
-    "version": "18.0.2.0.8",
+    "version": "18.0.2.0.10",
     "category": "Contract Management",
     "license": "AGPL-3",
     "author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)",

odoo/addons/contract/models/contract.py

@@ -42,6 +42,9 @@ class ContractContract(models.Model):
     group_id = fields.Many2one(
         string="Group",
         comodel_name="account.analytic.account",
+        compute="_compute_group_id",
+        store=True,
+        readonly=False,
         ondelete="restrict",
     )
     tag_ids = fields.Many2many(comodel_name="contract.tag", string="Tags")
@@ -215,6 +218,32 @@ class ContractContract(models.Model):
                     "invoice"
                 ]
 
+    @api.depends(
+        "contract_line_ids",
+        "contract_line_ids.analytic_distribution",
+        "contract_line_fixed_ids",
+        "contract_line_fixed_ids.analytic_distribution",
+    )
+    def _compute_group_id(self):
+        """Compute the group_id based on the analytic_distribution
+        in the contract lines.
+        If all contract lines have the same analytic account, set it as group_id.
+        Otherwise, set group_id to False.
+        """
+        for record in self:
+            record.group_id = False
+            all_analytic_accounts = []
+            contract_lines = record.contract_line_ids | record.contract_line_fixed_ids
+            for line in contract_lines:
+                if line.analytic_distribution:
+                    all_analytic_accounts.extend(
+                        int(acc_id)
+                        for account_ids in line.analytic_distribution.keys()
+                        for acc_id in account_ids.split(",")
+                    )
+            if len(set(all_analytic_accounts)) == 1:
+                record.group_id = all_analytic_accounts[0]
+
     # === Onchange Methods ===
 
     @api.onchange("contract_template_id")
@@ -539,14 +568,6 @@ class ContractContract(models.Model):
         """
         self.ensure_one()
 
-        def can_be_invoiced(contract_line):
-            return (
-                not contract_line.is_canceled
-                and contract_line.recurring_next_date
-                and contract_line.recurring_next_date <= date_ref
-                and contract_line.next_period_date_start
-            )
-
         lines2invoice = previous = self.env["contract.line"]
         current_section = current_note = False
         for line in self.contract_line_ids:
@@ -560,7 +581,7 @@ class ContractContract(models.Model):
                 elif line.note_invoicing_mode == "with_next_line":
                     current_note = line
             elif line.is_recurring_note or not line.display_type:
-                if can_be_invoiced(line):
+                if line._can_be_invoiced(date_ref):
                     if current_section:
                         lines2invoice |= current_section
                         current_section = False

odoo/addons/contract/models/contract_line.py

@@ -261,6 +261,15 @@ class ContractLine(models.Model):
                 }
             )
 
+    def _can_be_invoiced(self, date_ref):
+        self.ensure_one()
+        return (
+            not self.is_canceled
+            and self.recurring_next_date
+            and self.recurring_next_date <= date_ref
+            and self.next_period_date_start
+        )
+
     @api.model
     def get_view(self, view_id=None, view_type="form", **options):
         default_contract_type = self.env.context.get("default_contract_type")

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

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a643d8e9740ea79099b147dcd5310757734569ef271a9790c8a5a58bfb8f1cec
+!! source digest: sha256:4f24d5a0544622601f21bd74ba692382ebb4a1c14375972bbea81e8fc86c1b71
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/contract/tree/18.0/contract"><img alt="OCA/contract" src="https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/contract-18-0/contract-18-0-contract"><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/contract&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module enables contracts management with recurring invoicing

odoo/addons/contract/tests/test_contract.py

@@ -1557,3 +1557,39 @@ class TestContract(TestContractBase):
         self.contract3.contract_line_ids.recurring_next_date = fields.Date.today()
         invoice_id = self.contract3.recurring_create_invoice()
         self.assertEqual(invoice_id.invoice_line_ids[0].name, "Header for May Services")
+
+    def test_analytic_account(self):
+        """Tests the automatic setting of the analytic account on the contract
+        depending on the analytic accounts set on the contract lines.
+        # Case 1: only one contract line with one analytic account
+            => the analytic account is set on the contract
+        # Case 2: only one contract line with two analytic accounts
+            => the analytic account is not set on the contract
+        # Case 3: two contract lines, with the same analytic account
+            => the analytic account is set on the contract
+        # Case 4: two contract lines, each one with one analytic account
+            => the analytic account is not set on the contract
+        """
+        plan = self.env["account.analytic.plan"].create({"name": "Test plan contract"})
+        self.analytic_account_1 = self.env["account.analytic.account"].create(
+            {"name": "Test account contract 1", "plan_id": plan.id}
+        )
+        self.analytic_account_2 = self.env["account.analytic.account"].create(
+            {"name": "Test account contract 2", "plan_id": plan.id}
+        )
+        # Case 1: only one contract line with one analytic account
+        self.acct_line.analytic_distribution = {self.analytic_account_1.id: 100}
+        self.assertEqual(self.contract.group_id, self.analytic_account_1)
+        # Case 2: only one contract line with two analytic accounts
+        self.acct_line.analytic_distribution = {
+            self.analytic_account_1.id: 50,
+            self.analytic_account_2.id: 50,
+        }
+        self.assertFalse(self.contract.group_id)
+        # Case 3: two contract lines, with the same analytic account
+        self.acct_line.analytic_distribution = {self.analytic_account_1.id: 100}
+        new_contract_line = self.acct_line.copy()
+        self.assertEqual(self.contract.group_id, self.analytic_account_1)
+        # Case 4: two contract lines, each one with one analytic account
+        new_contract_line.analytic_distribution = {self.analytic_account_2.id: 100}
+        self.assertFalse(self.contract.group_id)

{odoo_addon_contract-18.0.2.0.8.dist-info → odoo_addon_contract-18.0.2.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-contract
-Version: 18.0.2.0.8
+Version: 18.0.2.0.10
 Requires-Python: >=3.10
 Requires-Dist: odoo==18.0.*
 Summary: Recurring - Contracts Management
@@ -28,7 +28,7 @@ Recurring - Contracts Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a643d8e9740ea79099b147dcd5310757734569ef271a9790c8a5a58bfb8f1cec
+   !! source digest: sha256:4f24d5a0544622601f21bd74ba692382ebb4a1c14375972bbea81e8fc86c1b71
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

{odoo_addon_contract-18.0.2.0.8.dist-info → odoo_addon_contract-18.0.2.0.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/contract/README.rst,sha256=jQYvFaIUKbbTboFzrm4FJ-LNWFlwRuIJZxedz6iLmBU,6176
+odoo/addons/contract/README.rst,sha256=mpqqvQFM9JraBvXe75rdPztk9aGufsNVsG5gZIIQP4I,6176
 odoo/addons/contract/__init__.py,sha256=dnUeA_K1torbiMNF3tt2dtECdk-FkWm01DByr9MBMIA,69
-odoo/addons/contract/__manifest__.py,sha256=0TcJi1M7IT-9Gr2299RwSd_TFqANxrHojhtvwT9dASQ,1777
+odoo/addons/contract/__manifest__.py,sha256=IllRPyWiCQo3F-Wt247jLZPu3KVUBYGHXWeI71kXRhU,1778
 odoo/addons/contract/controllers/__init__.py,sha256=ZAYSY9pxyJjumL2QVLuxqtBzjLwKPiQsVXMBAWvNGGY,85
 odoo/addons/contract/controllers/main.py,sha256=5C-WzZ6zPWeea-Kb0U01a1yNCtcn29iZeoc9hjkODa4,3676
 odoo/addons/contract/data/contract_cron.xml,sha256=yYTdn4fmIU5zsfFEgx-H_55M9nwc0WfJ3Q6ufxQKPt8,549
@@ -84,8 +84,8 @@ odoo/addons/contract/migrations/18.0.2.0.0/pre-migrate.py,sha256=ywaZcxy-bxj2MRi
 odoo/addons/contract/models/__init__.py,sha256=n3UpKXb_Oi-2ebHho6pWrd6kw_cMK6GG1E3fl7ey_zc,372
 odoo/addons/contract/models/account_move.py,sha256=QdSF_E5cifIgOiPiZ1PKXxuA5y9y4PC-kkUurDdGKo4,387
 odoo/addons/contract/models/account_move_line.py,sha256=X-GJ66Q_6BySwImRLMpFxgIqfhsOaEUb6xLSQveB0uc,396
-odoo/addons/contract/models/contract.py,sha256=KJtdPswD9RjOUPVhnkH08Peml3niWKWvHswseyqkKoc,25646
-odoo/addons/contract/models/contract_line.py,sha256=0vuK44zs8jByFnYFI0nZ9IYz8lsbv7nPdhaDLpYIYIA,10298
+odoo/addons/contract/models/contract.py,sha256=2zUJmp8-4ZhOxVJ4sLE9q1dotjXbeXsolA8PZx2LxGc,26533
+odoo/addons/contract/models/contract_line.py,sha256=UgCJI5S0ttfRuWeqbNNhylFeZR7El2P-QVQ0p7aW1Yk,10565
 odoo/addons/contract/models/contract_modification.py,sha256=d0tv2Zn6_WrR633pmzwAavzC2I3sLYmGokOKtMn7AYY,1147
 odoo/addons/contract/models/contract_recurring_mixin.py,sha256=KE4sMLd241v1RgTtdPGHbak-RD2sJmSLYsKNPWaQ8Mg,9278
 odoo/addons/contract/models/contract_tag.py,sha256=h5Up3F6ijIhQbYSB6xCqZVVUtyLYxfj4MsAIKv2Q5-Q,434
@@ -103,7 +103,7 @@ odoo/addons/contract/security/contract_security.xml,sha256=HZuxPZMX-EMf8QtXdwbnL
 odoo/addons/contract/security/contract_tag.xml,sha256=cetorNv2M6tHKHcnfwUeX85EZyT3tpoBLF8W-XZ7sK8,890
 odoo/addons/contract/security/ir.model.access.csv,sha256=icelaOGF35WgUrxB2l18IVfcUNlPuJnzy4LG676_zt0,1569
 odoo/addons/contract/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/contract/static/description/index.html,sha256=cjMizvgrvI_vJh0ihAyGedCVdWZ3hSDoS1QXyXNPvx0,17445
+odoo/addons/contract/static/description/index.html,sha256=nA68f9bjvyKCK_ody-ruXve5veu_Nr2iEIDAPWfJDa8,17445
 odoo/addons/contract/static/src/img/contract_icon.svg,sha256=2IFs70Oy9WtE9of2SO4Vj08mwzcw-I5s_LL3UvtKlus,9643
 odoo/addons/contract/static/src/js/contract_portal_tour.esm.js,sha256=ULRzpiiKOhvKx0P-SBoMVBJzGtOQfi70yf2-1djxFuk,589
 odoo/addons/contract/static/src/screenshots/portal-detail.png,sha256=8pMCU4nqwnSM-rbWZd3iJxXdYLBiYzuWNvT_NKslcoo,113399
@@ -111,7 +111,7 @@ odoo/addons/contract/static/src/screenshots/portal-list.png,sha256=gWSW4rlncFZem
 odoo/addons/contract/static/src/screenshots/portal-my.png,sha256=YrtvTDjoc839Eka5zSZ8FQhtzoMEeW4FrXGrYAwAkS4,22985
 odoo/addons/contract/static/src/scss/frontend.scss,sha256=LilfXNOwW8D2eXOMY0ZgrEv8hU5Vn1u9inCEIJp8D0g,1863
 odoo/addons/contract/tests/__init__.py,sha256=iive8lH1QtzKmbhBBzzU4AQgSAgWxdJF1mMLEFOiA4c,138
-odoo/addons/contract/tests/test_contract.py,sha256=zUsuGNECeIhtkFJ_LmKUA8m5uzurFSLx34oN_C48siI,66532
+odoo/addons/contract/tests/test_contract.py,sha256=SbfNbmuVT6mSL8avthQLUsqWdz1JVtKlyMMB62TR9vM,68620
 odoo/addons/contract/tests/test_contract_manually_create_invoice.py,sha256=GfA-hDaI4mSztE-2zQgFE_bQM-nsKzFhQRybi8EGeLo,2541
 odoo/addons/contract/tests/test_multicompany.py,sha256=0CPfv0-JSFsXRInazugzzYrogSZFa6lrdNwuBLbaTX8,4552
 odoo/addons/contract/tests/test_portal.py,sha256=pyhXyzB5o-jdzJW6x10tF7pRuIUQWLQXTSUsB7nUB2k,1298
@@ -126,7 +126,7 @@ odoo/addons/contract/views/res_partner_view.xml,sha256=v7RAxXm0japPQeOsf2zLgieZH
 odoo/addons/contract/wizards/__init__.py,sha256=ZSirPz2XSS6FGPESnPJHqIJamHdHrdL7j2oYu_kglTs,47
 odoo/addons/contract/wizards/contract_manually_create_invoice.py,sha256=LIOStLcchRqOeRbHCPnEmrEj1c9_8BSW6HixsBmU57Y,2986
 odoo/addons/contract/wizards/contract_manually_create_invoice.xml,sha256=JPgtH9mDP74PhTgsJ0lZ1zmn8P3WWRRKp9QUWn38W-4,3730
-odoo_addon_contract-18.0.2.0.8.dist-info/METADATA,sha256=950v-qckT1BwKDTaBPWNPzU8c3vs4s1akeLG4_kL6qc,6785
-odoo_addon_contract-18.0.2.0.8.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_contract-18.0.2.0.8.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_contract-18.0.2.0.8.dist-info/RECORD,,
+odoo_addon_contract-18.0.2.0.10.dist-info/METADATA,sha256=6VCxOlmpWavMCVSRfUnN_eGMWXa8S2IDST2V2otX1sU,6786
+odoo_addon_contract-18.0.2.0.10.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_contract-18.0.2.0.10.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_contract-18.0.2.0.10.dist-info/RECORD,,