odoo-addon-contract 18.0.2.1.1.1__py3-none-any.whl → 18.0.2.1.3__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:2a14adb69a48e1bdcd006ad6241badf413fbb261251a7034da574f75771212f5
+   !! source digest: sha256:0adf39a4fdc6cae53a64d10e241e495a15206999bca5af77a1e6ed738ffe73c7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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.1.1",
+    "version": "18.0.2.1.3",
     "category": "Contract Management",
     "license": "AGPL-3",
     "author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)",

odoo/addons/contract/models/contract_line.py

@@ -69,6 +69,26 @@ class ContractLine(models.Model):
             max_date_end=False,
         )
 
+    def _get_analytic_distribution_arguments(self):
+        self.ensure_one()
+        partner_categ_ids = self.contract_id.partner_id.category_id.ids
+        return {
+            "product_id": self.product_id.id,
+            "product_categ_id": self.product_id.categ_id.id,
+            "partner_id": self.contract_id.partner_id.id,
+            "partner_category_id": partner_categ_ids,
+            "company_id": self.company_id.id,
+        }
+
+    @api.depends("contract_id.partner_id", "product_id")
+    def _compute_analytic_distribution(self):
+        for line in self:
+            if not line.display_type:
+                distribution = line.env[
+                    "account.analytic.distribution.model"
+                ]._get_distribution(line._get_analytic_distribution_arguments())
+                line.analytic_distribution = distribution or line.analytic_distribution
+
     @api.constrains("recurring_next_date", "date_start")
     def _check_recurring_next_date_start_date(self):
         for line in self:

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:2a14adb69a48e1bdcd006ad6241badf413fbb261251a7034da574f75771212f5
+!! source digest: sha256:0adf39a4fdc6cae53a64d10e241e495a15206999bca5af77a1e6ed738ffe73c7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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

@@ -1593,3 +1593,20 @@ class TestContract(TestContractBase):
         # 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)
+
+    def test_analytic_distribution(self):
+        # Create an analytic distribution model for product 1
+        analytic_plan = self.env["account.analytic.plan"].create({"name": "Plan"})
+        analytic_account = self.env["account.analytic.account"].create(
+            {"name": "Test", "plan_id": analytic_plan.id}
+        )
+        self.env["account.analytic.distribution.model"].create(
+            {
+                "product_id": self.product_1.id,
+                "analytic_distribution": {str(analytic_account.id): 100},
+            }
+        )
+        new_contract_line = self.env["contract.line"].create(self.line_vals)
+        self.assertEqual(
+            new_contract_line.analytic_distribution, {str(analytic_account.id): 100}
+        )

odoo/addons/contract/views/contract_portal_templates.xml

@@ -228,7 +228,7 @@
                         <tbody class="contract_tbody">
                             <t t-foreach="contract.contract_line_ids" t-as="line">
                                 <tr
-                                    t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''"
+                                    t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else 'text-muted' if line.is_canceled else ''"
                                 >
                                     <t t-if="not line.display_type">
                                         <td name="td_name">
@@ -263,7 +263,10 @@
                                             name="td_recurring_next_date"
                                             class="text-right"
                                         >
-                                            <span t-field="line.recurring_next_date" />
+                                            <span
+                                                t-field="line.recurring_next_date"
+                                                t-if="not line.is_canceled"
+                                            />
                                         </td>
                                     </t>
                                     <t t-if="line.display_type == 'line_section'">

