Merge lp:~yann-papouin/openobject-addons/6.1-bug-997642-fix-services-make-to-stock into lp:openobject-addons/6.1

[Yann Papouin]

=== modified file 'project_mrp/project_procurement.py'
--- project_mrp/project_procurement.py	2011-12-19 16:54:40 +0000
+++ project_mrp/project_procurement.py	2013-09-11 08:32:52 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from openerp.tools.translate import _
 
 class procurement_order(osv.osv):
     _name = "procurement.order"
@@ -37,8 +38,10 @@
         """ 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')) \
-                    for proc in self.browse(cr, uid, ids, context=context))
+        for p in self.browse(cr, uid, ids, context=context):
+            if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.state not in ('done', 'cancelled')):
+                return False
+        return True
 
     def check_produce_service(self, cr, uid, procurement, context=None):    
         return True
@@ -80,7 +83,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':_('Task created.')}, context=context)
         return task_id
 
 procurement_order()