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

bizzappdev · 2025-01-28T09:16:49Z

Dependency MR for module l10n_eu_product_adr_dangerous_goods OCA/community-data-files#211

Dependency MR for module delivery_postlogistics #974

ivantodorovich · 2025-02-05T13:30:00Z

delivery_postlogistics_dangerous_goods/tests/test_postlogistics_dangerous_goods.py

@@ -30,6 +30,7 @@ def setUpClassWebservice(cls):
        cls.service_class = PostlogisticsWebServiceDangerousGoods(
            cls.env.user.company_id
        )
+        return None


Isn't it the same without it?

Return will be needed as we are calling super, else pre-commit will fail.
So, we return the super result now.

rousseldenis · 2025-02-06T08:17:57Z

/ocabot migration delivery_postlogistics_dangerous_goods

StephaneMangin · 2025-03-19T12:01:38Z

@bizzappdev Module delivery_postlogistics is up and green, you can rebase safely

rousseldenis · 2025-03-20T08:11:04Z

@bizzappdev Could you fix tests ? It seems a method does not exist

StephaneMangin · 2025-03-20T09:15:48Z

@bizzappdev Could you fix tests ? It seems a method does not exist

Yes please use _get_quant_packages_from_picking instead (packages exists in two different models stock.quant.package, used here and product.packaging)

StephaneMangin · 2025-03-20T11:02:50Z

delivery_postlogistics_dangerous_goods/postlogistics/web_service.py

+class PostlogisticsWebServiceDangerousGoods(web_service.PostlogisticsWebService):
+    def _get_unnumbers(self, picking, pack=None):
+        """
+        If any dangerous goods with limited quantity, returns a list of UNNumbers.
+        """
+        products = (
+            pack
+            and pack.mapped("quant_ids.product_id")
+            or picking.mapped("move_ids.product_id")
+        )
+        limited_amount_lq = picking.env.ref(
+            "l10n_eu_product_adr_dangerous_goods.limited_amount_1"
+        )
+        limited_quantity_products = products.filtered(
+            lambda p: p.is_dangerous and p.limited_amount_id == limited_amount_lq
+        )
+        # Since 14.0, un numbers checks are done directly in l10n_eu_product_adr
+        return [
+            int(product.adr_goods_id.un_number) for product in limited_quantity_products
+        ]
+
+    def _prepare_attributes(
+        self, picking, pack=None, pack_num=None, pack_total=None, pack_weight=None
+    ):
+        # Adds a new attribute UNNumbers when there's dangerous goods
+        # in the pack / picking
+        res = super()._prepare_attributes(
+            picking, pack, pack_num, pack_total, pack_weight
+        )
+        unnumbers = self._get_unnumbers(picking, pack)
+        if unnumbers:
+            res.setdefault("przl", []).append("LQ")
+            res["unnumbers"] = unnumbers
+        return res


I update the delivery_postlogistics API to implement these method in stock.picking and avoid overriding this webservice which is not meant to be overridden with multiple module that could not be chained properly.
Please see implementation in stock.picking

For instance replace in stock.picking by:

def _get_unnumbers(self, pack=None): """ If any dangerous goods with limited quantity, returns a list of UNNumbers. """ self.ensure_one() products = ( pack and pack.mapped("quant_ids.product_id") or self.mapped("move_ids.product_id") ) limited_amount_lq = self.env.ref( "l10n_eu_product_adr_dangerous_goods.limited_amount_1" ) limited_quantity_products = products.filtered( lambda p: p.is_dangerous and p.limited_amount_id == limited_amount_lq ) # Since 14.0, un numbers checks are done directly in l10n_eu_product_adr return [ int(product.adr_goods_id.un_number) for product in limited_quantity_products ] def postlogistics_label_prepare_attributes( self, pack=None, pack_num=None, pack_total=None, pack_weight=None ): # Adds a new attribute UNNumbers when there's dangerous goods # in the pack / picking res = super().postlogistics_label_prepare_attributes( pack, pack_num, pack_total, pack_weight ) unnumbers = self._get_unnumbers(pack) if unnumbers: res.setdefault("przl", []).append("LQ") res["unnumbers"] = unnumbers return res

StephaneMangin · 2025-03-20T11:07:05Z

delivery_postlogistics_dangerous_goods/models/stock_picking.py

