diff --git a/operating_unit/static/description/index.html b/operating_unit/static/description/index.html
index a6b26f3218..5ae57c196d 100644
--- a/operating_unit/static/description/index.html
+++ b/operating_unit/static/description/index.html
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -441,7 +442,9 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
diff --git a/pos_operating_unit/README.rst b/pos_operating_unit/README.rst
index 7c24db1d93..6596f5fde7 100644
--- a/pos_operating_unit/README.rst
+++ b/pos_operating_unit/README.rst
@@ -1,6 +1,6 @@
-=========================
-POS Operating Unit Access
-=========================
+========================
+POS with Operating Units
+========================
 
 .. 
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/pos_operating_unit/__manifest__.py b/pos_operating_unit/__manifest__.py
index 17bf915eb4..9a4a89fd63 100644
--- a/pos_operating_unit/__manifest__.py
+++ b/pos_operating_unit/__manifest__.py
@@ -1,6 +1,6 @@
 {
-    "name": "POS Operating Unit Access",
-    "version": "14.0.1.0.0",
+    "name": "POS with Operating Units",
+    "version": "17.0.1.0.0",
     "author": "Ilyas, Ooops404, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/operating-unit",
     "category": "Point of sale",
@@ -9,5 +9,6 @@
     "data": [
         "security/pos_security.xml",
         "views/pos_views.xml",
+        "views/res_config_settings_views.xml",
     ],
 }
diff --git a/pos_operating_unit/models/__init__.py b/pos_operating_unit/models/__init__.py
index 55d2bb6794..199e05d7ee 100644
--- a/pos_operating_unit/models/__init__.py
+++ b/pos_operating_unit/models/__init__.py
@@ -2,3 +2,4 @@
 from . import pos_order
 from . import pos_session
 from . import pos_payment
+from . import res_config_settings
diff --git a/pos_operating_unit/models/pos_order.py b/pos_operating_unit/models/pos_order.py
index 0c19571c9e..1ec9085f02 100644
--- a/pos_operating_unit/models/pos_order.py
+++ b/pos_operating_unit/models/pos_order.py
@@ -11,14 +11,15 @@ class POSOrder(models.Model):
     )
     config_id = fields.Many2one(related="session_id.config_id", readonly=True)
 
-    @api.model
-    def create(self, vals):
-        session_id = self.env["pos.session"].sudo().browse(vals.get("session_id"))
-        if session_id.config_id:
-            vals["operating_unit_ids"] = [
-                (6, 0, session_id.config_id.operating_unit_ids.ids)
-            ]
-        return super(POSOrder, self).create(vals)
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            session_id = self.env["pos.session"].sudo().browse(vals.get("session_id"))
+            if session_id.config_id:
+                vals["operating_unit_ids"] = [
+                    (6, 0, session_id.config_id.operating_unit_ids.ids)
+                ]
+        return super().create(vals_list)
 
 
 class POSOrderLine(models.Model):
@@ -30,11 +31,12 @@ class POSOrderLine(models.Model):
         string="Operating Units",
     )
 
-    @api.model
-    def create(self, vals):
-        order_id = self.env["pos.order"].sudo().browse(vals.get("order_id"))
-        if order_id.config_id:
-            vals["operating_unit_ids"] = [
-                (6, 0, order_id.config_id.operating_unit_ids.ids)
-            ]
-        return super(POSOrderLine, self).create(vals)
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            order_id = self.env["pos.order"].sudo().browse(vals.get("order_id"))
+            if order_id.config_id:
+                vals["operating_unit_ids"] = [
+                    (6, 0, order_id.config_id.operating_unit_ids.ids)
+                ]
+        return super().create(vals_list)
diff --git a/pos_operating_unit/models/pos_payment.py b/pos_operating_unit/models/pos_payment.py
index 5f7098d4f8..82be4ba6fb 100644
--- a/pos_operating_unit/models/pos_payment.py
+++ b/pos_operating_unit/models/pos_payment.py
@@ -11,11 +11,12 @@ class POSPayment(models.Model):
     )
     config_id = fields.Many2one(related="session_id.config_id", readonly=True)
 
