[MIG] delivery_carrier_manual_price: Migration to 17.0

OCA · Dec 11, 2024 · dbb6d9f · dbb6d9f
1 parent 521a98d
commit dbb6d9f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/delivery_carrier_manual_price/README.rst b/delivery_carrier_manual_price/README.rst
@@ -65,6 +65,7 @@ Contributors
 
 -  Jordi Masvidal <[email protected]>
 -  Marina Alapont <[email protected]>
+-  Lois Rilo <[email protected]>
 
 Maintainers
 -----------

diff --git a/delivery_carrier_manual_price/__manifest__.py b/delivery_carrier_manual_price/__manifest__.py
@@ -1,11 +1,10 @@
 # Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-
 {
     "name": "Delivery Carrier Manual Price",
     "summary": "Allow setting manual shipping cost in sale order.",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Delivery",
     "website": "https://github.com/OCA/delivery-carrier",
     "author": "ForgeFlow,Odoo Community Association (OCA)",

diff --git a/delivery_carrier_manual_price/readme/CONTRIBUTORS.md b/delivery_carrier_manual_price/readme/CONTRIBUTORS.md
@@ -1,2 +1,3 @@
 - Jordi Masvidal \<<[email protected]>\>
 - Marina Alapont \<<[email protected]>\>
+- Lois Rilo \<<[email protected]>\>
diff --git a/delivery_carrier_manual_price/static/description/index.html b/delivery_carrier_manual_price/static/description/index.html
@@ -410,6 +410,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Jordi Masvidal &lt;<a class="reference external" href="mailto:jordi.masvidal&#64;forgeflow.com">jordi.masvidal&#64;forgeflow.com</a>&gt;</li>
 <li>Marina Alapont &lt;<a class="reference external" href="mailto:marina.alapont&#64;forgeflow.com">marina.alapont&#64;forgeflow.com</a>&gt;</li>
+<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

diff --git a/delivery_carrier_manual_price/tests/test_delivery_carrier_manual_price.py b/delivery_carrier_manual_price/tests/test_delivery_carrier_manual_price.py
@@ -26,7 +26,7 @@ def setUpClass(cls):
             }
         )
         cls.product = cls.env["product.product"].create(
-            {"name": "Test product", "type": "product"}
+            {"name": "Test product", "type": "consu"}
         )
         cls.partner = cls.env["res.partner"].create({"name": "Test Partner"})
         cls.sale = cls.env["sale.order"].create(

diff --git a/delivery_carrier_manual_price/wizard/choose_delivery_carrier_views.xml b/delivery_carrier_manual_price/wizard/choose_delivery_carrier_views.xml
@@ -11,17 +11,14 @@
                 <field name="is_manual_price" invisible="1" />
             </field>
             <field name="delivery_price" position="attributes">
-                <attribute name="invisible">0</attribute>
-                <attribute
-                    name="attrs"
-                >{'invisible': [('is_manual_price','=', False)]}</attribute>
+                <attribute name="invisible">not is_manual_price</attribute>
                 <attribute name="widget">monetary</attribute>
                 <attribute name="options">{'currency_field': 'currency_id'}</attribute>
             </field>
             <field name="display_price" position="attributes">
                 <attribute
-                    name="attrs"
-                >{'invisible': ['|', ('carrier_id','=', False), ('is_manual_price','=', True)]}</attribute>
+                    name="invisible"
+                >not carrier_id or is_manual_price</attribute>
             </field>
             <field name="display_price" position="before">
                 <field name="delivery_price" position="move" />