[18.0][MIG] product_multi_company: Migration to 18.0

OCA · Nov 26, 2024 · 4437b25 · 4437b25
1 parent 4c6184a
commit 4437b25
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/product_multi_company/README.rst b/product_multi_company/README.rst
@@ -86,6 +86,10 @@ Contributors
    -  Prabakaran <[email protected]>
    -  Karthik <[email protected]>
 
+-  `Dynapps <https://www.dynapps.eu>`__:
+
+   -  Bert Van Groenendael <[email protected]>
+
 Maintainers
 -----------
 

diff --git a/product_multi_company/readme/CONTRIBUTORS.md b/product_multi_company/readme/CONTRIBUTORS.md
@@ -7,3 +7,5 @@
 - [Sodexis](https://sodexis.com):
   - Prabakaran \<<[email protected]>\>
   - Karthik \<<[email protected]>\>
+- [Dynapps](https://www.dynapps.eu):
+  - Bert Van Groenendael \<<[email protected]>\>
diff --git a/product_multi_company/static/description/index.html b/product_multi_company/static/description/index.html
@@ -432,6 +432,10 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <li>Karthik &lt;<a class="reference external" href="mailto:karthik&#64;sodexis.com">karthik&#64;sodexis.com</a>&gt;</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://www.dynapps.eu">Dynapps</a>:<ul>
+<li>Bert Van Groenendael &lt;<a class="reference external" href="mailto:bert.vangroenendael&#64;dynapps.eu">bert.vangroenendael&#64;dynapps.eu</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

diff --git a/product_multi_company/tests/test_product_multi_company.py b/product_multi_company/tests/test_product_multi_company.py
@@ -124,15 +124,19 @@ def test_search_product(self):
         )
         searched_templates = self.env["product.template"].search(
             [
-                ("company_id", "in", [self.company_1.id, False]),
                 ("id", "in", expected_products.product_tmpl_id.ids),
+                "|",
+                ("company_id", "=", self.company_1.id),
+                ("company_id", "=", False),
             ]
         )
         self.assertEqual(searched_templates, expected_products.product_tmpl_id)
         searched_products = self.product_obj.search(
             [
-                ("company_id", "in", [self.company_1.id, False]),
                 ("id", "in", expected_products.ids),
+                "|",
+                ("company_id", "=", self.company_1.id),
+                ("company_id", "=", False),
             ]
         )
         self.assertEqual(searched_products, expected_products)