Merge lp:~openerp-dev/openobject-addons/trunk-bug-997642-amb into lp:openobject-addons

[Amit Bhavsar (Open ERP)]

Hello,

It's raised the problem when create S.O with project_mrp installed for service product.
Now Fixes the problem of procurement for service product with latest addons.

Thanks!

[Fabien (Open ERP) (fp-tinyerp)]

The proposed patch was not good: proc.procurement_method instead of proc.product_id.procure_method

=== modified file 'project_mrp/project_procurement.py'
--- project_mrp/project_procurement.py	2012-08-06 06:11:13 +0000
+++ project_mrp/project_procurement.py	2012-08-27 10:18:02 +0000
@@ -37,8 +37,9 @@
         """ Checks if task is done or not.
         @return: True or False.
         """
-        return all(proc.product_id.type != 'service' or (proc.task_id and proc.task_id.state in ('done', 'cancelled')) \
+        res = all((proc.product_id.type != 'service') or ((proc.product_id.type == 'service') and (proc.product_id.procure_method == 'make_to_stock')) or (proc.task_id and proc.task_id.state in ('done', 'cancelled')) \
                     for proc in self.browse(cr, uid, ids, context=context))
+        return res
 
     def check_produce_service(self, cr, uid, procurement, context=None):    
         return True
@@ -80,7 +81,7 @@
                 'project_id':  project and project.id or False,
                 'company_id': procurement.company_id.id,
             },context=context)
-            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running'}, context=context)
+            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running', 'message':'from project: task created.'}, context=context)
         self.running_send_note(cr, uid, ids, context=None)
         return task_id