odoo-addon-shopfloor 16.0.1.0.0.24__py3-none-any.whl → 16.0.2.1.0__py3-none-any.whl

odoo/addons/shopfloor/i18n/pt_BR.po

@@ -893,6 +893,12 @@ msgstr ""
 msgid "Packaging not found in the current transfer."
 msgstr ""
 
+#. module: shopfloor
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "Packaging {} dimension updated."
+msgstr ""
+
 #. module: shopfloor
 #: code:addons/shopfloor/actions/message.py:0
 #, python-format
@@ -1059,6 +1065,11 @@ msgstr ""
 msgid "Restart the operation, someone has canceled it."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+msgid "Restrict scannable barcode at work selection"
+msgstr ""
+
 #. module: shopfloor
 #: model_terms:ir.ui.view,arch_db:shopfloor.view_stock_move_line_detailed_operation_tree
 msgid "SF Priority"
@@ -1090,11 +1101,6 @@ msgstr ""
 msgid "Scan Location Or Pack First Is Possible"
 msgstr ""
 
-#. module: shopfloor
-#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
-msgid "Scan first location or pack"
-msgstr ""
-
 #. module: shopfloor
 #: code:addons/shopfloor/actions/message.py:0
 #, python-format
@@ -1634,6 +1640,18 @@ msgid ""
 "with the remaining lines."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+msgid ""
+"When checked, the user will be restricted by the type of object barcode  "
+"that he can scan to select the document/transfer/move line to work on."
+msgstr ""
+
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid "When choosing an order to pack, do not allow to scan a product."
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__allow_get_work
 msgid ""
@@ -1653,10 +1671,10 @@ msgid "When picking, prevent unloading the whole bin when full."
 msgstr ""
 
 #. module: shopfloor
-#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
 msgid ""
-"When selecting work, force the user to first scan a location or pack,then "
-"the product or lot."
+"When selecting a move line, force the user to first scan a package or a "
+"location and not a product or a lot."
 msgstr ""
 
 #. module: shopfloor

odoo/addons/shopfloor/i18n/shopfloor.pot

@@ -45,6 +45,16 @@ msgid ""
 "decreasing the delivered quantity of the related SO line.\n"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__allow_alternative_destination_package
+msgid ""
+"\n"
+"When moving a whole package, the user normally scans\n"
+"a destination location.\n"
+"If enabled, they will also be allowed\n"
+"to scan a destination package.\n"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__multiple_move_single_pack
 msgid ""
@@ -134,6 +144,11 @@ msgstr ""
 msgid "Allow Alternative Destination Is Possible"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__allow_alternative_destination_package_is_possible
+msgid "Allow Alternative Destination Package Is Possible"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__allow_force_reservation_is_possible
 msgid "Allow Force Reservation Is Possible"
@@ -159,6 +174,11 @@ msgstr ""
 msgid "Allow create returns"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__allow_alternative_destination_package
+msgid "Allow to change the destination package"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__allow_unreserve_other_moves
 msgid "Allow to process reserved quantities"
@@ -325,6 +345,11 @@ msgid ""
 "the same package."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_stock_move_line__result_package_id
+msgid "Destination Package"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__disable_full_bin_action_is_possible
 msgid "Disable Full Bin Action Is Possible"
@@ -370,6 +395,11 @@ msgstr ""
 msgid "Goods packed into {0.name}"
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,help:shopfloor.field_stock_move_line__result_package_id
+msgid "If set, the operations are packed into this package"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__ignore_no_putaway_available
 msgid ""
@@ -469,6 +499,20 @@ msgstr ""
 msgid "Location {} empty"
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "Lot %(lot_name)s not found in location %(location_name)s"
+msgstr ""
+
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "Lot %(lot_name)s not found in transfer %(picking_name)s"
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0
@@ -600,6 +644,13 @@ msgstr ""
 msgid "No line to pack found."
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "No lines to process, set quantities on some"
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0
@@ -798,6 +849,15 @@ msgstr ""
 msgid "Package %(package_name)s cannot be used: %(error)s"
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid ""
+"Package %(package_name)s contains already lines from a different operation "
+"type %(picking_type_name)s."
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/models/stock_move_line.py:0
@@ -815,6 +875,20 @@ msgid ""
 "Package %(package_name)s is not available in transfer %(picking_name)s."
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "Package %(package_name)s not found in location %(location_name)s"
+msgstr ""
+
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "Package %(package_name)s not found in transfer %(picking_name)s"
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,field_description:shopfloor.field_stock_picking__package_level_count
 msgid "Package Level Count"
