Add shopfloor_vendor_packaging

setup/shopfloor_vendor_packaging/odoo/addons/shopfloor_vendor_packaging

@@ -0,0 +1 @@
+../../../../shopfloor_vendor_packaging

setup/shopfloor_vendor_packaging/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

shopfloor/actions/data.py

@@ -188,11 +188,7 @@ def _lot_parser(self):
 
     @ensure_model("stock.move.line")
     def move_line(self, record, with_picking=False, **kw):
-        display_vendor_packagings = kw.get("display_vendor_packagings")
-        record = record.with_context(
-            location=record.location_id.id,
-            display_vendor_packagings=display_vendor_packagings,
-        )
+        record = record.with_context(location=record.location_id.id)
         parser = self._move_line_parser
         if with_picking:
             parser += [("picking_id:picking", self._picking_parser)]
@@ -238,11 +234,7 @@ def _move_line_parser(self):
 
     @ensure_model("stock.move")
     def move(self, record, **kw):
-        display_vendor_packagings = kw.get("display_vendor_packagings")
-        record = record.with_context(
-            location=record.location_id.id,
-            display_vendor_packagings=display_vendor_packagings,
-        )
+        record = record.with_context(location=record.location_id.id)
         parser = self._move_parser
         return self._jsonify(record, parser)
 
@@ -264,10 +256,6 @@ def _move_parser(self):
 
     @ensure_model("stock.package_level")
     def package_level(self, record, **kw):
-        display_vendor_packagings = kw.get("display_vendor_packagings")
-        record = record.with_context(
-            display_vendor_packagings=display_vendor_packagings
-        )
         return self._jsonify(record, self._package_level_parser)
 
     def package_levels(self, records, **kw):
@@ -303,10 +291,6 @@ def _package_level_parser(self):
 
     @ensure_model("product.product")
     def product(self, record, **kw):
-        display_vendor_packagings = kw.get("display_vendor_packagings")
-        record = record.with_context(
-            display_vendor_packagings=display_vendor_packagings
-        )
         return self._jsonify(record, self._product_parser, **kw)
 
     def products(self, record, **kw):
@@ -326,16 +310,8 @@ def _product_parser(self):
         ]
 
     def _product_packaging(self, rec, field):
-        display_vendor_packagings = rec.env.context["display_vendor_packagings"]
-        packagings = rec.packaging_ids
-        if display_vendor_packagings:
-            packagings = packagings.filtered(lambda x: x.qty)
-        else:
-            packagings = packagings.filtered(
-                lambda x: x.qty and not x.packaging_type_id.is_vendor_packaging
-            )
         return self._jsonify(
-            packagings,
+            rec.packaging_ids.filtered(lambda x: x.qty),
             self._packaging_parser,
             multi=True,
         )

shopfloor/models/shopfloor_menu.py

