[MIG] shopfloor_base: Backport from 13.0

.pre-commit-config.yaml

@@ -6,7 +6,6 @@ exclude: |
   ^delivery_preference_glue_stock_picking_group/|
   ^sale_stock_available_to_promise_release/|
   ^shopfloor/|
-  ^shopfloor_base/|
   ^shopfloor_batch_automatic_creation/|
   ^shopfloor_checkout_sync/|
   ^shopfloor_example/|

shopfloor_base/__manifest__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # Copyright 2020 Akretion (http://www.akretion.com)
 # Copyright 2020 BCIM
@@ -6,15 +7,15 @@
 {
     "name": "Shopfloor Base",
     "summary": "Core module for creating mobile apps",
-    "version": "13.0.1.1.0",
+    "version": "10.0.1.1.0",
     "development_status": "Alpha",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",
     "author": "Camptocamp, BCIM, Akretion, Odoo Community Association (OCA)",
     "maintainers": ["guewen", "simahawk", "sebalix"],
     "license": "LGPL-3",
     "application": True,
-    "depends": ["base_jsonify", "base_rest", "base_sparse_field", "auth_api_key"],
+    "depends": ["base_jsonify", "base_rest", "auth_api_key"],
     "data": [
         "data/module_category_data.xml",
         "security/groups.xml",
@@ -32,5 +33,6 @@
         "demo/shopfloor_profile_demo.xml",
     ],
     "post_init_hook": "post_init_hook",
-    "installable": False,
+    "installable": True,
+    "external_dependencies": {"python": ["slugify"]},
 }

shopfloor_base/actions/base_action.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # Copyright 2021 ACSONE SA/NV (http://www.acsone.eu)
 # @author Simone Orsi <simahawk@gmail.com>

shopfloor_base/actions/data.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo.addons.component.core import Component

shopfloor_base/actions/data_detail.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 

shopfloor_base/actions/message.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo import _

shopfloor_base/actions/savepoint.py

@@ -1,10 +1,11 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 import uuid
 
 from psycopg2 import sql
 
-from odoo.sql_db import clear_env, flush_env
+from odoo.api import Environment
 
 from odoo.addons.component.core import Component
 
@@ -30,17 +31,21 @@ class Savepoint(object):
     def __init__(self, cr):
         self._cr = cr
         self.name = uuid.uuid1().hex
-        flush_env(self._cr, clear=False)
         self._execute("SAVEPOINT {}")
 
     def rollback(self):
-        clear_env(self._cr)
+        self._clear_env()
         self._execute("ROLLBACK TO SAVEPOINT {}")
 
     def release(self):
-        flush_env(self._cr, clear=False)
         self._execute("RELEASE SAVEPOINT {}")
 
     def _execute(self, query):
         # pylint: disable=sql-injection
         self._cr.execute(sql.SQL(query).format(sql.Identifier(self.name)))
+
+    def _clear_env(self):
+        for env in list(Environment.envs):
+            if env.cr is self.cr:
+                env.clear()
+                break

shopfloor_base/actions/schema.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # Copyright 2021 ACSONE SA/NV (http://www.acsone.eu)
 # @author Simone Orsi <simahawk@gmail.com>

shopfloor_base/actions/schema_detail.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo.addons.component.core import Component

shopfloor_base/actions/search.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo.addons.component.core import Component

shopfloor_base/controllers/main.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # Copyright 2020 Akretion (http://www.akretion.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).

shopfloor_base/hooks.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2021 ACSONE SA/NV
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 

shopfloor_base/models/__init__.py

@@ -1,3 +1,4 @@
+from . import base
 from . import shopfloor_menu
 from . import shopfloor_profile
 from . import shopfloor_scenario

shopfloor_base/models/base.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2021 ACSONE SA/NV (http://www.acsone.eu)
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from odoo import models
+
+
+class Base(models.AbstractModel):
+
+    _inherit = "base"
+
+    def jsonify(self, parser, one=False):
+        # Add support for params one... provided by base_jsonify from 13.0
+        if one:
+            self.ensure_one()
+        result = super(Base, self).jsonify(parser)
+        return result[0] if one else result

shopfloor_base/models/shopfloor_menu.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # Copyright 2021 ACSONE SA/NV (http://www.acsone.eu)
 # @author Simone Orsi <simahawk@gmail.com>

shopfloor_base/models/shopfloor_profile.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo import fields, models

shopfloor_base/models/shopfloor_scenario.py

@@ -1,13 +1,15 @@
+# -*- coding: utf-8 -*-
 # Copyright 2021 ACSONE SA/NV (http://www.acsone.eu)
 # @author Simone Orsi <simahawk@gmail.com>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 import json
 import logging
 
-from odoo import api, fields, models
+import slugify
 
-from odoo.addons.base_sparse_field.models.fields import Serialized
-from odoo.addons.http_routing.models.ir_http import slugify
+from odoo import api, fields, models
+from odoo.fields import Serialized
+from odoo.tools import ustr
 
 _logger = logging.getLogger(__name__)
 
@@ -26,9 +28,7 @@ class ShopfloorScenario(models.Model):
         "This value must match a service component's `usage`.",
     )
     options = Serialized(compute="_compute_options", default={})
