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

[IMP]hr_recruit : Improve create method and Improve lfilter help as per suggest 

bzr revid: dbr@tinyerp.com-20130603123920-6spa009pzvrhzxos
This commit is contained in:
DBR (OpenERP) 2013-06-03 18:09:20 +05:30
parent 86abcbf3bb
commit 516d7fbb43
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_holidays/hr_holidays_view.xml
View File

@ -14,7 +14,7 @@
<separator/>
<filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
<separator/>
<filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests and My Allocation Requests"/>
<filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests"/>
<separator/>
<filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
<field name="employee_id"/>

7
addons/hr_recruitment/hr_recruitment.py
View File

@ -577,9 +577,8 @@ class crm_meeting(osv.Model):
_inherit = 'crm.meeting'
def create(self, cr, uid, vals, context=None):
meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
obj_meeting = self.browse(cr, uid, meeting_id, context=context)
self.pool.get('hr.applicant').log_meeting(cr, uid, context.get('active_ids',[]), obj_meeting.name, obj_meeting.date, obj_meeting.duration, context=context)
return meeting_id
if 'active_ids' in context and 'active_model' in context and context['active_model'] == 'hr.applicant':
self.pool.get('hr.applicant').log_meeting(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
return super(crm_meeting, self).create(cr, uid, vals, context=context)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: