From e95f85ef917a2467e9ba1ed2c81cab1a13f0a42b Mon Sep 17 00:00:00 2001
From: Denis Mudarisov <denis.mudarisov@gmail.com>
Date: Wed, 30 Jun 2021 13:41:23 +0500
Subject: [PATCH] :arrow_up: update views and docs

---
 pos_order_merge/doc/index.rst             |  2 +-
 pos_order_merge/views/pos_config_view.xml | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pos_order_merge/doc/index.rst b/pos_order_merge/doc/index.rst
index 24306ecf22..89f6e90805 100644
--- a/pos_order_merge/doc/index.rst
+++ b/pos_order_merge/doc/index.rst
@@ -14,7 +14,7 @@ Configuration
 
   * Open POS configuration form
   * Click on ``[Edit]``
-  * Check **[x] Order Merge** box under ``Bar & Restaurant`` section
+  * Check **[x] Order Merge** box under ``Order Interface`` section
 
 Usage
 =====
diff --git a/pos_order_merge/views/pos_config_view.xml b/pos_order_merge/views/pos_config_view.xml
index cc46425b61..f86b775c93 100644
--- a/pos_order_merge/views/pos_config_view.xml
+++ b/pos_order_merge/views/pos_config_view.xml
@@ -3,10 +3,22 @@
     <record id="view_pos_config_form" model="ir.ui.view">
         <field name="name">pos.config.form.view.inherit</field>
         <field name="model">pos.config</field>
-        <field name="inherit_id" ref="point_of_sale.pos_config_view_form" />
+        <field name="inherit_id" ref="pos_restaurant.pos_config_view_form_inherit_restaurant" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='iface_orderline_notes']" position="after">
-                <field name="iface_order_merge" />
+            <xpath expr="//div[@id='iface_orderline_notes']" position="after">
+                <div class="col-12 col-lg-6 o_setting_box"
+                    id="iface_order_merge"
+                    attrs="{'invisible': [('module_pos_restaurant', '=', False)]}">
+                    <div class="o_setting_left_pane">
+                        <field name="iface_order_merge"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="iface_order_merge"/>
+                        <div class="text-muted">
+                            Merge orders
+                        </div>
+                    </div>
+                </div>
             </xpath>
         </field>
     </record>