[18.0] [MIG] delivery_postlogistics: Migration to 18.0 #940

bizzappdev · 2025-01-28T09:08:34Z

No description provided.

…tics in 13.0

* fix 'PostLogistics' terms * make 'Package Code' required for PostLogistics delivery packaging * show a link listing available package codes for PostLogistics delivery packaging * update README

Some chars are disallowed from postlogistics API ("|", "", "<", ">") and output json should be sanitized

… API

history_ids has been removed as below link. So the code is obsoleted. odoo/odoo@b3180c8#diff-9a22420c4a72cc9b6d558b3d832846c2e44a4f3731c6df9579d66c6279c4804eL54-L57 _get_origin_pickings is to determine number of pickings of a sale order. So it should get pickings from sale_id of found picking.

The cassette `tests/fixtures/cassettes/test_store_label.yaml` should be updated as the label was failed to decode in both 13.0 and 14.0. * https://github.com/odoo/odoo/blob/13.0/odoo/addons/base/models/ir_attachment.py#L212 * https://github.com/odoo/odoo/blob/14.0/odoo/addons/base/models/ir_attachment.py#L554 We can remove the method _selection_file_type with below reasons. * It is used in base_delivery_carrier_label but was removed on Sep 5, 2019 https://github.com/OCA/delivery-carrier/blame/12.0/base_delivery_carrier_label/models/shipping_label.py#L15 * PR migration to 13.0 of base_delivery_carrier_label was merged on Oct 22, 2020 https://github.com/OCA/delivery-carrier/pull/251/files * Dependency on base_delivery_carrier_label was removed in migration to 14.0 on Apr 14 2021 OCA@4ba2b56#diff-f16078e35000c05a9b63f5e7e04b6f5fd50eadae8b14a45aa9c1eb078031060cL12 OCA@4ba2b56#diff-08c11b571d9c0b0c509c3922c77f407ef4c429473fda9bc2d4d542520e7a4e3fR12

… for delivery type other than postlogistics.

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: delivery-carrier-16.0/delivery-carrier-16.0-delivery_postlogistics Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-delivery_postlogistics/

ivantodorovich

Thanks @bizzappdev !

Minor comments here and there

Please note there's a "WIP" commit, that possibly needs squashing

delivery_postlogistics/models/delivery_carrier.py

delivery_postlogistics/models/stock_picking.py

delivery_postlogistics/wizard/stock_picking_return.py

vvrossem

Thank you for this migration work in progress 🙏
Please find below some suggestions

Squash administrative commits (if any) with the previous commit for reducing commit noise. Check https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate for details.

delivery_postlogistics/__manifest__.py

delivery_postlogistics/postlogistics/web_service.py

vvrossem · 2025-02-06T04:10:49Z

delivery_postlogistics/postlogistics/web_service.py

+from odoo.tools.translate import LazyTranslate
+
+_lt = LazyTranslate(__name__, default_lang="en_US")


why is LazyTranslate needed? (I'm not familiar with its usage)

When the default language is unavailable and a log with a traceback is generated, test cases fail. This issue arises because the translation system expects a valid language context, which may not always be present.
https://github.com/odoo/odoo/blob/18.0/odoo/tools/translate.py#L587

In this particular case, the PostlogisticsWebService class is not an Odoo class, which could explain why it lacks Odoo’s built-in translation functionality. In the Odoo codebase, LazyTranslate has been used in similar scenarios to avoid such issues:
https://github.com/odoo/odoo/blob/b2e564f07f6883111da4581bccfb0f45c7588063/odoo/tools/image.py#L88

Additionally, I was not familiar with self.env._, but it would face the same issue here since self does not have an env in this context.

delivery_postlogistics/views/postlogistics_license.xml

delivery_postlogistics/tests/common.py

delivery_postlogistics/models/postlogistics_shipping_label.py

vvrossem · 2025-02-06T04:40:55Z

delivery_postlogistics/models/stock_picking.py

+        "Fixed delivery date", help="Specific delivery date (ZAW3217)"
+    )
+
+    # TODO: consider refactoring these fields using a partner relation instead


could this migration be the opportunity to take care of this?

This migration MUST be the opportunity to do so and will. I agreed.

vvrossem · 2025-02-06T04:41:30Z

delivery_postlogistics/models/stock_picking.py

