Merge PR #942 into 16.0

Signed-off-by jbaudoux
OCA · Nov 4, 2024 · c9a9c78 · c9a9c78
2 parents d56784b + 5b0e7b4
commit c9a9c78
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/shopfloor/actions/message.py b/shopfloor/actions/message.py
@@ -686,12 +686,19 @@ def picking_zero_quantity(self):
             "body": _("The picked quantity must be a value above zero."),
         }
 
-    def selected_lines_qty_done_higher_than_allowed(self):
+    def selected_lines_qty_done_higher_than_allowed(self, line):
+        """
+        :param line: The selected line
+        """
         return {
             "message_type": "warning",
             "body": _(
                 "The quantity scanned for one or more lines cannot be "
-                "higher than the maximum allowed."
+                "higher than the maximum allowed. "
+                "(%(product_name)s : %(quantity_done)s > %(quantity_reserved)s)",
+                product_name=line.product_id.name,
+                quantity_done=str(line.qty_done),
+                quantity_reserved=str(line.reserved_uom_qty),
             ),
         }
 

diff --git a/shopfloor/services/checkout.py b/shopfloor/services/checkout.py
@@ -1216,7 +1216,9 @@ def _check_allowed_qty_done(self, picking, lines):
                 return self._response_for_select_package(
                     picking,
                     lines,
-                    message=self.msg_store.selected_lines_qty_done_higher_than_allowed(),
+                    message=self.msg_store.selected_lines_qty_done_higher_than_allowed(
+                        line
+                    ),
                 )
 
     def _set_dest_package_from_selection(self, picking, selected_lines, package):

diff --git a/shopfloor/tests/test_checkout_base.py b/shopfloor/tests/test_checkout_base.py
@@ -1,5 +1,7 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo.fields import first
+
 from .common import CommonCase
 
 
@@ -71,6 +73,7 @@ def _data_for_select_line(self, picking, **kw):
         return data
 
     def _assert_select_package_qty_above(self, response, picking):
+        line = first(picking.move_line_ids)
         self.assert_response(
             response,
             next_state="select_package",
@@ -86,6 +89,12 @@ def _assert_select_package_qty_above(self, response, picking):
             message={
                 "message_type": "warning",
                 "body": "The quantity scanned for one or more lines cannot be "
-                "higher than the maximum allowed.",
+                "higher than the maximum allowed. "
+                "(%(product_name)s : %(quantity_done)s > %(quantity_reserved)s)"
+                % dict(
+                    product_name=line.product_id.name,
+                    quantity_done=str(line.qty_done),
+                    quantity_reserved=str(line.reserved_uom_qty),
+                ),
             },
         )