[MIG] contract: Migration to 19.0

Author: BhaveshHeliconia

contract/README.rst

@@ -21,13 +21,13 @@ Recurring - Contracts Management
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github
-    :target: https://github.com/OCA/contract/tree/18.0/contract
+    :target: https://github.com/OCA/contract/tree/19.0/contract
     :alt: OCA/contract
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/contract-18-0/contract-18-0-contract
+    :target: https://translation.odoo-community.org/projects/contract-19-0/contract-19-0-contract
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=18.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=19.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -98,9 +98,9 @@ Usage
 
 |image2|
 
-.. |image| image:: https://raw.githubusercontent.com/OCA/contract/18.0/contract/static/src/screenshots/portal-my.png
-.. |image1| image:: https://raw.githubusercontent.com/OCA/contract/18.0/contract/static/src/screenshots/portal-list.png
-.. |image2| image:: https://raw.githubusercontent.com/OCA/contract/18.0/contract/static/src/screenshots/portal-detail.png
+.. |image| image:: https://raw.githubusercontent.com/OCA/contract/19.0/contract/static/src/screenshots/portal-my.png
+.. |image1| image:: https://raw.githubusercontent.com/OCA/contract/19.0/contract/static/src/screenshots/portal-list.png
+.. |image2| image:: https://raw.githubusercontent.com/OCA/contract/19.0/contract/static/src/screenshots/portal-detail.png
 
 Known issues / Roadmap
 ======================
@@ -114,7 +114,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/contract/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/contract/issues/new?body=module:%20contract%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/contract/issues/new?body=module:%20contract%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -158,6 +158,10 @@ Contributors
 
      - Antoni Marroig <[email protected]>
 
+- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
+
+     - Bhavesh Heliconia
+
 Maintainers
 -----------
 
