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

[Yann Papouin]

Automatically derived from https://code.launchpad.net/~yann-papouin/openobject-addons/6.1-bug-997642-fix-services-make-to-stock for https://code.launchpad.net/~openerp/openobject-addons/6.1.

[Holger Brunn (Therp) (hbrunn)]

#19 should this be p.product_id.procure_method?

review: Needs Fixing (code review)

[Yann Papouin (yann-papouin)]

No, the procure_method is stored in the procurement object when created.
https://bugs.launchpad.net/ocb-addons/+bug/997642/comments/7

[Holger Brunn (Therp) (hbrunn)]

Thanks for your pointer and sorry for overlooking!

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

review: Approve (code review, no tests)

=== modified file 'project_mrp/project_procurement.py'
--- project_mrp/project_procurement.py	2011-12-19 16:54:40 +0000
+++ project_mrp/project_procurement.py	2014-01-30 10:05:07 +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()