@@ -911,6 +985,13 @@ msgstr ""
 msgid "Packaging not found in the current transfer."
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "Packaging {} dimension updated."
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0
@@ -1017,6 +1098,15 @@ msgstr ""
 msgid "Processing reserved quantities is not allowed for menu {}."
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid ""
+"Product %(product_name)s not found in location %(location_name)s or transfer"
+" %(picking_name)s."
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model,name:shopfloor.model_stock_move_line
 msgid "Product Moves (Stock Move Line)"
@@ -1094,6 +1184,11 @@ msgstr ""
 msgid "Restart the operation, someone has canceled it."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+msgid "Restrict scannable barcode at work selection"
+msgstr ""
+
 #. module: shopfloor
 #: model_terms:ir.ui.view,arch_db:shopfloor.view_stock_move_line_detailed_operation_tree
 msgid "SF Priority"
@@ -1126,11 +1221,6 @@ msgstr ""
 msgid "Scan Location Or Pack First Is Possible"
 msgstr ""
 
-#. module: shopfloor
-#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
-msgid "Scan first location or pack"
-msgstr ""
-
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0
@@ -1421,6 +1511,13 @@ msgstr ""
 msgid "The content of {} cannot be transferred with this scenario."
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/models/stock_move_line.py:0
+#, python-format
+msgid "The demand cannot be negative"
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/services/cluster_picking.py:0
@@ -1671,6 +1768,15 @@ msgstr ""
 msgid "Transfer {} is not available."
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid ""
+"Transferring to a different package is not allowed, please scan a location "
+"instead."
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0
@@ -1728,6 +1834,18 @@ msgid ""
 "with the remaining lines."
 msgstr ""
 
+#. module: shopfloor
+#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+msgid ""
+"When checked, the user will be restricted by the type of object barcode  "
+"that he can scan to select the document/transfer/move line to work on."
+msgstr ""
+
+#. module: shopfloor
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
+msgid "When choosing an order to pack, do not allow to scan a product."
+msgstr ""
+
 #. module: shopfloor
 #: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__allow_get_work
 msgid ""
@@ -1747,10 +1865,10 @@ msgid "When picking, prevent unloading the whole bin when full."
 msgstr ""
 
 #. module: shopfloor
-#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__scan_location_or_pack_first
+#: model_terms:ir.ui.view,arch_db:shopfloor.shopfloor_menu_form_view
 msgid ""
-"When selecting work, force the user to first scan a location or pack,then "
-"the product or lot."
+"When selecting a move line, force the user to first scan a package or a "
+"location and not a product or a lot."
 msgstr ""
 
 #. module: shopfloor
@@ -1823,6 +1941,13 @@ msgstr ""
 msgid "You cannot place it here"
 msgstr ""
 
+#. module: shopfloor
+#. odoo-python
+#: code:addons/shopfloor/actions/message.py:0
+#, python-format
+msgid "You cannot process that much units."
+msgstr ""
+
 #. module: shopfloor
 #. odoo-python
 #: code:addons/shopfloor/actions/message.py:0

odoo/addons/shopfloor/migrations/16.0.2.0.0/post-migration.py

@@ -0,0 +1,43 @@
+# Copyright 2023 Camptocamp SA (http://www.camptocamp.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+import json
+import logging
+
+from odoo import SUPERUSER_ID, api
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    if not version:
+        return
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    zone_picking_scenario = env["shopfloor.scenario"].search(
+        [("name", "=", "Zone Picking")]
+    )
+    _update_scenario_options(zone_picking_scenario)
+    zone_picking_menus = env["shopfloor.menu"].search(
+        [("scenario_id", "=", zone_picking_scenario.id)]
+    )
+    _enable_option_in_menus(zone_picking_menus)
+
+
+def _update_scenario_options(scenario):
+    options = scenario.options
+    options["allow_alternative_destination_package"] = True
+    options_edit = json.dumps(options or {}, indent=4, sort_keys=True)
+    scenario.write({"options_edit": options_edit})
+    _logger.info(
+        "Option allow_alternative_destination_package added to scenario Zone Picking"
+    )
+
+
+def _enable_option_in_menus(menus):
+    for menu in menus:
+        menu.allow_alternative_destination_package = True
+        _logger.info(
+            "Option allow_alternative_destination_package enabled for menu {}".format(
+                menu.name
+            )
+        )

odoo/addons/shopfloor/models/shopfloor_menu.py

