From 02baa490cdb54b7cc7f97c825236717b191bd8d5 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 20 Apr 2010 10:49:47 +0530
Subject: [PATCH] [IMP]:hr_expese:improved SQL reportx

bzr revid: apa@tinyerp.com-20100420051947-kx9m74f9s87ze7hf
---
 addons/hr_expense/report/hr_expense_report.py |  3 ++
 .../report/hr_expense_report_view.xml         | 41 ++++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 27f5c7c15da..cc3f282e9fa 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -31,6 +31,7 @@ class hr_expense_report(osv.osv):
     _columns = {
         'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
@@ -72,6 +73,7 @@ class hr_expense_report(osv.osv):
                      s.department_id,
                      to_char(date_trunc('day',s.create_date), 'YYYY') as year,
                      to_char(date_trunc('day',s.create_date), 'MM') as month,
+                     to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD') as day,
                      l.product_id as product_id,
                      sum(l.unit_quantity * u.factor) as product_qty,
                      s.user_id as user_id,
@@ -87,6 +89,7 @@ class hr_expense_report(osv.osv):
                      left join product_uom u on (u.id=l.uom_id)
                  group by
                      date_trunc('day',s.create_date),
+                     to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD'),
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY'),
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY'),
                      l.product_id,
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 3da247c5d46..972557edd0c 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -12,6 +12,7 @@
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
+                <field name="day" invisible="1"/>
                 <field name="invoice_id" invisible="1"/>
                 <field name="department_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
@@ -47,16 +48,16 @@
             <search string="Expenses">
             	<group>
             		<filter icon="terp-hr" string="This Year"
-	                  	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                  	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                   	    help="Expenses during last 7 year"/>
 	                <filter icon="terp-hr" string="This Month"
 	                   		name="month"
-	                   		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                   		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                   		help="Expenses during last month"/>
 		            <filter icon="gtk-media-rewind"
 	                        string="    7 Days    "
 	                        separator="1"
-	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                        help="Expenses during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Draft"
@@ -71,34 +72,45 @@
 	                   		icon="terp-hr"
 	                   		domain="[('state','=','accepted')]"
 	                   		help = "Accepted Expenses"/>
-	                <filter string="Invoiced"
-	                   		icon="terp-hr"
-	                   		domain="[('state','=','invoiced')]"
-	                   		help = "Invoiced Expenses"/>
 	  				<separator orientation="vertical"/>
 	                <field name="user_id" widget="selection">
                         <filter icon="terp-hr"
                         		string="My Expenses"
                         		help = "My Expenses"
                         		domain="[('user_id','=',uid)]" />
+                        <filter icon="terp-hr"
+	                        		string="Expenses Non Assigned User"
+	                        		help="Expenses Non Assigned User"
+	                        		domain="[('user_id','=',False)]"/>
                     </field>
-
 				</group>
 				<newline/>
-				<group expand="1" string="Extended options..." colspan="10" col="12">
+				<group expand="0" string="Extended options..." colspan="10" col="12">
+					<filter string="Invoiced"
+	                   		icon="terp-hr"
+	                   		domain="[('state','=','invoiced')]"
+	                   		help = "Invoiced Expenses"/>
+	                <filter string="Reimbursed"
+	                   		icon="terp-hr"
+	                   		domain="[('state','=','paid')]"
+	                   		help = "Reimbursed Expenses"/>
+	                <filter string="Cancelled"
+	                   		icon="terp-hr"
+	                   		domain="[('state','=','cancelled')]"
+	                   		help = "Cancelled Expenses"/>
+	                <separator orientation="vertical"/>
                     <field name="employee_id" widget="selection"/>
                     <field name="product_id" widget="selection"/>
                     <field name="department_id" widget="selection"/>
                     <newline/>
                     <field name="journal_id" widget="selection"/>
-                    <field name="state"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
+  				    <separator orientation="vertical"/>
                     <field name="date_confirm"/>
                     <field name="date_valid"/>
                 </group>
                 <newline/>
-                <group string="Group By...">
+                <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
                     <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
                     <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -106,8 +118,9 @@
                     <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
                     <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
                     <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
                 </group>
@@ -120,7 +133,7 @@
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_user_id':uid}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>