Simplify.

master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/vifib_open_order_interaction_workflow/scripts/Delivery_assertCustomTradeConditionAndOpenOrder.xml

@@ -66,17 +66,20 @@ if trade_condition is not None:\n
 if custom_trade_condition is None:\n
   # If no trade condition or generic trade condition\n
   # try to find existing trade condition\n
-  trade_condition_list = portal.sale_trade_condition_module.searchFolder(destination_section_relative_url=order.getDestinationSectionRelativeUrl(),\n
-                                                                         validation_state="validated",\n
-                                                                         specialise_relative_url=vifib_trade_condition)\n
+  trade_condition_list = portal.portal_catalog(\n
+  destination_section_relative_url=order.getDestinationSection(),\n
+  validation_state="validated",\n
+  specialise_relative_url=vifib_trade_condition,\n
+  portal_type=\'Sale Trade Condition\')\n
   if len(trade_condition_list):\n
     custom_trade_condition = trade_condition_list[0].getObject()\n
 \n
 if custom_trade_condition is None:\n
   # nothing found then create a new custom trade condition\n
   custom_trade_condition = portal.sale_trade_condition_module.newContent(specialise=vifib_trade_condition,\n
-                                                                    destination_section_relative_url=order.getDestinationSectionRelativeUrl(),\n
-                                                                    title="ViFiB Custom Conditions")\n
+                                                                    destination_section_relative_url=order.getDestinationSection(),\n
+                                                                    title="ViFiB Custom Conditions",\n
+                                                                    portal_type=\'Sale Trade Condition\')\n
 \n
 if custom_trade_condition is None:\n
   raise ValueError(\'It was impossible to generate custom trade condition.\')\n

master/bt5/vifib_open_trade/bt/revision

-146
\ No newline at end of file
+147
\ No newline at end of file