fixup! [MIG] delivery_postlogistics: Migration to 18.0

Author: StephaneMangin

delivery_postlogistics/__manifest__.py

@@ -10,7 +10,8 @@
     "category": "Delivery",
     "complexity": "normal",
     "depends": [
-        "stock_delivery" "delivery_carrier_option",
+        "stock_delivery",
+        "delivery_carrier_option",
         "delivery_carrier_shipping_label",
     ],
     "website": "https://github.com/OCA/delivery-carrier",

delivery_postlogistics/data/delivery.xml

@@ -7,7 +7,7 @@
     >
         <field name="name">Format A7</field>
         <field name="code">A7</field>
-        <field name="postlogistics_type">label_layout</field>
+        <field name="type">label_layout</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -16,7 +16,7 @@
     >
         <field name="name">Format A6</field>
         <field name="code">A6</field>
-        <field name="postlogistics_type">label_layout</field>
+        <field name="type">label_layout</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -25,7 +25,7 @@
     >
         <field name="name">Format A5</field>
         <field name="code">A5</field>
-        <field name="postlogistics_type">label_layout</field>
+        <field name="type">label_layout</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -34,7 +34,7 @@
     >
         <field name="name">Format FE</field>
         <field name="code">FE</field>
-        <field name="postlogistics_type">label_layout</field>
+        <field name="type">label_layout</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <!-- Output formats -->
@@ -44,7 +44,7 @@
     >
         <field name="name">EPS</field>
         <field name="code">EPS</field>
-        <field name="postlogistics_type">output_format</field>
+        <field name="type">output_format</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -53,7 +53,7 @@
     >
         <field name="name">GIF</field>
         <field name="code">GIF</field>
-        <field name="postlogistics_type">output_format</field>
+        <field name="type">output_format</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -62,7 +62,7 @@
     >
         <field name="name">JPG</field>
         <field name="code">JPG</field>
-        <field name="postlogistics_type">output_format</field>
+        <field name="type">output_format</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -71,7 +71,7 @@
     >
         <field name="name">PNG</field>
         <field name="code">PNG</field>
-        <field name="postlogistics_type">output_format</field>
+        <field name="type">output_format</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -80,7 +80,7 @@
     >
         <field name="name">PDF</field>
         <field name="code">PDF</field>
-        <field name="postlogistics_type">output_format</field>
+        <field name="type">output_format</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -89,7 +89,7 @@
     >
         <field name="name">sPDF</field>
         <field name="code">sPDF</field>
-        <field name="postlogistics_type">output_format</field>
+        <field name="type">output_format</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -98,7 +98,7 @@
     >
         <field name="name">ZPL2</field>
         <field name="code">ZPL2</field>
-        <field name="postlogistics_type">output_format</field>
+        <field name="type">output_format</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <!-- resolutions -->
@@ -108,7 +108,7 @@
     >
         <field name="name">200 ppp</field>
         <field name="code">200</field>
-        <field name="postlogistics_type">resolution</field>
+        <field name="type">resolution</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -117,7 +117,7 @@
     >
         <field name="name">300 ppp</field>
         <field name="code">300</field>
-        <field name="postlogistics_type">resolution</field>
+        <field name="type">resolution</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
     <record
@@ -126,7 +126,7 @@
     >
         <field name="name">600 ppp</field>
         <field name="code">600</field>
-        <field name="postlogistics_type">resolution</field>
+        <field name="type">resolution</field>
         <field name="partner_id" ref="partner_postlogistics" />
     </record>
 </odoo>

delivery_postlogistics/i18n/delivery_postlogistics.pot

@@ -34,7 +34,7 @@ msgid "Access Token"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__additional
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__additional
 msgid "Additional Service"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__basic
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__basic
 msgid "Basic Service"
 msgstr ""
 
@@ -167,7 +167,7 @@ msgid "Database Data"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__delivery
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__delivery
 msgid "Delivery Instructions"
 msgstr ""
 
@@ -356,7 +356,7 @@ msgid "JPG"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__label_layout
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__label_layout
 msgid "Label Layout"
 msgstr ""
 
@@ -472,12 +472,12 @@ msgid "Original (unoptimized, unresized) attachment"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__output_format
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__output_format
 msgid "Output Format"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__resolution
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__resolution
 msgid "Output Resolution"
 msgstr ""
 
@@ -519,7 +519,7 @@ msgid "Parcel Tracking"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__partner_option
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__partner_option
 msgid "Partner Option"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgid "PostLogistics error:"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields,field_description:delivery_postlogistics.field_postlogistics_delivery_carrier_template_option__postlogistics_type
+#: model:ir.model.fields,field_description:delivery_postlogistics.field_postlogistics_delivery_carrier_template_option__type
 msgid "PostLogistics option type"
 msgstr ""
 

delivery_postlogistics/i18n/es.po

@@ -37,7 +37,7 @@ msgid "Access Token"
 msgstr "Ficha de acceso"
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__additional
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__additional
 msgid "Additional Service"
 msgstr "Servicio adicional"
 
@@ -107,7 +107,7 @@ msgstr ""
 "PostLogistics"
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__basic
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__basic
 msgid "Basic Service"
 msgstr "Servicio básico"
 
@@ -190,7 +190,7 @@ msgid "Database Data"
 msgstr "Fecha de la base de datos"
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__delivery
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__delivery
 msgid "Delivery Instructions"
 msgstr "Instrucciones de entrega"
 
@@ -383,7 +383,7 @@ msgid "JPG"
 msgstr "JPG"
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__label_layout
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__label_layout
 msgid "Label Layout"
 msgstr "Diseño de etiqueta"
 
