[MIG] delivery_package_number: Migration to 18.0

Author: CarlosRoca13

delivery_package_number/README.rst

@@ -1,6 +1,6 @@
-============================
-Stock Picking Package Number
-============================
+=======================
+Delivery Package Number
+=======================
 
 .. 
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -17,13 +17,13 @@ Stock Picking Package Number
     :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/17.0/delivery_package_number
+    :target: https://github.com/OCA/delivery-carrier/tree/18.0/delivery_package_number
     :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-17-0/delivery-carrier-17-0-delivery_package_number
+    :target: https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-delivery_package_number
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -58,13 +58,17 @@ If delivey packages are used:
 When the picking is confirmed, the user has the chance to change the
 number of packages in the confirmation wizard.
 
+Note: You can prevent the wizard from popping up to set the number of
+packages by selecting the option "Avoid set number of packages" in the
+operation type.
+
 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 to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_package_number%0Aversion:%2017.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_package_number%0Aversion:%2018.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.
 
@@ -79,20 +83,20 @@ Authors
 Contributors
 ------------
 
-- `Tecnativa <https://www.tecnativa.com>`__:
+-  `Tecnativa <https://www.tecnativa.com>`__:
 
-  - Pedro M. Baeza
-  - David Vidal
-  - Marçal Isern
-  - Carlos Roca
+   -  Pedro M. Baeza
+   -  David Vidal
+   -  Marçal Isern
+   -  Carlos Roca
 
 ..
 
-   - `Sygel <https://www.sygel.es>`__:
+   -  `Sygel <https://www.sygel.es>`__:
 
    ..
 
-      - Ángel García de la Chica Herrera <angel.garcia@sygel.es>
+      -  Ángel García de la Chica Herrera <angel.garcia@sygel.es>
 
 Maintainers
 -----------
