[MERGE] from trunk

[odoo/odoo.git] / addons / point_of_sale / point_of_sale_view.xml

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 195b7ce..a8b69c2 100644 (file)
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -744,9 +744,10 @@
         <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
                 id="menu_pos_details" parent="menu_point_rep" sequence="6" />
 
-        <record model="ir.actions.client" id="action_pos_pos">
+        <record model="ir.actions.act_url" id="action_pos_pos">
             <field name="name">Start Point of Sale</field>
-            <field name="tag">pos.ui</field>
+            <field name="url">/pos/web/</field>
+            <field name="target">self</field>
         </record>
 
         <!-- Top menu item -->
@@ -786,7 +787,7 @@
                                 <field name="cash_control" />
                             </tree>
                         </field>
-                        <group string="Material Interfaces" >
+                        <group string="Settings" >
                             <group>
                                 <field name="iface_self_checkout" />
                                 <field name="iface_cashdrawer" />
@@ -796,9 +797,14 @@
                             <group>
                                 <field name="iface_electronic_scale" />
                                 <field name="iface_vkeyboard" />
-                                <field name="iface_print_via_proxy" />
+                                <field name="iface_big_scrollbars" />
                             </group>
                         </group>
+                        <group string="Receipt" >
+                            <field name="iface_print_via_proxy" />
+                            <field name="receipt_header" placeholder="A custom receipt header message"/>
+                            <field name="receipt_footer" placeholder="A custom receipt header footage"/>
+                        </group>
                     </sheet>
 
                 </form>