Merge lp:~unifield-team/unifield-wm/us-173 into lp:unifield-wm

[jftempo]

=== modified file 'purchase_override/purchase.py'
--- purchase_override/purchase.py	2015-03-12 07:20:39 +0000
+++ purchase_override/purchase.py	2015-04-09 12:19:33 +0000
@@ -3053,7 +3053,10 @@
 
         # Cancel the listed procurement orders
         for proc_id in proc_ids:
-            if not self.search(cr, uid, [('id', 'not in', ids), ('procurement_id', '=', proc_id)], context=context):
+            if not self.search(cr, uid, [
+                ('order_id.state', '!=', 'split'),
+                ('id', 'not in', ids),
+                ('procurement_id', '=', proc_id)], context=context):
                 proc_obj.action_cancel(cr, uid, [proc_id])
 
         self.write(cr, uid, ids, {'state': 'cancel'}, context=context)