From e9df7817ec9156d0de46d0dcfb4435d337afda82 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 25 Jun 2010 10:57:59 +0530
Subject: [PATCH] [IMP] Point of Sale:Usability Improvements

bzr revid: vir@tinyerp.com-20100625052759-2282330iff9cjgfi
---
 addons/point_of_sale/pos_view.xml             | 12 +++++------
 addons/point_of_sale/statement_view.xml       | 20 +++++++++++++------
 .../wizard/pos_close_statement.py             |  9 ++++++---
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 4e4747a9b88..e5370666d06 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -76,7 +76,7 @@
                         <page string="Order and Payment">
                             <group colspan="2" col="2" name="Type">
                                 <separator string="Order Information" colspan="4"/>
-				<field name="user_salesman_id" />
+                                <field name="user_salesman_id" />
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="shop_id" widget="selection"  />
                                 <field name="name"/>
@@ -174,7 +174,7 @@
             </field>
         </record>
 
-        <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
+        <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="2" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
 
@@ -798,15 +798,15 @@
                     id="products_for_output_operations"/>
 
         <menuitem name="Register Management" parent="menu_point_root"
-            id="menu_point_config" sequence="3"/>
+            id="menu_point_config" sequence="4"/>
         <menuitem
-            name="Input Operations" parent="menu_point_config"
+            name="Input Operations" parent="menu_point_of_sale"
             string="Refloat"
             action="action_box_entries"
-            id="menu_wizard_enter_jrnl" sequence="3" />
+            id="menu_wizard_enter_jrnl" sequence="2" />
 
         <menuitem
-            name="Output Operations" parent="menu_point_config"
+            name="Output Operations" parent="menu_point_of_sale"
             string="Refloat"
             action="action_box_out"
             id="menu_wizard_enter_jrnl2" sequence="3" />
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index a8039276970..6173beb73f8 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -222,7 +222,7 @@
        <!-- <menuitem action="action_bank_statement_tree_all" id="menu_statement_tree_all" parent="point_of_sale.menu_point_root" sequence="2"/-->
 <!--        <menuitem action="action_bank_statement_tree_all" id="menu_statement_tree_all" parent="point_of_sale.menu_point_root" sequence="2"/>
 -->
-        <menuitem name="Cash Register" parent="point_of_sale.menu_point_root" id="menu_statement_tree_all" sequence="3"/>
+        <menuitem name="Cash Register" parent="point_of_sale.menu_point_root" id="menu_statement_tree_all" sequence="4"/>
 
         <record id="action_bank_statement_tree1" model="ir.actions.act_window">
             <field name="name">My Cashboxes to Close</field>
@@ -472,8 +472,12 @@
 
 
         <menuitem
-            name="Open Registers" parent="point_of_sale.menu_point_config"
-            string="Open Register"
+            name="Opening Operations" parent="point_of_sale.menu_point_root"
+            string="Opening Operations"
+            id="menu_open_operations" sequence="1" />
+        <menuitem
+            name="Open my Cash Registers" parent="menu_open_operations"
+            string="Open my Cash Register"
             action="action_pos_open_statement"
             id="menu_open_statement" sequence="1" />
 
@@ -483,10 +487,14 @@
                  parent="menu_statement_tree_all"/>
 
         <menuitem
-            name="Close Register" parent="point_of_sale.menu_point_config"
-            string="Close Register"
+            name="Closing Operations" parent="point_of_sale.menu_point_root"
+            string="Closing Operations"
+            id="menu_closing_operations" sequence="3" />
+        <menuitem
+            name="Close my Cash Registers" parent="menu_closing_operations"
+            string="Close my Cash Registers"
             action="action_pos_close_statement"
-            id="menu_close_statement" sequence="2" />
+            id="menu_close_statement" sequence="1" />
 
        <menuitem icon="STOCK_PRINT"
                     action="action_report_all_closed_cashbox_of_the_day"
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index c0627d1ff59..97ecb140dc0 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -38,6 +38,7 @@ class pos_close_statement(osv.osv_memory):
         """
         company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
         list_statement = []
+        mod_obj = self.pool.get('ir.model.data')
         statement_obj = self.pool.get('account.bank.statement')
         journal_obj = self.pool.get('account.journal')
         journal_lst = journal_obj.search(cr, uid, [('company_id', '=', company_id), ('auto_cash', '=', True), ('check_dtls', '=', False)])
@@ -46,15 +47,17 @@ class pos_close_statement(osv.osv_memory):
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
             list_statement = ids
             statement_obj.button_confirm(cr, uid, ids, context)
-        if not list_statement:
-            return {}
+#        if not list_statement:
+#            return {}
+        model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_bank_statement_tree')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         return {
                 'domain': "[('id','in', list_statement)]",
                 'name': 'Close Statements',
                 'view_type': 'form',
                 'view_mode': 'tree,form',
                 'res_model': 'account.bank.statement',
-                'view_id': False,
+                'views': [(resource_id,'tree')],
                 'type': 'ir.actions.act_window'
 }