diff --git a/pos_place/__manifest__.py b/pos_place/__manifest__.py
index 6b3fc4fd74..beb9618390 100644
--- a/pos_place/__manifest__.py
+++ b/pos_place/__manifest__.py
@@ -16,7 +16,7 @@
         "security/ir_rule.xml",
         "security/res_groups.xml",
         "security/ir.model.access.csv",
-        # "views/view_account_invoice.xml",
+        "views/view_account_move.xml",
         "views/view_pos_config.xml",
         "views/view_pos_place.xml",
         "views/view_pos_order.xml",
diff --git a/pos_place/models/__init__.py b/pos_place/models/__init__.py
index 684717770b..027bb556dc 100644
--- a/pos_place/models/__init__.py
+++ b/pos_place/models/__init__.py
@@ -1,4 +1,4 @@
-# from . import account_invoice
+from . import account_move
 from . import pos_place
 from . import pos_config
 from . import pos_order
diff --git a/pos_place/models/account_move.py b/pos_place/models/account_move.py
index 3574dee401..fe757b9196 100644
--- a/pos_place/models/account_move.py
+++ b/pos_place/models/account_move.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class AccountInvoice(models.Model):
-    _inherit = "account.invoice"
+class AccountMove(models.Model):
+    _inherit = "account.move"
 
     place_id = fields.Many2one(string="Place", comodel_name="pos.place")
diff --git a/pos_place/security/ir_rule.xml b/pos_place/security/ir_rule.xml
index a931e906c4..c497b264bb 100644
--- a/pos_place/security/ir_rule.xml
+++ b/pos_place/security/ir_rule.xml
@@ -10,9 +10,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="name">Point of Sale Places</field>
         <field name="model_id" ref="model_pos_place" />
         <field name="global" eval="True" />
-        <field name="domain_force">['|',
-            ('company_id', '=', False),
-            ('company_id', '=', user.company_id.id)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
 
 </odoo>
diff --git a/pos_place/views/view_account_invoice.xml b/pos_place/views/view_account_invoice.xml
deleted file mode 100644
index 827b9950e3..0000000000
--- a/pos_place/views/view_account_invoice.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-Copyright (C) 2022 - Today: GRAP (http://www.grap.coop)
-@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
-License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
--->
-<odoo>
-
-    <record id="view_account_invoice_tree" model="ir.ui.view">
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_tree" />
-        <field name="arch" type="xml">
-            <field name="partner_id" position="after">
-                <field name="place_id" groups="pos_place.group_pos_place_user" />
-            </field>
-        </field>
-    </record>
-
-    <record id="view_account_invoice_form" model="ir.ui.view">
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_form" />
-        <field name="arch" type="xml">
-            <field name="date_due" position="after">
-                <field name="place_id" groups="pos_place.group_pos_place_user" />
-            </field>
-        </field>
-    </record>
-
-</odoo>
diff --git a/pos_place/views/view_account_move.xml b/pos_place/views/view_account_move.xml
new file mode 100644
index 0000000000..1cf7164cf6
--- /dev/null
+++ b/pos_place/views/view_account_move.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Copyright (C) 2022 - Today: GRAP (http://www.grap.coop)
+@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
+License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+<odoo>
+
+    <record id="view_account_move_tree" model="ir.ui.view">
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_invoice_tree" />
+        <field name="arch" type="xml">
+            <field name="company_id" position="before">
+                <field
+                    name="place_id"
+                    groups="pos_place.group_pos_place_user"
+                    optional="show"
+                />
+            </field>
+        </field>
+    </record>
+
+    <record id="view_account_move_form" model="ir.ui.view">
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form" />
+        <field name="arch" type="xml">
+            <field name="partner_shipping_id" position="after">
+                <field name="place_id" groups="pos_place.group_pos_place_user" />
+            </field>
+        </field>
+    </record>
+
+</odoo>