Skip to content

Commit 255d33f

Browse files
StephaneManginStephaneMangin
committed
fixup! [MIG] delivery_postlogistics: Migration to 18.0
1 parent 4d44284 commit 255d33f

11 files changed

+32
-28
lines changed

‎delivery_postlogistics/i18n/delivery_postlogistics.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,8 @@ msgstr ""
443443
#: code:addons/delivery_postlogistics/postlogistics/web_service.py:0
444444
#, python-format
445445
msgid ""
446-
"No PostLogistics packaging services found in packaging {packaging_name}, for"
447-
" picking {pickin_name}."
446+
"No PostLogistics packaging services found in package type {package_type_name}, for"
447+
" picking {picking_name}."
448448
msgstr ""
449449

450450
#. module: delivery_postlogistics

‎delivery_postlogistics/i18n/es.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,8 @@ msgstr "Nombre"
474474
#: code:addons/delivery_postlogistics/postlogistics/web_service.py:0
475475
#, python-format
476476
msgid ""
477-
"No PostLogistics packaging services found in packaging {packaging_name}, for "
478-
"picking {pickin_name}."
477+
"No PostLogistics packaging services found in package type {package_type_name}, for "
478+
"picking {picking_name}."
479479
msgstr ""
480480
"No se han encontrado servicios de embalaje PostLogistics en embalaje "
481481
"{packaging_name}, para recogida {pickin_name}."
@@ -966,7 +966,7 @@ msgstr "la documentación"
966966

967967
#, python-format
968968
#~ msgid ""
969-
#~ "No PostLogistics packaging services found in packaging {}, for picking {}."
969+
#~ "No PostLogistics packaging services found in package type {package_type_name}, for picking {picking_name}."
970970
#~ msgstr ""
971971
#~ "No se encontraron servicios de embalaje de PostLogistics en el embalaje "
972-
#~ "{}, para recoger {}."
972+
#~ "{package_type_name}, para recoger {picking_name}."

‎delivery_postlogistics/i18n/it.po

+2-2
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,8 @@ msgstr ""
447447
#: code:addons/delivery_postlogistics/postlogistics/web_service.py:0
448448
#, python-format
449449
msgid ""
450-
"No PostLogistics packaging services found in packaging {packaging_name}, for "
451-
"picking {pickin_name}."
450+
"No PostLogistics packaging services found in package type {package_type_name}, for "
451+
"picking {picking_name}."
452452
msgstr ""
453453

454454
#. module: delivery_postlogistics

‎delivery_postlogistics/models/stock_package_type.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class PackageType(models.Model):
1212
ondelete={"postlogistics": "set default"},
1313
)
1414

15-
def _get_packaging_codes(self):
15+
def _get_shipper_package_code_list(self):
1616
"""
1717
Return the list of packaging codes
1818
"""

‎delivery_postlogistics/models/stock_picking.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ class StockPicking(models.Model):
2727
"Mobile", help="For notify delivery by telephone (ZAW3213)"
2828
)
2929

