Skip to content

Commit 3296c5d

Browse files
jans23jans23
committed
[MIG] delivery_ups_oca: Migration to 15.0
1 parent 3fc130b commit 3296c5d

14 files changed

+179
-128
lines changed

‎delivery_ups_oca/README.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Delivery UPS OCA
1717
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1818
:alt: License: AGPL-3
1919
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
20-
:target: https://github.com/OCA/delivery-carrier/tree/14.0/delivery_ups_oca
20+
:target: https://github.com/OCA/delivery-carrier/tree/15.0/delivery_ups_oca
2121
:alt: OCA/delivery-carrier
2222
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23-
:target: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-delivery_ups_oca
23+
:target: https://translation.odoo-community.org/projects/delivery-carrier-15-0/delivery-carrier-15-0-delivery_ups_oca
2424
:alt: Translate me on Weblate
2525
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26-
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=14.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=15.0
2727
:alt: Try me on Runboat
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -48,8 +48,8 @@ Configuration
4848

4949
To configure this module, you need to:
5050

51-
#. Add a carrier account with delivery type ``ups`` and fill in your credentials (UPS
52-
Client and UPS Client Secret)
51+
#. Add a Shipping Method with Provider ``UPS`` and fill in your UPS credentials
52+
(Client ID and Client Secret)
5353
#. Configure in Odoo all required fields of the UPS tab with your account data
5454
https://wwwapps.ups.com/ppc/ppc.html (Shipper number, Default Packaging, Package
5555
Dimension Code, Package Weight Code and File Format).
@@ -88,7 +88,7 @@ Bug Tracker
8888
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
8989
In case of trouble, please check there if your issue has already been reported.
9090
If you spotted it first, help us to smash it by providing a detailed and welcomed
91-
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
91+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_ups_oca%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
9292

9393
Do not contact contributors directly about support or help with technical issues.
9494

@@ -132,6 +132,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
132132
mission is to support the collaborative development of Odoo features and
133133
promote its widespread use.
134134

135-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/14.0/delivery_ups_oca>`_ project on GitHub.
135+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/15.0/delivery_ups_oca>`_ project on GitHub.
136136

137137
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

‎delivery_ups_oca/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"name": "Delivery UPS OCA",
66
"summary": "Integrate UPS webservice",
7-
"version": "14.0.1.0.1",
7+
"version": "15.0.1.0.1",
88
"development_status": "Beta",
99
"category": "Delivery",
1010
"website": "https://github.com/OCA/delivery-carrier",

‎delivery_ups_oca/data/product_packaging_data.xml

