[MIG] delivery_correos_express: Migration to 17.0

Author: pablo-cort-s73

delivery_correos_express/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Delivery Correos Express",
     "summary": "Delivery Carrier implementation for Correos Express using their API",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Stock",
     "website": "https://github.com/OCA/delivery-carrier",
     "author": "Studio73, Odoo Community Association (OCA)",

delivery_correos_express/models/correos_express_request.py

@@ -11,6 +11,7 @@
 _logger = logging.getLogger(__name__)
 CORREOS_EXPRESS_LABEL_TYPE = [("1", "PDF"), ("2", "ZPL")]
 CORREOS_EXPRESS_SERVICE = [
+    ("26", "ISLAS EXPRESS"),
     ("61", "PAQ10"),
     ("62", "PAQ14"),
     ("63", "PAQ24"),
@@ -96,15 +97,15 @@ def _check_for_error(self, result):
         return_code = 999
         message = "Webservice ERROR."
         # shipment
-        if type(result.get("codigoRetorno", "false")) != str:
+        if not isinstance(result.get("codigoRetorno", "false"), str):
             return_code = result.get("codigoRetorno")
             message = result.get("mensajeRetorno") or ""
         # label
-        if type(result.get("codErr", "false")) != str:
+        if not isinstance(result.get("codErr", "false"), str):
             return_code = result.get("codErr")
             message = result.get("desErr") or ""
         # tracking
-        if type(result.get("error", "false")) != str:
+        if not isinstance(result.get("error", "false"), str):
             return_code = result.get("error")
             message = result.get("mensajeError") or ""
         return return_code, message

delivery_correos_express/models/delivery_carrier.py

@@ -42,6 +42,12 @@ def correos_express_get_tracking_link(self, picking):
         tracking_url = "https://s.correosexpress.com/c?n={}"
         return tracking_url.format(picking.carrier_tracking_ref)
 
+    def _format_correos_express_phone(self, phone):
+        """Switch international prefix + to 00, as it's the one accepted by Correos
+        Express, and remove spaces in the string for not overpassing the 15 chars limit.
+        """
+        return phone.replace("+", "00").replace(" ", "").replace("-", "")[:15]
+
     def _get_partner_streets(self, partner):
         streets = []
         if partner.street:
@@ -66,7 +72,7 @@ def _get_correos_express_receiver_info(self, picking):
             "paisISODest": partner.country_id.code or "",
             "codPosIntDest": partner.zip if not national else "",
             "contacDest": partner.name[:40] if partner.name else "",  # mandatory
-            "telefDest": phone[:15] if phone else "",  # mandatory
+            "telefDest": self._format_correos_express_phone(phone),  # mandatory
             "emailDest": partner.email[:75] if partner.email else "",
         }
 
@@ -83,7 +89,7 @@ def _get_correos_express_sender_info(self, picking):
             "paisISORte": partner.country_id.code or "",
             "codPosIntRte": "",
             "contacRte": partner.name or "",
-            "telefRte": partner.phone or "",
+            "telefRte": self._format_correos_express_phone(partner.phone or ""),
             "emailRte": partner.email or "",
         }
 

delivery_correos_express/tests/test_delivery_correos_express.py

@@ -48,7 +48,7 @@ def setUpClass(cls):
         cls.sale_order.carrier_id = cls.carrier_correos_express.id
         cls.sale_order.action_confirm()
         cls.picking = cls.sale_order.picking_ids[0]
-        cls.picking.move_ids.quantity_done = 20
+        cls.picking.move_ids.quantity = 20
 
     @mock.patch(
         "%s.create_shipment" % request_model,

delivery_correos_express/views/delivery_carrier_view.xml

@@ -7,66 +7,38 @@
             <xpath expr="//notebook/page[1]" position='before'>
                 <page
                     string="Correos Express Configuration"
-                    attrs="{'invisible': [('delivery_type', '!=', 'correos_express')]}"
+                    invisible="delivery_type != 'correos_express'"
                 >
                     <group>
                         <group>
                             <field
                                 name="correos_express_username"
-                                attrs="{
-                                    'required': [
-                                        ('delivery_type', '=', 'correos_express')
-                                    ]
-                                }"
+                                required="delivery_type == 'correos_express'"
                             />
                             <field
                                 name="correos_express_password"
                                 password="True"
-                                attrs="{
-                                    'required': [
-                                        ('delivery_type', '=', 'correos_express')
-                                    ]
-                                }"
+                                required="delivery_type == 'correos_express'"
                             />
                             <field
                                 name="correos_express_customer_code"
-                                attrs="{
-                                    'required': [
-                                        ('delivery_type', '=', 'correos_express')
-                                    ]
-                                }"
+                                required="delivery_type == 'correos_express'"
                             />
                             <field
                                 name="correos_express_sender_code"
-                                attrs="{
-                                    'required': [
-                                        ('delivery_type', '=', 'correos_express')
-                                    ]
-                                }"
+                                required="delivery_type == 'correos_express'"
                             />
                             <field
                                 name="correos_express_label_type"
-                                attrs="{
-                                    'required': [
-                                        ('delivery_type', '=', 'correos_express')
-                                    ]
-                                }"
+                                required="delivery_type == 'correos_express'"
                             />
                             <field
                                 name="correos_express_product"
-                                attrs="{
-                                    'required': [
-                                        ('delivery_type', '=', 'correos_express')
-                                    ]
-                                }"
+                                required="delivery_type == 'correos_express'"
                             />
                             <field
                                 name="correos_express_transport"
-                                attrs="{
-                                    'required': [
-                                        ('delivery_type', '=', 'correos_express')
-                                    ]
-                                }"
+                                required="delivery_type == 'correos_express'"
                             />
                         </group>
                     </group>

delivery_correos_express/views/stock_picking_views.xml

@@ -2,20 +2,17 @@
 <odoo>
     <record id="view_picking_withcarrier_out_form" model="ir.ui.view">
         <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
+        <field
+            name="inherit_id"
+            ref="stock_delivery.view_picking_withcarrier_out_form"
+        />
         <field name="arch" type="xml">
             <xpath expr="//button[@name='print_return_label']/.." position='inside'>
                 <button
                     name="correos_express_get_label"
                     string="Print Correos Express Label"
                     type="object"
-                    attrs="{'invisible':[
-                        '|',
-                        '|',
-                        ('carrier_tracking_ref', '=', False),
-                        ('delivery_type', '!=', 'correos_express'),
-                        ('state', '!=', 'done')
-                    ]}"
+                    invisible="(carrier_tracking_ref != True) or (delivery_type != 'correos_express') or (state != 'done')"
                 />
             </xpath>
         </field>