FIX product_logistics_uom: exclude with product_dimension module

Author: bealdav

.copier-answers.yml

@@ -17,7 +17,8 @@ odoo_test_flavor: Both
 odoo_version: 18.0
 org_name: Odoo Community Association (OCA)
 org_slug: OCA
-rebel_module_groups: []
+rebel_module_groups:
+- product_logistics_uom
 repo_description: product-attribute
 repo_name: product-attribute
 repo_slug: product-attribute

.github/workflows/test.yml

@@ -36,10 +36,19 @@ jobs:
       matrix:
         include:
           - container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest
+            include: "product_logistics_uom"
             name: test with Odoo
           - container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest
+            include: "product_logistics_uom"
             name: test with OCB
             makepot: "true"
+          - container: ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest
+            exclude: "product_logistics_uom"
+            name: test with Odoo exclude
+          - container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest
+            exclude: "product_logistics_uom"
+            name: test with OCB exclude
+            makepot: "true"
     services:
       postgres:
         image: postgres:12
@@ -50,6 +59,8 @@ jobs:
         ports:
           - 5432:5432
     env:
+      INCLUDE: "${{ matrix.include }}"
+      EXCLUDE: "${{ matrix.exclude }}"
       OCA_ENABLE_CHECKLOG_ODOO: "1"
     steps:
       - uses: actions/checkout@v4

product_logistics_uom/README.rst

@@ -112,18 +112,18 @@ Authors
 Contributors
 ------------
 
-- Raphaël Reverdy <raphael.reverdy@akretion.com>
-- Fernando La Chica <fernandolachica@gmail.com>
-- Laurent Mignon <laurent.mignon@acsone.eu>
-- Nhan Tran <nhant@trobz.com>
+-  Raphaël Reverdy <raphael.reverdy@akretion.com>
+-  Fernando La Chica <fernandolachica@gmail.com>
+-  Laurent Mignon <laurent.mignon@acsone.eu>
+-  Nhan Tran <nhant@trobz.com>
 
 Other credits
 -------------
 
 The development of this module has been financially supported by:
 
-- Akretion <https://akretion.com>
-- La Base <https://labase.coop>
+-  Akretion <https://akretion.com>
+-  La Base <https://labase.coop>
 
 Maintainers
 -----------

product_logistics_uom/__manifest__.py

@@ -14,6 +14,9 @@
     "depends": [
         "product",
     ],
+    "excludes": [
+        "product_dimension",
+    ],
     "data": [
         "views/res_config_settings.xml",
         "views/product.xml",

product_logistics_uom/tests/test_product_logistics_uom.py

@@ -2,8 +2,6 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
 
 
-from unittest.mock import patch
-
 from odoo.tests.common import TransactionCase
 
 
@@ -61,19 +59,10 @@ def test_template_volume(self):
         template = self.product.product_tmpl_id
         template.volume_uom_id = self.volume_uom_l
         # Volume calculation from product_dimension module has compatibility issue.
-        with patch(
-            "odoo.addons.product_dimension.models.product_template.ProductTemplate._calc_volume",
-            return_value=1,
-        ):
-            template.volume = 1
-            self.assertEqual(template.product_volume, 1000)
-
-        with patch(
-            "odoo.addons.product_dimension.models.product_template.ProductTemplate._calc_volume",
-            return_value=0.01,
-        ):
-            template.product_volume = 10
-            self.assertEqual(template.volume, 0.01)
+        template.volume = 1
+        self.assertEqual(template.product_volume, 1000)
+        template.product_volume = 10
+        self.assertEqual(template.volume, 0.01)
         template.volume_uom_id = self.volume_uom_m3
         self.assertEqual(template.product_volume, template.volume)
 
@@ -120,11 +109,7 @@ def test_template_with_variant(self):
         self.assertFalse(template.show_weight_uom_warning)  # for coverage
         variant.unlink()
         # Volume calculation from product_dimension module has compatibility issue.
-        with patch(
-            "odoo.addons.product_dimension.models.product_template.ProductTemplate._calc_volume",
-            return_value=10.0,
-        ):
-            self.assertEqual(template.volume, 10.0)
+        self.assertEqual(template.volume, 10.0)
         self.assertEqual(template.weight, 10.0)
         self.assertEqual(template.product_volume, 10.0)
         self.assertEqual(template.product_weight, 10.0)