+    def _generate_postlogistics_label(
+        self, webservice_class=None, package_ids=None, skip_attach_file=False
+    ):
+        """Generate post logistic label using specific from this module."""
+        if webservice_class is None:
+            webservice_class = PostlogisticsWebServiceDangerousGoods
+        return super()._generate_postlogistics_label(
+            webservice_class=webservice_class,
+            package_ids=package_ids,
+            skip_attach_file=skip_attach_file,
+        )


Suggested change

def _generate_postlogistics_label(

self, webservice_class=None, package_ids=None, skip_attach_file=False

):

"""Generate post logistic label using specific from this module."""

if webservice_class is None:

webservice_class = PostlogisticsWebServiceDangerousGoods

return super()._generate_postlogistics_label(

webservice_class=webservice_class,

package_ids=package_ids,

skip_attach_file=skip_attach_file,

)

def _get_unnumbers(self, pack=None):

"""

If any dangerous goods with limited quantity, returns a list of UNNumbers.

"""

self.ensure_one()

products = (

pack

and pack.mapped("quant_ids.product_id")

or self.mapped("move_ids.product_id")

)

limited_amount_lq = self.env.ref(

"l10n_eu_product_adr_dangerous_goods.limited_amount_1"

)

limited_quantity_products = products.filtered(

lambda p: p.is_dangerous and p.limited_amount_id == limited_amount_lq

)

# Since 14.0, un numbers checks are done directly in l10n_eu_product_adr

return [

int(product.adr_goods_id.un_number) for product in limited_quantity_products

]

def postlogistics_label_prepare_attributes(

self, pack=None, pack_num=None, pack_total=None, pack_weight=None

):

# Adds a new attribute UNNumbers when there's dangerous goods

# in the pack / picking

res = super().postlogistics_label_prepare_attributes(

pack, pack_num, pack_total, pack_weight

)

unnumbers = self._get_unnumbers(pack)

if unnumbers:

res.setdefault("przl", []).append("LQ")

res["unnumbers"] = unnumbers

return res

StephaneMangin · 2025-03-20T11:43:49Z

delivery_postlogistics_dangerous_goods/tests/test_postlogistics_dangerous_goods.py

+    @classmethod
+    def setUpClassWebservice(cls):
+        res = super().setUpClassWebservice()
+        cls.service_class = PostlogisticsWebServiceDangerousGoods(
+            cls.env.user.company_id
+        )
+        return res


Suggested change

@classmethod

def setUpClassWebservice(cls):

res = super().setUpClassWebservice()

cls.service_class = PostlogisticsWebServiceDangerousGoods(

cls.env.user.company_id

)

return res

You can safely remove when implementation is updated

StephaneMangin · 2025-03-20T12:19:44Z

delivery_postlogistics_dangerous_goods/tests/test_postlogistics_dangerous_goods.py

+        # no unnumber should be sent through the api
+        products = [(self.product_no_lq, 10.0)]
+        picking = self.create_picking(product_matrix=products)
+        package_ids = picking._get_packages_from_picking()


Suggested change

package_ids = picking._get_packages_from_picking()

package_ids = picking._get_quant_packages_from_picking()

StephaneMangin · 2025-03-20T12:19:52Z

delivery_postlogistics_dangerous_goods/tests/test_postlogistics_dangerous_goods.py

+        # we should have the list of unnumbers
+        products = [(self.dangerous_weapon, 10.0)]
+        picking = self.create_picking(product_matrix=products)
+        package_ids = picking._get_packages_from_picking()


Suggested change

package_ids = picking._get_packages_from_picking()

package_ids = picking._get_quant_packages_from_picking()

StephaneMangin

A last update and it will be all good ^^

StephaneMangin · 2025-03-21T11:51:01Z

delivery_postlogistics_dangerous_goods/tests/test_postlogistics_dangerous_goods.py

+        products = [(self.product_no_lq, 10.0)]
+        picking = self.create_picking(product_matrix=products)
+        package_ids = picking._get_quant_packages_from_picking()
+        recipient = self.service_class._prepare_recipient(picking)


Suggested change

recipient = self.service_class._prepare_recipient(picking)

recipient = picking.postlogistics_label_prepare_recipient()

StephaneMangin · 2025-03-21T11:51:11Z

delivery_postlogistics_dangerous_goods/tests/test_postlogistics_dangerous_goods.py

+        products = [(self.dangerous_weapon, 10.0)]
+        picking = self.create_picking(product_matrix=products)
+        package_ids = picking._get_quant_packages_from_picking()
+        recipient = self.service_class._prepare_recipient(picking)


Suggested change

