Merge lp:~openerp-dev/openobject-addons/6.1-opw-574389-ado into lp:openobject-addons/6.1

[Amit Dodiya (OpenERP)]

Hello,

"[FIX] Error on delegate task"

Steps to reproduce:

1). Install project, project_mrp and project_mailgate modules.
2). Create a new task and try to delegate with pending / done state.

Regards,
Amit

[Naresh(OpenERP) (nch-openerp)]

The line 36 in the diff wf_service.trg_write(uid, 'procurement.order', task.procurement_id.id, cr)

should be wf_service.trg_write(uid, 'procurement.order', task_data.procurement_id.id, cr)

otherwise you will have * undefined variable task *\

Thanks,
Naresh

review: Needs Fixing

[Amit Dodiya (OpenERP) (ado-openerp)]

Hello,

The code is changed.

Regards,
Amit

review: Needs Resubmitting

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6877. By Amit Dodiya<email address hidden> on 2012-07-05

[FIX] Error on delegate task

=== modified file 'project_mailgate/project_mailgate.py'
--- project_mailgate/project_mailgate.py	2011-09-07 22:38:59 +0000
+++ project_mailgate/project_mailgate.py	2012-07-05 11:37:23 +0000
@@ -99,12 +99,16 @@
     def do_pending(self, cr, uid, ids, context=None):
         res = super(project_tasks, self).do_pending(cr, uid, ids, context)
         tasks = self.browse(cr, uid, ids, context=context)
+        if not isinstance(tasks,list):
+            tasks = [tasks]
         self.message_append(cr, uid, tasks, _('Pending'), context=context)
         return res
 
     def do_close(self, cr, uid, ids, context=None):
         res = super(project_tasks, self).do_close(cr, uid, ids, context)
         tasks = self.browse(cr, uid, ids, context=context)
+        if not isinstance(tasks,list):
+            tasks = [tasks]
         for task in tasks:
             if task.state == 'done':
                 self.message_append(cr, uid, tasks, _('Done'), context=context)
 
=== modified file 'project_mrp/project_mrp.py'
--- project_mrp/project_mrp.py	2012-01-02 10:08:34 +0000
+++ project_mrp/project_mrp.py	2012-07-05 11:37:23 +0000
@@ -32,9 +32,11 @@
 
     def _validate_subflows(self, cr, uid, ids):
         wf_service = netsvc.LocalService("workflow")
-        for task in self.browse(cr, uid, ids):
-            if task.procurement_id:
-                wf_service.trg_write(uid, 'procurement.order', task.procurement_id.id, cr)
+        task_data = self.browse(cr, uid, ids)
+        if isinstance(task_data, list):
+            task_data = task_data[0]
+        if task_data.procurement_id:
+                wf_service.trg_write(uid, 'procurement.order', task_data.procurement_id.id, cr)
 
     def do_close(self, cr, uid, ids, *args, **kwargs):
         res = super(project_task, self).do_close(cr, uid, ids, *args, **kwargs)