diff --git a/addons/project/project.py b/addons/project/project.py index 37dc326be18..bf03d080403 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -889,8 +889,7 @@ class task(osv.osv): if not task.date_end: vals.update({ 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}) self.write(cr, uid, [task.id],vals, context=context) - message = _("The task '%s' is done") % (task.name,) - self.log(cr, uid, task.id, message) + self.do_close_send_note(cr, uid, [task.id], context) return True def do_reopen(self, cr, uid, ids, context=None): @@ -910,6 +909,7 @@ class task(osv.osv): }, context=context) self.write(cr, uid, [task.id], {'state': 'open'}, context=context) + self.do_open_send_note(cr, uid, [task.id], context) return True def do_cancel(self, cr, uid, ids, context={}): @@ -928,9 +928,8 @@ class task(osv.osv): 'ref_doc1': 'project.task,%d' % task.id, 'ref_doc2': 'project.project,%d' % project.id, }, context=context) - message = _("The task '%s' is cancelled.") % (task.name,) - self.log(cr, uid, task.id, message) self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0}, context=context) + self.do_cancel_send_note(cr, uid, [task.id], context) return True def do_open(self, cr, uid, ids, context={}): @@ -941,12 +940,12 @@ class task(osv.osv): if not t.date_start: data['date_start'] = time.strftime('%Y-%m-%d %H:%M:%S') self.write(cr, uid, [t.id], data, context=context) - message = _("The task '%s' is opened.") % (t.name,) - self.log(cr, uid, t.id, message) + self.do_open_send_note(cr, uid, [t.id], context) return True def do_draft(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state': 'draft'}, context=context) + self.do_draft_send_note(cr, uid, ids, context) return True @@ -985,20 +984,16 @@ class task(osv.osv): 'name': newname, }, context=context) if delegate_data['state'] == 'pending': - self.do_pending(cr, uid, task.id, context=context) + self.do_pending(cr, uid, [task.id], context=context) elif delegate_data['state'] == 'done': - self.do_close(cr, uid, task.id, context=context) - - message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_data['user_id'][1]) - self.log(cr, uid, task.id, message) + self.do_close(cr, uid, [task.id], context=context) + self.do_delegation_send_note(cr, uid, [task.id], context) delegated_tasks[task.id] = delegated_task_id return delegated_tasks def do_pending(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state': 'pending'}, context=context) - for (id, name) in self.name_get(cr, uid, ids): - message = _("The task '%s' is pending.") % name - self.log(cr, uid, id, message) + self.do_pending_send_note(cr, uid, ids, context) return True def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None): @@ -1029,7 +1024,7 @@ class task(osv.osv): def set_kanban_state_done(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context) - def _change_type(self, cr, uid, ids, next, *args): + def _change_type(self, cr, uid, ids, next, context=None): """ go to the next stage if next is False, go to previous stage @@ -1050,13 +1045,14 @@ class task(osv.osv): elif typeid and typeid in sorted_types and sorted_types.index(typeid) != len(sorted_types)-1: index = sorted_types.index(typeid) self.write(cr, uid, task.id, {'type_id': sorted_types[index+1]}) + self.state_change_send_note(cr, uid, [task.id], context) return True - def next_type(self, cr, uid, ids, *args): - return self._change_type(cr, uid, ids, True, *args) + def next_type(self, cr, uid, ids, context=None): + return self._change_type(cr, uid, ids, True, context) - def prev_type(self, cr, uid, ids, *args): - return self._change_type(cr, uid, ids, False, *args) + def prev_type(self, cr, uid, ids, context=None): + return self._change_type(cr, uid, ids, False, context) def _store_history(self, cr, uid, ids, context=None): for task in self.browse(cr, uid, ids, context=context): @@ -1072,11 +1068,67 @@ class task(osv.osv): }, context=context) return True + def get_needaction_user_ids(self, cr, uid, ids, context=None): + result = dict.fromkeys(ids, []) + for obj in self.browse(cr, uid, ids, context=context): + if obj.state == 'draft' and obj.user_id: + result[obj.id] = [obj.user_id.id] + return result + + def message_get_subscribers(self, cr, uid, ids, context=None): + sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context); + for obj in self.browse(cr, uid, ids, context=context): + if obj.user_id: + sub_ids.append(obj.user_id.id) + return self.pool.get('res.users').read(cr, uid, sub_ids, context=context) + def create(self, cr, uid, vals, context=None): result = super(task, self).create(cr, uid, vals, context=context) self._store_history(cr, uid, [result], context=context) + self.create_send_note(cr, uid, [result], context=context) return result + def create_send_note(self, cr, uid, ids, context=None): + self.message_append_note(cr, uid, ids, _('System notification'), _("Task has been created."), type='notification', context=context) + return True + + def do_pending_send_note(self, cr, uid, ids, context=None): + msg = 'Task is now pending.' + self.message_append_note(cr, uid, ids, 'System Notification', msg, context=context) + return True + + def do_open_send_note(self, cr, uid, ids, context=None): + msg = 'Task has been opened.' + self.message_append_note(cr, uid, ids, 'System Notification', msg, context=context) + return True + + def do_cancel_send_note(self, cr, uid, ids, context=None): + msg = 'Task has been canceled.' + self.message_append_note(cr, uid, ids, 'System Notification', msg, context=context) + return True + + def do_close_send_note(self, cr, uid, ids, context=None): + msg = 'Task has been closed.' + self.message_append_note(cr, uid, ids, 'System Notification', msg, context=context) + return True + + def do_draft_send_note(self, cr, uid, ids, context=None): + msg = 'Task has been renewed.' + self.message_append_note(cr, uid, ids, 'System Notification', msg, context=context) + return True + + def do_delegation_send_note(self, cr, uid, ids, context=None): + for task in self.browse(cr, uid, ids, context=context): + msg = 'Task has been delegated to %s.' % (task.user_id.name) + self.message_append_note(cr, uid, [task.id], 'System Notification', msg, context=context) + return True + + def state_change_send_note(self, cr, uid, ids, context=None): + for task in self.browse(cr, uid, ids, context=context): + msg = 'Stage changed to %s' % (task.type_id.name) + self.message_append_note(cr, uid, [task.id], 'System Notification', msg, context=context) + return True + # Overridden to reset the kanban_state to normal whenever # the stage (type_id) of the task changes. def write(self, cr, uid, ids, vals, context=None): diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 9fa0583ade9..ab22c786d0f 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -292,12 +292,6 @@ - - - - - -