@@ -171,6 +175,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/contract <https://github.com/OCA/contract/tree/18.0/contract>`_ project on GitHub.
+This module is part of the `OCA/contract <https://github.com/OCA/contract/tree/19.0/contract>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

contract/__manifest__.py

@@ -9,9 +9,10 @@
 # Copyright 2020 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+
 {
     "name": "Recurring - Contracts Management",
-    "version": "18.0.2.0.6",
+    "version": "19.0.1.0.0",
     "category": "Contract Management",
     "license": "AGPL-3",
     "author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)",
@@ -29,7 +30,6 @@
         "data/template_mail_notification.xml",
         "data/mail_message_subtype.xml",
         "data/ir_ui_menu.xml",
-        "wizards/contract_manually_create_invoice.xml",
         "views/contract_tag.xml",
         "views/contract_template.xml",
         "views/contract_template_line.xml",
@@ -38,6 +38,7 @@
         "views/res_partner_view.xml",
         "views/res_config_settings.xml",
         "views/contract_portal_templates.xml",
+        "wizards/contract_manually_create_invoice.xml",
     ],
     "assets": {
         "web.assets_frontend": ["contract/static/src/scss/frontend.scss"],

contract/controllers/main.py

@@ -1,7 +1,7 @@
 # Copyright 2020-2022 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, http
+from odoo import http
 from odoo.exceptions import AccessError, MissingError
 from odoo.http import request
 
@@ -43,9 +43,12 @@ def portal_my_contracts(
         contract_obj = request.env["contract.contract"]
         domain = self._get_filter_domain(kw)
         searchbar_sortings = {
-            "date": {"label": _("Date"), "order": "recurring_next_date desc"},
-            "name": {"label": _("Name"), "order": "name desc"},
-            "code": {"label": _("Reference"), "order": "code desc"},
+            "date": {
+                "label": request.env._("Date"),
+                "order": "recurring_next_date desc",
+            },
+            "name": {"label": request.env._("Name"), "order": "name desc"},
+            "code": {"label": request.env._("Reference"), "order": "code desc"},
         }
         # default sort by order
         if not sortby:

contract/migrations/18.0.2.0.0/end-migrate.py

@@ -13,7 +13,6 @@
 
 from odoo import Command, api, fields, models
 from odoo.exceptions import ValidationError
-from odoo.osv import expression
 
 _logger = logging.getLogger(__name__)
 
@@ -237,7 +236,6 @@ def _onchange_contract_template_id(self):
                 (
                     field.compute,
                     field.related,
-                    field.automatic,
                     field.readonly,
                     field.company_dependent,
                     field.name in self.NO_SYNC,
@@ -661,7 +659,7 @@ def _cron_recurring_create(self, date_ref=False, create_type="invoice"):
         if not date_ref:
             date_ref = fields.Date.context_today(self)
         domain = self._get_contracts_to_invoice_domain(date_ref)
-        domain = expression.AND(
+        domain = fields.Domain.AND(
             [
                 domain,
                 [("generation_type", "=", create_type)],

contract/migrations/18.0.2.0.0/pre-migrate.py

@@ -27,7 +27,7 @@ class ContractLine(models.Model):
         string="Contract",
         required=True,
         index=True,
-        auto_join=True,
+        bypass_search_access=True,
         ondelete="cascade",
     )
     currency_id = fields.Many2one(related="contract_id.currency_id")

contract/models/contract.py

@@ -42,18 +42,14 @@ class ContractTemplateLine(models.Model):
         readonly=False,
     )
     quantity = fields.Float(default=1.0, required=True)
-    product_uom_category_id = fields.Many2one(
-        comodel_name="uom.category",
-        related="product_id.uom_id.category_id",
-        readonly=True,
-    )
+    allowed_uom_ids = fields.Many2many("uom.uom", compute="_compute_allowed_uom_ids")
     uom_id = fields.Many2one(
         comodel_name="uom.uom",
         compute="_compute_uom_id",
         store=True,
         readonly=False,
         string="Unit of Measure",
-        domain="[('category_id', '=', product_uom_category_id)]",
+        domain="[('id', 'in', allowed_uom_ids)]",
     )
 
     # === Pricing ===
@@ -153,13 +149,22 @@ def _compute_name(self):
                 )
                 line.name = product.get_product_multiline_description_sale()
 
-    @api.depends("product_id")
+    @api.depends("product_id", "product_id.uom_id", "product_id.uom_ids")
+    def _compute_allowed_uom_ids(self):
+        for option in self:
+            option.allowed_uom_ids = (
+                option.product_id.uom_id | option.product_id.uom_ids
+            )
+
+    @api.depends("product_id", "allowed_uom_ids")
     def _compute_uom_id(self):
         for line in self:
-            if not line.uom_id or (
-                line.product_id.uom_id.category_id.id != line.uom_id.category_id.id
-            ):
+            if line.product_id and line.product_id.uom_id in line.allowed_uom_ids:
                 line.uom_id = line.product_id.uom_id
+            elif line.allowed_uom_ids:
+                line.uom_id = line.allowed_uom_ids[0]
+            else:
+                line.uom_id = False
 
     @api.depends("contract_id.contract_type")
     def _compute_automatic_price(self):

contract/models/contract_line.py

@@ -28,31 +28,32 @@ def _get_partner_contract_domain(self):
 
     def _compute_contract_count(self):
         contract_model = self.env["contract.contract"]
-        fetch_data = contract_model.read_group(
-            self._get_partner_contract_domain(),
-            ["partner_id", "contract_type"],
-            ["partner_id", "contract_type"],
-            lazy=False,
+        fetch_data = contract_model.formatted_read_group(
+            domain=[("partner_id", "in", self.ids)],
+            groupby=["partner_id", "contract_type"],
+            aggregates=["__count"],
         )
-        result = [
-            [data["partner_id"][0], data["contract_type"], data["__count"]]
-            for data in fetch_data
-        ]
         for partner in self:
             partner_child_ids = partner.child_ids.ids + partner.ids
             partner.sale_contract_count = sum(
-                r[2] for r in result if r[0] in partner_child_ids and r[1] == "sale"
+                d["__count"]
+                for d in fetch_data
+                if d["partner_id"][0] in partner_child_ids
+                and d["contract_type"] == "sale"
             )
             partner.purchase_contract_count = sum(
-                r[2] for r in result if r[0] in partner_child_ids and r[1] == "purchase"
+                d["__count"]
+                for d in fetch_data
+                if d["partner_id"][0] in partner_child_ids
+                and d["contract_type"] == "purchase"
             )
 
     def act_show_contract(self):
         """This opens contract view
         @return: the contract view
         """
         self.ensure_one()
-        contract_type = self._context.get("contract_type")
+        contract_type = self.env.context.get("contract_type")
 
         res = self._get_act_window_contract_xml(contract_type)
         action_context = {k: v for k, v in self.env.context.items() if k != "group_by"}

contract/models/contract_template_line.py

@@ -25,3 +25,6 @@
 - [APSL](https://www.apsl.tech):
 
   > - Antoni Marroig \<<[email protected]>\>
+
+- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
+  > - Bhavesh Heliconia