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

[MOD/IMP]hr_*: Usability Improvement 

bzr revid: dbr@tinyerp.com-20100923123510-y02p80gsic0fqfot
This commit is contained in:
DBR (OpenERP) 2010-09-23 18:05:10 +05:30
parent 17c8331fcd
commit 5be9626fe4
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_evaluation/report/hr_evaluation_report.py
View File

@ -79,7 +79,7 @@ class hr_evaluation_report(osv.osv):
s.state,
s.progress as progress_bar,
avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(24)/(-3600) as delay_date,
avg(extract('epoch' from age(s.date,CURRENT_DATE)))/(24)/(-3600) as overpass_dela
avg(extract('epoch' from age(s.date,CURRENT_DATE)))/(24)/(-3600) as overpass_delay
from
hr_evaluation_interview l
LEFT JOIN

23
addons/hr_holidays/report/hr_holidays_report_view.xml
View File

@ -45,13 +45,12 @@
<field name="arch" type="xml">
<search string="Leaves">
<group>
<filter icon="terp-go-year" string="This Year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this year"/>
<filter icon="terp-go-month" 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'))]" help="Leaves in this month"/>
<filter icon="terp-go-week" 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'))]" help="Leaves during last 7 days"/>
<separator orientation="vertical"/>
<filter icon="terp-go-year" string=" Year "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Leaves takes in current year"/>
<filter icon="terp-go-month" string="Month" name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Leaves takes in current month"/>
<filter icon="terp-go-week" string=" Month-1 " separator="1"
domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Leaves takes in last month"/>
<separator orientation="vertical"/>
<filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
help = "Draft and Confirmed leaves"/>
<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
@ -63,11 +62,11 @@
</group>
<newline/>
<group expand="0" string="Group By..." colspan="10" col="12">
<filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
help="Leaves by empolyee"/>
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_symbol-selection" string="Category" context="{'group_by':'category_id'}"
help="Leaves by category"/>
@ -75,9 +74,9 @@
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<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'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Leave on Date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by Leave on Month"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by Leave on Year"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." colspan="10" col="12">