[IMP]hr_timesheet_shhet add chatter
bzr revid: pna@tinyerp.com-20121112095424-p3z0bwx1f38nbv4n
This commit is contained in:
parent
40745949d4
commit
d987291a63
|
@ -412,7 +412,7 @@ class hr_holidays(osv.osv):
|
||||||
|
|
||||||
def create_notificate(self, cr, uid, ids, context=None):
|
def create_notificate(self, cr, uid, ids, context=None):
|
||||||
for obj in self.browse(cr, uid, ids, context=context):
|
for obj in self.browse(cr, uid, ids, context=context):
|
||||||
self.message_post(cr, uid, ids,
|
self.message_post(cr, uid, [obj.id],
|
||||||
_("Request <b>created</b>, waiting confirmation."), context=context)
|
_("Request <b>created</b>, waiting confirmation."), context=context)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
|
@ -95,9 +95,10 @@ class hr_timesheet_sheet(osv.osv):
|
||||||
if (abs(sheet.total_difference) < di) or not di:
|
if (abs(sheet.total_difference) < di) or not di:
|
||||||
wf_service = netsvc.LocalService("workflow")
|
wf_service = netsvc.LocalService("workflow")
|
||||||
wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
|
wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
|
||||||
|
self.confirm_send_note(cr, uid, ids, context)
|
||||||
else:
|
else:
|
||||||
raise osv.except_osv(_('Warning!'), _('Please verify that the total difference of the sheet is lower than %.2f.') %(di,))
|
raise osv.except_osv(_('Warning!'), _('Please verify that the total difference of the sheet is lower than %.2f.') %(di,))
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def attendance_action_change(self, cr, uid, ids, context=None):
|
def attendance_action_change(self, cr, uid, ids, context=None):
|
||||||
hr_employee = self.pool.get('hr.employee')
|
hr_employee = self.pool.get('hr.employee')
|
||||||
|
@ -220,6 +221,21 @@ class hr_timesheet_sheet(osv.osv):
|
||||||
if employee_id:
|
if employee_id:
|
||||||
department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id
|
department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id
|
||||||
return {'value': {'department_id': department_id}}
|
return {'value': {'department_id': department_id}}
|
||||||
|
|
||||||
|
# ------------------------------------------------
|
||||||
|
# OpenChatter methods and notifications
|
||||||
|
# ------------------------------------------------
|
||||||
|
|
||||||
|
def needaction_domain_get(self, cr, uid, ids, context=None):
|
||||||
|
emp_obj = self.pool.get('hr.employee')
|
||||||
|
empids = emp_obj.search(cr, uid, [('parent_id.user_id', '=', uid)], context=context)
|
||||||
|
dom = ['&', ('state', '=', 'confirm'), ('employee_id', 'in', empids)]
|
||||||
|
return dom
|
||||||
|
|
||||||
|
def confirm_send_note(self, cr, uid, ids, context=None):
|
||||||
|
for obj in self.browse(cr, uid, ids, context=context):
|
||||||
|
self.message_post(cr, uid, [obj.id], body=_("Timesheet has been Submitted by %s .") % (obj.employee_id.name), context=context)
|
||||||
|
|
||||||
hr_timesheet_sheet()
|
hr_timesheet_sheet()
|
||||||
|
|
||||||
class account_analytic_line(osv.osv):
|
class account_analytic_line(osv.osv):
|
||||||
|
|
Loading…
Reference in New Issue