recipient = self.service_class._prepare_recipient(picking)

recipient = picking.postlogistics_label_prepare_recipient()

StephaneMangin · 2025-03-21T11:52:51Z

@BhaveshHeliconia A last rebase and it's all good ^^ Sorry for the inconvenience, it's been a bit unhandy these days...

Currently translated at 100.0% (4 of 4 strings) Translation: delivery-carrier-14.0/delivery-carrier-14.0-delivery_postlogistics_dangerous_goods Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-delivery_postlogistics_dangerous_goods/es/

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics_dangerous_goods-BAD branch 3 times, most recently from 4cf732f to 7c767f0 Compare January 28, 2025 11:16

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

ivantodorovich approved these changes Feb 5, 2025

View reviewed changes

bizzappdev marked this pull request as draft February 5, 2025 14:41

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics_dangerous_goods-BAD branch from 7c767f0 to f8e50f0 Compare February 6, 2025 06:45

bizzappdev marked this pull request as ready for review February 6, 2025 06:47

OCA-git-bot added this to the 18.0 milestone Feb 6, 2025

rousseldenis added needs review migration labels Feb 6, 2025

OCA-git-bot mentioned this pull request Feb 6, 2025

Migration to version 18.0 #889

Open

24 tasks

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics_dangerous_goods-BAD branch from f8e50f0 to fc34c3a Compare February 10, 2025 05:40

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics_dangerous_goods-BAD branch from fc34c3a to 1d445f5 Compare February 17, 2025 10:17

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics_dangerous_goods-BAD branch from 1d445f5 to 580520e Compare March 20, 2025 05:13

StephaneMangin suggested changes Mar 20, 2025

View reviewed changes

StephaneMangin reviewed Mar 20, 2025

View reviewed changes

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics_dangerous_goods-BAD branch from 580520e to 18a8def Compare March 21, 2025 06:11

StephaneMangin suggested changes Mar 21, 2025

View reviewed changes

mmequignon and others added 6 commits March 22, 2025 13:21

Add delivery_postlogistics_dangerous_goods

6bb6c07

[MIG] delivery_postlogistics_dangerous_goods: Migration to 14.0

a303a47

[UPD] Update delivery_postlogistics_dangerous_goods.pot

248b7c2

[UPD] README.rst

2ebe6a7

[ADD] icon.png

df0785e

[UPD] README.rst

590155e

Ivorra78 and others added 6 commits March 22, 2025 13:21

Added translation using Weblate (Spanish)

0ab9b06

Added translation using Weblate (Italian)

d344d29

[IMP] delivery_postlogistics_dangerous_goods: pre-commit auto fixes

a5569ea

[MIG] delivery_postlogistics_dangerous_goods: Migration to 18.0

d84d3d7

[DON'T MERGE] test-requirements.txt

f36f450

bizzappdev force-pushed the 18.0-mig-delivery_postlogistics_dangerous_goods-BAD branch from 18a8def to f36f450 Compare March 22, 2025 07:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

bizzappdev commented Jan 28, 2025 •

edited

Loading

ivantodorovich Feb 5, 2025

bizzappdev Feb 6, 2025

rousseldenis commented Feb 6, 2025

StephaneMangin commented Mar 19, 2025

rousseldenis commented Mar 20, 2025

StephaneMangin commented Mar 20, 2025 •

edited

Loading

StephaneMangin Mar 20, 2025

StephaneMangin Mar 20, 2025

StephaneMangin Mar 20, 2025

StephaneMangin Mar 20, 2025

StephaneMangin Mar 20, 2025

StephaneMangin Mar 20, 2025

StephaneMangin left a comment

StephaneMangin Mar 21, 2025

StephaneMangin Mar 21, 2025

StephaneMangin commented Mar 21, 2025

	package_ids = picking._get_packages_from_picking()
	package_ids = picking._get_quant_packages_from_picking()

	recipient = self.service_class._prepare_recipient(picking)
	recipient = picking.postlogistics_label_prepare_recipient()

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

Are you sure you want to change the base?

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

Conversation

bizzappdev commented Jan 28, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rousseldenis commented Feb 6, 2025

StephaneMangin commented Mar 19, 2025

rousseldenis commented Mar 20, 2025

StephaneMangin commented Mar 20, 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

StephaneMangin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StephaneMangin commented Mar 21, 2025

bizzappdev commented Jan 28, 2025 •

edited

Loading

StephaneMangin commented Mar 20, 2025 •

edited

Loading