[IMP] hr_evaluation : Removed all filters related to a date field and added the relat...

bzr revid: mdi@tinyerp.com-20120522065954-1xhbje34p0j5xqsn

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e38a879..a3c1b18 100644 (file)
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -254,14 +254,12 @@
                     <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
                     <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-week" string="7 Days" help="Appraisal to close within the next 7 days"
-                        domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id" />
                     <field name="plan_id" widget="selection" />
+                    <field name="date"/>
                     </group>
                     <newline/>
                     <group expand='0' string='Group by...'>

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b82c8f6..9653667 100644 (file)
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -47,17 +47,6 @@
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
                <group>
-                       <filter icon="terp-go-year" string="Year"
-                        name="year"
-                       domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
-                    <separator orientation="vertical"/>                                                
-                    <filter icon="terp-go-month" string=" Month " name="month" 
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Evaluation done in current month"/>
-                       <filter icon="terp-go-month" string="    Month-1    " 
-                        domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Evaluation done in last month"/>
-                    <separator orientation="vertical"/>
                        <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
                                help = "In progress Evaluations"/>
                        <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]"
@@ -74,6 +63,7 @@
                     <field name="deadline"/>
                     <separator orientation="vertical"/>
                     <field name="state"/>
+                    <field name="create_date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">