+46-46
Original file line numberDiff line numberDiff line change
@@ -2,119 +2,119 @@
22
<!-- Copyright 2021 Tecnativa - Víctor Martínez
33
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
44
<odoo>
5-
<record id="product_packaging_ups_01" model="product.packaging">
6-
<field name="shipper_package_code">01</field>
5+
<record id="package_type_ups_01" model="stock.package.type">
76
<field name="name">UPS Letter</field>
87
<field name="package_carrier_type">ups</field>
8+
<field name="shipper_package_code">01</field>
99
</record>
10-
<record id="product_packaging_ups_02" model="product.packaging">
11-
<field name="shipper_package_code">02</field>
10+
<record id="package_type_ups_02" model="stock.package.type">
1211
<field name="name">Customer Supplied Package</field>
1312
<field name="package_carrier_type">ups</field>
13+
<field name="shipper_package_code">02</field>
1414
</record>
15-
<record id="product_packaging_ups_03" model="product.packaging">
16-
<field name="shipper_package_code">03</field>
15+
<record id="package_type_ups_03" model="stock.package.type">
1716
<field name="name">Tube</field>
1817
<field name="package_carrier_type">ups</field>
18+
<field name="shipper_package_code">03</field>
1919
</record>
20-
<record id="product_packaging_ups_04" model="product.packaging">
21-
<field name="shipper_package_code">04</field>
20+
<record id="package_type_ups_04" model="stock.package.type">
2221
<field name="name">PAK</field>
2322
<field name="package_carrier_type">ups</field>
23+
<field name="shipper_package_code">04</field>
2424
</record>
25-
<record id="product_packaging_ups_21" model="product.packaging">
26-
<field name="shipper_package_code">21</field>
25+
<record id="package_type_ups_21" model="stock.package.type">
2726
<field name="name">UPS Express Box</field>
2827
<field name="package_carrier_type">ups</field>
28+
<field name="shipper_package_code">21</field>
2929
</record>
30-
<record id="product_packaging_ups_24" model="product.packaging">
31-
<field name="shipper_package_code">24</field>
30+
<record id="package_type_ups_24" model="stock.package.type">
3231
<field name="name">UPS 25KG Box</field>
3332
<field name="package_carrier_type">ups</field>
33+
<field name="shipper_package_code">24</field>
3434
</record>
35-
<record id="product_packaging_ups_25" model="product.packaging">
36-
<field name="shipper_package_code">25</field>
35+
<record id="package_type_ups_25" model="stock.package.type">
3736
<field name="name">UPS 10KG Box</field>
3837
<field name="package_carrier_type">ups</field>
38+
<field name="shipper_package_code">25</field>
3939
</record>
40-
<record id="product_packaging_ups_30" model="product.packaging">
41-
<field name="shipper_package_code">30</field>
40+
<record id="package_type_ups_30" model="stock.package.type">
4241
<field name="name">Pallet</field>
4342
<field name="package_carrier_type">ups</field>
43+
<field name="shipper_package_code">30</field>
4444
</record>
45-
<record id="product_packaging_ups_2a" model="product.packaging">
46-
<field name="shipper_package_code">2a</field>
45+
<record id="package_type_ups_2a" model="stock.package.type">
4746
<field name="name">Small Express Box</field>
4847
<field name="package_carrier_type">ups</field>
48+
<field name="shipper_package_code">2a</field>
4949
</record>
50-
<record id="product_packaging_ups_2b" model="product.packaging">
51-
<field name="shipper_package_code">2b</field>
50+
<record id="package_type_ups_2b" model="stock.package.type">
5251
<field name="name">Medium Express Box</field>
5352
<field name="package_carrier_type">ups</field>
53+
<field name="shipper_package_code">2b</field>
5454
</record>
55-
<record id="product_packaging_ups_2c" model="product.packaging">
56-
<field name="shipper_package_code">2c</field>
55+
<record id="package_type_ups_2c" model="stock.package.type">
5756
<field name="name">Large Express Box</field>
5857
<field name="package_carrier_type">ups</field>
58+
<field name="shipper_package_code">2c</field>
5959
</record>
60-
<record id="product_packaging_ups_56" model="product.packaging">
61-
<field name="shipper_package_code">56</field>
60+
<record id="package_type_ups_56" model="stock.package.type">
6261
<field name="name">Flats</field>
6362
<field name="package_carrier_type">ups</field>
63+
<field name="shipper_package_code">56</field>
6464
</record>
65-
<record id="product_packaging_ups_57" model="product.packaging">
66-
<field name="shipper_package_code">57</field>
65+
<record id="package_type_ups_57" model="stock.package.type">
6766
<field name="name">Parcels</field>
6867
<field name="package_carrier_type">ups</field>
68+
<field name="shipper_package_code">57</field>
6969
</record>
70-
<record id="product_packaging_ups_58" model="product.packaging">
71-
<field name="shipper_package_code">58</field>
70+
<record id="package_type_ups_58" model="stock.package.type">
7271
<field name="name">BPM</field>
7372
<field name="package_carrier_type">ups</field>
73+
<field name="shipper_package_code">58</field>
7474
</record>
75-
<record id="product_packaging_ups_59" model="product.packaging">
76-
<field name="shipper_package_code">59</field>
75+
<record id="package_type_ups_59" model="stock.package.type">
7776
<field name="name">First Class</field>
7877
<field name="package_carrier_type">ups</field>
78+
<field name="shipper_package_code">59</field>
7979
</record>
80-
<record id="product_packaging_ups_60" model="product.packaging">
81-
<field name="shipper_package_code">60</field>
80+
<record id="package_type_ups_60" model="stock.package.type">
8281
<field name="name">Priority</field>
8382
<field name="package_carrier_type">ups</field>
83+
<field name="shipper_package_code">60</field>
8484
</record>
85-
<record id="product_packaging_ups_61" model="product.packaging">
86-
<field name="shipper_package_code">61</field>
85+
<record id="package_type_ups_61" model="stock.package.type">
8786
<field name="name">Machineables</field>
8887
<field name="package_carrier_type">ups</field>
88+
<field name="shipper_package_code">61</field>
8989
</record>
90-
<record id="product_packaging_ups_62" model="product.packaging">
91-
<field name="shipper_package_code">62</field>
90+
<record id="package_type_ups_62" model="stock.package.type">
9291
<field name="name">Irregulars</field>
9392
<field name="package_carrier_type">ups</field>
93+
<field name="shipper_package_code">62</field>
9494
</record>
95-
<record id="product_packaging_ups_63" model="product.packaging">
96-
<field name="shipper_package_code">63</field>
95+
<record id="package_type_ups_63" model="stock.package.type">
9796
<field name="name">Parcel Post</field>
9897
<field name="package_carrier_type">ups</field>
98+
<field name="shipper_package_code">63</field>
9999
</record>
100-
<record id="product_packaging_ups_64" model="product.packaging">
101-
<field name="shipper_package_code">64</field>
100+
<record id="package_type_ups_64" model="stock.package.type">
102101
<field name="name">BPM Parcel</field>
103102
<field name="package_carrier_type">ups</field>
103+
<field name="shipper_package_code">64</field>
104104
</record>
105-
<record id="product_packaging_ups_65" model="product.packaging">
106-
<field name="shipper_package_code">65</field>
105+
<record id="package_type_ups_65" model="stock.package.type">
107106
<field name="name">Media Mail</field>
108107
<field name="package_carrier_type">ups</field>
108+
<field name="shipper_package_code">65</field>
109109
</record>
110-
<record id="product_packaging_ups_66" model="product.packaging">
111-
<field name="shipper_package_code">66</field>
110+
<record id="package_type_ups_66" model="stock.package.type">
112111
<field name="name">BPM Flat</field>
113112
<field name="package_carrier_type">ups</field>
113+
<field name="shipper_package_code">66</field>
114114
</record>
115-
<record id="product_packaging_ups_67" model="product.packaging">
116-
<field name="shipper_package_code">67</field>
115+
<record id="package_type_ups_67" model="stock.package.type">
117116
<field name="name">Standard Flat</field>
118117
<field name="package_carrier_type">ups</field>
118+
<field name="shipper_package_code">67</field>
119119
</record>
120120
</odoo>

