odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merged hsa's branch lp:~openerp-dev/openobject-addons/trunk-10-hr-click-2-bde-timesheet-hsa 

bzr revid: bde@tinyerp.com-20121112110220-rqk5qo07ol4duzds
This commit is contained in:
Bharat Devnani (OpenERP) 2012-11-12 16:32:20 +05:30
parent 89f8722f23 d987291a63
commit 54e2722948
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_holidays/hr_holidays.py
View File

@ -412,7 +412,7 @@ class hr_holidays(osv.osv):
def create_notificate(self, cr, uid, ids, context=None):
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)
return True

15
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
View File

@ -95,6 +95,7 @@ class hr_timesheet_sheet(osv.osv):
if (abs(sheet.total_difference) < di) or not di:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
self.confirm_send_note(cr, uid, ids, context)
else:
raise osv.except_osv(_('Warning!'), _('Please verify that the total difference of the sheet is lower than %.2f.') %(di,))
return True
@ -222,6 +223,20 @@ class hr_timesheet_sheet(osv.osv):
department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.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()
class account_analytic_line(osv.osv):