[MIG] delivery_state: Migration to 16.0

- Standard migration
- Delivery state term correction
- Implement fix in #555

TT40419

Author: David

delivery_state/README.rst

@@ -77,7 +77,7 @@ described before, but we'll get additionally:
         * Shipping recorded in carrier
         * In transit
         * Canceled shipment (finished)
-        * Incidence
+        * Incident
         * Warehouse delivered
         * Customer delivered (finished)
   #. In the field *Tracking state* we'll get the tracking state name given by

delivery_state/__manifest__.py

@@ -13,7 +13,7 @@
     "website": "https://github.com/OCA/delivery-carrier",
     "license": "AGPL-3",
     "category": "Delivery",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "depends": ["delivery"],
     "data": [
         "data/ir_cron_data.xml",

delivery_state/i18n/delivery_state.pot

@@ -101,8 +101,8 @@ msgid "In transit"
 msgstr ""
 
 #. module: delivery_state
-#: model:ir.model.fields.selection,name:delivery_state.selection__stock_picking__delivery_state__incidence
-msgid "Incidence"
+#: model:ir.model.fields.selection,name:delivery_state.selection__stock_picking__delivery_state__incident
+msgid "Incident"
 msgstr ""
 
 #. module: delivery_state

delivery_state/i18n/es.po

@@ -120,8 +120,8 @@ msgid "In transit"
 msgstr "En tránsito"
 
 #. module: delivery_state
-#: model:ir.model.fields.selection,name:delivery_state.selection__stock_picking__delivery_state__incidence
-msgid "Incidence"
+#: model:ir.model.fields.selection,name:delivery_state.selection__stock_picking__delivery_state__incident
+msgid "Incident"
 msgstr "Incidencia"
 
 #. module: delivery_state

delivery_state/migrations/15.0.1.0.0/pre-migration.py

@@ -0,0 +1,15 @@
+# Copyright 2022 Tecnativa - David Vidal
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.logged_query(
+        env.cr,
+        """
+        UPDATE stock_picking
+        SET delivery_state = 'incident'
+        WHERE delivery_state = 'incidence'
+        """,
+    )

delivery_state/migrations/16.0.1.0.0/pre-migration.py

@@ -30,7 +30,7 @@ class StockPicking(models.Model):
             ("shipping_recorded_in_carrier", "Shipping recorded in carrier"),
             ("in_transit", "In transit"),
             ("canceled_shipment", "Canceled shipment"),
-            ("incidence", "Incidence"),
+            ("incident", "Incident"),
             ("customer_delivered", "Customer delivered"),
             ("warehouse_delivered", "Warehouse delivered"),
         ],
@@ -66,14 +66,7 @@ def _update_delivery_state(self):
                 ("delivery_type", "not in", [False, "fixed", "base_one_rule"]),
             ]
         )
-        delivery_types = self.mapped("delivery_type")
-        # Split them by delivery type so we can ignore those without the
-        # proper method.
-        for delivery_type in delivery_types:
-            delivery_type_pickings = pickings.filtered(
-                lambda x: x.delivery_type == delivery_type
-            )
-            delivery_type_pickings.tracking_state_update()
+        pickings.tracking_state_update()
 
     def _send_delivery_state_delivered_email(self):
         for item in self.filtered(

delivery_state/models/stock_picking.py

@@ -21,7 +21,7 @@ described before, but we'll get additionally:
         * Shipping recorded in carrier
         * In transit
         * Canceled shipment (finished)
-        * Incidence
+        * Incident
         * Warehouse delivered
         * Customer delivered (finished)
   #. In the field *Tracking state* we'll get the tracking state name given by

delivery_state/readme/USAGE.rst

@@ -432,7 +432,7 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 <li>Shipping recorded in carrier</li>
 <li>In transit</li>
 <li>Canceled shipment (finished)</li>
-<li>Incidence</li>
+<li>Incident</li>
 <li>Warehouse delivered</li>
 <li>Customer delivered (finished)</li>
 </ul>

delivery_state/static/description/index.html

@@ -76,7 +76,7 @@ def test_delivery_state(self):
         self.assertEqual(len(delivery_lines), 1)
         self.sale.action_confirm()
         picking = self.sale.picking_ids[0]
-        self.assertEqual(len(picking.move_lines), 1)
+        self.assertEqual(len(picking.move_ids), 1)
         self.assertEqual(picking.carrier_id, self.carrier)
         picking.action_confirm()
         picking.action_assign()
@@ -104,7 +104,7 @@ def test_delivery_confirmation_send(self):
         picking.company_id.delivery_state_delivered_email_validation = True
         picking.company_id.delivery_state_delivered_mail_template_id = template
         picking.carrier_tracking_ref = "XX-0000"
-        picking.move_lines.quantity_done = 1
+        picking.move_ids.quantity_done = 1
         picking._action_done()
         picking.write({"delivery_state": "customer_delivered"})
         mails = picking.message_ids.filtered(

delivery_state/tests/test_delivery_state.py

@@ -0,0 +1 @@
+../../../../delivery_state

setup/delivery_state/odoo/addons/delivery_state

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)