[IMP] delivery_package_number: Ask only once for the number of packages wizard.

sergio-teruel · sergio-teruel · commit 722b96a3a65f · 2024-03-16T07:48:34.000+01:00
TT48170
diff --git a/delivery_package_number/README.rst b/delivery_package_number/README.rst
@@ -7,7 +7,7 @@ Stock Picking Package Number
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:c744a790b8d846005f7e828a8a4d0c2dcc678bd29063852c1ce3b213f7630c24
+   !! source digest: sha256:c288c2ac4c113b596baa1dbbc22473f708cfa98e20f201106d993af9fca57092
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -84,6 +84,7 @@ Contributors
   * David Vidal
   * Marçal Isern
   * Carlos Roca
+  * Sergio Teruel
 
 
  * `Sygel <https://www.sygel.es>`_:
diff --git a/delivery_package_number/__manifest__.py b/delivery_package_number/__manifest__.py
@@ -17,8 +17,6 @@
         "reports/report_package_number.xml",
         "views/stock_picking_type_views.xml",
         "views/stock_picking_views.xml",
-        "wizard/stock_immediate_transfer_views.xml",
-        "wizard/stock_backorder_confirmation_views.xml",
         "wizard/stock_number_package_validate_wiz_view.xml",
     ],
 }
diff --git a/delivery_package_number/models/stock_picking.py b/delivery_package_number/models/stock_picking.py
@@ -15,6 +15,7 @@ class StockPicking(models.Model):
         default=0,
         copy=False,
     )
+    ask_number_of_packages = fields.Boolean(compute="_compute_ask_number_of_packages")
 
     @api.depends("package_ids")
     def _compute_number_of_packages(self):
@@ -37,13 +38,20 @@ def _action_generate_number_of_packages_wizard(self):
             ),
         }
 
-    def _check_set_number_of_packages(self):
+    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
+            )
+
+    def _get_pickings_to_set_number_of_packages(self):
+        """Get pickings that needed raise wizard to fill number of packages"""
         pickings_to_set_number_of_packages = self.browse()
         for picking in self:
-            if (
-                picking.picking_type_id.force_set_number_of_packages
-                and not picking.number_of_packages
-            ):
+            if not picking.number_of_packages:
                 pickings_to_set_number_of_packages |= picking
         return pickings_to_set_number_of_packages
 
@@ -52,9 +60,10 @@ def _pre_action_done_hook(self):
         if (
             res
             and isinstance(res, bool)
+            and self.ask_number_of_packages
             and not self.env.context.get("bypass_set_number_of_packages")
         ):
-            pickings_to_set_nop = self._check_set_number_of_packages()
+            pickings_to_set_nop = self._get_pickings_to_set_number_of_packages()
             if pickings_to_set_nop:
                 return pickings_to_set_nop._action_generate_number_of_packages_wizard()
         return res
diff --git a/delivery_package_number/readme/CONTRIBUTORS.rst b/delivery_package_number/readme/CONTRIBUTORS.rst
@@ -4,6 +4,7 @@
   * David Vidal
   * Marçal Isern
   * Carlos Roca
+  * Sergio Teruel
 
 
  * `Sygel <https://www.sygel.es>`_:
diff --git a/delivery_package_number/static/description/index.html b/delivery_package_number/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -366,7 +367,7 @@ <h1 class="title">Stock Picking Package Number</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:c744a790b8d846005f7e828a8a4d0c2dcc678bd29063852c1ce3b213f7630c24
+!! source digest: sha256:c288c2ac4c113b596baa1dbbc22473f708cfa98e20f201106d993af9fca57092
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/15.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-15-0/delivery-carrier-15-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=15.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
@@ -427,6 +428,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <li>David Vidal</li>
 <li>Marçal Isern</li>
 <li>Carlos Roca</li>
+<li>Sergio Teruel</li>
 </ul>
 </li>
 </ul>
diff --git a/delivery_package_number/wizard/stock_backorder_confirmation.py b/delivery_package_number/wizard/stock_backorder_confirmation.py
@@ -5,24 +5,10 @@
 
 
 class StockBackorderConfirmation(models.TransientModel):
-    _inherit = ["stock.backorder.confirmation", "stock.number.package.mixin"]
-    _name = "stock.backorder.confirmation"
+    _inherit = "stock.backorder.confirmation"
 
     def process(self):
-        if self.number_of_packages:
-            self.pick_ids.write({"number_of_packages": self.number_of_packages})
         # put context key for avoiding `base_delivery_carrier_label` auto-packaging feature
-        res = super(
+        return super(
             StockBackorderConfirmation, self.with_context(set_default_package=False)
         ).process()
-        if self.print_package_label:
-            report = (
-                self.pick_ids.picking_type_id.report_number_of_packages
-                or self.env.ref(
-                    "delivery_package_number.action_delivery_package_number_report"
-                )
-            )
-            report_action = report.report_action(self.pick_ids)
-            report_action.update({"close_on_report_download": True})
-            return report_action
-        return res
diff --git a/delivery_package_number/wizard/stock_backorder_confirmation_views.xml b/delivery_package_number/wizard/stock_backorder_confirmation_views.xml
diff --git a/delivery_package_number/wizard/stock_immediate_transfer_views.xml b/delivery_package_number/wizard/stock_immediate_transfer_views.xml
diff --git a/delivery_package_number/wizard/stock_inmediate_transfer.py b/delivery_package_number/wizard/stock_inmediate_transfer.py
@@ -4,24 +4,10 @@
 
 
 class StockImmediateTransfer(models.TransientModel):
-    _inherit = ["stock.immediate.transfer", "stock.number.package.mixin"]
-    _name = "stock.immediate.transfer"
+    _inherit = "stock.immediate.transfer"
 
     def process(self):
-        if self.number_of_packages:
-            self.pick_ids.write({"number_of_packages": self.number_of_packages})
         # put context key for avoiding `base_delivery_carrier_label` auto-packaging feature
-        res = super(
+        return super(
             StockImmediateTransfer, self.with_context(set_default_package=False)
         ).process()
-        if self.print_package_label:
-            report = (
-                self.pick_ids.picking_type_id.report_number_of_packages
-                or self.env.ref(
-                    "delivery_package_number.action_delivery_package_number_report"
-                )
-            )
-            report_action = report.report_action(self.pick_ids)
-            report_action.update({"close_on_report_download": True})
-            return report_action
-        return res

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`	`"reports/report_package_number.xml",`
`18`	`18`	`"views/stock_picking_type_views.xml",`
`19`	`19`	`"views/stock_picking_views.xml",`
`20`		`- "wizard/stock_immediate_transfer_views.xml",`
`21`		`- "wizard/stock_backorder_confirmation_views.xml",`
`22`	`20`	`"wizard/stock_number_package_validate_wiz_view.xml",`
`23`	`21`	`],`
`24`	`22`	`}`