[IMP]hr_holidays: link meeting to leave request
bzr revid: kjo@tinyerp.com-20120608063755-vviuq755hjl52c8n
This commit is contained in:
parent
59ecb806e2
commit
8a670326ab
|
@ -280,6 +280,7 @@ class hr_holidays(osv.osv):
|
|||
'date': record.date_from,
|
||||
'end_date': record.date_to,
|
||||
'date_deadline': record.date_to,
|
||||
'leave_id': record.id,
|
||||
}
|
||||
case_id = meeting_obj.create(cr, uid, vals)
|
||||
self._create_resource_leave(cr, uid, [record], context=context)
|
||||
|
@ -517,4 +518,9 @@ class hr_employee(osv.osv):
|
|||
|
||||
hr_employee()
|
||||
|
||||
class crm_meeting(osv.osv):
|
||||
_inherit = 'crm.meeting'
|
||||
_columns = {
|
||||
'leave_id': fields.many2one('hr.holidays','Leave Meeting'),
|
||||
}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -531,5 +531,14 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<act_window
|
||||
domain="[('leave_id', '=', active_id)]"
|
||||
id="act_hr_leave_request_to_meeting"
|
||||
name="Leave Meetings"
|
||||
res_model="crm.meeting"
|
||||
src_model="hr.holidays"
|
||||
view_mode="tree,form,calendar,gantt"
|
||||
view_type="form"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
Loading…
Reference in New Issue