X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;ds=sidebyside;f=addons%2Fpoint_of_sale%2Fpoint_of_sale_view.xml;h=1a1e0442c161ce4ed7f9bcb4b659e0e4083d3f87;hb=211a9d090461b1328919469a02fb812540fdded4;hp=0379d14e573401df581b06093403af495e536120;hpb=a814343ab74d075ffe1b88723c1a3029f2798bfc;p=odoo%2Fodoo.git

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 0379d14..1a1e044 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -3,9 +3,9 @@
     <data>
 
         <!-- Top menu item -->
-        <menuitem name="PoS Backend"
+        <menuitem name="Point of Sale"
             id="menu_point_root"
-            groups="group_pos_manager"
+            groups="group_pos_manager,group_pos_user"
             sequence="140"/>
 
         <record id="categ_others" model="pos.category">
@@ -15,24 +15,21 @@
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
             <field name="model">pos.order</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Point of Sale Orders" version="7.0">
-                    <div class="oe_form_topbar">
-                        <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft" context="{'pos_session_id' : session_id}"/>
-                        <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
-                        <button name="refund" string="Return Products" type="object" icon="gtk-ok"
+                    <header>
+                        <button name="%(action_pos_payment)d" string="Payment" class="oe_highlight" type="action" states="draft" context="{'pos_session_id' : session_id}"/>
+                        <button name="action_invoice" string="Invoice" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
+                        <button name="refund" string="Return Products" type="object" 
                             attrs="{'invisible':[('state','=','draft')]}"/>
-                        <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-                            <div class="oe_right">
-                                <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
-                            </div>
-                    </div>
+                        <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
+                    </header>
                     <sheet>
                     <group col="4" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
-                        <field name="session_id" required="1" />
+                        <field name="session_id" required="1"/>
                         <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
                     </group>
                     <notebook colspan="4">
@@ -61,14 +58,14 @@
                             <group class="oe_subtotal_footer">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-                                <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
+                                <button name="button_dummy" string="Update" class="oe_link" states="draft"/>
                             </group>
                         </page>
                         <page string="Payments">
                             <field name="statement_ids" colspan="4" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="journal_id"/>
-                                    <field name="statement_id" />
+                                    <field name="statement_id"/>
                                     <field name="amount"/>
                                 </tree>
                                 <form string="Statement lines" version="7.0">
@@ -114,11 +111,19 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
             <field name="domain">[]</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new order.
+              </p><p>
+                Use this menu to browse your preceeding orders. To record new
+                orders, you should better use the menu <i>Your Session</i> for
+                the touchscreen interface.
+              </p>
+            </field>
         </record>
         <record model="ir.ui.view" id="view_pos_order_tree">
             <field name="name">Sales</field>
             <field name="model">pos.order</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders" colors="blue:state == 'draft';gray:state in ('done','cancel');black:state not in('done','cancel')">
                     <field name="name"/>
@@ -135,7 +140,6 @@
         <record id="view_pos_order_filter" model="ir.ui.view">
             <field name="name">pos.order.list.select</field>
             <field name="model">pos.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order"/>
@@ -155,8 +159,8 @@
             </field>
         </record>
 
-        <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="10" />
-        <menuitem parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user"/>
+        <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="10"/>
+        <menuitem parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="2" groups="group_pos_manager,group_pos_user"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
 
         <record id="product_normal_action" model="ir.actions.act_window">
@@ -166,6 +170,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,kanban</field>
             <field name="context" eval="{'default_pos_categ_id': ref('point_of_sale.categ_others')}"/>
+            <field name="domain" eval="[('pos_categ_id','&lt;&gt;',False)]"/>
             <field name="view_id" ref="product.product_product_tree_view"/>
             <field name="search_view_id" ref="product.product_search_form_view"/>
             <field name="help" type="html">
@@ -190,7 +195,6 @@
         <record model="ir.ui.view" id="view_pos_order_line">
             <field name="name">Sale lines</field>
             <field name="model">pos.order.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS Order lines">
                     <field name="product_id" readonly="1"/>
