Stabilise.

Confirmed Sale Order Line shall have Computer Partition.

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.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.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>
         </item>
         <item>
             <key> <string>use_acquisition</string> </key>

master/bt5/vifib_erp5/bt/revision

-407
+408
\ No newline at end of file

master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleOrderLine_tryToAllocatePartition.xml

@@ -84,11 +84,12 @@ 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 computer_partition_relative_url\n
 \n
 sale_order = context.getParentValue()\n
 if sale_order.getSimulationState() == \'ordered\':\n
   try:\n
-    assignComputerPartition(sale_order)\n
+    computer_partition = getComputerPartition(sale_order)\n
   except ValueError:\n
     # It was not possible to find free Computer Partition\n
     pass\n
@@ -96,13 +97,14 @@ if sale_order.getSimulationState() == \'ordered\':\n
     # user has bad balance\n
     pass\n
   else:\n
-    try:\n
-      sale_order.Base_checkConsistency()\n
-    except ValidationFailed:\n
-      # order not ready yet\n
-      pass\n
-    else:\n
-      sale_order.confirm()\n
+    if computer_partition is not None:\n
+      try:\n
+        sale_order.Base_checkConsistency()\n
+      except ValidationFailed:\n
+        # order not ready yet\n
+        pass\n
+      else:\n
+        sale_order.confirm()\n
 </string> </value>
         </item>
         <item>

master/bt5/vifib_slap/bt/revision

-654
+655
\ No newline at end of file