-    @api.model
-    def create(self, vals):
-        pos_order_id = self.env["pos.order"].sudo().browse(vals.get("pos_order_id"))
-        if pos_order_id.config_id:
-            vals["operating_unit_ids"] = [
-                (6, 0, pos_order_id.config_id.operating_unit_ids.ids)
-            ]
-        return super(POSPayment, self).create(vals)
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            pos_order_id = self.env["pos.order"].sudo().browse(vals.get("pos_order_id"))
+            if pos_order_id.config_id:
+                vals["operating_unit_ids"] = [
+                    (6, 0, pos_order_id.config_id.operating_unit_ids.ids)
+                ]
+        return super().create(vals_list)
diff --git a/pos_operating_unit/models/pos_session.py b/pos_operating_unit/models/pos_session.py
index 734235265d..3a6b97ec40 100644
--- a/pos_operating_unit/models/pos_session.py
+++ b/pos_operating_unit/models/pos_session.py
@@ -10,9 +10,10 @@ class POSSession(models.Model):
         string="Operating Units",
     )
 
-    @api.model
-    def create(self, vals):
-        config_id = self.env["pos.config"].sudo().browse(vals.get("config_id"))
-        if config_id:
-            vals["operating_unit_ids"] = [(6, 0, config_id.operating_unit_ids.ids)]
-        return super(POSSession, self).create(vals)
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            config_id = self.env["pos.config"].sudo().browse(vals.get("config_id"))
+            if config_id:
+                vals["operating_unit_ids"] = [(6, 0, config_id.operating_unit_ids.ids)]
+        return super().create(vals_list)
diff --git a/pos_operating_unit/models/res_config_settings.py b/pos_operating_unit/models/res_config_settings.py
new file mode 100644
index 0000000000..087acd3d83
--- /dev/null
+++ b/pos_operating_unit/models/res_config_settings.py
@@ -0,0 +1,10 @@
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    pos_operating_unit_ids = fields.Many2many(
+        related="pos_config_id.operating_unit_ids",
+        readonly=False,
+    )
diff --git a/pos_operating_unit/security/pos_security.xml b/pos_operating_unit/security/pos_security.xml
index 36630438bd..e2ce66e1f0 100644
--- a/pos_operating_unit/security/pos_security.xml
+++ b/pos_operating_unit/security/pos_security.xml
@@ -3,7 +3,7 @@
     <record id="ir_rule_pos_config_allowed_operating_units" model="ir.rule">
         <field name="model_id" ref="point_of_sale.model_pos_config" />
         <field name="domain_force">['|', ('operating_unit_ids', '=', False),
-            ('operating_unit_ids', 'in', user.operating_unit_ids.ids)]</field>
+            ('operating_unit_ids', 'in', operating_unit_ids)]</field>
         <field name="name">POS Config allowed operating units</field>
         <field name="global" eval="True" />
         <field eval="0" name="perm_unlink" />
@@ -15,7 +15,7 @@
     <record id="ir_rule_pos_session_allowed_operating_units" model="ir.rule">
         <field name="model_id" ref="point_of_sale.model_pos_session" />
         <field name="domain_force">['|', ('operating_unit_ids', '=', False),
-            ('operating_unit_ids', 'in', user.operating_unit_ids.ids)]</field>
+            ('operating_unit_ids', 'in', operating_unit_ids)]</field>
         <field name="name">POS Session allowed operating units</field>
         <field name="global" eval="True" />
         <field eval="0" name="perm_unlink" />
@@ -27,7 +27,7 @@
     <record id="ir_rule_pos_order_allowed_operating_units" model="ir.rule">
         <field name="model_id" ref="point_of_sale.model_pos_order" />
         <field name="domain_force">['|', ('operating_unit_ids', '=', False),
-            ('operating_unit_ids', 'in', user.operating_unit_ids.ids)]</field>
+            ('operating_unit_ids', 'in', operating_unit_ids)]</field>
         <field name="name">POS Order allowed operating units</field>
         <field name="global" eval="True" />
         <field eval="0" name="perm_unlink" />
@@ -39,7 +39,7 @@
      <record id="ir_rule_pos_order_line_allowed_operating_units" model="ir.rule">
         <field name="model_id" ref="point_of_sale.model_pos_order_line" />
         <field name="domain_force">['|', ('operating_unit_ids', '=', False),
-            ('operating_unit_ids', 'in', user.operating_unit_ids.ids)]</field>
+            ('operating_unit_ids', 'in', operating_unit_ids)]</field>
         <field name="name">POS Order Line allowed operating units</field>
         <field name="global" eval="True" />
         <field eval="0" name="perm_unlink" />