@@ -207,7 +211,6 @@
         <record model="ir.ui.view" id="view_pos_order_line_form">
             <field name="name">Sale line</field>
             <field name="model">pos.order.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Order line" version="7.0">
                     <group col="4">
@@ -256,7 +259,6 @@
         <record model="ir.ui.view" id="view_pos_trans_user_form">
             <field name="name">report.trans.pos.user.form</field>
             <field name="model">report.transaction.pos</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -276,7 +278,6 @@
         <record model="ir.ui.view" id="view_trans_pos_user_tree">
             <field name="name">Sales by user</field>
             <field name="model">report.transaction.pos</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_create" widget="date" />
@@ -295,7 +296,6 @@
         <record model="ir.ui.view" id="view_report_transaction_pos_calendar">
             <field name="name">report.transaction.pos.calendar</field>
             <field name="model">report.transaction.pos</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_create" string="POS Report">
@@ -308,7 +308,6 @@
          <record model="ir.ui.view" id="view_report_transaction_pos_graph">
             <field name="name">report.transaction.pos.graph</field>
             <field name="model">report.transaction.pos</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="POS Report">
@@ -349,7 +348,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_form">
             <field name="name">report.sales.by.user.pos.form</field>
             <field name="model">report.sales.by.user.pos</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -366,7 +364,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_tree">
             <field name="name">report.sales.by.user.pos.tree</field>
             <field name="model">report.sales.by.user.pos</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_order" widget="date"/>
@@ -380,7 +377,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_calendar">
             <field name="name">report.sales.by.user.pos.calendar</field>
             <field name="model">report.sales.by.user.pos</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="POS Report">
@@ -393,7 +389,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_graph">
             <field name="name">report.sales.by.user.pos.graph</field>
             <field name="model">report.sales.by.user.pos</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="Sales by User">
@@ -417,7 +412,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_form">
             <field name="name">report.sales.by.user.pos.month.form</field>
             <field name="model">report.sales.by.user.pos.month</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -434,7 +428,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_tree">
             <field name="name">report.sales.by.user.pos.month.tree</field>
             <field name="model">report.sales.by.user.pos.month</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_order" widget="date"/>
@@ -448,7 +441,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_calendar">
             <field name="name">report.sales.by.user.pos.month.calendar</field>
             <field name="model">report.sales.by.user.pos.month</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="POS Report">
@@ -461,7 +453,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_graph">
             <field name="name">report.sales.by.user.pos.month.graph</field>
             <field name="model">report.sales.by.user.pos.month</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="Sales by User">
@@ -485,7 +476,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_form">
             <field name="name">report.sales.by.margin.pos.form</field>
             <field name="model">report.sales.by.margin.pos</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -504,7 +494,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_tree">
             <field name="name">report.sales.by.margin.pos.tree</field>
             <field name="model">report.sales.by.margin.pos</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="user_id"/>
@@ -520,7 +509,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_calendar">
             <field name="name">report.sales.by.margin.pos.calendar</field>
             <field name="model">report.sales.by.margin.pos</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
@@ -533,7 +521,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_graph">
             <field name="name">report.sales.by.margin.pos.graph</field>
             <field name="model">report.sales.by.margin.pos</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
@@ -554,7 +541,6 @@
          <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_form">
             <field name="name">report.sales.by.margin.pos.month.form</field>
             <field name="model">report.sales.by.margin.pos.month</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -573,7 +559,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_tree">
             <field name="name">report.sales.by.margin.pos.month.tree</field>
             <field name="model">report.sales.by.margin.pos.month</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="user_id"/>
@@ -589,7 +574,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_calendar">
             <field name="name">report.sales.by.margin.pos.month.calendar</field>
             <field name="model">report.sales.by.margin.pos.month</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
@@ -602,7 +586,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_graph">
             <field name="name">report.sales.by.margin.pos.month.graph</field>
             <field name="model">report.sales.by.margin.pos.month</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
@@ -623,7 +606,6 @@
         <record id="product_normal_form_pos_view" model="ir.ui.view">
             <field name="name">product.normal.pos.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                   <group name="status" position="after">
@@ -639,7 +621,6 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="misc" position="after">
@@ -649,6 +630,9 @@
                         <field name="expense_pdt"/>
                     </group>
                 </group>
