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

[FIX] signature of overloads to the project)_task methods 

bzr revid: xmo@openerp.com-20100911111326-ymk1csobvakjavvv
This commit is contained in:
Xavier Morel 2010-09-11 16:43:26 +05:30
parent 394bc2fd2e
commit 44963c74f5
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/project_mailgate/project_mailgate.py
View File

@ -120,34 +120,34 @@ class project_tasks(osv.osv):
message_id=message_id, attach=attach, \
context=context)
def do_draft(self, cr, uid, ids, *args):
res = super(project_tasks, self).do_draft(cr, uid, ids, *args)
def do_draft(self, cr, uid, ids, *args, **kwargs):
res = super(project_tasks, self).do_draft(cr, uid, ids, *args, **kwargs)
tasks = self.browse(cr, uid, ids)
self._history(cr, uid, tasks, _('Draft'))
return res
def do_open(self, cr, uid, ids, *args):
res = super(project_tasks, self).do_open(cr, uid, ids, *args)
def do_open(self, cr, uid, ids, *args, **kwargs):
res = super(project_tasks, self).do_open(cr, uid, ids, *args, **kwargs)
tasks = self.browse(cr, uid, ids)
self._history(cr, uid, tasks, _('Open'))
return res
def do_pending(self, cr, uid, ids, *args):
res = super(project_tasks, self).do_pending(cr, uid, ids, *args)
def do_pending(self, cr, uid, ids, *args, **kwargs):
res = super(project_tasks, self).do_pending(cr, uid, ids, *args, **kwargs)
tasks = self.browse(cr, uid, ids)
self._history(cr, uid, tasks, _('Pending'))
return res
def do_close(self, cr, uid, ids, *args):
res = super(project_tasks, self).do_close(cr, uid, ids, *args)
def do_close(self, cr, uid, ids, *args, **kwargs):
res = super(project_tasks, self).do_close(cr, uid, ids, *args, **kwargs)
tasks = self.browse(cr, uid, ids)
for task in tasks:
if task.state == 'done':
self._history(cr, uid, tasks, _('Done'))
return res
def do_cancel(self, cr, uid, ids, *args):
res = super(project_tasks, self).do_cancel(cr, uid, ids, *args)
def do_cancel(self, cr, uid, ids, *args, **kwargs):
res = super(project_tasks, self).do_cancel(cr, uid, ids, *args, **kwargs)
tasks = self.browse(cr, uid, ids)
self._history(cr, uid, tasks, _('Cancel'))
return res

20
addons/project_mrp/project_mrp.py
View File

@ -29,22 +29,20 @@ class project_task(osv.osv):
'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null')
}
def do_close(self, cr, uid, ids, *args):
res = super(project_task, self).do_close(cr, uid, ids, *args)
tasks = self.browse(cr, uid, ids)
for task in tasks:
def _validate_subflows(self, cr, uid, ids):
for task in self.browse(cr, uid, ids):
if task.procurement_id:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'procurement.order', task.procurement_id.id, 'subflow.done', cr)
def do_close(self, cr, uid, ids, *args, **kwargs):
res = super(project_task, self).do_close(cr, uid, ids, *args, **kwargs)
self._validate_subflows(cr, uid, ids)
return res
def do_cancel(self, cr, uid, ids, *args):
res = super(project_task, self).do_cancel(cr, uid, ids, *args)
tasks = self.browse(cr, uid, ids)
for task in tasks:
if task.procurement_id:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'procurement.order', task.procurement_id.id, 'subflow.cancel', cr)
def do_cancel(self, cr, uid, ids, *args, **kwargs):
res = super(project_task, self).do_cancel(cr, uid, ids, *args, **kwargs)
self._validate_subflows(cr, uid, ids)
return True
project_task()