Rifakat (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-17104-rha into
lp:openobject-addons/6.0.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #832569 in OpenERP Addons: "[6.0] hr_holidays, holidays report per
department shows unactive employees"
https://bugs.launchpad.net/openobject-addons/+bug/832569
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-17104-rha/+merge/72834
Hello,
Fixed the problem of showing inactive employees in Holidays report per
department and also put filter for active employees in hr_holidays search view.
Thanks,
Rifakat
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-17104-rha/+merge/72834
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-17104-rha.
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2011-01-14 00:11:01 +0000
+++ hr_holidays/hr_holidays_view.xml 2011-08-25 07:39:25 +0000
@@ -10,6 +10,7 @@
<search string="Search Leave">
<group col='8' colspan='4'>
<filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/>
+ <filter icon="terp-personal+" name="active" domain="[('employee_id.active','=',True)]" string="Active Employees" help="Active employees"/>
<separator orientation="vertical"/>
<filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
@@ -260,7 +261,7 @@
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_id" ref="edit_holiday_new"/>
- <field name="context">{"search_default_department_id": department_id, "search_default_my_leaves": 1}</field>
+ <field name="context">{"search_default_department_id": department_id, "search_default_my_leaves": 1, "search_default_active":eval('True')}</field>
<field name="domain">[('type','=','remove')]</field>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
<field name="help">Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type.</field>
@@ -294,7 +295,7 @@
<field name="name">Allocation Requests</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
- <field name="context">{"search_default_my_leaves": 1,'default_type':'add',"search_default_department_id": department_id}</field>
+ <field name="context">{"search_default_my_leaves": 1,'default_type':'add',"search_default_department_id": department_id,"search_default_active":eval('True')}</field>
<field name="domain">[('type','=','add')]</field>
<field name="view_id" ref="allocation_leave_new"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -322,7 +323,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_holiday_simple"/>
- <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1}</field>
+ <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1,"search_default_active":eval('True')}</field>
<field name="domain">[('holiday_type','=','employee')]</field>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
=== modified file 'hr_holidays/report/available_holidays_view.xml'
--- hr_holidays/report/available_holidays_view.xml 2011-01-14 00:11:01 +0000
+++ hr_holidays/report/available_holidays_view.xml 2011-08-25 07:39:25 +0000
@@ -7,7 +7,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" eval="view_holiday_simple"/>
- <field name="context">{'search_default_group_employee': 1, 'search_default_group_type': 1}</field>
+ <field name="context">{'search_default_group_employee': 1, 'search_default_group_type': 1, "search_default_active":eval('True')}</field>
<field name="domain">[('holiday_type','=','employee')]</field>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
=== modified file 'hr_holidays/report/holidays_summary_report.py'
--- hr_holidays/report/holidays_summary_report.py 2011-01-17 18:02:22 +0000
+++ hr_holidays/report/holidays_summary_report.py 2011-08-25 07:39:25 +0000
@@ -216,10 +216,8 @@
elif data['model']=='ir.ui.menu':
for id in data['form']['depts']:
dept = obj_dept.browse(cr, uid, id, context=context)
- cr.execute("""SELECT id FROM hr_employee \
- WHERE department_id = %s""", (id,))
- emp_ids = [x[0] for x in cr.fetchall()]
- if emp_ids==[]:
+ emp_ids = obj_emp.search(cr, uid, [('department_id','=',id),('active','=',True)], context=context)
+ if not emp_ids:
continue
dept_done=0
for item in obj_emp.read(cr, uid, emp_ids, ['id', 'name']):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