+                <field name="ean13" position="after">
+                    <button name="edit_ean" type="object" string="Edit" />
+                </field>
             </field>
         </record>
 
@@ -656,7 +640,6 @@
         <record id="pos_category_form_view" model="ir.ui.view">
             <field name="name">pos.category.form</field>
             <field name="model">pos.category</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product PoS Categories" version="7.0">
                     <sheet>
@@ -675,7 +658,6 @@
         <record id="pos_category_tree_view" model="ir.ui.view">
             <field name="name">pos.category.tree</field>
             <field name="model">pos.category</field>
-            <field name="type">tree</field>
             <field name="field_parent" eval="False"/>
             <field name="arch" type="xml">
                 <tree string="Product PoS Categories">
@@ -691,6 +673,18 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new category.
+              </p><p>
+                Categories are used to browse your products through the
+                touchscreen interface.
+              </p><p>
+                If you put a photo on the category, the layout of the
+                touchscreen interface will automatically. We suggest not to put
+                a photo on categories for small (1024x768) screens.
+              </p>
+            </field>
         </record>
         <menuitem action="pos_category_action" id="menu_pos_category" parent="menu_point_of_sale_product" sequence="0" />
         <!-- END -->
@@ -710,7 +704,9 @@
                 Click to add a payment method.
               </p><p>
                 Payment methods are defined by accounting journals having the
-                field <i>Payment Method</i> checked.
+                field <i>PoS Payment Method</i> checked. In order to be useable
+                from the touchscreen interface, you must set the payment method
+                on the <i>Point of Sale</i> configuration.
               </p>
             </field>
         </record>
@@ -723,7 +719,6 @@
         <record model="ir.ui.view" id="view_pos_order_tree_all_sales_lines">
             <field name="name">POS Sales Lines</field>
             <field name="model">pos.order.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders lines">
                     <field name="order_id" />
@@ -764,22 +759,9 @@
         </record>
 
         <!-- Top menu item -->
-        <!--
-            right now it's not possible to directly call a client action
-            from a menuitem, so we can't use this shortcut element and
-            use an explicit record element instead
-        -->
-        <record id="menu_point_root_touchscreen" model="ir.ui.menu">
-            <field name="name">Point of Sale</field>
-            <field name="action" ref="action_pos_pos"/>
-            <field name="groups_id" eval="[(6, 0, [ref('point_of_sale.group_pos_manager'), ref('point_of_sale.group_pos_user')])]"/>
-            <field name="sequence">150</field>
-        </record>
-
         <record model="ir.ui.view" id="view_pos_config_form">
             <field name="name">pos.config.form.view</field>
             <field name="model">pos.config</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Point of Sale Configuration" version="7.0">
                     <header>
@@ -812,7 +794,6 @@
                         <group string="Material Interfaces" >
                             <group>
                                 <field name="iface_self_checkout" />
-                                <field name="iface_websql" />
                                 <field name="iface_led" />
                                 <field name="iface_cashdrawer" />
                                 <field name="iface_payment_terminal" />
@@ -833,7 +814,6 @@
         <record model="ir.ui.view" id="view_pos_config_tree">
             <field name="name">pos.config.tree.view</field>
             <field name="model">pos.config</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Point of Sale Configuration" colors="grey:state == 'inactive'">
                     <field name="name" />
@@ -846,7 +826,6 @@
         <record model="ir.ui.view" id="view_pos_config_search">
             <field name="name">pos.config.search.view</field>
             <field name="model">pos.config</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Config">
                     <field name="name" />
@@ -892,85 +871,97 @@
         <record model="ir.ui.view" id="view_pos_session_form">
             <field name="name">pos.session.form.view</field>
             <field name="model">pos.session</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Point of Sale Session" version="7.0">
                     <header>
-                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" />
-                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened" />
-                        <button name="close" type="workflow" string="Validate &amp; Close" states="closing_control,opened" />
-
+                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
+                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened"
+                            class="oe_highlight"/>
+                        <button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
+                            class="oe_highlight"/>
+                        <button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"/>
                         <div class="oe_right">
                             <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1"/>
                         </div>
                     </header>
                     <sheet>
