Skip to content

Commit 0fa989c

Browse files
committed
[MIG] delivery_roulier: Migration to 17.0
1 parent 50b4b5b commit 0fa989c

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

delivery_roulier/__manifest__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
44
{
55
"name": "Delivery Carrier Roulier",
6-
"version": "16.0.1.0.0",
6+
"version": "17.0.1.0.0",
77
"author": "Akretion,Odoo Community Association (OCA)",
88
"summary": "Integration of multiple carriers",
99
"maintainers": ["florian-dacosta"],
@@ -20,6 +20,7 @@
2020
"external_dependencies": {
2121
"python": [
2222
"roulier", # '>0.2.0'
23+
"odoo_test_helper",
2324
],
2425
},
2526
"installable": True,

delivery_roulier/decorator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def get_delivery_type(cls, *args, **kwargs):
3434
return cls[0].carrier_id.delivery_type
3535

3636
delivery_type = get_delivery_type(cls, *args, **kwargs)
37-
fun = "_{}{}".format(delivery_type, fun_name)
37+
fun = f"_{delivery_type}{fun_name}"
3838
if not hasattr(cls, fun):
3939
fun = "_roulier%s" % (fun_name)
4040
return getattr(cls, fun)(*args, **kwargs)

delivery_roulier/models/stock_picking.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def _roulier_generate_labels(self):
8484
label_info = []
8585
for picking in self:
8686
move_line_no_pack = picking.move_line_ids.filtered(
87-
lambda ml: ml.qty_done > 0.0 and not ml.result_package_id
87+
lambda ml: ml.quantity > 0.0 and not ml.result_package_id
8888
)
8989
if move_line_no_pack:
9090
raise UserError(

delivery_roulier/models/stock_quant_package.py

+6-9
Original file line numberDiff line numberDiff line change
@@ -112,24 +112,22 @@ def _roulier_parse_response(self, picking, response):
112112
# find for which package the label is. tracking number will be updated on
113113
# this pack later on (in base_delivery_carrier_label)
114114
package_id = False
115+
ref = parcel.get("reference")
115116
if len(self) == 1:
116117
package_id = self.id
117118
else:
118-
pack = self.filtered(lambda p: p.name == parcel.get("reference"))
119+
pack = self.filtered(lambda p, ref=ref: p.name == ref)
119120
if len(pack) == 1:
120121
package_id = pack.id
121-
122+
name_prefix = ref or tracking_number or label.get("name")
123+
name_suffix = label.get("type", "").lower()
122124
parcels_data.append(
123125
{
124126
"tracking_number": tracking_number,
125127
"parcel_tracking_uri": parcel.get("tracking", {}).get("url", False),
126128
"package_id": package_id,
127129
"file": label.get("data"),
128-
"name": "%s.%s"
129-
% (
130-
parcel.get("reference") or tracking_number or label.get("name"),
131-
label.get("type", "").lower(),
132-
),
130+
"name": f"{name_prefix}.{name_suffix}",
133131
"file_type": label.get("type"),
134132
}
135133
)
@@ -287,8 +285,7 @@ def _roulier_prepare_attachments(self, picking, response):
287285
"res_model": "stock.picking",
288286
"datas": attachment["data"],
289287
"type": "binary",
290-
"name": "%s-%s.%s"
291-
% (self.name, attachment["name"], attachment["type"]),
288+
"name": f"{self.name}-{attachment['name']}.{attachment['type']}",
292289
}
293290
for attachment in attachments
294291
]

delivery_roulier/tests/test_delivery_roulier.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,9 @@ def setUp(self):
8787
"location_id": self.order.warehouse_id.lot_stock_id.id,
8888
"inventory_quantity": 1,
8989
}
90-
)._apply_inventory()
90+
).action_apply_inventory()
9191
self.order.action_confirm()
9292
self.picking = self.order.picking_ids
93-
self.env["stock.immediate.transfer"].create(
94-
{"pick_ids": [(6, 0, self.picking.ids)]}
95-
).process()
9693

9794
@classmethod
9895
def tearDownClass(cls):

requirements.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# generated from manifests external_dependencies
2+
odoo_test_helper
3+
roulier

0 commit comments

Comments
 (0)