From b217bcf3c5cab4d7a4008b2fb93cb6af121020d4 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 17 Aug 2010 10:35:59 +0530
Subject: [PATCH] [MOD/IMP] lunch : Usability Improvements

bzr revid: vir@tinyerp.com-20100817050559-e1lj750cnw58wuoh
---
 addons/lunch/lunch.py                         |  2 +-
 addons/lunch/lunch_view.xml                   | 26 ++++++++++++++++++-
 .../lunch/report/report_lunch_order_view.xml  |  6 ++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 8dfce4acaff..9e98d503149 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -94,7 +94,7 @@ class lunch_cashmove(osv.osv):
     _description = "Cash Move"
 
     _columns = {
-        'name': fields.char('Name', size=128),
+        'name': fields.char('Description', size=128),
         'user_cashmove': fields.many2one('res.users', 'User Name', required=True),
         'amount': fields.float('Amount', digits=(16, 2)),
         'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, required=True),
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 5d0fe20c801..71a89124101 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -77,6 +77,7 @@
                 <search string="Search Lunch Order">
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-today" name="Today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
                     <separator orientation="vertical"/>
                     <field name="user_id"/>
@@ -193,7 +194,8 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
-                        <filter string="Box" icon="terp-accessories-archiver+" domain="[]"  context="{'group_by':'box'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Box" icon="terp-dolar" domain="[]"  context="{'group_by':'box'}"/>
                     </group>
                 </search>
 
@@ -331,6 +333,27 @@
             </field>
         </record>
 
+<!-- Lunch Amount Search view -->
+
+        <record model="ir.ui.view" id="view_report_lunch_amount_search">
+            <field name="name">Lunch amount</field>
+            <field name="model">report.lunch.amount</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Box Amount by User">
+                    <group>
+                        <field name="user_id" select="1"/>
+                        <field name="box" select="1"/>
+                        <field name="amount" select="1"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="4">
+                        <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
 <!-- Lunch Amount Action -->
 
         <record model="ir.actions.act_window" id="action_report_lunch_amount_tree">
@@ -338,6 +361,7 @@
             <field name="res_model">report.lunch.amount</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_report_lunch_amount_search"/>
         </record>
 
         <menuitem name="Cash Position by User"
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index 25377799204..d65b8b01c1e 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -42,7 +42,7 @@
                 <newline/>
                 <group expand="0" string="Group By..." colspan="10" col="12">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Box" icon="terp-accessories-archiver+" context="{'group_by':'box_name'}"/>
+                    <filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
@@ -62,8 +62,8 @@
         <field name="context">{'search_default_month':1,'search_default_User':1}</field>
     </record>
 
-    <menuitem name="Lunch Order Analysis" parent="menu_lunch_reporting_order"
-              id="menu_lunch_order_analysis" action="action_report_lunch_order_all"  sequence="1" />
+<!--    <menuitem name="Lunch Order Analysis" parent="menu_lunch_reporting_order"-->
+<!--              id="menu_lunch_order_analysis" action="action_report_lunch_order_all"  sequence="1" />-->
 
 	</data>
 </openerp>
\ No newline at end of file