[MIG] delivery_multi_destination: Migration to 16.0

delivery_multi_destination/README.rst

@@ -14,16 +14,16 @@ Multiple destinations for the same delivery method
     :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
-    :target: https://github.com/OCA/delivery-carrier/tree/15.0/delivery_multi_destination
+    :target: https://github.com/OCA/delivery-carrier/tree/16.0/delivery_multi_destination
     :alt: OCA/delivery-carrier
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/delivery-carrier-15-0/delivery-carrier-15-0-delivery_multi_destination
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/99/15.0
+    :target: https://runbot.odoo-community.org/runbot/99/16.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module allows to set different price rules depending on the destination.
 
@@ -67,7 +67,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_multi_destination%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_multi_destination%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -105,6 +105,6 @@ 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.
 
-This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/15.0/delivery_multi_destination>`_ project on GitHub.
+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.

delivery_multi_destination/__manifest__.py

@@ -5,7 +5,7 @@
 
 {
     "name": "Multiple destinations for the same delivery method",
-    "version": "15.0.1.0.2",
+    "version": "16.0.1.0.2",
     "category": "Delivery",
     "website": "https://github.com/OCA/delivery-carrier",
     "author": "Tecnativa, Odoo Community Association (OCA)",

delivery_multi_destination/i18n/delivery_multi_destination.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"

delivery_multi_destination/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Multiple destinations for the same delivery method</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/delivery-carrier/tree/15.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" href="https://translation.odoo-community.org/projects/delivery-carrier-15-0/delivery-carrier-15-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" href="https://runbot.odoo-community.org/runbot/99/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" 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" href="https://translation.odoo-community.org/projects/delivery-carrier-15-0/delivery-carrier-15-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" href="https://runbot.odoo-community.org/runbot/99/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-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.
@@ -419,7 +419,7 @@ <h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
 <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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_multi_destination%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_multi_destination%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -452,7 +452,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 <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>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/15.0/delivery_multi_destination">OCA/delivery-carrier</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/16.0/delivery_multi_destination">OCA/delivery-carrier</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

delivery_multi_destination/tests/test_delivery_multi_destination.py

@@ -49,21 +49,21 @@ def setUpClass(cls):
         cls.product_child_2 = cls.env["product.product"].create(
             {"name": "Test child 2", "detailed_type": "service"}
         )
+        zip_prefix_child1 = cls.env["delivery.zip.prefix"].create({"name": "22222"})
+        zip_prefix_child2 = cls.env["delivery.zip.prefix"].create({"name": "33333"})
         cls.carrier_multi = cls._create_carrier(
             cls,
             (
                 {
                     "name": "Test child 1",
                     "product_id": cls.product_child_1,
-                    "zip_from": 20000,
-                    "zip_to": 29999,
+                    "zip_prefix_ids": zip_prefix_child1,
                     "fixed_price": 50,
                 },
                 {
                     "name": "Test child 2",
                     "product_id": cls.product_child_2,
-                    "zip_from": 30000,
-                    "zip_to": 39999,
+                    "zip_prefix_ids": zip_prefix_child2,
                     "fixed_price": 150,
                 },
             ),
@@ -84,17 +84,16 @@ def _create_carrier(self, childs):
         carrier_form = Form(self.env["delivery.carrier"])
         carrier_form.name = "Test carrier multi"
         carrier_form.product_id = self.product
-        carrier_form.destination_type = "multi"
         carrier_form.delivery_type = "fixed"
         carrier_form.fixed_price = 100
+        carrier_form.destination_type = "multi"
         for child_item in childs:
             with carrier_form.child_ids.new() as child_form:
                 child_form.name = child_item["name"]
                 child_form.product_id = child_item["product_id"]
                 child_form.country_ids.add(self.country_2)
                 child_form.state_ids.add(self.state)
-                child_form.zip_from = child_item["zip_from"]
-                child_form.zip_to = child_item["zip_to"]
+                child_form.zip_prefix_ids.add(child_item["zip_prefix_ids"])
                 child_form.delivery_type = "fixed"
                 child_form.fixed_price = child_item["fixed_price"]
         return carrier_form.save()
@@ -163,7 +162,7 @@ def test_picking_validation(self):
         self.sale_order.action_confirm()
         picking = self.sale_order.picking_ids
         self.assertEqual(picking.carrier_id, self.carrier_multi)
-        picking.move_lines.quantity_done = 1
+        picking.move_ids.quantity_done = 1
         picking._action_done()
         self.assertAlmostEqual(picking.carrier_price, 50)
 

delivery_multi_destination/views/delivery_carrier_view.xml

@@ -81,11 +81,8 @@
                     invisible="not context.get('show_children_fields', False)"
                 />
                 <field
-                    name="zip_from"
-                    invisible="not context.get('show_children_fields', False)"
-                />
-                <field
-                    name="zip_to"
+                    name="zip_prefix_ids"
+                    widget="many2many_tags"
                     invisible="not context.get('show_children_fields', False)"
                 />
             </field>

setup/delivery_multi_destination/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)