30-
def _get_packages_from_picking(self):
31-
"""Get all the packages from the picking"""
30+
def _get_quant_packages_from_picking(self):
31+
"""Get all the quant packages from the picking"""
3232
self.ensure_one()
33-
operation_obj = self.env["stock.move.line"]
34-
operations = operation_obj.search(
33+
operations = self.env["stock.move.line"].search(
3534
[
3635
"|",
3736
("package_id", "!=", False),
@@ -45,8 +44,7 @@ def _get_packages_from_picking(self):
4544
# moved so take the source one.
4645
package_ids.add(operation.result_package_id.id or operation.package_id.id)
4746

48-
packages = self.env["stock.quant.package"].browse(package_ids)
49-
return packages
47+
return self.env["stock.quant.package"].browse(package_ids)
5048

5149
def get_shipping_label_values(self, label):
5250
# TODO: consider to depends on base_delivery_carrier_label
@@ -197,7 +195,7 @@ def _generate_postlogistics_label(
197195
webservice_class = PostlogisticsWebService
198196

199197
if package_ids is None:
200-
packages = self._get_packages_from_picking()
198+
packages = self._get_quant_packages_from_picking()
201199
packages = packages.sorted(key=attrgetter("name"))
202200
else:
203201
# restrict on the provided packages

‎delivery_postlogistics/postlogistics/web_service.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,12 @@ def _get_license(self, picking):
219219
def _prepare_attributes(
220220
self, picking, pack=None, pack_num=None, pack_total=None, pack_weight=None
221221
):
222-
packaging = (
222+
package_type = (
223223
pack
224224
and pack.package_type_id
225225
or picking.carrier_id.postlogistics_default_package_type_id
226226
)
227-
services = packaging._get_packaging_codes()
227+
services = package_type._get_shipper_package_code_list()
228228

229229
if pack_weight:
230230
total_weight = pack_weight
@@ -236,8 +236,8 @@ def _prepare_attributes(
236236
raise UserError(
237237
picking.env._(
238238
"No PostLogistics packaging services found "
239-
"in packaging {packaging_name}, for picking {pickin_name}."
240-
).format(packaging_name=packaging.name, pickin_name=picking.name)
239+
"in package type {package_type_name}, for picking {picking_name}."
240+
).format(package_type_name=package_type.name, picking_name=picking.name)
241241
)
242242

243243
# Activate phone notification ZAW3213
@@ -304,7 +304,7 @@ def _get_item_additional_data(self, picking, package=None):
304304

305305
result = []
306306
packaging_codes = (
307-
package and package.package_type_id._get_packaging_codes() or []
307+
package and package.package_type_id._get_shipper_package_code_list() or []
308308
)
309309

310310
if set(packaging_codes) & {"BLN", "N"}:

‎delivery_postlogistics/tests/test_packaging_code.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ def setUpClass(cls):
2929

3030
def test_shipper_package_code_get_packaging_code(self):
3131
# If no shipper_package_code is set on the package_type then
32-
# _get_packaging_codes should return []
32+
# _get_shipper_package_code_list should return []
3333
with Form(self.package_type) as package_type:
3434
package_type.package_carrier_type = False
35-
self.assertEqual(self.package_type._get_packaging_codes(), [])
35+
self.assertEqual(self.package_type._get_shipper_package_code_list(), [])
3636
# case 2: type is set, but no matching carrier is found
37-
# _get_packaging_codes returns []
37+
# _get_shipper_package_code_list returns []
3838
with Form(self.package_type) as package_type:
3939
package_type.package_carrier_type = "none"
40-
self.assertEqual(self.package_type._get_packaging_codes(), [])
40+
self.assertEqual(self.package_type._get_shipper_package_code_list(), [])
4141
# case 3: When package_carrier_type is set, shipper_package_code is
42-
# computed, and _get_packaging_codes should return the expected codes
42+
# computed, and _get_shipper_package_code_list should return the expected codes
4343
with Form(self.package_type) as package_type:
4444
package_type.package_carrier_type = self.carrier.delivery_type
4545
package_type.shipper_package_code = PACKAGE_CODE
46-
self.assertEqual(self.package_type._get_packaging_codes(), EXPECTED_CODES)
46+
self.assertEqual(self.package_type._get_shipper_package_code_list(), EXPECTED_CODES)
4747

4848
def test_postlogistics_cancel_shipment(self):
4949
self.picking = self.env["stock.picking"].create(

‎delivery_postlogistics/tests/test_sanitize_values.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_sanitize(self):
4949
self.check_strings_in_dict(customer)
5050
recipient = self.service_class._prepare_recipient(self.picking)
5151
self.check_strings_in_dict(recipient)
52-
packages = self.picking._get_packages_from_picking()
52+
packages = self.picking._get_quant_packages_from_picking()
5353
item_list = self.service_class._prepare_item_list(
5454
self.picking, recipient, packages
5555
)

‎delivery_postlogistics/views/delivery.xml

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!-- Copyright 2019 Camptocamp SA
3+
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
24
<odoo>
35
<record id="delivery_carrier_postlogistics_inherit_view" model="ir.ui.view">
46
<field name="model">delivery.carrier</field>

‎delivery_postlogistics/views/stock.xml

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!-- Copyright 2019 Camptocamp SA
3+
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
24
<odoo>
35
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
46
<field name="model">stock.picking</field>

‎delivery_postlogistics/views/stock_package_type_view.xml

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2+
<!-- Copyright 2021 Camptocamp SA
3+
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
24
<odoo>
35
<record id="stock_package_type_form_delivery" model="ir.ui.view">
46
<field name="model">stock.package.type</field>

0 commit comments

Comments
 (0)