odoo-addon-delivery-multi-destination 16.0.1.0.0.3__py3-none-any.whl → 16.0.2.0.0.6__py3-none-any.whl

odoo/addons/delivery_multi_destination/i18n/zh_CN.po

@@ -16,11 +16,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.8\n"
 
+#. module: delivery_multi_destination
+#: model:ir.model.fields.selection,name:delivery_multi_destination.selection__delivery_carrier__delivery_type__base_on_destination
+msgid "Based on Destination"
+msgstr ""
+
 #. module: delivery_multi_destination
 #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1
 msgid "Belgium"
 msgstr "比利时"
 
+#. module: delivery_multi_destination
+#: model:ir.model,name:delivery_multi_destination.model_choose_delivery_carrier
+msgid "Delivery Carrier Selection Wizard"
+msgstr ""
+
 #. module: delivery_multi_destination
 #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type
 msgid "Destination Type"
@@ -36,6 +46,20 @@ msgstr "目标网格"
 msgid "Destinations"
 msgstr "目的地"
 
+#. module: delivery_multi_destination
+#. odoo-python
+#: code:addons/delivery_multi_destination/wizards/choose_delivery_carrier.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: delivery_multi_destination
+#. odoo-python
+#: code:addons/delivery_multi_destination/models/delivery_carrier.py:0
+#, python-format
+msgid "Error: this delivery method is not available for this address."
+msgstr ""
+
 #. module: delivery_multi_destination
 #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2
 msgid "France"
@@ -43,25 +67,21 @@ msgstr "法国"
 
 #. module: delivery_multi_destination
 #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi
-#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi
 #: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template
 msgid "International Carrier Inc."
 msgstr "国际航空公司。"
 
 #. module: delivery_multi_destination
-#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1
 #: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template
 msgid "International Carrier Inc., Belgium"
 msgstr "比利时国际航空公司"
 
 #. module: delivery_multi_destination
-#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2
 #: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template
 msgid "International Carrier Inc., France"
 msgstr "法国国际航空公司"
 
 #. module: delivery_multi_destination
-#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3
 #: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template
 msgid "International Carrier Inc., United Kingdom"
 msgstr "英国国际航空公司"
@@ -81,12 +101,18 @@ msgstr "一个目的地"
 msgid "Parent carrier"
 msgstr "父承运商"
 
+#. module: delivery_multi_destination
+#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__delivery_type
+msgid "Provider"
+msgstr ""
+
 #. module: delivery_multi_destination
 #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier
 msgid "Shipping Methods"
 msgstr ""
 
 #. module: delivery_multi_destination
+#. odoo-python
 #: code:addons/delivery_multi_destination/models/delivery_carrier.py:0
 #, python-format
 msgid "There is no matching delivery rule."
@@ -97,18 +123,6 @@ msgstr ""
 msgid "United Kingdom"
 msgstr "英国"
 
-#. module: delivery_multi_destination
-#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi
-#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1
-#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2
-#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3
-#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template
-#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template
-#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template
-#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template
-msgid "Units"
-msgstr ""
-
 #~ msgid "Delivery Methods"
 #~ msgstr "交货方式"
 

odoo/addons/delivery_multi_destination/migrations/16.0.2.0.0/pre-migration.py

@@ -0,0 +1,15 @@
+# Copyright 2022 Coop IT Easy SC
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.logged_query(
+        env.cr,
+        """
+        UPDATE delivery_carrier
+        SET delivery_type = 'base_on_destination'
+        WHERE destination_type = 'multi'
+        """,
+    )

odoo/addons/delivery_multi_destination/models/delivery_carrier.py

@@ -21,10 +21,40 @@ class DeliveryCarrier(models.Model):
         ondelete="cascade",
     )
     destination_type = fields.Selection(
-        selection=[("one", "One destination"), ("multi", "Multiple destinations")],
-        default="one",
-        required=True,
+        selection=[
+            ("one", "One destination"),
+            ("multi", "Multiple destinations"),
+        ],
+        compute="_compute_destination_type",
+        inverse="_inverse_destination_type",
+        store=True,
     )