‎delivery_ups_oca/i18n/delivery_ups_oca.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,12 @@ msgstr ""
375375

376376
#. module: delivery_ups_oca
377377
#: model:ir.model.fields,field_description:delivery_ups_oca.field_delivery_carrier__ups_client_id
378-
msgid "Ups Client"
378+
msgid "Client ID"
379379
msgstr ""
380380

381381
#. module: delivery_ups_oca
382382
#: model:ir.model.fields,field_description:delivery_ups_oca.field_delivery_carrier__ups_client_secret
383-
msgid "Ups Client Secret"
383+
msgid "Client Secret"
384384
msgstr ""
385385

386386
#. module: delivery_ups_oca

‎delivery_ups_oca/i18n/it.po

+2-2
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,12 @@ msgstr ""
376376

377377
#. module: delivery_ups_oca
378378
#: model:ir.model.fields,field_description:delivery_ups_oca.field_delivery_carrier__ups_client_id
379-
msgid "Ups Client"
379+
msgid "Client ID"
380380
msgstr ""
381381

382382
#. module: delivery_ups_oca
383383
#: model:ir.model.fields,field_description:delivery_ups_oca.field_delivery_carrier__ups_client_secret
384-
msgid "Ups Client Secret"
384+
msgid "Client Secret"
385385
msgstr ""
386386

387387
#. module: delivery_ups_oca

‎delivery_ups_oca/migrations/15.0.1.0.0/pre-migration.py

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
def migrate(cr, version):
2+
if not version:
3+
return
4+
5+
# Update XML IDs to point to the new model
6+
cr.execute(
7+
"""
8+
UPDATE ir_model_data
9+
SET model = 'stock.package.type'
10+
WHERE model = 'product.packaging'
11+
AND module = 'delivery_ups_oca'
12+
AND name LIKE 'product_packaging_ups_%'
13+
"""
14+
)
15+
16+
# Copy data from product.packaging to stock.package.type
17+
cr.execute(
18+
"""
19+
INSERT INTO stock_package_type
20+
(name, package_carrier_type, shipper_package_code,
21+
create_uid, create_date, write_uid, write_date)
22+
SELECT
23+
name, package_carrier_type, shipper_package_code,
24+
create_uid, create_date, write_uid, write_date
25+
FROM product_packaging
26+
WHERE package_carrier_type = 'ups'
27+
AND shipper_package_code IS NOT NULL
28+
ON CONFLICT DO NOTHING
29+
"""
30+
)

‎delivery_ups_oca/models/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
22
from . import delivery_carrier
33
from . import product_packaging
4+
from . import stock_package_type
45
from . import stock_picking
56
from . import ups_request