-
-                    <group>
-                        <field name="config_id"/>
+                        <div class="oe_right oe_button_box">
+                            <button name="%(action_pos_box_in)d" string="Put Money In" type="action" states="opened,closing_control"/>
+                            <button name="%(action_pos_box_out)d" string="Take Money Out" type="action" states="opened,closing_control"/>
+                        </div>
+                        <h1 class="oe_title">
+                            Session:
+                            <field name="name" attrs="{'invisible': [('name','=','/')]}" class="oe_inline"/>
+                        </h1>
                         <field name="has_opening_control" invisible="1" />
                         <field name="has_closing_control" invisible="1" />
-            			<group>
-            				<button name="%(action_pos_box_in)d" string="Put Money In" type="action" states="opened"/>
-            				<button name="%(action_pos_box_out)d" string="Take Money Out" type="action" states="opened"/>
-                            <button name="open_frontend_cb" type="object" string="Open Point Of Sale" states="opened" />
-            			</group>
-                        <newline/>
-                        <field name="user_id" />
-                        <field name="name" />
-                        <newline/>
-                        <field name="start_at" attrs="{'insivible' : [('state', '=', 'opening_control')]}"/>
-                        <field name="stop_at" attrs="{'insivible' : [('state', '=', 'opening_control')]}"/>
-                        <separator string="Cash Control" colspan="4"/>
-                            <field name="cash_register_id" invisible="1" />
-                            <field name="opening_details_ids" colspan="4" nolabel="1" attrs="{'invisible' : [('state', 'not in', ('opening_control',))]}">
-                                <tree string="Opening Cashbox Lines" editable="bottom">
-                                    <field name="pieces" readonly="1" />
-                                    <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)" />
-                                    <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
-                                </tree>
-                            </field>
-
-                            <field name="details_ids" colspan="4" nolabel="1" attrs="{'invisible': [('state', '=', 'opening_control')]}">
-                                <tree string="Cashbox Lines" editable="bottom">
-                                    <field name="pieces" readonly="1" />
-                                    <field name="number_opening" readonly="1"/>
-                                    <field name="subtotal_opening"/>
-                                    <field name="number_closing"/>
-                                    <field name="subtotal_closing"/>
-                                </tree>
-                            </field>
-
+                        <group>
+                            <group>
+                                <field name="user_id"/>
+                                <field name="config_id" attrs="{'invisible' : [('config_id', '&lt;&gt;', False)]}"/>
+                            </group>
+                            <group>
+                                <field name="start_at" attrs="{'invisible' : [('state', '=', 'opening_control')]}"/>
+                                <field name="stop_at" attrs="{'invisible' : [('state', '&lt;&gt;', 'closed')]}"/>
+                            </group>
+                            <newline/>
+
+                            <group string="Opening Cash Control">
+                                <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
+                                    <tree string="Opening Cashbox Lines" editable="bottom">
+                                        <field name="pieces" readonly="1" />
+                                        <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening)" />
+                                        <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                    </tree>
+                                </field>
+                            </group>
+                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '=', 'opening_control')]}">
+                                <field name="details_ids" nolabel="1" colspan="2">
+                                    <tree string="Cashbox Lines" editable="bottom">
+                                        <field name="pieces" readonly="1" />
+                                        <field name="number_closing"/>
+                                        <field name="subtotal_closing"/>
+                                    </tree>
+                                </field>
+                            </group>
 
-                            <group col="4" colspan="4">
-                                <group col="2" colspan="2">
-                                    <separator string="Cash Balance" colspan="2"/>
-                                    <field name="cash_register_balance_start" readonly="1" string="Opening Cash Control"/>
+                            <div>
+                                <group class="oe_subtotal_footer oe_right">
+                                    <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
-                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theorical Cash Closing"/>
-                                </group>
-                                <group col="2" colspan="2" attrs="{'invisible' : [('state', '=', 'opening_control')]}">
-                                    <separator string="Cash Closing Balance" colspan="2"/>
-                                    <field name="cash_register_balance_end_real"/>
-                                    <field name="cash_register_difference" />
+                                    <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theorical Balance"/>
                                 </group>
