diff --git a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderLineConstraint/line_aggregate_computer_partition_constraint.xml b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderLineConstraint/line_aggregate_computer_partition_constraint.xml
index a508ed372e531c02b1729a1284b457ca9baf3988..9dc379846cf81a30c4fb23ef4d6c7819209af582 100644
--- a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderLineConstraint/line_aggregate_computer_partition_constraint.xml
+++ b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderLineConstraint/line_aggregate_computer_partition_constraint.xml
@@ -86,7 +86,7 @@
         </item>
         <item>
             <key> <string>test_tales_expression</string> </key>
-            <value> <string>python: object.getSimulationState() == \'confirmed\' and object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]</string> </value>
+            <value> <string>python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]</string> </value>
         </item>
         <item>
             <key> <string>use_acquisition</string> </key>
diff --git a/master/bt5/vifib_erp5/bt/revision b/master/bt5/vifib_erp5/bt/revision
index 5587802b4e488e50d8c558c30f51fd77fa0708d8..7b89b2202c953386efdf6390320429ff42de30a2 100644
--- a/master/bt5/vifib_erp5/bt/revision
+++ b/master/bt5/vifib_erp5/bt/revision
@@ -1 +1 @@
-405
\ No newline at end of file
+406
\ No newline at end of file
diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleOrderLine_tryToAllocatePartition.xml b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleOrderLine_tryToAllocatePartition.xml
index 258194ec2cd6893c3e560017e1e608ef71619b6f..064a9c630b029caeccebaf90397355c1d40c0918 100644
--- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleOrderLine_tryToAllocatePartition.xml
+++ b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleOrderLine_tryToAllocatePartition.xml
@@ -84,13 +84,11 @@ def assignComputerPartition(order):\n
             software_instance.getPortalType(), software_instance.getSlaXmlAsDict()])\n
           order_line.edit(\n
             aggregate_list=order_line.getAggregateList()+[computer_partition_relative_url])\n
-          return True\n
 \n
 sale_order = context.getParentValue()\n
 if sale_order.getSimulationState() == \'ordered\':\n
-  assigned = False\n
   try:\n
-    assigned = assignComputerPartition(sale_order)\n
+    assignComputerPartition(sale_order)\n
   except ValueError:\n
     # It was not possible to find free Computer Partition\n
     pass\n
diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision
index a869e998c0e3bac924179254460c4911d81e84a6..5628fa72e96ce2e8a8bb9acda2e338c4deb08e13 100644
--- a/master/bt5/vifib_slap/bt/revision
+++ b/master/bt5/vifib_slap/bt/revision
@@ -1 +1 @@
-638
\ No newline at end of file
+639
\ No newline at end of file