Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-leave_type-kjo into
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-leave_type-kjo/+merge/109295
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-leave_type-kjo/+merge/109295
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-06-07 09:31:53 +0000
+++ hr_holidays/hr_holidays.py 2012-06-08 06:42:25 +0000
@@ -280,6 +280,7 @@
'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 @@
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:
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-06-07 13:21:46 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-06-08 06:42:25 +0000
@@ -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>
_______________________________________________
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
