odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

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

bzr revid: mdi@tinyerp.com-20120522065954-1xhbje34p0j5xqsn
This commit is contained in:
Divyesh Makwana (Open ERP) 2012-05-22 12:29:54 +05:30
parent cf2a6ceb95
commit 27cc0e0b28
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -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...'>

12
addons/hr_evaluation/report/hr_evaluation_report_view.xml
View File

@ -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...">