+    delivery_type = fields.Selection(
+        selection_add=[("base_on_destination", "Based on Destination")],
+        ondelete={"base_on_destination": "set default"},
+    )
+
+    @api.depends("delivery_type")
+    def _compute_destination_type(self):
+        for carrier in self:
+            if carrier.delivery_type == "base_on_destination":
+                carrier.destination_type = "multi"
+            else:
+                carrier.destination_type = "one"
+
+    def _inverse_destination_type(self):
+        for carrier in self:
+            # Switch to multi
+            if carrier.destination_type == "multi":
+                carrier.delivery_type = "base_on_destination"
+            # Switch away from multi -> we know that destination_type is
+            # non-multi. However, in a hypothetical scenario where we switch
+            # from one non-multi destination_type to another, we don't want to
+            # forcibly reset delivery_type to 'fixed' each time, so we check
+            # whether delivery_type is invalid for a non-multi destination_type
+            # before we forcibly reset to 'fixed'.
+            elif carrier.delivery_type == "base_on_destination":
+                carrier.delivery_type = "fixed"
 
     @api.onchange("destination_type", "child_ids")
     def _onchange_destination_type(self):
@@ -32,14 +62,14 @@ class DeliveryCarrier(models.Model):
         if self.destination_type == "multi" and self.child_ids and not self.product_id:
             self.product_id = fields.first(self.child_ids.product_id)
 
-    def search(self, args, offset=0, limit=None, order=None, count=False):
-        """Don't show by default children carriers."""
+    def search(self, domain, offset=0, limit=None, order=None, count=False):
+        """Don't show children carriers by default."""
         if not self.env.context.get("show_children_carriers"):
