pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] hr_expense/hr_holiday: make user follower expenses/holidays about him/her but encoded by someone else

Browse Source
This commit is contained in:
Bhumi Patel
2015-03-09 20:06:04 +01:00
committed by Richard Mathot
parent de4135305c
commit ff1d3849af
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/hr_expense.py
+21
View File
@@ -105,6 +105,27 @@ class hr_expense_expense(osv.osv):
'currency_id': _get_currency,
}
def add_follower(self, cr, uid, ids, employee_id, context=None):
employee = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
if employee and employee.user_id:
self.message_subscribe_users(cr, uid, ids, user_ids=[employee.user_id.id], context=context)
def create(self, cr, uid, vals, context=None):
if context is None:
context = {}
employee_id = vals.get('employee_id', False)
hr_expense_id = super(hr_expense_expense, self).create(cr, uid, vals, context=context)
self.add_follower(cr, uid, [hr_expense_id], employee_id, context=context)
return hr_expense_id
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
employee_id = vals.get('employee_id', False)
hr_expense_id = super(hr_expense_expense, self).write(cr, uid, ids, vals, context=context)
self.add_follower(cr, uid, ids, employee_id, context=context)
return hr_expense_id
def unlink(self, cr, uid, ids, context=None):
for rec in self.browse(cr, uid, ids, context=context):
if rec.state != 'draft':
addons/hr_holidays/hr_holidays.py
+15 -2
View File
@@ -352,19 +352,32 @@ class hr_holidays(osv.osv):
result['value']['number_of_days_temp'] = 0
return result
def add_follower(self, cr, uid, ids, employee_id, context=None):
employee = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
if employee and employee.user_id:
self.message_subscribe_users(cr, uid, ids, user_ids=[employee.user_id.id], context=context)
def create(self, cr, uid, values, context=None):
""" Override to avoid automatic logging of creation """
if context is None:
context = {}
employee_id = values.get('employee_id', False)
context = dict(context, mail_create_nolog=True)
if values.get('state') and values['state'] not in ['draft', 'confirm', 'cancel'] and not self.pool['res.users'].has_group(cr, uid, 'base.group_hr_user'):
raise AccessError(_('You cannot set a leave request as \'%s\'. Contact a human resource manager.') % values.get('state'))
return super(hr_holidays, self).create(cr, uid, values, context=context)
hr_holiday_id = super(hr_holidays, self).create(cr, uid, values, context=context)
self.add_follower(cr, uid, [hr_holiday_id], employee_id, context=context)
return hr_holiday_id
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
employee_id = vals.get('employee_id', False)
if vals.get('state') and vals['state'] not in ['draft', 'confirm', 'cancel'] and not self.pool['res.users'].has_group(cr, uid, 'base.group_hr_user'):
raise AccessError(_('You cannot set a leave request as \'%s\'. Contact a human resource manager.') % vals.get('state'))
return super(hr_holidays, self).write(cr, uid, ids, vals, context=context)
hr_holiday_id = super(hr_holidays, self).write(cr, uid, ids, vals, context=context)
self.add_follower(cr, uid, ids, employee_id, context=context)
return hr_holiday_id
def holidays_reset(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {