From 22d3c09141048d9f1cdbf149f0b4eaff8f2d394c Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 10 Nov 2011 16:44:48 +0530
Subject: [PATCH] [IMP]point_of_sale:improvement analysis report

bzr revid: kbh@tinyerp.com-20111110111448-wr5ce6x3s4aqkrnj
---
 .../report/pos_order_report_view.xml          |   7 +-
 .../report/report_cash_register_view.xml      | 114 +++++++++---------
 2 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index ab6e9f73df4..494dceec93e 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -35,10 +35,11 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
+                        <filter icon="terp-go-year" string="Year" name="year"
                             domain="[('year','=',time.strftime('%%Y'))]"
                             help="POS ordered created during current year"/>
-                        <filter icon="terp-go-month" string="Month"
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-month" string="Month" name="This Month"
                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="POS ordered created during current month"/>
                         <filter icon="terp-go-month"
@@ -88,7 +89,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
             <field name="search_view_id" ref="view_report_pos_order_search"/>
-            <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_This Month':1,'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
         <menuitem action="action_report_pos_order_all" id="menu_report_pos_order_all" parent="menu_point_rep" sequence="3"/>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 8e42a9a5ce0..b5ef398ceb3 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -2,54 +2,56 @@
 <openerp>
     <data>
         <record id="view_report_cash_register_tree" model="ir.ui.view">
-	        <field name="name">report.cash.register.tree</field>
-	        <field name="model">report.cash.register</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Point of Sale Cash Register Analysis">
-	                <field name="date" invisible="1"/>
-	                <field name="user_id" invisible="1"/>
-	                <field name="state" invisible="1"/>
-	                <field name="year" invisible="1"/>
-	                <field name="month" invisible="1"/>
-	                <field name="day" invisible="1"/>
-	                <field name="journal_id" invisible="1"/>
-	                <field name="balance_start" />
-	                <field name="balance_end_real" />
-	            </tree>
-	        </field>
+          <field name="name">report.cash.register.tree</field>
+          <field name="model">report.cash.register</field>
+          <field name="type">tree</field>
+          <field name="arch" type="xml">
+              <tree string="Point of Sale Cash Register Analysis">
+                  <field name="date" invisible="1"/>
+                  <field name="user_id" invisible="1"/>
+                  <field name="state" invisible="1"/>
+                  <field name="year" invisible="1"/>
+                  <field name="month" invisible="1"/>
+                  <field name="day" invisible="1"/>
+                  <field name="journal_id" invisible="1"/>
+                  <field name="balance_start" />
+                  <field name="balance_end_real" />
+              </tree>
+          </field>
         </record>
 
         <record id="view_report_cash_register_search" model="ir.ui.view">
-	        <field name="name">report.cash.register.search</field>
-	        <field name="model">report.cash.register</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Point of Sale Cash Register Analysis">
-	                <group>
-	                    <filter icon="terp-go-year" string="Year"
-	                        domain="[('year','=',time.strftime('%%Y'))]"
-	                        help="Cash Analysis created during this year"/>
-	                    <filter icon="terp-go-month" string="Month"
-	                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-	                        help="Cash Analysis created in current month"/>
-	                    <filter icon="terp-go-month"
-	                         string="Month -1"
-	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-	                         help="Cash Analysis created in last month"/>
-	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-go-today"
+          <field name="name">report.cash.register.search</field>
+          <field name="model">report.cash.register</field>
+          <field name="type">search</field>
+          <field name="arch" type="xml">
+              <search string="Point of Sale Cash Register Analysis">
+                  <group>
+                      <filter icon="terp-go-year" string="Year" name="year"
+                          domain="[('year','=',time.strftime('%%Y'))]"
+                          help="Cash Analysis created during this year"/>
+                      <separator orientation="vertical"/>
+
+                      <filter icon="terp-go-month" string="Month" name="This Month"
+                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                          help="Cash Analysis created in current month"/>
+                      <filter icon="terp-go-month"
+                           string="Month -1"
+                           domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                           help="Cash Analysis created in last month"/>
+                      <separator orientation="vertical"/>
+                      <filter icon="terp-go-today"
                              string="    Today    "
                              name="today"
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Cash Analysis created by today"/>	                    
-	                    <separator orientation="vertical"/>
+                             help="Cash Analysis created by today"/>
+                      <separator orientation="vertical"/>
                         <filter icon="terp-document-new"
                             string="Draft"
                             domain="[('state','=',('draft'))]"/>
-	                    <filter icon="terp-camera_test"
-	                        string="Confirm"
-	                        domain="[('state','=',('confirm'))]"/>
+                      <filter icon="terp-camera_test"
+                          string="Confirm"
+                          domain="[('state','=',('confirm'))]"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
@@ -57,31 +59,31 @@
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
                         </field>
-                    </group>  
+                    </group>
                     <newline/>
-	                <group expand="1" string="Group By...">
-	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                  <group expand="1" string="Group By...">
+                      <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                      <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-	                    <separator orientation="vertical"/>
+                      <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year from Creation date of cash register"/>
-	                </group>                                  
-	            </search>
-	        </field>
+                  </group>
+              </search>
+          </field>
         </record>
 
         <record id="action_report_cash_register_all" model="ir.actions.act_window">
-	        <field name="name">Register Analysis</field>
-	        <field name="res_model">report.cash.register</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="search_view_id" ref="view_report_cash_register_search"/>
-	        <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
-	    </record>
+          <field name="name">Register Analysis</field>
+          <field name="res_model">report.cash.register</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree,form</field>
+          <field name="search_view_id" ref="view_report_cash_register_search"/>
+          <field name="context">{'search_default_year':1,'search_default_This Month':1,'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+      </record>
 
-	    <menuitem action="action_report_cash_register_all" id="menu_report_cash_register_all" parent="menu_point_rep" sequence="1"/>
-	</data>
+      <menuitem action="action_report_cash_register_all" id="menu_report_cash_register_all" parent="menu_point_rep" sequence="1"/>
+  </data>
 </openerp>