-            if args is None:
-                args = []
-            args += [("parent_id", "=", False)]
-        return super(DeliveryCarrier, self).search(
-            args,
+            if domain is None:
+                domain = []
+            domain += [("parent_id", "=", False)]
+        return super().search(
+            domain,
             offset=offset,
             limit=limit,
             order=order,
@@ -48,9 +78,17 @@ class DeliveryCarrier(models.Model):
 
     @api.model
     def name_search(self, name="", args=None, operator="ilike", limit=100):
-        """Don't show by default children carriers."""
-        domain = [("parent_id", "=", False)]
-        return self.search(domain, limit=limit).name_get()
+        """Don't show children carriers by default."""
+        if not self.env.context.get("show_children_carriers"):
+            if args is None:
+                args = []
+            args += [("parent_id", "=", False)]
+        return super().name_search(
+            name=name,
+            args=args,
+            operator=operator,
+            limit=limit,
+        )
 
     def available_carriers(self, partner):
         """If the carrier is multi, we test the availability on children."""
@@ -65,60 +103,54 @@ class DeliveryCarrier(models.Model):
                 available |= carrier
         return available
 
-    def rate_shipment(self, order):
-        """We have to override this method for getting the proper price
-        according destination on sales orders.
-        """
-        if self.destination_type == "one":
-            return super().rate_shipment(order)
-        else:
-            carrier = self.with_context(show_children_carriers=True)
-            for subcarrier in carrier.child_ids:
-                if subcarrier._match_address(order.partner_shipping_id):
-                    return super(
-                        DeliveryCarrier,
-                        subcarrier,
-                    ).rate_shipment(order)
+    def base_on_destination_rate_shipment(self, order):
+        carrier = self.with_context(show_children_carriers=True)
+        for subcarrier in carrier.child_ids:
+            if subcarrier._match_address(order.partner_shipping_id):
+                return subcarrier.rate_shipment(order)
+        # this should normally not happen, because the delivery carrier should
+        # be filtered out before, but in case it is somehow selected anyway,
+        # at least it will fail nicely.
+        return {
+            "success": False,
+            "price": 0.0,
+            "error_message": _(
+                "Error: this delivery method is not available for this address."
+            ),
+            "warning_message": False,
+        }
 
-    def send_shipping(self, pickings):
-        """We have to override this method for redirecting the result to the
-        proper "child" carrier.
-        """
-        if self.destination_type == "one" or not self:
-            return super().send_shipping(pickings)
-        else:
-            carrier = self.with_context(show_children_carriers=True)
-            res = []
-            for p in pickings:
-                picking_res = False
-                for subcarrier in carrier.child_ids.filtered(
-                    lambda x: not x.company_id or x.company_id == p.company_id
-                ):
-                    if subcarrier.delivery_type == "fixed":
-                        if subcarrier._match_address(p.partner_id):
-                            picking_res = [
-                                {
-                                    "exact_price": subcarrier.fixed_price,
-                                    "tracking_number": False,
-                                }
-                            ]
-                            break
-                    else:
-                        try:
-                            # on base_on_rule_send_shipping, the method
-                            # _get_price_available is called using p.carrier_id,
-                            # ignoring the self arg, so we need to temporarily replace
-                            # it with the subcarrier
-                            p.carrier_id = subcarrier.id
-                            picking_res = super(
-                                DeliveryCarrier, subcarrier
-                            ).send_shipping(p)
-                            break
-                        except Exception:  # pylint: disable=except-pass
-                            pass
-                        finally:
-                            p.carrier_id = carrier
-                if not picking_res:
-                    raise ValidationError(_("There is no matching delivery rule."))
-                res += picking_res
-            return res
+    def base_on_destination_send_shipping(self, pickings):
+        carrier = self.with_context(show_children_carriers=True)
+        res = []
+        for p in pickings:
+            picking_res = False
+            for subcarrier in carrier.child_ids.filtered(
+                lambda x: not x.company_id or x.company_id == p.company_id
+            ):
+                if subcarrier.delivery_type == "fixed":
+                    if subcarrier._match_address(p.partner_id):
+                        picking_res = [
+                            {
+                                "exact_price": subcarrier.fixed_price,
+                                "tracking_number": False,
+                            }
+                        ]
+                        break
+                else:
+                    try:
+                        # on base_on_rule_send_shipping, the method
+                        # _get_price_available is called using p.carrier_id,
+                        # ignoring the self arg, so we need to temporarily replace
+                        # it with the subcarrier
+                        p.carrier_id = subcarrier.id
+                        picking_res = subcarrier.send_shipping(p)
+                        break
+                    except Exception:  # pylint: disable=except-pass
+                        pass
+                    finally:
+                        p.carrier_id = carrier
+            if not picking_res:
+                raise ValidationError(_("There is no matching delivery rule."))
+            res += picking_res
+        return res

odoo/addons/delivery_multi_destination/readme/newsfragments/540.feature.rst

@@ -0,0 +1,4 @@
+Introduced 'based on destination' delivery type. This is the delivery type used
+by all multi-destination carriers instead of 'fixed'. Consequently, destination
+type has been turned into a computed field that checks if the delivery type is
+'based on destination' or not.

odoo/addons/delivery_multi_destination/static/description/index.html

@@ -3,15 +3,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Multiple destinations for the same delivery method</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@ span.option {
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -359,16 +360,21 @@ ul.auto-toc {
 </style>
 </head>
 <body>
-<div class="document" id="multiple-destinations-for-the-same-delivery-method">
-<h1 class="title">Multiple destinations for the same delivery method</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="multiple-destinations-for-the-same-delivery-method">
+<h1>Multiple destinations for the same delivery method</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:01da966e0e1ee6b31aaa5d0da6e4a614eec3e5fa0637dde2aeaf2096d1428b01
+!! source digest: sha256:25e624cc13975bea90a7a3aadc32eef1f35fefa8ea2223ba32dc6dd702552b28
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/16.0/delivery_multi_destination"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-delivery_multi_destination"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/16.0/delivery_multi_destination"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-delivery_multi_destination"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to set different price rules depending on the destination.</p>
 <p>This module restores the concept of delivery grid, reusing the same model for
 nesting several “children” delivery methods, one per possible destination.
@@ -390,7 +396,7 @@ without the need to create a glue module for having multiple destinations.</p>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <p>To configure delivery methods with multiple destinations:</p>
 <ol class="arabic simple">
 <li>Go to Inventory &gt; Configuration &gt; Delivery &gt; Shipping Methods</li>
@@ -402,21 +408,21 @@ destinations.</li>
 </ol>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
 <ol class="arabic simple">
 <li>When using the delivery method in a Sales order, delivery address will be
 used for computing the delivery price according introduced destinations.</li>
 </ol>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h2>
 <ul class="simple">
 <li>Delivery prices for e-commerce (<cite>website_sale_delivery</cite> module) might need
 an extra module for handling everything properly.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -424,15 +430,15 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-5">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Authors</a></h3>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-7">Contributors</a></h3>
 <ul class="simple">
 <li><cite>Tecnativa &lt;https://www.tecnativa.com&gt;__</cite>:<ul>
 <li>Pedro M. Baeza</li>
@@ -448,9 +454,11 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
@@ -459,5 +467,6 @@ promote its widespread use.</p>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>

odoo/addons/delivery_multi_destination/tests/test_delivery_multi_destination.py

@@ -72,6 +72,7 @@ class TestDeliveryMultiDestination(common.TransactionCase):
             {
                 "name": "Test carrier single",
                 "destination_type": "one",
+                "fixed_price": 100,
                 "child_ids": False,
             }
         )
@@ -84,8 +85,7 @@ class TestDeliveryMultiDestination(common.TransactionCase):
         carrier_form = Form(self.env["delivery.carrier"])
         carrier_form.name = "Test carrier multi"
         carrier_form.product_id = self.product
-        carrier_form.delivery_type = "fixed"
-        carrier_form.fixed_price = 100
+        carrier_form.delivery_type = "base_on_destination"
         # this needs to be done in this order
         carrier_form.destination_type = "multi"
         for child_item in childs:
@@ -136,6 +136,20 @@ class TestDeliveryMultiDestination(common.TransactionCase):
         sale_order_line = order.order_line.filtered("is_delivery")
         self.assertAlmostEqual(sale_order_line.price_unit, 150, 2)
 
+    def test_compute(self):
+        self.carrier_multi.delivery_type = "fixed"
+        self.assertEqual(self.carrier_multi.destination_type, "one")
+        self.carrier_multi.delivery_type = "base_on_destination"
+        self.assertEqual(self.carrier_multi.destination_type, "multi")
+
+    def test_inverse(self):
+        self.carrier_multi.destination_type = "one"
+        self.assertEqual(self.carrier_multi.destination_type, "one")
+        self.assertEqual(self.carrier_multi.delivery_type, "fixed")
+        self.carrier_multi.destination_type = "multi"
+        self.assertEqual(self.carrier_multi.destination_type, "multi")
+        self.assertEqual(self.carrier_multi.delivery_type, "base_on_destination")
+
     def test_search(self):
         carriers = self.env["delivery.carrier"].search([])
         children_carrier = self.carrier_multi.with_context(

odoo/addons/delivery_multi_destination/wizards/__init__.py

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2024 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from . import choose_delivery_carrier

odoo/addons/delivery_multi_destination/wizards/choose_delivery_carrier.py

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2024 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from odoo import _, api, models
+
+
+class ChooseDeliveryCarrier(models.TransientModel):
+    _inherit = "choose.delivery.carrier"
+
+    @api.onchange("carrier_id")
+    def _onchange_carrier_id(self):
+        result = super()._onchange_carrier_id()
+        if self.delivery_type == "base_on_destination":
+            vals = self._get_shipment_rate()
+            # although ._onchange_carrier_id() in the delivery module can
+            # return a dict with an "error" key and a string value, this is
+            # not handled by the caller (see BaseModel._onchange_eval()),
+            # which only handles dicts with a "warning" key and a dict as a
+            # value.
+            if vals.get("error_message"):
+                return {
+                    "warning": {"title": _("Error"), "message": vals["error_message"]}
+                }
+            if vals.get("warning_message"):
+                return {"warning": {"message": vals["warning_message"]}}
+        return result

{odoo_addon_delivery_multi_destination-16.0.1.0.0.3.dist-info → odoo_addon_delivery_multi_destination-16.0.2.0.0.6.dist-info}/METADATA

@@ -1,18 +1,21 @@
 Metadata-Version: 2.1
-Name: odoo-addon-delivery-multi-destination
-Version: 16.0.1.0.0.3
+Name: odoo-addon-delivery_multi_destination
+Version: 16.0.2.0.0.6
 Summary: Multiple destinations for the same delivery method
 Home-page: https://github.com/OCA/delivery-carrier
 Author: Tecnativa, Odoo Community Association (OCA)
 Author-email: support@odoo-community.org
 License: AGPL-3
-Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Framework :: Odoo
 Classifier: Framework :: Odoo :: 16.0
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Requires-Python: >=3.10
-Requires-Dist: odoo <16.1dev,>=16.0a
+Requires-Dist: odoo<16.1dev,>=16.0a
+
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
 
 ==================================================
 Multiple destinations for the same delivery method
@@ -23,13 +26,13 @@ Multiple destinations for the same delivery method
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:01da966e0e1ee6b31aaa5d0da6e4a614eec3e5fa0637dde2aeaf2096d1428b01
+   !! source digest: sha256:25e624cc13975bea90a7a3aadc32eef1f35fefa8ea2223ba32dc6dd702552b28
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
@@ -128,5 +131,3 @@ promote its widespread use.
 This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/16.0/delivery_multi_destination>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
-
-

odoo_addon_delivery_multi_destination-16.0.2.0.0.6.dist-info/RECORD

@@ -0,0 +1,35 @@
+odoo/addons/delivery_multi_destination/README.rst,sha256=aiwO7yxzseVQ6ZLKa1vKyuFmYMP6tMCsIdygI6WVxtA,4418
+odoo/addons/delivery_multi_destination/__init__.py,sha256=zI6OgKd-jvRibsvs40jL7kgXqg4cvbAufnC02Ac8Zvs,109
+odoo/addons/delivery_multi_destination/__manifest__.py,sha256=yTSZaOuW6OnwvZLcy0DFj5Hvn_J2_NTCWCBgJZl7xkk,694
+odoo/addons/delivery_multi_destination/demo/delivery_carrier_demo.xml,sha256=6k6ImN8f1e6UtuhUCNFXWVL-X0ROrOkUVXKSHnc_m30,3817
+odoo/addons/delivery_multi_destination/i18n/cs_CZ.po,sha256=oJ93mx5Mvhe5jW6g_3wCZDGIVSlAFtQTECrlGLSxkzI,4761
+odoo/addons/delivery_multi_destination/i18n/de.po,sha256=mnmL6qUHHQxpT-NTPccUeZkUb7jf-Ud0MUgj588mm1Y,4634
+odoo/addons/delivery_multi_destination/i18n/delivery_multi_destination.pot,sha256=os7ybwX4dY0lrqjenS8m7mgYKmG9ZZJ-EHM4X_HHgUg,4152
+odoo/addons/delivery_multi_destination/i18n/es.po,sha256=fQdQFDcpzbf0VhPhl9xLpoOlYEVS2F9VqFtTIgKPTUo,4885
+odoo/addons/delivery_multi_destination/i18n/fr.po,sha256=LpVpZNFnz_r69PCL4VdJhhR-2EoTHHOnRZyc4fq-BME,4452
+odoo/addons/delivery_multi_destination/i18n/it.po,sha256=usXBioDAeiR2WyuOcuaV_YXnk0yCatmL85hhiPVDRNA,4843
+odoo/addons/delivery_multi_destination/i18n/nl.po,sha256=GECjjy8OwVi7nAlRqNCDo8us-NbSaYjS2rssK4sHIQU,4452
+odoo/addons/delivery_multi_destination/i18n/nl_NL.po,sha256=BpwWz6PPORRtx7qQ_MZ4YgYGNek39RTJvyujBGagsLs,4461
+odoo/addons/delivery_multi_destination/i18n/pt_BR.po,sha256=LaJ-56qOnsZf3_LFe00rMHD5a5ZYgSkobZrhVmXeaGk,5049
+odoo/addons/delivery_multi_destination/i18n/sl.po,sha256=y7td5RwT0r_Rz9JM3N7uyBt7lT_JoesUOGsa2uq9GBc,4581
+odoo/addons/delivery_multi_destination/i18n/zh_CN.po,sha256=F77ETzLT-Zdg4u5s1aDr2O3cxbg41tKBZaObOSegXTY,4617
+odoo/addons/delivery_multi_destination/migrations/16.0.2.0.0/pre-migration.py,sha256=LssV1emY80IxVTUUyx8w6Skx2xgALvlxLyTBUOQNLOg,387
+odoo/addons/delivery_multi_destination/models/__init__.py,sha256=-K4wh1XVA03SZzTTycr_kcgawLtJanP54sq4kwHL5eA,97
+odoo/addons/delivery_multi_destination/models/delivery_carrier.py,sha256=fLtiiTbGSQnC7YJq5_HSnMPWMUF9dOEThsd1_jnRxSI,6299
+odoo/addons/delivery_multi_destination/readme/CONFIGURE.rst,sha256=7ODOGLMD-pk4sqqbXT2EEvsJ-rafrnQz4Xwe3WeD9Xk,386
+odoo/addons/delivery_multi_destination/readme/CONTRIBUTORS.rst,sha256=qYFJW8WItTLugT9t5wMcw4A9AVUrCAI5UPrKlwaNJnc,209
+odoo/addons/delivery_multi_destination/readme/DESCRIPTION.rst,sha256=zGE7V1m8-nd6FcVva5rSgmnD1i8gOQoIP_4aMeHKEGE,383
+odoo/addons/delivery_multi_destination/readme/ROADMAP.rst,sha256=mFUYDdJtYvVAOcxbnU3uIEAb5pCfyvKC-FoOFbx_9ko,129
+odoo/addons/delivery_multi_destination/readme/USAGE.rst,sha256=1L4dwqAZ4L8oNQMO90fp64D4_IVf1AEpBGpun6HNFDo,153
+odoo/addons/delivery_multi_destination/readme/newsfragments/540.feature.rst,sha256=HcMNzTYCiVEPVJM7nmzRf6Nl9uSO5iI8QY32tcYmB8o,270
+odoo/addons/delivery_multi_destination/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
+odoo/addons/delivery_multi_destination/static/description/index.html,sha256=XFmOKNy61Te44Ov8jeGZkQcF__cXPRxTbEZaLuk6lm0,14477
+odoo/addons/delivery_multi_destination/tests/__init__.py,sha256=84QCPauC2-TkXZsq1euuy3oNLYJpiocgsAVkUqpUsLI,112
+odoo/addons/delivery_multi_destination/tests/test_delivery_multi_destination.py,sha256=IX8m8fi6TeH3QiNTQGTPmlFrgmWALqlNTphpzRem8Tk,8149
+odoo/addons/delivery_multi_destination/views/delivery_carrier_view.xml,sha256=EpJXlKQraYrvdjNnXEf28hWladF3ak0vbCyAnpQHPq4,4234
+odoo/addons/delivery_multi_destination/wizards/__init__.py,sha256=WzkF-IFQ_LPMzbez5zfXFInhBYCYOjtu79Jrg7g5-2c,133
+odoo/addons/delivery_multi_destination/wizards/choose_delivery_carrier.py,sha256=X8lmXdG2WYYLat-vHKWsUzJx7MevDzmRH9XREek8PUc,1072
+odoo_addon_delivery_multi_destination-16.0.2.0.0.6.dist-info/METADATA,sha256=JldvZfBNqX3LDsNN3lPKgzGII_ppO6MUv48snsEiPms,4974
+odoo_addon_delivery_multi_destination-16.0.2.0.0.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_delivery_multi_destination-16.0.2.0.0.6.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_delivery_multi_destination-16.0.2.0.0.6.dist-info/RECORD,,

{odoo_addon_delivery_multi_destination-16.0.1.0.0.3.dist-info → odoo_addon_delivery_multi_destination-16.0.2.0.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any