+        return packages
+
+    def get_shipping_label_values(self, label):
+        # TODO: consider to depends on base_delivery_carrier_label


could this migration be the opportunity to take care of this?

This migration MUST be the opportunity to do so and will. I agreed.

vvrossem · 2025-02-06T04:41:54Z

delivery_postlogistics/models/stock_picking.py

+        """Pickings using this module must have a package
+        If not this method put it one silently
+        """
+        # TODO: consider to depends on base_delivery_carrier_label


could this migration be the opportunity to take care of this?

This migration MUST be the opportunity to do so and will. I agreed.

vvrossem · 2025-02-06T04:46:27Z

delivery_postlogistics/readme/CREDITS.md

Remove references in CREDITS.rst of past financed migrations by other companies

bizzappdev · 2025-02-07T07:20:18Z

@vvrossem @ivantodorovich Changes are done. Can you please review it again?

vvrossem

Thank you and please add yourself in readme/CONTRIBUTORS.md 🙏

delivery_postlogistics/tests/test_stock_move.py

StephaneMangin

Thanks for your contribution.
We need to shrink the functional aspect of this module by reusing some of the already exsiting standard objects to manage options. By doing this we could manage these options association explicitly (1 object instead of 3 - i.e. a single A4/300pp/JPG paper format record). The tricky part is to migrate all previously existing data (defining unicity constraint to know when creating a new configuration or reusing it)

StephaneMangin · 2025-02-10T10:23:59Z

delivery_postlogistics/__manifest__.py

+    "license": "AGPL-3",
+    "category": "Delivery",
+    "complexity": "normal",
+    "depends": ["stock_delivery"],


Suggested change

"depends": ["stock_delivery"],

"depends": [

"stock_delivery",

"base_delivery_carrier_label",

"delivery_carrier_shipping_label"

],

Please, we need to be closer to the future label management. (Several other delivery carriers implementation will benefits from it)

StephaneMangin · 2025-02-10T10:25:41Z

delivery_postlogistics/models/postlogistics_shipping_label.py

+# Copyright 2013-2016 Camptocamp SA
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PostlogisticsShippingLabel(models.Model):
+    _name = "postlogistics.shipping.label"
+    _inherits = {"ir.attachment": "attachment_id"}
+    _description = "Shipping Label for PostLogistics"
+
+    file_type = fields.Char(string="File type", default="pdf")
+    attachment_id = fields.Many2one(
+        comodel_name="ir.attachment",
+        string="Attachement",
+        required=True,
+        ondelete="cascade",
+    )


Replaced by "shipping.label" from "delivery_carrier_shipping_label"

https://github.com/OCA/delivery-carrier/blob/a6c77e35298641b9a808792876de4da658def0da/delivery_carrier_shipping_label/models/shipping_label.py

StephaneMangin · 2025-02-10T10:36:59Z

delivery_postlogistics/models/delivery_carrier.py

+    postlogistics_label_layout = fields.Many2one(
+        comodel_name="postlogistics.delivery.carrier.template.option",
+        string="Label layout",
+        domain=[("postlogistics_type", "=", "label_layout")],
+    )
+    postlogistics_output_format = fields.Many2one(
+        comodel_name="postlogistics.delivery.carrier.template.option",
+        string="Output format",
+        domain=[("postlogistics_type", "=", "output_format")],
+    )
+    postlogistics_resolution = fields.Many2one(
+        comodel_name="postlogistics.delivery.carrier.template.option",
+        string="Resolution",
+        domain=[("postlogistics_type", "=", "resolution")],
+    )


We should stick to standard by using and extending (if needed) the model "report.paperformat" from base module.
https://github.com/odoo/odoo/blob/2efab4e7b90d36ce60c9858576922b504509993a/odoo/addons/base/models/report_paperformat.py#L167

StephaneMangin · 2025-02-10T10:37:08Z

delivery_postlogistics/models/postlogistics_carrier_template_options.py