@@ -516,12 +516,12 @@ msgid "Original (unoptimized, unresized) attachment"
 msgstr "Archivo adjunto original (sin optimizar y sin redimensionar)"
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__output_format
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__output_format
 msgid "Output Format"
 msgstr "Formato de Salida"
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__resolution
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__resolution
 msgid "Output Resolution"
 msgstr "Resolución de salida"
 
@@ -563,7 +563,7 @@ msgid "Parcel Tracking"
 msgstr "Seguimiento del envío"
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__partner_option
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__partner_option
 msgid "Partner Option"
 msgstr "Opción de Socio"
 
@@ -674,7 +674,7 @@ msgid "PostLogistics error:"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields,field_description:delivery_postlogistics.field_postlogistics_delivery_carrier_template_option__postlogistics_type
+#: model:ir.model.fields,field_description:delivery_postlogistics.field_postlogistics_delivery_carrier_template_option__type
 msgid "PostLogistics option type"
 msgstr "Tipo de Opción Postlogística"
 

delivery_postlogistics/i18n/it.po

@@ -35,7 +35,7 @@ msgid "Access Token"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__additional
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__additional
 msgid "Additional Service"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgid ""
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__basic
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__basic
 msgid "Basic Service"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgid "Database Data"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__delivery
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__delivery
 msgid "Delivery Instructions"
 msgstr ""
 
@@ -360,7 +360,7 @@ msgid "JPG"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__label_layout
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__label_layout
 msgid "Label Layout"
 msgstr ""
 
@@ -476,12 +476,12 @@ msgid "Original (unoptimized, unresized) attachment"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__output_format
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__output_format
 msgid "Output Format"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__resolution
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__resolution
 msgid "Output Resolution"
 msgstr ""
 
@@ -523,7 +523,7 @@ msgid "Parcel Tracking"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__postlogistics_type__partner_option
+#: model:ir.model.fields.selection,name:delivery_postlogistics.selection__postlogistics_delivery_carrier_template_option__type__partner_option
 msgid "Partner Option"
 msgstr ""
 
@@ -632,7 +632,7 @@ msgid "PostLogistics error:"
 msgstr ""
 
 #. module: delivery_postlogistics
-#: model:ir.model.fields,field_description:delivery_postlogistics.field_postlogistics_delivery_carrier_template_option__postlogistics_type
+#: model:ir.model.fields,field_description:delivery_postlogistics.field_postlogistics_delivery_carrier_template_option__type
 msgid "PostLogistics option type"
 msgstr ""
 

delivery_postlogistics/migrations/18.0.1.0.0/pre-migration.py

@@ -11,6 +11,9 @@
 MODEL_TO_RENAMED_FIELDS = {
     "res.partner": [
         ("postlogistics_option_ids", "delivery_carrier_template_option_ids"),
+    ],
+    "delivery.carrier.template.option": [
+        ("postlogistics_type", "type"),
     ]
 }
 
@@ -52,6 +55,6 @@ def _rename_fields(env):
 
 
 def migrate(env, version):
-    _migrate_models(env)
     _rename_models(env)
+    _migrate_models(env)
     _rename_fields(env)

delivery_postlogistics/models/delivery_carrier.py

@@ -51,17 +51,17 @@ class DeliveryCarrier(models.Model):
     postlogistics_label_layout = fields.Many2one(
         comodel_name="delivery.carrier.template.option",
         string="Label layout",
-        domain=[("postlogistics_type", "=", "label_layout")],
+        domain=[("type", "=", "label_layout")],
     )
     postlogistics_output_format = fields.Many2one(
         comodel_name="delivery.carrier.template.option",
         string="Output format",
-        domain=[("postlogistics_type", "=", "output_format")],
+        domain=[("type", "=", "output_format")],
     )
     postlogistics_resolution = fields.Many2one(
         comodel_name="delivery.carrier.template.option",
         string="Resolution",
-        domain=[("postlogistics_type", "=", "resolution")],
+        domain=[("type", "=", "resolution")],
     )
     postlogistics_tracking_format = fields.Selection(
         [

delivery_postlogistics/security/ir.model.access.csv

@@ -3,11 +3,3 @@ access_postlogistics_license_salesman,postlogistics.license.salesman,model_postl
 access_postlogistics_license_manager,postlogistics.license.manager,model_postlogistics_license,sales_team.group_sale_manager,1,1,1,1
 access_postlogistics_license_stock_user,postlogistics.license.stock_user,model_postlogistics_license,stock.group_stock_user,1,0,0,0
 access_postlogistics_license_stock_manager,postlogistics.license.stock_manager,model_postlogistics_license,stock.group_stock_manager,1,1,1,1
-
-access_delivery_carrier_template_option_salesman,delivery.carrier.relation.option.salesman,model_postlogistics_delivery_carrier_template_option,sales_team.group_sale_salesman,1,0,0,0
-access_delivery_carrier_template_option_sales_manager,delivery.carrier.relation.option.sale.manager,model_postlogistics_delivery_carrier_template_option,sales_team.group_sale_manager,1,1,1,1
-access_delivery_carrier_template_option_stock_user,delivery.carrier.template.option stock_user,model_postlogistics_delivery_carrier_template_option,stock.group_stock_user,1,0,0,0
-access_delivery_carrier_template_option_stock_manager,delivery.carrier.template.option stock_manager,model_postlogistics_delivery_carrier_template_option,stock.group_stock_manager,1,1,1,1
-
-access_shipping_label_user,shipping.label user,model_postlogistics_shipping_label,stock.group_stock_user,1,1,1,0
-access_shipping_label_manager,shipping.label manager,model_postlogistics_shipping_label,stock.group_stock_manager,1,1,1,1