-                            </group>
+                                <div class="oe_clear"/>
+                                <div attrs="{'invisible' : [('cash_journal_id', '=', False)]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
+                                    <p class="oe_view_nocontent_create">
+                                    You can define another list of available currencies on the
+                                    <i>Cash Registers</i> tab of the <b><field name="cash_journal_id" class="oe_inline"/></b>
+                                    payment method.
+                                    </p>
+                                </div>
+                            </div>
 
-                            <separator string="Summary by Payment Methods" colspan="4" attrs="{'invisible' : [('state', '=', 'opening_control')]}"/>
-                            <field name="statement_ids" colspan="4" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}">
-                                <tree string="Statements">
-                                    <field name="name" />
-                                    <field name="journal_id" />
-                                    <field name="balance_start" />
-                                    <field name="total_entry_encoding" />
-                                    <field name="balance_end_real" />
-                                    <field name="difference" />
-                                    <field name="currency" />
-                                    <field name="state" />
-                                </tree>
-                            </field>
+
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'opening_control')]}">
+                                <field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
+                                <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
+                            </group>
                         </group>
 
+                        <separator string="Summary by Payment Methods" attrs="{'invisible' : [('state', '=', 'opening_control')]}"/>
+                        <field name="statement_ids" attrs="{'invisible' : [('state', '=', 'opening_control')]}">
+                            <tree string="Statements">
+                                <field name="name" />
+                                <field name="journal_id" />
+                                <field name="balance_start" />
+                                <field name="total_entry_encoding" />
+                                <field name="balance_end_real" />
+                                <field name="difference" />
+                                <field name="currency" />
+                                <field name="state" />
+                            </tree>
+                        </field>
+
                     </sheet>
                 </form>
             </field>
@@ -979,7 +970,6 @@
         <record model="ir.ui.view" id="view_pos_session_tree">
             <field name="name">pos.session.tree.view</field>
             <field name="model">pos.session</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Point of Sale Session">
                     <field name="config_id" />
@@ -987,6 +977,7 @@
                     <field name="user_id" />
                     <field name="start_at" />
                     <field name="stop_at" />
+                    <field name="state" />
                 </tree>
             </field>
         </record>
@@ -994,7 +985,6 @@
         <record model="ir.ui.view" id="view_pos_session_search">
             <field name="name">pos.session.search.view</field>
             <field name="model">pos.session</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Session">
                     <field name="name" />
@@ -1019,26 +1009,31 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_pos_session_search" />
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to start a new session.
+              </p><p>
+                A session is a period of time, usually one day, during which
+                you sell through the point of sale. The user has to check the
+                currencies in your cash registers at the beginning and the end
+                of each session.
+              </p><p>
+                Note that you should better to use the menu <i>Your Session</i>
+                to quickly open a new session.
+              </p>
+            </field>
         </record>
 
         <menuitem
-            parent="menu_point_rep"
-            action="action_pos_session"
-            id="menu_pos_session"
-            sequence="0"
-            groups="group_pos_manager"/>
-
-        <menuitem
             parent="menu_point_of_sale"
             action="action_pos_session"
             id="menu_pos_session_all"
-            sequence="0"
+            sequence="1"
             groups="group_pos_manager"/>
 
         <record id="view_pos_order_filter" model="ir.ui.view">
             <field name="name">pos.order.list.select</field>
             <field name="model">pos.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name"/>
@@ -1060,7 +1055,24 @@
             </field>
         </record>
 
-        <menuitem action="action_pos_session_opening" parent="menu_point_of_sale" id="menu_pos_session_opening" sequence="0" />
+        <menuitem action="action_pos_session_opening"
+            parent="menu_point_of_sale"
+            id="menu_pos_session_opening" sequence="0"/>
+
+        <record model="ir.ui.view" id="pos_ean13_generator">
+            <field name="name">pos.ean_wizard</field>
+            <field name="model">pos.ean_wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Ean13 Generator" version="7.0">  
+                    <field name="ean13_pattern"/>
+                    <footer>
+                        <button name="sanitize_ean13" type="object" string="Apply"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
 
     </data>
 </openerp>