[IMP] purchase_order_secondary_unit: Compatibility with product variants

Ernesto Tejeda · dalonsod · commit 17f02ac6f287 · 2024-11-13T16:40:38.000+01:00
diff --git a/purchase_order_secondary_unit/README.rst b/purchase_order_secondary_unit/README.rst
@@ -19,9 +19,9 @@ Purchase Order Secondary Unit
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/purchase-workflow-15-0/purchase-workflow-15-0-purchase_order_secondary_unit
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/purchase-workflow&target_branch=15.0
-    :alt: Try me on Runboat
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/142/15.0
+    :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
diff --git a/purchase_order_secondary_unit/i18n/purchase_order_secondary_unit.pot b/purchase_order_secondary_unit/i18n/purchase_order_secondary_unit.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -20,21 +20,15 @@ msgid "Default secondary unit for purchases"
 msgstr ""
 
 #. module: purchase_order_secondary_unit
-#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__display_name
-#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: purchase_order_secondary_unit
-#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template__id
-#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line__id
-msgid "ID"
+#: model:ir.model.fields,help:purchase_order_secondary_unit.field_product_product__purchase_secondary_uom_id
+msgid ""
+"In order to set a value, please first add at least one record in 'Secondary "
+"Unit of Measure'"
 msgstr ""
 
 #. module: purchase_order_secondary_unit
-#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_product_template____last_update
-#: model:ir.model.fields,field_description:purchase_order_secondary_unit.field_purchase_order_line____last_update
-msgid "Last Modified on"
+#: model:ir.model,name:purchase_order_secondary_unit.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: purchase_order_secondary_unit
diff --git a/purchase_order_secondary_unit/models/__init__.py b/purchase_order_secondary_unit/models/__init__.py
@@ -1,3 +1,4 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import product_product
 from . import product_template
 from . import purchase_order
diff --git a/purchase_order_secondary_unit/models/product_product.py b/purchase_order_secondary_unit/models/product_product.py
@@ -0,0 +1,17 @@
+# Copyright 2023 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ProductProduct(models.Model):
+    _inherit = "product.product"
+
+    purchase_secondary_uom_id = fields.Many2one(
+        comodel_name="product.secondary.unit",
+        string="Default secondary unit for purchases",
+        help="In order to set a value, please first add at least one record"
+        " in 'Secondary Unit of Measure'",
+        domain="['|', ('product_id', '=', id),"
+        "'&', ('product_tmpl_id', '=', product_tmpl_id),"
+        "     ('product_id', '=', False)]",
+    )
diff --git a/purchase_order_secondary_unit/models/product_template.py b/purchase_order_secondary_unit/models/product_template.py
@@ -9,4 +9,5 @@ class ProductTemplate(models.Model):
     purchase_secondary_uom_id = fields.Many2one(
         comodel_name="product.secondary.unit",
         string="Default secondary unit for purchases",
+        domain="[('product_tmpl_id', '=', id), ('product_id', '=', False)]",
     )
diff --git a/purchase_order_secondary_unit/static/description/index.html b/purchase_order_secondary_unit/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Purchase Order Secondary Unit</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Purchase Order Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/purchase-workflow/tree/15.0/purchase_order_secondary_unit"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/purchase-workflow-15-0/purchase-workflow-15-0-purchase_order_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/purchase-workflow&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/purchase-workflow/tree/15.0/purchase_order_secondary_unit"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/purchase-workflow-15-0/purchase-workflow-15-0-purchase_order_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/142/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of purchase orders to allow buy products
 in secondary unit of distinct category.</p>
 <p><strong>Table of contents</strong></p>
diff --git a/purchase_order_secondary_unit/tests/test_purchase_order_secondary_unit.py b/purchase_order_secondary_unit/tests/test_purchase_order_secondary_unit.py
@@ -14,16 +14,19 @@ def setUpClass(cls):
         cls.product_uom_kg = cls.env.ref("uom.product_uom_kgm")
         cls.product_uom_gram = cls.env.ref("uom.product_uom_gram")
         cls.product_uom_unit = cls.env.ref("uom.product_uom_unit")
-        with Form(cls.env["product.product"]) as form:
-            form.name = "Test"
-            form.uom_id = cls.product_uom_kg
-            form.uom_po_id = cls.product_uom_kg
-            with form.secondary_uom_ids.new() as line:
-                line.name = "unit-700"
-                line.uom_id = cls.product_uom_unit
-                line.factor = 0.7
-        cls.product = form.save()
-        cls.secondary_unit = cls.product.secondary_uom_ids
+        # Create a product
+        product_form = Form(cls.env["product.product"])
+        product_form.name = "Test"
+        product_form.uom_id = cls.product_uom_kg
+        product_form.uom_po_id = cls.product_uom_kg
+        cls.product = product_form.save()
+        # Set a secondary unit on the template of the previously created product
+        with Form(cls.product.product_tmpl_id) as template_form:
+            with template_form.secondary_uom_ids.new() as secondary_uom_form:
+                secondary_uom_form.name = "unit-700"
+                secondary_uom_form.uom_id = cls.product_uom_unit
+                secondary_uom_form.factor = 0.7
+        cls.secondary_unit = cls.product.product_tmpl_id.secondary_uom_ids
         cls.product.purchase_secondary_uom_id = cls.secondary_unit.id
         cls.partner = cls.env["res.partner"].create({"name": "test - partner"})
         cls.purchase_order_obj = cls.env["purchase.order"]
diff --git a/purchase_order_secondary_unit/views/product_views.xml b/purchase_order_secondary_unit/views/product_views.xml
@@ -9,11 +9,7 @@
         <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <field name="uom_po_id" position="after">
-                <field
-                    name="purchase_secondary_uom_id"
-                    domain="[('product_tmpl_id', '=', id)]"
-                    options="{'no_create': True}"
-                />
+                <field name="purchase_secondary_uom_id" options="{'no_create': True}" />
             </field>
         </field>
     </record>
diff --git a/purchase_order_secondary_unit/views/purchase_order_views.xml b/purchase_order_secondary_unit/views/purchase_order_views.xml
@@ -20,6 +20,10 @@
                 <field
                     name="secondary_uom_id"
                     class="oe_inline"
+                    domain="['|', ('product_id', '=', product_id),
+                                '&amp;', ('product_tmpl_id.product_variant_ids', 'in', [product_id]),
+                                         ('product_id', '=', False)]"
+                    options="{'no_create': True}"
                     attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
                 />
             </xpath>
@@ -33,7 +37,9 @@
                 />
                 <field
                     name="secondary_uom_id"
-                    domain="[('product_tmpl_id.product_variant_ids', 'in', product_id and [product_id] or [])]"
+                    domain="['|', ('product_id', '=', product_id),
+                                '&amp;', ('product_tmpl_id.product_variant_ids', 'in', [product_id]),
+                                         ('product_id', '=', False)]"
                     options="{'no_create': True}"
                     attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
                 />

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@ class ProductTemplate(models.Model):`
`9`	`9`	`purchase_secondary_uom_id = fields.Many2one(`
`10`	`10`	`comodel_name="product.secondary.unit",`
`11`	`11`	`string="Default secondary unit for purchases",`
	`12`	`+ domain="[('product_tmpl_id', '=', id), ('product_id', '=', False)]",`
`12`	`13`	`)`