Skip to content

Commit 70e2c17

Browse files
pablo-cort-s73pablo-cort-s73
committed
[MIG] delivery_correos_express: Migration to 17.0
1 parent c05891a commit 70e2c17

File tree

5 files changed

+19
-49
lines changed

5 files changed

+19
-49
lines changed

‎delivery_correos_express/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Delivery Correos Express",
55
"summary": "Delivery Carrier implementation for Correos Express using their API",
6-
"version": "16.0.1.0.0",
6+
"version": "17.0.1.0.0",
77
"category": "Stock",
88
"website": "https://github.com/OCA/delivery-carrier",
99
"author": "Studio73, Odoo Community Association (OCA)",

‎delivery_correos_express/models/correos_express_request.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
_logger = logging.getLogger(__name__)
1212
CORREOS_EXPRESS_LABEL_TYPE = [("1", "PDF"), ("2", "ZPL")]
1313
CORREOS_EXPRESS_SERVICE = [
14+
("26", "ISLAS EXPRESS"),
1415
("61", "PAQ10"),
1516
("62", "PAQ14"),
1617
("63", "PAQ24"),
@@ -96,15 +97,15 @@ def _check_for_error(self, result):
9697
return_code = 999
9798
message = "Webservice ERROR."
9899
# shipment
99-
if type(result.get("codigoRetorno", "false")) != str:
100+
if not isinstance(result.get("codigoRetorno", "false"), str):
100101
return_code = result.get("codigoRetorno")
101102
message = result.get("mensajeRetorno") or ""
102103
# label
103-
if type(result.get("codErr", "false")) != str:
104+
if not isinstance(result.get("codErr", "false"), str):
104105
return_code = result.get("codErr")
105106
message = result.get("desErr") or ""
106107
# tracking
107-
if type(result.get("error", "false")) != str:
108+
if not isinstance(result.get("error", "false"), str):
108109
return_code = result.get("error")
109110
message = result.get("mensajeError") or ""
110111
return return_code, message

‎delivery_correos_express/tests/test_delivery_correos_express.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def setUpClass(cls):
4848
cls.sale_order.carrier_id = cls.carrier_correos_express.id
4949
cls.sale_order.action_confirm()
5050
cls.picking = cls.sale_order.picking_ids[0]
51-
cls.picking.move_ids.quantity_done = 20
51+
cls.picking.move_ids.quantity = 20
5252

5353
@mock.patch(
5454
"%s.create_shipment" % request_model,

‎delivery_correos_express/views/delivery_carrier_view.xml

+8-36
Original file line numberDiff line numberDiff line change
@@ -7,66 +7,38 @@
77
<xpath expr="//notebook/page[1]" position='before'>
88
<page
99
string="Correos Express Configuration"
10-
attrs="{'invisible': [('delivery_type', '!=', 'correos_express')]}"
10+
invisible="delivery_type != 'correos_express'"
1111
>
1212
<group>
1313
<group>
1414
<field
1515
name="correos_express_username"
16-
attrs="{
17-
'required': [
18-
('delivery_type', '=', 'correos_express')
19-
]
20-
}"
16+
required="delivery_type == 'correos_express'"
2117
/>
2218
<field
2319
name="correos_express_password"
2420
password="True"
25-
attrs="{
26-
'required': [
27-
('delivery_type', '=', 'correos_express')
28-
]
29-
}"
21+
required="delivery_type == 'correos_express'"
3022
/>
3123
<field
3224
name="correos_express_customer_code"
33-
attrs="{
34-
'required': [
35-
('delivery_type', '=', 'correos_express')
36-
]
37-
}"
25+
required="delivery_type == 'correos_express'"
3826
/>
3927
<field
4028
name="correos_express_sender_code"
41-
attrs="{
42-
'required': [
43-
('delivery_type', '=', 'correos_express')
44-
]
45-
}"
29+
required="delivery_type == 'correos_express'"
4630
/>
4731
<field
4832
name="correos_express_label_type"
49-
attrs="{
50-
'required': [
51-
('delivery_type', '=', 'correos_express')
52-
]
53-
}"
33+
required="delivery_type == 'correos_express'"
5434
/>
5535
<field
5636
name="correos_express_product"
57-
attrs="{
58-
'required': [
59-
('delivery_type', '=', 'correos_express')
60-
]
61-
}"
37+
required="delivery_type == 'correos_express'"
6238
/>
6339
<field
6440
name="correos_express_transport"
65-
attrs="{
66-
'required': [
67-
('delivery_type', '=', 'correos_express')
68-
]
69-
}"
41+
required="delivery_type == 'correos_express'"
7042
/>
7143
</group>
7244
</group>

‎delivery_correos_express/views/stock_picking_views.xml

+5-8
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
<odoo>
33
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
44
<field name="model">stock.picking</field>
5-
<field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
5+
<field
6+
name="inherit_id"
7+
ref="stock_delivery.view_picking_withcarrier_out_form"
8+
/>
69
<field name="arch" type="xml">
710
<xpath expr="//button[@name='print_return_label']/.." position='inside'>
811
<button
912
name="correos_express_get_label"
1013
string="Print Correos Express Label"
1114
type="object"
12-
attrs="{'invisible':[
13-
'|',
14-
'|',
15-
('carrier_tracking_ref', '=', False),
16-
('delivery_type', '!=', 'correos_express'),
17-
('state', '!=', 'done')
18-
]}"
15+
invisible="(carrier_tracking_ref != True) or (delivery_type != 'correos_express') or (state != 'done')"
1916
/>
2017
</xpath>
2118
</field>

0 commit comments

Comments
 (0)