shopfloor: add option to exclude package types in product info

camptocamp · Feb 9, 2024 · b7cf551 · b7cf551
1 parent c114af4
commit b7cf551
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 4 deletions.
diff --git a/shopfloor/README.rst b/shopfloor/README.rst
@@ -7,7 +7,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f1d165021abc730bc8bf96092b9f76139e4b17c777975af4c9e496f86774bab6
+   !! source digest: sha256:562ff659a1a8d75715516363b4a01778493ebfbedd5ae2db173e11358eab7039
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/shopfloor/__manifest__.py b/shopfloor/__manifest__.py
@@ -49,6 +49,7 @@
     "data": [
         "data/shopfloor_scenario_data.xml",
         "security/groups.xml",
+        "views/res_config_settings.xml",
         "views/shopfloor_menu.xml",
         "views/stock_picking_type.xml",
         "views/stock_location.xml",

diff --git a/shopfloor/actions/data.py b/shopfloor/actions/data.py
@@ -309,9 +309,17 @@ def _product_parser(self):
             ("seller_ids:supplier_code", self._product_supplier_code),
         ]
 
-    def _product_packaging(self, rec, field):
+    def _product_packaging(self, rec, field, apply_excluded=True):
+        packagings = rec.packaging_ids.filtered(lambda x: x.qty)
+        if apply_excluded:
+            excluded_packaging_types = (
+                self.env.user.company_id.shopfloor_excluded_product_packaging_ids
+            )
+            packagings = packagings.filtered(
+                lambda x: x.packaging_type_id not in excluded_packaging_types
+            )
         return self._jsonify(
-            rec.packaging_ids.filtered(lambda x: x.qty),
+            packagings,
             self._packaging_parser,
             multi=True,
         )

diff --git a/shopfloor/models/__init__.py b/shopfloor/models/__init__.py
@@ -1,4 +1,6 @@
 from . import priority_postpone_mixin
+from . import res_company
+from . import res_config_settings
 from . import shopfloor_menu
 from . import shopfloor_app
 from . import stock_picking_type

diff --git a/shopfloor/models/res_company.py b/shopfloor/models/res_company.py
@@ -0,0 +1,17 @@
+# Copyright 2024 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+from odoo import fields, models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    shopfloor_excluded_product_packaging_ids = fields.Many2many(
+        comodel_name="product.packaging.type",
+        string="Packagings Excluded from Product Information",
+        help=(
+            "Used to prevent certain package types from being returned "
+            "to the shopfloor app when querying for product information."
+        ),
+    )
diff --git a/shopfloor/models/res_config_settings.py b/shopfloor/models/res_config_settings.py
@@ -0,0 +1,13 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    shopfloor_excluded_product_packaging_ids = fields.Many2many(
+        related="company_id.shopfloor_excluded_product_packaging_ids",
+        readonly=False,
+    )
diff --git a/shopfloor/static/description/index.html b/shopfloor/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Shopfloor</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f1d165021abc730bc8bf96092b9f76139e4b17c777975af4c9e496f86774bab6
+!! source digest: sha256:562ff659a1a8d75715516363b4a01778493ebfbedd5ae2db173e11358eab7039
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/wms/tree/14.0/shopfloor"><img alt="OCA/wms" src="https://img.shields.io/badge/github-OCA%2Fwms-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/wms-14-0/wms-14-0-shopfloor"><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/wms&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Shopfloor is a barcode scanner application for internal warehouse operations.</p>

diff --git a/shopfloor/views/res_config_settings.xml b/shopfloor/views/res_config_settings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2024 Camptocamp SA
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+-->
+<odoo>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.shopfloor</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@data-key='stock']" position="inside">
+                <h2>Shopfloor</h2>
+                <div
+                    class="row mt16 o_settings_container"
+                    id="shopfloor_excluded_product_packaging_ids"
+                >
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_right_pane">
+                            <label for="shopfloor_excluded_product_packaging_ids" />
+                            <div class="text-muted">
+                                Used to prevent certain package types from being returned
+                                to the shopfloor app when querying for product information.
+                            </div>
+                            <div class="content-group">
+                                <div class="mt16">
+                                    <field
+                                        name="shopfloor_excluded_product_packaging_ids"
+                                        widget="many2many_tags"
+                                        options="{'no_create': True}"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>