From 8a670326abcde7bad42650c4cee5f445ac3e0e08 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 8 Jun 2012 12:07:55 +0530 Subject: [PATCH] [IMP]hr_holidays: link meeting to leave request bzr revid: kjo@tinyerp.com-20120608063755-vviuq755hjl52c8n --- addons/hr_holidays/hr_holidays.py | 6 ++++++ addons/hr_holidays/hr_holidays_view.xml | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 7d6c80ba7e1..e68169db012 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -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: diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 58abaae02ac..d6ba0a34faa 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -531,5 +531,14 @@ + +