@@ -107,6 +111,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/17.0/delivery_package_number>`_ project on GitHub.
+This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/18.0/delivery_package_number>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

delivery_package_number/__manifest__.py

@@ -1,9 +1,9 @@
 # Copyright 2020 Tecnativa - David Vidal
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
-    "name": "Stock Picking Package Number",
+    "name": "Delivery Package Number",
     "summary": "Set or compute number of packages for a picking",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Delivery",
     "website": "https://github.com/OCA/delivery-carrier",
     "author": "Tecnativa, Odoo Community Association (OCA)",

delivery_package_number/models/stock_picking.py

@@ -18,11 +18,12 @@ class StockPicking(models.Model):
     )
     ask_number_of_packages = fields.Boolean(compute="_compute_ask_number_of_packages")
 
-    @api.depends("package_ids")
+    @api.depends("move_line_ids", "move_line_ids.result_package_id")
     def _compute_number_of_packages(self):
         for picking in self:
-            if picking.package_ids:
-                picking.number_of_packages = len(picking.package_ids)
+            packages = picking.move_line_ids.result_package_id
+            if packages:
+                picking.number_of_packages = len(packages)
 
     def _action_generate_number_of_packages_wizard(self):
         view = self.env.ref("delivery_package_number.view_number_package_validate")
@@ -43,9 +44,12 @@ def _compute_ask_number_of_packages(self):
         """To Know if is needed raise wizard to ask user by package number"""
         for picking in self:
             picking.ask_number_of_packages = bool(
-                picking.carrier_id
-                and not picking.package_ids
-                or picking.picking_type_id.force_set_number_of_packages
+                (
+                    picking.carrier_id
+                    and not picking.move_line_ids.result_package_id
+                    or picking.picking_type_id.force_set_number_of_packages
+                )
+                and not picking.picking_type_id.avoid_set_number_of_packages
             )
 
     def _get_pickings_to_set_number_of_packages(self):

delivery_package_number/models/stock_picking_type.py

@@ -6,6 +6,7 @@
 class StockPickingType(models.Model):
     _inherit = "stock.picking.type"
 
+    avoid_set_number_of_packages = fields.Boolean()
     force_set_number_of_packages = fields.Boolean()
     report_number_of_packages = fields.Many2one(
         "ir.actions.report",

delivery_package_number/readme/USAGE.md

@@ -11,3 +11,7 @@ If delivey packages are used:
 
 When the picking is confirmed, the user has the chance to change the
 number of packages in the confirmation wizard.
+
+Note: You can prevent the wizard from popping up to set the number of packages
+by selecting the option "Avoid set number of packages" in the operation
+type.

delivery_package_number/reports/report_package_number.xml

@@ -2,10 +2,7 @@
 <odoo>
     <template id="delivery_package_number_document">
         <t t-call="web.basic_layout">
-            <t
-                t-set="move_ids"
-                t-value="doc.move_ids._rollup_move_dests({doc.move_ids[:1].id})"
-            />
+            <t t-set="move_ids" t-value="doc.move_ids._rollup_move_dests()" />
             <t
                 t-set="dest_picking"
                 t-value="doc.move_ids.browse(move_ids).filtered('sale_line_id')[:1].picking_id"

delivery_package_number/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Stock Picking Package Number</title>
+<title>Delivery Package Number</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document" id="stock-picking-package-number">
-<h1 class="title">Stock Picking Package Number</h1>
+<div class="document" id="delivery-package-number">
+<h1 class="title">Delivery Package Number</h1>
 
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:a11704398060fb7a09c7964e7653f3c5e98d222a404dec84e8dfe64a2908985e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/17.0/delivery_package_number"><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-17-0/delivery-carrier-17-0-delivery_package_number"><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=17.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/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/18.0/delivery_package_number"><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-18-0/delivery-carrier-18-0-delivery_package_number"><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=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module recovers the number of packages field that was present in
 previous versions of Odoo, that can be either be set manually by the
 user, but also allows to be computed when the delivery packages flow is
@@ -404,13 +404,16 @@ <h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 </ol>
 <p>When the picking is confirmed, the user has the chance to change the
 number of packages in the confirmation wizard.</p>
+<p>Note: You can prevent the wizard from popping up to set the number of
+packages by selecting the option “Avoid set number of packages” in the
+operation type.</p>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-2">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 to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_package_number%0Aversion:%2017.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_package_number%0Aversion:%2018.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">
@@ -454,7 +457,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">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/17.0/delivery_package_number">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/18.0/delivery_package_number">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_package_number/tests/test_delivery_package_number.py

@@ -10,7 +10,7 @@ class TestDeliveryPackageNumber(TransactionCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.product = cls.env["product.product"].create(
-            {"name": "Test product", "type": "product"}
+            {"name": "Test product", "type": "consu", "is_storable": True}
         )
         cls.partner = cls.env["res.partner"].create({"name": "Test partner"})
         cls.wh1 = cls.env["stock.warehouse"].create(

delivery_package_number/views/stock_picking_type_views.xml

@@ -4,9 +4,13 @@
         <field name="model">stock.picking.type</field>
         <field name="inherit_id" ref="stock.view_picking_type_form" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='default_location_src_id']/.." position="after">
+            <xpath expr="//group[@name='locations']" position="after">
                 <group string="Number of packages">
-                    <field name="force_set_number_of_packages" />
+                    <field name="avoid_set_number_of_packages" />
+                    <field
+                        name="force_set_number_of_packages"
+                        invisible="avoid_set_number_of_packages"
+                    />
                     <field name="report_number_of_packages" />
                 </group>
             </xpath>

delivery_package_number/views/stock_picking_views.xml

@@ -8,7 +8,6 @@
         />
         <field name="arch" type="xml">
             <xpath expr="//group[@name='carrier_data']" position="inside">
-                <field name="package_ids" invisible="1" />
                 <field name="number_of_packages" readonly="state == 'done'" />
             </xpath>
         </field>

delivery_package_number/wizard/stock_number_package_validate_wiz_view.xml

@@ -17,15 +17,15 @@
                     invisible="not stock_number_package_validation_line_ids"
                     nolabel="1"
                 >
-                    <tree create="0" delete="0" editable="1">
+                    <list create="0" delete="0" editable="bottom">
                         <field
                             name="picking_id"
                             options="{'no_open': True}"
                             readonly="1"
                             force_save="1"
                         />
                         <field name="number_of_packages" />
-                    </tree>
+                    </list>
                 </field>
                 <footer>
                     <button