@@ -33,7 +33,7 @@ by scanning a product or product packaging EAN to increase the quantity
 (i.e. +1 Unit or +1 Box)
 """
 
-AUTO_POST_LINE = """
+AUTO_POST_LINE_HELP = """
 When setting result pack & destination,
 automatically post the corresponding line
 if this option is checked.
@@ -46,6 +46,13 @@ A new move will be added as a return of the delivery,
 decreasing the delivered quantity of the related SO line.
 """
 
+ALLOW_ALTERNATIVE_DESTINATION_PACKAGE_HELP = """
+When moving a whole package, the user normally scans
+a destination location.
+If enabled, they will also be allowed
+to scan a destination package.
+"""
+
 
 class ShopfloorMenu(models.Model):
     _inherit = "shopfloor.menu"
@@ -171,11 +178,12 @@ class ShopfloorMenu(models.Model):
     show_oneline_package_content_is_possible = fields.Boolean(
         compute="_compute_show_oneline_package_content_is_possible"
     )
+    # TODO this field could be renamed
     scan_location_or_pack_first = fields.Boolean(
-        string="Scan first location or pack",
+        string="Restrict scannable barcode at work selection",
         help=(
-            "When selecting work, force the user to first scan a location or pack,"
-            "then the product or lot."
+            "When checked, the user will be restricted by the type of object barcode "
+            " that he can scan to select the document/transfer/move line to work on."
         ),
     )
     scan_location_or_pack_first_is_possible = fields.Boolean(
@@ -205,11 +213,19 @@ class ShopfloorMenu(models.Model):
     auto_post_line = fields.Boolean(
         string="Automatically post line",
         default=False,
-        help=AUTO_POST_LINE,
+        help=AUTO_POST_LINE_HELP,
     )
     auto_post_line_is_possible = fields.Boolean(
         compute="_compute_auto_post_line_is_possible"
     )
+    allow_alternative_destination_package = fields.Boolean(
+        string="Allow to change the destination package",
+        default=False,
+        help=ALLOW_ALTERNATIVE_DESTINATION_PACKAGE_HELP,
+    )
+    allow_alternative_destination_package_is_possible = fields.Boolean(
+        compute="_compute_allow_alternative_destination_package_is_possible"
+    )
 
     @api.onchange("unload_package_at_destination")
     def _onchange_unload_package_at_destination(self):
@@ -424,6 +440,7 @@ class ShopfloorMenu(models.Model):
                 "auto_post_line"
             )
 
+    @api.depends("scenario_id")
     def _compute_allow_alternative_destination_is_possible(self):
         for menu in self:
             menu.allow_alternative_destination_is_possible = (
@@ -434,3 +451,10 @@ class ShopfloorMenu(models.Model):
     def _compute_allow_return_is_possible(self):
         for menu in self:
             menu.allow_return_is_possible = menu.scenario_id.has_option("allow_return")
+
+    @api.depends("scenario_id")
+    def _compute_allow_alternative_destination_package_is_possible(self):
+        for menu in self:
+            menu.allow_alternative_destination_package_is_possible = (
+                menu.scenario_id.has_option("allow_alternative_destination_package")
+            )

odoo/addons/shopfloor/models/stock_move_line.py

@@ -24,6 +24,7 @@ class StockMoveLine(models.Model):
     # we search lines based on their location in some workflows
     location_id = fields.Many2one(index=True)
     package_id = fields.Many2one(index=True)
+    result_package_id = fields.Many2one(index=True)
 
     # allow domain on picking_id.xxx without too much perf penalty
     picking_id = fields.Many2one(auto_join=True)
@@ -153,6 +154,8 @@ class StockMoveLine(models.Model):
         :param split_partial: split if qty is less than expected
             otherwise rely on a backorder.
         """
+        if self.reserved_uom_qty < 0:
+            raise UserError(_("The demand cannot be negative"))
         # store a new line if we have split our line (not enough qty)
         new_line = self.env["stock.move.line"]
         rounding = self.product_uom_id.rounding

odoo/addons/shopfloor/models/stock_picking.py

@@ -116,3 +116,14 @@ class StockPicking(models.Model):
         )
         assigned_moves._action_assign()
         return new_picking.id
+
+    def _put_in_pack(self, move_line_ids, create_package_level=True):
+        """
+        Marks the corresponding move lines as 'shopfloor_checkout_done'
+        when the package is created in the backend.
+
+        """
+        new_package = super()._put_in_pack(move_line_ids, create_package_level)
+        lines = move_line_ids.filtered(lambda p: p.result_package_id == new_package)
+        lines.write({"shopfloor_checkout_done": True})
+        return new_package