@@ -51,7 +51,7 @@
     <record id="ir_rule_pos_payment_allowed_operating_units" model="ir.rule">
         <field name="model_id" ref="point_of_sale.model_pos_payment" />
         <field name="domain_force">['|', ('operating_unit_ids', '=', False),
-            ('operating_unit_ids', 'in', user.operating_unit_ids.ids)]</field>
+            ('operating_unit_ids', 'in', operating_unit_ids)]</field>
         <field name="name">POS Payment allowed operating units</field>
         <field name="global" eval="True" />
         <field eval="0" name="perm_unlink" />
@@ -63,7 +63,7 @@
     <record id="ir_rule_report_pos_order_allowed_operating_units" model="ir.rule">
         <field name="model_id" ref="point_of_sale.model_report_pos_order" />
         <field name="domain_force">['|', ('config_id.operating_unit_ids', '=', False),
-            ('config_id.operating_unit_ids', 'in', user.operating_unit_ids.ids)]</field>
+            ('config_id.operating_unit_ids', 'in', operating_unit_ids)]</field>
         <field name="name">POS Order Report allowed operating units</field>
         <field name="global" eval="True" />
         <field eval="0" name="perm_unlink" />
diff --git a/pos_operating_unit/static/description/index.html b/pos_operating_unit/static/description/index.html
index b954a410bd..7092067cbe 100644
--- a/pos_operating_unit/static/description/index.html
+++ b/pos_operating_unit/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>POS Operating Unit Access</title>
+<title>POS with Operating Units</title>
 <style type="text/css">
 
 /*
@@ -360,8 +360,8 @@
 </style>
 </head>
 <body>
-<div class="document" id="pos-operating-unit-access">
-<h1 class="title">POS Operating Unit Access</h1>
+<div class="document" id="pos-with-operating-units">
+<h1 class="title">POS with Operating Units</h1>
 
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
diff --git a/pos_operating_unit/tests/__init__.py b/pos_operating_unit/tests/__init__.py
index d9b96c4fa5..b66281b776 100644
--- a/pos_operating_unit/tests/__init__.py
+++ b/pos_operating_unit/tests/__init__.py
@@ -1 +1 @@
-from . import test_module
+from . import test_pos_operating_unit
diff --git a/pos_operating_unit/tests/test_module.py b/pos_operating_unit/tests/test_pos_operating_unit.py
similarity index 54%
rename from pos_operating_unit/tests/test_module.py
rename to pos_operating_unit/tests/test_pos_operating_unit.py
index cb181e4e9a..d8de6c0ef8 100644
--- a/pos_operating_unit/tests/test_module.py
+++ b/pos_operating_unit/tests/test_pos_operating_unit.py
@@ -1,68 +1,67 @@
 from odoo import fields
 from odoo.exceptions import AccessError
-from odoo.tests.common import TransactionCase
+from odoo.models import Command
 
+from odoo.addons.operating_unit.tests.common import OperatingUnitCommon
 
-class TestModule(TransactionCase):
-    def setUp(self):
-        super(TestModule, self).setUp()
-        self.ResUsers = self.env["res.users"]
-        self.PosOrder = self.env["pos.order"]
-        self.pos_product = self.env.ref("point_of_sale.whiteboard_pen")
-        self.pricelist = self.env.ref("product.list0")
 
-        # Create a new pos config and open it
-        self.pos_config = self.env.ref("point_of_sale.pos_config_main").copy()
+class TestPOSOperatingUnit(OperatingUnitCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.PosOrder = cls.env["pos.order"]
+        cls.pos_product = cls.env.ref("point_of_sale.whiteboard_pen")
+        cls.pricelist = cls.env["product.pricelist"].search([], limit=1)
 
-        # company
-        self.company = self.env.ref("base.main_company")
-        # group
-        self.group_user = self.env.ref("base.group_user")
-        self.group_pos_manager = self.env.ref("point_of_sale.group_pos_manager")
-        # Main Operating Unit
-        self.ou1 = self.env.ref("operating_unit.main_operating_unit")
-        # B2B Operating Unit
-        self.b2b = self.env.ref("operating_unit.b2b_operating_unit")
+        # Create a new pos config and open it
+        cls.pos_config = cls.env.ref("point_of_sale.pos_config_main").copy()
+        cls.group_pos_manager = cls.env.ref("point_of_sale.group_pos_manager")
+        cls.group_account_invoice = cls.env.ref("account.group_account_invoice")
 
-        self.pos_config.operating_unit_ids = [(6, 0, [self.ou1.id])]
-        self.pos_config.open_session_cb()
+        cls.pos_config.operating_unit_ids = [Command.set([cls.ou1.id])]
+        cls.pos_config.open_ui()
 
-        # Create users
-        self.user1_id = self._create_user(
-            "user_1",
-            [self.group_user, self.group_pos_manager],
-            self.company,
-            [self.ou1, self.b2b],
+        cls.user1.write(
+            {
+                "groups_id": [
+                    Command.link(cls.group_pos_manager.id),
+                    Command.link(cls.group_account_invoice.id),
+                ],
+                "operating_unit_ids": [Command.link(cls.b2b.id)],
+            }
         )
-        self.user2_id = self._create_user(
-            "user_2",
-            [self.group_user, self.group_pos_manager],
-            self.company,
-            [self.b2b],
+        cls.user2.write(
+            {
+                "groups_id": [
+                    Command.link(cls.group_pos_manager.id),
+                    Command.link(cls.group_account_invoice.id),
+                ],
+                "operating_unit_ids": [Command.set([cls.b2b.id])],
+            }
         )
 
     def test_operating_unit_access_config(self):
-        config1_ids = self.env["pos.config"].with_user(self.user1_id).search([])
+        config1_ids = self.env["pos.config"].with_user(self.user1).search([])
         self.assertIn(self.pos_config, config1_ids)
-        config2_ids = self.env["pos.config"].with_user(self.user2_id).search([])
+        config2_ids = self.env["pos.config"].with_user(self.user2).search([])
         self.assertNotIn(self.pos_config, config2_ids)
 
     def test_operating_unit_access_session(self):
-        self.pos_config.current_session_id.with_user(self.user1_id).read()
+        self.pos_config.current_session_id.with_user(self.user1).read()
         with self.assertRaises(AccessError):
-            self.pos_config.current_session_id.with_user(self.user2_id).read()
+            self.pos_config.current_session_id.with_user(self.user2).read()
 
     def test_operating_unit_access_order_and_line_and_payment(self):
         order = self._create_order()
-        order.with_user(self.user1_id).read()
-        order.lines.with_user(self.user1_id).read()
+        order.with_user(self.user1).read()
+        order.lines.with_user(self.user1).read()
         with self.assertRaises(AccessError):
-            order.with_user(self.user2_id).read()
+            order.with_user(self.user2).read()
         with self.assertRaises(AccessError):
-            order.lines.with_user(self.user2_id).read()
-        order.payment_ids.with_user(self.user1_id).read()
+            order.lines.with_user(self.user2).read()
+        order.payment_ids.with_user(self.user1).read()
         with self.assertRaises(AccessError):
-            order.payment_ids.with_user(self.user2_id).read()
+            order.payment_ids.with_user(self.user2).read()
 
     def _create_order(self):
         # Create order
@@ -71,6 +70,7 @@ def _create_order(self):
             "id": "0006-001-0010",
             "to_invoice": False,
             "data": {
+                "date_order": fields.Datetime.to_string(fields.Datetime.now()),
                 "pricelist_id": self.pricelist.id,
                 "user_id": 1,
                 "name": "Order 0006-001-0010",
@@ -84,6 +84,7 @@ def _create_order(self):
                         {
                             "product_id": self.pos_product.id,
                             "qty": 1,
+                            "price_unit": 1000,
                             "price_subtotal": 1000,
                             "price_subtotal_incl": 1000,
                         },
@@ -117,20 +118,3 @@ def _create_order(self):
         result = self.PosOrder.create_from_ui([order_data])
         order = self.PosOrder.browse(result[0].get("id"))
         return order
-
-    def _create_user(self, login, groups, company, operating_units):
-        """Create a user."""
-        group_ids = [group.id for group in groups]
-        user = self.ResUsers.with_context({"no_reset_password": True}).create(
-            {
-                "name": "Chicago Purchase User",
-                "login": login,
-                "password": "demo",
-                "email": "chicago@yourcompany.com",
-                "company_id": company.id,
-                "company_ids": [(4, company.id)],
-                "operating_unit_ids": [(4, ou.id) for ou in operating_units],
-                "groups_id": [(6, 0, group_ids)],
-            }
-        )
-        return user.id
diff --git a/pos_operating_unit/views/pos_views.xml b/pos_operating_unit/views/pos_views.xml
index 824b7153e8..145f3c82e2 100644
--- a/pos_operating_unit/views/pos_views.xml
+++ b/pos_operating_unit/views/pos_views.xml
@@ -5,22 +5,20 @@
         <field name="model">pos.config</field>
         <field name="inherit_id" ref="point_of_sale.pos_config_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='company_id']/../../.." position="after">
-                <div class="col-xs-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_left_pane" />
-                        <div class="o_setting_right_pane">
-                            <div
-                            class="content-group"
-                            groups="operating_unit.group_manager_operating_unit"
-                        >
-                                <label for="operating_unit_ids" />
-                                <field
-                                name="operating_unit_ids"
-                                widget="many2many_tags"
-                            />
-                            </div>
-                        </div>
-                    </div>
+            <xpath expr="//setting[@id='other_devices']" position="before">
+                <setting
+                    id="operating_units_setting"
+                    string="Operating Units"
+                    help="Operating units used for this POS"
+                >
+                    <field
+                        name="operating_unit_ids"
+                        colspan="4"
+                        widget="many2many_tags"
+                        options="{'no_create': True}"
+                        groups="operating_unit.group_manager_operating_unit"
+                    />
+                </setting>
             </xpath>
         </field>
     </record>
@@ -31,7 +29,14 @@
         <field name="inherit_id" ref="point_of_sale.view_pos_pos_form" />
         <field name="arch" type="xml">
             <field name="session_id" position="after">
-                <field name="config_id" />
+                <field name="config_id" optional="show" />
+                <field
+                    name="operating_unit_ids"
+                    widget="many2many_tags"
+                    optional="show"
+                    readonly="1"
+                    groups="operating_unit.group_multi_operating_unit"
+                />
             </field>
         </field>
     </record>
@@ -42,7 +47,13 @@
         <field name="inherit_id" ref="point_of_sale.view_pos_order_tree" />
         <field name="arch" type="xml">
             <field name="session_id" position="before">
-                <field name="config_id" />
+                <field name="config_id" optional="show" />
+                <field
+                    name="operating_unit_ids"
+                    widget="many2many_tags"
+                    optional="show"
+                    groups="operating_unit.group_multi_operating_unit"
+                />
             </field>
         </field>
     </record>
@@ -54,6 +65,13 @@
         <field name="arch" type="xml">
             <field name="session_id" position="after">
                 <field name="config_id" />
+                <field
+                    name="operating_unit_ids"
+                    widget="many2many_tags"
+                    options="{'no_create': True}"
+                    readonly="1"
+                    groups="operating_unit.group_multi_operating_unit"
+                />
             </field>
         </field>
     </record>
@@ -65,6 +83,12 @@
         <field name="arch" type="xml">
             <field name="payment_date" position="after">
                 <field name="config_id" />
+                <field
+                    name="operating_unit_ids"
+                    widget="many2many_tags"
+                    optional="show"
+                    groups="operating_unit.group_multi_operating_unit"
+                />
             </field>
         </field>
     </record>
diff --git a/pos_operating_unit/views/res_config_settings_views.xml b/pos_operating_unit/views/res_config_settings_views.xml
new file mode 100644
index 0000000000..188c7a4b4e
--- /dev/null
+++ b/pos_operating_unit/views/res_config_settings_views.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.point_of_sale</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="point_of_sale.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <block id="pos_payment_section" position="before">
+                <block title="Operating Units" id="operating_units_section">
+                    <setting
+                        id="operating_units_setting"
+                        string="Operating Units"
+                        help="Operating units used for this POS"
+                    >
+                        <field
+                            name="pos_operating_unit_ids"
+                            colspan="4"
+                            widget="many2many_tags"
+                            options="{'no_create': True}"
+                            groups="operating_unit.group_manager_operating_unit"
+                        />
+                    </setting>
+                </block>
+            </block>
+        </field>
+    </record>
+</odoo>