+# Copyright 2013-2016 Camptocamp SA
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+POSTLOGISTICS_TYPES = [
+    ("label_layout", "Label Layout"),
+    ("output_format", "Output Format"),
+    ("resolution", "Output Resolution"),
+    ("basic", "Basic Service"),
+    ("additional", "Additional Service"),
+    ("delivery", "Delivery Instructions"),
+    ("partner_option", "Partner Option"),
+]
+
+
+class DeliveryCarrierTemplateOption(models.Model):
+    _name = "postlogistics.delivery.carrier.template.option"
+    _description = "Delivery carrier template option"
+
+    partner_id = fields.Many2one(comodel_name="res.partner", string="Carrier")
+    name = fields.Char(translate=True)
+    code = fields.Char()
+    description = fields.Char(
+        help="Allow to define a more complete description than in the name field.",
+    )
+    postlogistics_type = fields.Selection(
+        selection=POSTLOGISTICS_TYPES,
+        string="PostLogistics option type",
+    )


We should stick to standard by using and extending (if needed) the model "report.paperformat" from base module.
https://github.com/odoo/odoo/blob/2efab4e7b90d36ce60c9858576922b504509993a/odoo/addons/base/models/report_paperformat.py#L167

StephaneMangin · 2025-02-10T10:38:10Z

delivery_postlogistics/models/stock_picking.py

+        return packages
+
+    def get_shipping_label_values(self, label):
+        # TODO: consider to depends on base_delivery_carrier_label


This migration MUST be the opportunity to do so and will. I agreed.

StephaneMangin · 2025-02-10T10:38:22Z

delivery_postlogistics/models/stock_picking.py

+        "Fixed delivery date", help="Specific delivery date (ZAW3217)"
+    )
+
+    # TODO: consider refactoring these fields using a partner relation instead


This migration MUST be the opportunity to do so and will. I agreed.

StephaneMangin · 2025-02-10T10:38:26Z

delivery_postlogistics/models/stock_picking.py

+        """Pickings using this module must have a package
+        If not this method put it one silently
+        """
+        # TODO: consider to depends on base_delivery_carrier_label


This migration MUST be the opportunity to do so and will. I agreed.

StephaneMangin · 2025-02-10T10:52:29Z

Should depends of #938

StephaneMangin · 2025-02-10T11:18:57Z

superseeded by #974

hparfr · 2025-02-13T07:58:18Z

replaced by #974

hailangvn and others added 30 commits January 20, 2025 11:37

[MOV] change module name, prepare to change file structure

bbbbb95

[REF] delivery_carrier_label_postlogistics becomes delivery_postlogis…

9b38a61

…tics in 13.0

delivery_postlogistics: avoid duplication of labels

16742bf

delivery_postlogistics: add pack_weight parameter on _prepare_attributes

57a7177

delivery_postlogistics: several fixes

952d657

* fix 'PostLogistics' terms * make 'Package Code' required for PostLogistics delivery packaging * show a link listing available package codes for PostLogistics delivery packaging * update README

delivery_postlogistics: Refactor tests

7a9f60c

Do not send disallowed chars on postlogistics api

398450d

Some chars are disallowed from postlogistics API ("|", "", "<", ">") and output json should be sanitized

delivery_postlogistics: Handle case where no label is returned by the…

26065c6

… API

[13.0] delivery_postlogistics: Add disallowed chars

89a8394

[IMP] *: pre-commit execution

dbd4052

[FIX] delivery_postlogistics: avoid overriding attach_shipping_label…

b7898aa

… for delivery type other than postlogistics.

delivery_postlogistics: Reproduce issue

38efae1

delivery_postlogistics: Fix bool has no attr split()

89bd8d1

[IMP] update dotfiles [ci skip]

5dcfe89

delivery_postlogistics 14.0.1.0.1

4308e05

delivery_postlogistics 14.0.1.0.2

3c8371a

Add delivery_postlogistics_dangerous_goods

8d9143b

[16.0][MIG] delivery_postlogistics: Migration to 16.0

e39c7a9

[UPD] Update delivery_postlogistics.pot

b6c00e1

[UPD] README.rst

2098e5a

[FIX] correct customer and recipient depending on picking code

95199a4

[FIX] Add validation for recipient's name and street

3129f81

[FIX] Add validation for recipient's city and zip

47145fc

[IMP] add button Create Shipping Label

6c86b01

[IMP] use native button Print return label for Returns

a995cd2

[IMP] returns: use same carrier as the original picking by default

923d5dd

[UPD] Update delivery_postlogistics.pot

fcca848

delivery_postlogistics 16.0.1.0.1

55e36a9