@@ -53,11 +53,6 @@
 to scan a destination package.
 """
 
-DISPLAY_VENDOR_PACKAGINGS_HELP = """
-When enabled, the user will be able to see the vendor packagings
-in the frontend, e.g. in the qty picker.
-"""
-
 
 class ShopfloorMenu(models.Model):
     _inherit = "shopfloor.menu"
@@ -231,14 +226,6 @@ class ShopfloorMenu(models.Model):
     allow_alternative_destination_package_is_possible = fields.Boolean(
         compute="_compute_allow_alternative_destination_package_is_possible"
     )
-    display_vendor_packagings = fields.Boolean(
-        string="Display vendor packagings",
-        default=False,
-        help=DISPLAY_VENDOR_PACKAGINGS_HELP,
-    )
-    display_vendor_packagings_is_possible = fields.Boolean(
-        compute="_compute_display_vendor_packagings_is_possible",
-    )
 
     @api.onchange("unload_package_at_destination")
     def _onchange_unload_package_at_destination(self):
@@ -468,10 +455,3 @@ def _compute_allow_alternative_destination_package_is_possible(self):
             menu.allow_alternative_destination_package_is_possible = (
                 menu.scenario_id.has_option("allow_alternative_destination_package")
             )
-
-    @api.depends("scenario_id")
-    def _compute_display_vendor_packagings_is_possible(self):
-        for menu in self:
-            menu.display_vendor_packagings_is_possible = menu.scenario_id.has_option(
-                "display_vendor_packagings"
-            )

shopfloor/views/shopfloor_menu.xml

@@ -168,13 +168,6 @@
                     />
                     <field name="allow_alternative_destination_package" />
                 </group>
-                <group
-                    name="display_vendor_packagings"
-                    attrs="{'invisible': [('display_vendor_packagings_is_possible', '=', False)]}"
-                >
-                    <field name="display_vendor_packagings_is_possible" invisible="1" />
-                    <field name="display_vendor_packagings" />
-                </group>
             </group>
         </field>
     </record>

shopfloor_reception/__manifest__.py

@@ -1,15 +1,15 @@
 {
     "name": "Shopfloor Reception",
     "summary": "Reception scenario for shopfloor",
-    "version": "14.0.2.6.1",
+    "version": "14.0.2.7.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "maintainers": ["mmequignon", "JuMiSanAr"],
     "license": "AGPL-3",
     "installable": True,
-    "depends": ["shopfloor"],
+    "depends": ["shopfloor", "shopfloor_vendor_packaging"],
     "data": [
         "data/shopfloor_scenario_data.xml",
     ],

shopfloor_vendor_packaging/__init__.py

@@ -0,0 +1,2 @@
+from . import models
+from . import actions

shopfloor_vendor_packaging/__manifest__.py

@@ -0,0 +1,19 @@
+# Copyright 2024 Camptocamp SA (http://www.camptocamp.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Shopfloor Vendor Packaging",
+    "summary": "Manage shopfloor behavior for vendor packaging",
+    "version": "14.0.1.0.0",
+    "development_status": "Alpha",
+    "category": "Inventory",
+    "website": "https://github.com/OCA/wms",
+    "author": "Camptocamp, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "data": [
+        "views/shopfloor_menu.xml",
+    ],
+    "depends": ["shopfloor", "product_packaging_type_vendor"],
+    "auto-install": True,
+}

shopfloor_vendor_packaging/actions/data.py

@@ -0,0 +1,56 @@
+# Copyright 2024 Camptocamp SA (http://www.camptocamp.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo.addons.component.core import Component
+from odoo.addons.shopfloor_base.utils import ensure_model
+
+
+class DataAction(Component):
+    _inherit = "shopfloor.data.action"
+
+    @ensure_model("stock.move.line")
+    def move_line(self, record, with_picking=False, **kw):
+        display_vendor_packagings = kw.get("display_vendor_packagings")
+        record = record.with_context(
+            display_vendor_packagings=display_vendor_packagings,
+        )
+        return super().move_line(record, with_picking, **kw)
+
+    @ensure_model("stock.move")
+    def move(self, record, **kw):
+        display_vendor_packagings = kw.get("display_vendor_packagings")
+        record = record.with_context(
+            display_vendor_packagings=display_vendor_packagings,
+        )
+        return super().move(record, **kw)
+
+    @ensure_model("stock.package_level")
+    def package_level(self, record, **kw):
+        display_vendor_packagings = kw.get("display_vendor_packagings")
+        record = record.with_context(
+            display_vendor_packagings=display_vendor_packagings
+        )
+        return super().package_level(record, **kw)
+
+    @ensure_model("product.product")
+    def product(self, record, **kw):
+        display_vendor_packagings = kw.get("display_vendor_packagings")
+        record = record.with_context(
+            display_vendor_packagings=display_vendor_packagings
+        )
+        return super().product(record, **kw)
+
+    def _product_packaging(self, rec, field):
+        display_vendor_packagings = rec.env.context.get("display_vendor_packagings")
+        packagings = rec.packaging_ids
+        if display_vendor_packagings:
+            packagings = packagings.filtered(lambda x: x.qty)
+        else:
+            packagings = packagings.filtered(
+                lambda x: x.qty and not x.packaging_type_id.is_vendor_packaging
+            )
+        return self._jsonify(
+            packagings,
+            self._packaging_parser,
+            multi=True,
+        )

shopfloor_vendor_packaging/models/shopfloor_menu.py

@@ -0,0 +1,29 @@
+# Copyright 2024 Camptocamp SA (http://www.camptocamp.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+DISPLAY_VENDOR_PACKAGINGS_HELP = """
+    When enabled, the user will be able to see the vendor packagings
+    in the frontend, e.g. in the qty picker.
+"""
+
+
+class ShopfloorMenu(models.Model):
+    _inherit = "shopfloor.menu"
+
+    display_vendor_packagings = fields.Boolean(
+        string="Display vendor packagings",
+        default=False,
+        help=DISPLAY_VENDOR_PACKAGINGS_HELP,
+    )
+    display_vendor_packagings_is_possible = fields.Boolean(
+        compute="_compute_display_vendor_packagings_is_possible",
+    )
+
+    @api.depends("scenario_id")
+    def _compute_display_vendor_packagings_is_possible(self):
+        for menu in self:
+            menu.display_vendor_packagings_is_possible = menu.scenario_id.has_option(
+                "display_vendor_packagings"
+            )

shopfloor_vendor_packaging/readme/CONTRIBUTORS.rst

@@ -0,0 +1 @@
+* Juan Miguel Sánchez Arce <[email protected]>

shopfloor_vendor_packaging/readme/DESCRIPTION.rst

@@ -0,0 +1,2 @@
+When installed, this module adds a new option in shopfloor
+to prevent vendor packagings from being displayed in the frontend.

shopfloor_vendor_packaging/views/shopfloor_menu.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="shopfloor_menu_form_view" model="ir.ui.view">
+        <field name="model">shopfloor.menu</field>
+        <field name="inherit_id" ref="shopfloor.shopfloor_menu_form_view" />
+        <field name="arch" type="xml">
+            <group name="options" position="inside">
+                <group
+                    name="display_vendor_packagings"
+                    attrs="{'invisible': [('display_vendor_packagings_is_possible', '=', False)]}"
+                >
+                    <field name="display_vendor_packagings_is_possible" invisible="1" />
+                    <field name="display_vendor_packagings" />
+                </group>
+            </group>
+        </field>
+    </record>
+</odoo>