Merge PR #777 into 15.0

OCA-git-bot · OCA-git-bot · commit 322e3111df40 · 2024-03-25T15:08:01.000Z
Signed-off-by pedrobaeza
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:b4909260c34e879e04938c7d1afb9f4c071ce53d2d36a2445d71f2a2f64a3da1
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -82,8 +82,8 @@ Contributors
 
   * Pedro M. Baeza
   * 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
@@ -2,6 +2,7 @@
 # Copyright 2023 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo import _, api, fields, models
+from odoo.tools import config
 
 
 class StockPicking(models.Model):
@@ -15,6 +16,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,24 +39,36 @@ 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
 
     def _pre_action_done_hook(self):
         res = super()._pre_action_done_hook()
+        test_condition = not config["test_enable"] or self.env.context.get(
+            "test_delivery_package_number"
+        )
         if (
             res
+            and test_condition
             and isinstance(res, bool)
+            and any(picking.ask_number_of_packages for picking in self)
             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
@@ -2,8 +2,8 @@
 
   * Pedro M. Baeza
   * 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:b4909260c34e879e04938c7d1afb9f4c071ce53d2d36a2445d71f2a2f64a3da1
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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
@@ -425,8 +426,8 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
 <li>Pedro M. Baeza</li>
 <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/tests/test_delivery_package_number.py b/delivery_package_number/tests/test_delivery_package_number.py
@@ -66,7 +66,9 @@ def test_backorder(self):
         picking = order.picking_ids
         picking.move_lines.quantity_done = 2
         picking.number_of_packages = 2
-        action = picking.button_validate()
+        action = picking.with_context(
+            test_delivery_package_number=True
+        ).button_validate()
         backorder_wizard = Form(
             self.env[action["res_model"]].with_context(**action["context"])
         ).save()
diff --git a/delivery_package_number/wizard/__init__.py b/delivery_package_number/wizard/__init__.py
@@ -1,4 +1,3 @@
-from . import stock_number_package_mixin
 from . import stock_inmediate_transfer
 from . import stock_backorder_confirmation
 from . import stock_number_package_validate_wiz
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
diff --git a/delivery_package_number/wizard/stock_number_package_mixin.py b/delivery_package_number/wizard/stock_number_package_mixin.py
diff --git a/delivery_package_number/wizard/stock_number_package_validate_wiz.py b/delivery_package_number/wizard/stock_number_package_validate_wiz.py
@@ -4,18 +4,28 @@
 
 
 class StockNumberPackageValidateWiz(models.TransientModel):
-    _inherit = "stock.number.package.mixin"
     _name = "stock.number.package.validate.wizard"
     _description = "Wizard to force set number of pickings when validate"
 
     pick_ids = fields.Many2many("stock.picking", "stock_picking_number_package_rel")
+    number_of_packages = fields.Integer(
+        help="Set the number of packages for this picking(s)",
+    )
     stock_number_package_validation_line_ids = fields.One2many(
         comodel_name="stock.number.package.validate.line.wizard",
         inverse_name="wiz_id",
         compute="_compute_stock_number_package_validation_line_ids",
         readonly=False,
         store=True,
     )
+    print_package_label = fields.Boolean(
+        compute="_compute_print_package_label", readonly=False, store=True
+    )
+
+    @api.depends("pick_ids")
+    def _compute_print_package_label(self):
+        for item in self:
+            item.print_package_label = item.pick_ids.picking_type_id.print_label
 
     @api.depends("pick_ids")
     def _compute_stock_number_package_validation_line_ids(self):

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`	`}`