Skip to content

Commit c92d08b

Browse files
committed
[MIG] delivery_ups_oca: Migration to 17.0
1 parent 15f5a2b commit c92d08b

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

delivery_ups_oca/tests/test_delivery_ups.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
_provider_class = _module_ns + ".models.ups_request.UpsRequest"
1414

1515

16-
class TestDeliveryUpsBase(common.SavepointCase):
16+
class TestDeliveryUpsBase(common.TransactionCase):
1717
@classmethod
1818
def setUpClass(cls):
1919
super().setUpClass()

delivery_ups_oca/views/delivery_carrier_view.xml

+12-10
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,45 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
1313
<page
1414
string="UPS"
1515
name="configuration_ups_oca"
16-
attrs="{'invisible': [('delivery_type', '!=', 'ups')]}"
16+
invisible="delivery_type != 'ups'"
1717
>
1818
<group>
1919
<group string="Service">
2020
<field
2121
name="ups_service_code"
22-
attrs="{'required': [('delivery_type', '=', 'ups')]}"
22+
required="delivery_type == 'ups'"
2323
/>
2424
</group>
2525
<group string="Misc">
2626
<field
2727
name="ups_shipper_number"
28-
attrs="{'required': [('delivery_type', '=', 'ups')]}"
28+
required="delivery_type == 'ups'"
2929
/>
3030
<field
3131
name="ups_default_packaging_id"
32-
attrs="{'required': [('delivery_type', '=', 'ups')]}"
32+
required="delivery_type == 'ups'"
3333
context="{'default_package_carrier_type': 'ups'}"
3434
/>
3535
<field name="ups_use_packages_from_picking" />
3636
<field
3737
name="ups_package_dimension_code"
38-
attrs="{'required': [('delivery_type', '=', 'ups')]}"
38+
required="delivery_type == 'ups'"
3939
/>
4040
<field
4141
name="ups_package_weight_code"
42-
attrs="{'required': [('delivery_type', '=', 'ups')]}"
42+
required="delivery_type == 'ups'"
4343
/>
4444
<field name="ups_tracking_state_update_sync" />
4545
</group>
4646
<group string="Credentials">
4747
<field
4848
name="ups_client_id"
49-
attrs="{'required': [('delivery_type', '=', 'ups')]}"
49+
required="delivery_type == 'ups'"
5050
/>
5151
<field
5252
name="ups_client_secret"
5353
password="True"
54-
attrs="{'required': [('delivery_type', '=', 'ups')]}"
54+
required="delivery_type == 'ups'"
5555
/>
5656
<button
5757
name="ups_update_token"
@@ -63,7 +63,7 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
6363
<group string="Label">
6464
<field
6565
name="ups_file_format"
66-
attrs="{'required': [('delivery_type', '=', 'ups')]}"
66+
required="delivery_type == 'ups'"
6767
/>
6868
</group>
6969
</group>
@@ -72,7 +72,9 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
7272
<field name="ups_cash_on_delivery" />
7373
<field
7474
name="ups_cod_funds_code"
75-
attrs="{'required': [('delivery_type', '=', 'ups'), ('ups_cash_on_delivery', '=', True)], 'invisible': [('ups_cash_on_delivery', '=', False)]}"
75+
required=""
76+
invisible="not ups_cash_on_delivery"
77+
required="delivery_type == 'ups' and ups_cash_on_delivery"
7678
/>
7779
</group>
7880
</group>

delivery_ups_oca/views/stock_picking_view.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
1313
name="ups_get_label"
1414
string="UPS Label"
1515
type="object"
16-
attrs="{'invisible':[
17-
'|',
18-
'|',
19-
('carrier_tracking_ref', '=', False),
20-
('delivery_type', '!=', 'ups'),
21-
('state', '!=', 'done')
22-
]}"
16+
invisible="not carrier_tracking_ref or delivery_type != 'ups' or state != 'done'"
2317
/>
2418
</xpath>
2519
</field>

0 commit comments

Comments
 (0)