‎delivery_ups_oca/models/delivery_carrier.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class DeliveryCarrier(models.Model):
6060
string="Service code",
6161
)
6262
ups_default_packaging_id = fields.Many2one(
63-
comodel_name="product.packaging",
63+
comodel_name="stock.package.type",
6464
string="Default Packaging Type",
6565
domain=[("package_carrier_type", "=", "ups")],
6666
)

‎delivery_ups_oca/models/product_packaging.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@
66
class ProductPackaging(models.Model):
77
_inherit = "product.packaging"
88

9-
package_carrier_type = fields.Selection(selection_add=[("ups", "UPS")])
9+
package_carrier_type = fields.Selection(
10+
selection=[("none", "None"), ("ups", "UPS")],
11+
default="none",
12+
ondelete={"ups": "set default"},
13+
)

‎delivery_ups_oca/models/stock_package_type.py

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Copyright 2020 Hunki Enterprises BV
2+
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
3+
from odoo import fields, models
4+
5+
6+
class StockPackageType(models.Model):
7+
_inherit = "stock.package.type"
8+
9+
package_carrier_type = fields.Selection(
10+
selection_add=[("ups", "UPS")],
11+
ondelete={"ups": "set default"},
12+
)

‎delivery_ups_oca/models/ups_request.py

+15-11
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def _quant_package_data_from_picking(self, package, picking, is_package=False):
111111
if is_package:
112112
NumOfPieces = sum(package.mapped("quant_ids.quantity"))
113113
PackageWeight = max(package.shipping_weight, package.weight)
114-
package = package.packaging_id
114+
package = package.package_type_id
115115
return {
116116
"Description": package.name,
117117
"NumOfPieces": str(NumOfPieces),
@@ -121,7 +121,7 @@ def _quant_package_data_from_picking(self, package, picking, is_package=False):
121121
},
122122
"Dimensions": {
123123
"UnitOfMeasurement": {"Code": self.package_dimension_code},
124-
"Length": str(package.packaging_length),
124+
"Length": str(package.length),
125125
"Width": str(package.width),
126126
"Height": str(package.height),
127127
},
@@ -165,7 +165,7 @@ def _prepare_create_shipping(self, picking):
165165
for package in picking.package_ids
166166
]
167167
else:
168-
# modelo: product.packaging
168+
# modelo: stock.package.type
169169
packages = []
170170
package_info = self._quant_package_data_from_picking(
171171
self.default_packaging_id, picking, False
@@ -268,7 +268,7 @@ def _quant_package_data_from_order(self, order):
268268
"PackagingType": {"Code": self.default_packaging_id.shipper_package_code},
269269
"Dimensions": {
270270
"UnitOfMeasurement": {"Code": self.package_dimension_code},
271-
"Length": str(self.default_packaging_id.packaging_length),
271+
"Length": str(self.default_packaging_id.length),
272272
"Width": str(self.default_packaging_id.width),
273273
"Height": str(self.default_packaging_id.height),
274274
},
@@ -396,17 +396,21 @@ def tracking_state_update(self, picking):
396396
else:
397397
for warning in shipment.get("warnings"):
398398
states_list.append(
399-
_("{} - Warning: {}").format(
400-
datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
401-
warning.get("message"),
402-
)
399+
_("%(datetime)s - Warning: %(message)s")
400+
% {
401+
"datetime": datetime.datetime.now().strftime(
402+
"%Y-%m-%d %H:%M:%S"
403+
),
404+
"message": warning.get("message"),
405+
}
403406
)
404407

405408
except Exception:
406409
states_list.append(
407-
_("{} - Error retrieving the tracking information.").format(
408-
datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
409-
)
410+
_("%(datetime)s - Error retrieving the tracking information.")
411+
% {
412+
"datetime": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
413+
}
410414
)
411415
return {
412416
"delivery_state": delivery_state,

‎delivery_ups_oca/readme/CONFIGURE.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
To configure this module, you need to:
22

3-
#. Add a carrier account with delivery type ``ups`` and fill in your credentials (UPS
4-
Client and UPS Client Secret)
3+
#. Add a Shipping Method with Provider ``UPS`` and fill in your UPS credentials
4+
(Client ID and Client Secret)
55
#. Configure in Odoo all required fields of the UPS tab with your account data
66
https://wwwapps.ups.com/ppc/ppc.html (Shipper number, Default Packaging, Package
77
Dimension Code, Package Weight Code and File Format).

0 commit comments

Comments
 (0)