-    options_edit = fields.Text(
-        help="Configure options via JSON", inverse="_inverse_options_edit"
-    )
+    options_edit = fields.Text(help="Configure options via JSON")
 
     _sql_constraints = [("key", "unique(key)", "Scenario key must be unique")]
 
@@ -37,11 +37,6 @@ def _compute_options(self):
         for rec in self:
             rec.options = rec._load_options()
 
-    def _inverse_options_edit(self):
-        for rec in self:
-            # Make sure options_edit is always readable
-            rec.options_edit = json.dumps(rec.options or {}, indent=4, sort_keys=True)
-
     def _load_options(self):
         return json.loads(self.options_edit or "{}")
 
@@ -61,11 +56,14 @@ def _onchange_key(self):
     @api.model
     def create(self, vals):
         self._handle_key(vals)
-        return super().create(vals)
+        self._ensure_options_edit_readability(vals)
+        return super(ShopfloorScenario, self).create(vals)
 
     def write(self, vals):
         self._handle_key(vals)
-        return super().write(vals)
+        if "options_edit" in vals:
+            self._ensure_options_edit_readability(vals)
+        return super(ShopfloorScenario, self).write(vals)
 
     def _handle_key(self, vals):
         # make sure technical names are always there
@@ -74,7 +72,11 @@ def _handle_key(self, vals):
 
     @staticmethod
     def _normalize_key(name):
-        return slugify(name).replace("-", "_")
+        return slugify.slugify(ustr(name)).replace("-", "_")
 
     def has_option(self, key):
         return self.options.get(key, False)
+
+    def _ensure_options_edit_readability(self, vals):
+        value = json.loads(vals.get("options_edit", "{}"))
+        vals["options_edit"] = json.dumps(value, indent=4, sort_keys=True)

shopfloor_base/security/groups.xml

@@ -9,9 +9,6 @@
     <record id="group_shopfloor_manager" model="res.groups">
         <field name="name">Shopfloor Manager</field>
         <field name="category_id" ref="shopfloor_base.module_category_shopfloor" />
-        <field
-            name="users"
-            eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
-        />
+        <field name="users" eval="[(4, ref('base.user_root'))]" />
     </record>
 </odoo>

shopfloor_base/services/app.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo.addons.component.core import Component

shopfloor_base/services/forms/form_mixin.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # @author Simone Orsi <simahawk@gmail.com>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).

shopfloor_base/services/menu.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo.osv import expression
@@ -21,7 +22,7 @@ class ShopfloorMenu(Component):
     _description = __doc__
 
     def _get_base_search_domain(self):
-        base_domain = super()._get_base_search_domain()
+        base_domain = super(ShopfloorMenu, self)._get_base_search_domain()
         return expression.AND(
             [
                 base_domain,

shopfloor_base/services/profile.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo.addons.base_rest.components.service import to_int

shopfloor_base/services/scan_anything.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # Copyright 2021 ACSONE SA/NV (http://www.acsone.eu)
 # @author Simone Orsi <simahawk@gmail.com>

shopfloor_base/services/service.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # Copyright 2020 Akretion (http://www.akretion.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
@@ -7,11 +8,11 @@
 from odoo import _, exceptions
 from odoo.http import request
 from odoo.osv import expression
-from odoo.tools import DotDict
 
 from odoo.addons.component.core import AbstractComponent
 
 from ..actions.base_action import get_actions_for
+from ..utils import DotDict
 
 
 class BaseShopfloorService(AbstractComponent):
@@ -22,9 +23,11 @@ class BaseShopfloorService(AbstractComponent):
     _collection = "shopfloor.service"
     _expose_model = None
 
-    def dispatch(self, method_name, *args, params=None):
+    def dispatch(self, method_name, _id=None, params=None):
         self._validate_headers_update_work_context(request, method_name)
-        return super().dispatch(method_name, *args, params=params)
+        return super(BaseShopfloorService, self).dispatch(
+            method_name, _id=_id, params=params
+        )
 
     def _actions_for(self, usage, **kw):
         return get_actions_for(self, usage, **kw)
@@ -53,6 +56,20 @@ def _to_json(self, records):
             res.append(self._convert_one_record(record))
         return res
 
+    def _get_input_validator(self, method_name):
+        # override the method to get the validator in a component
+        # instead of a method, to keep things apart
+        validator_component = self.component(usage="%s.validator" % self._usage)
+        return validator_component._get_validator(method_name)
+
+    def _get_output_validator(self, method_name):
+        # override the method to get the validator in a component
+        # instead of a method, to keep things apart
+        validator_component = self.component(
+            usage="%s.validator.response" % self._usage
+        )
+        return validator_component._get_validator(method_name)
+
     def _response(
         self, base_response=None, data=None, next_state=None, message=None, popup=None
     ):
@@ -107,7 +124,7 @@ def _response(
     _requires_header_profile = False
 
     def _get_openapi_default_parameters(self):
-        defaults = super()._get_openapi_default_parameters()
+        defaults = super(BaseShopfloorService, self)._get_openapi_default_parameters()
         # Normal users can't read an API key, ignore it using sudo() only
         # because it's a demo key.
         demo_api_key = self.env.ref("shopfloor.api_key_demo", raise_if_not_found=False)

shopfloor_base/services/user.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 from odoo.addons.base_rest.components.service import to_int