OCA-git-bot and others added 3 commits January 20, 2025 11:37

[BOT] post-merge updates

c42fcac

[IMP] delivery_postlogistics: pre-commit auto fixes

5293e95

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics-BAD branch 7 times, most recently from 054d771 to f9389fe Compare January 29, 2025 05:06

bizzappdev mentioned this pull request Feb 3, 2025

[18.0] [MIG] delivery_postlogistics_dangerous_goods: Migration to 18.0 #941

Open

bizzappdev marked this pull request as ready for review February 5, 2025 07:43

ivantodorovich suggested changes Feb 5, 2025

View reviewed changes

delivery_postlogistics/models/delivery_carrier.py Outdated Show resolved Hide resolved

delivery_postlogistics/models/stock_picking.py Outdated Show resolved Hide resolved

delivery_postlogistics/wizard/stock_picking_return.py Outdated Show resolved Hide resolved

bizzappdev marked this pull request as draft February 5, 2025 13:43

vvrossem reviewed Feb 6, 2025

View reviewed changes

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics-BAD branch 2 times, most recently from dea3dd1 to 7f0e7a9 Compare February 7, 2025 07:06

bizzappdev marked this pull request as ready for review February 7, 2025 07:18

vvrossem approved these changes Feb 7, 2025

View reviewed changes

delivery_postlogistics/tests/test_stock_move.py Show resolved Hide resolved

bizzappdev added 2 commits February 7, 2025 17:34

[MIG] delivery_postlogistics: Migration to 18.0

df17089

[ADD]test-requirements.txt

aae5629

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics-BAD branch from 7f0e7a9 to aae5629 Compare February 7, 2025 12:04

HeliconiaSolutions mentioned this pull request Feb 10, 2025

[18.0][MIG] delivery_postlogistics_server_env: Migration to 18.0 #972

Open

StephaneMangin suggested changes Feb 10, 2025

View reviewed changes

StephaneMangin mentioned this pull request Feb 10, 2025

[18.0] [MIG] delivery_postlogistics: Migration to 18.0 #974

Open

hparfr closed this Feb 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[18.0] [MIG] delivery_postlogistics: Migration to 18.0 #940

[18.0] [MIG] delivery_postlogistics: Migration to 18.0 #940

bizzappdev commented Jan 28, 2025

ivantodorovich left a comment

vvrossem left a comment

vvrossem Feb 6, 2025

bizzappdev Feb 6, 2025

vvrossem Feb 6, 2025

StephaneMangin Feb 10, 2025

vvrossem Feb 6, 2025

StephaneMangin Feb 10, 2025

vvrossem Feb 6, 2025

StephaneMangin Feb 10, 2025

vvrossem Feb 6, 2025

bizzappdev commented Feb 7, 2025

vvrossem left a comment

StephaneMangin left a comment

StephaneMangin Feb 10, 2025 •

edited

Loading

StephaneMangin Feb 10, 2025

StephaneMangin Feb 10, 2025

StephaneMangin Feb 10, 2025

StephaneMangin Feb 10, 2025

StephaneMangin Feb 10, 2025

StephaneMangin Feb 10, 2025

StephaneMangin commented Feb 10, 2025

StephaneMangin commented Feb 10, 2025

hparfr commented Feb 13, 2025

		from odoo.tools.translate import LazyTranslate

		_lt = LazyTranslate(__name__, default_lang="en_US")

-    "depends": ["stock_delivery"],
+    "depends": [
+        "stock_delivery",
+        "base_delivery_carrier_label",
+        "delivery_carrier_shipping_label"
+    ],

[18.0] [MIG] delivery_postlogistics: Migration to 18.0 #940

[18.0] [MIG] delivery_postlogistics: Migration to 18.0 #940

Conversation

bizzappdev commented Jan 28, 2025

ivantodorovich left a comment

Choose a reason for hiding this comment

vvrossem left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bizzappdev commented Feb 7, 2025

vvrossem left a comment

Choose a reason for hiding this comment

StephaneMangin left a comment

Choose a reason for hiding this comment

StephaneMangin Feb 10, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StephaneMangin commented Feb 10, 2025

StephaneMangin commented Feb 10, 2025

hparfr commented Feb 13, 2025

StephaneMangin Feb 10, 2025 •

edited

Loading