{odoo_addon_contract-18.0.2.1.1.1.dist-info → odoo_addon_contract-18.0.2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-contract
-Version: 18.0.2.1.1.1
+Version: 18.0.2.1.3
 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:2a14adb69a48e1bdcd006ad6241badf413fbb261251a7034da574f75771212f5
+   !! source digest: sha256:0adf39a4fdc6cae53a64d10e241e495a15206999bca5af77a1e6ed738ffe73c7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

{odoo_addon_contract-18.0.2.1.1.1.dist-info → odoo_addon_contract-18.0.2.1.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/contract/README.rst,sha256=rF2rbsLWWNaw1vzINN1g2AEVbMEbhaqkqmSnco6UEJM,6176
+odoo/addons/contract/README.rst,sha256=747JZ19LPL5aN6RVgMtddZUW_-uErnBqRRfE3WNVQ0c,6176
 odoo/addons/contract/__init__.py,sha256=dnUeA_K1torbiMNF3tt2dtECdk-FkWm01DByr9MBMIA,69
-odoo/addons/contract/__manifest__.py,sha256=6pqK28AEEtO4dxhOT8-Nqfe4c3Z6-nsbA6frBi9SWF0,1777
+odoo/addons/contract/__manifest__.py,sha256=VN2nSStXlJ9kIgQqfNWfbV2PSssuLQ9ku4hpPqR83Mk,1777
 odoo/addons/contract/controllers/__init__.py,sha256=ZAYSY9pxyJjumL2QVLuxqtBzjLwKPiQsVXMBAWvNGGY,85
 odoo/addons/contract/controllers/main.py,sha256=fvOq4YUZvZX9AHlXXIj5u_Lv3W7l-zxEKRXgnLaojjw,3931
 odoo/addons/contract/data/contract_cron.xml,sha256=yYTdn4fmIU5zsfFEgx-H_55M9nwc0WfJ3Q6ufxQKPt8,549
@@ -85,7 +85,7 @@ odoo/addons/contract/models/__init__.py,sha256=n3UpKXb_Oi-2ebHho6pWrd6kw_cMK6GG1
 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=2zUJmp8-4ZhOxVJ4sLE9q1dotjXbeXsolA8PZx2LxGc,26533
-odoo/addons/contract/models/contract_line.py,sha256=K2zZ12anxju7f_lyVadnmiEQXvtfF6_aiBbvLZPE0sI,10660
+odoo/addons/contract/models/contract_line.py,sha256=2kfxbiIW5xAniMO43Vz5j2oG39aMIjbX4217XH-nADs,11539
 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=8LQiZ803iOKwntBO3chbZhABmJ_uBvQ0iqTPOtDdDqU,17445
+odoo/addons/contract/static/description/index.html,sha256=fVWQTXGDJsRjhuQM6RuyTzUsMzTkNXXLRHdzqWVlDY0,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,13 +111,13 @@ 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=SbfNbmuVT6mSL8avthQLUsqWdz1JVtKlyMMB62TR9vM,68620
+odoo/addons/contract/tests/test_contract.py,sha256=TpmiEFHrNyn34_7wEyjqAra8niA5NjD1_byzdWDwcjo,69371
 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
 odoo/addons/contract/views/contract.xml,sha256=A2ac8FZ5Yv3A8R6NdDlSLsSInA2bxicSER35r7Ed-aE,27247
 odoo/addons/contract/views/contract_line.xml,sha256=lv4yMV7z6viOdRbjKAovbuk0if8rc8ORG6qrn4Zv7RQ,11368
-odoo/addons/contract/views/contract_portal_templates.xml,sha256=3kvWLvjFWP4_BsJDiHGWb4JhO6svzD0EaF5HoONX6oU,16972
+odoo/addons/contract/views/contract_portal_templates.xml,sha256=ZGEXay6ETChCPpTh97ilzNTAj0crwfX02zGlmjbzpaI,17178
 odoo/addons/contract/views/contract_tag.xml,sha256=rgaNYk1wJxX9Jm0W0qOYEUJSBUdD3emL5_RuQYJtUI8,1678
 odoo/addons/contract/views/contract_template.xml,sha256=3AT-3amt3J3qePo9cYXDusPlRi46yQUY73FAerURxrE,7864
 odoo/addons/contract/views/contract_template_line.xml,sha256=ZJHlC7crsjjp0qm4MzWMItCKhR8MKdP9hexyJhLr5Pc,3929
@@ -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.1.1.1.dist-info/METADATA,sha256=Dysu7S0TmB3KkB4DCGtIu2TPO3HdLgDRj5wnL-5fzTU,6787
-odoo_addon_contract-18.0.2.1.1.1.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_contract-18.0.2.1.1.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_contract-18.0.2.1.1.1.dist-info/RECORD,,
+odoo_addon_contract-18.0.2.1.3.dist-info/METADATA,sha256=rF5tfdGK6us7n1O65MBJwW9oRvrOmxjicqLTpfYT-co,6785
+odoo_addon_contract-18.0.2.1.3.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_contract-18.0.2.1.3.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_contract-18.0.2.1.3.dist-info/RECORD,,