Provide more generic script to find delivery lines.

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_getSoftwarePackingListLineList.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery\n
+\n
+computer = state_change[\'object\']\n
+# Get required arguments\n
+kwargs = state_change.kwargs\n
+software_release_url = state_change.kwargs["software_release_url"]\n
+\n
+portal = computer.getPortalObject()\n
+\n
+# Only get one software release\n
+software_release_document_result = computer.portal_catalog(\n
+  portal_type=\'Software Release\', # validation_state=(\'shared\', \'released\', \'published\', \'shared_alive\', \'released_alive\', \'published_alive\'),\n
+  url_string=software_release_url, limit=2)\n
+if len(software_release_document_result) != 1:\n
+  raise ValueError("No software release found for %s %s" % (computer.getRelativeUrl(), software_release_url))\n
+else:\n
+  software_release_document = software_release_document_result[0]\n
+\n
+# Packing List valid state\n
+if state_list is None:\n
+  state_list = []\n
+  state_list.extend(portal.getPortalReservedInventoryStateList())\n
+  state_list.extend(portal.getPortalTransitInventoryStateList())\n
+\n
+return portal.portal_catalog(\n
+  portal_type=\'Purchase Packing List Line\',\n
+  simulation_state=state_list,\n
+  default_resource_uid=service_uid_list,\n
+  sort_on=((\'movement.start_date\', \'DESC\'),),\n
+  aggregate_relative_url=ComplexQuery(\n
+    Query(aggregate_relative_url=software_release_document.getRelativeUrl()),\n
+    Query(aggregate_relative_url=computer.getRelativeUrl()),\n
+    operator="AND"),\n
+  limit=limit\n
+)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>state_change, service_uid_list, state_list=None, limit=1</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Computer_getSoftwarePackingListLineList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_getSoftwareSetupPackingListLine.xml

@@ -52,47 +52,15 @@
             <key> <string>_body</string> </key>
             <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery\n
 \n
-computer = state_change[\'object\']\n
-# Get required arguments\n
-kwargs = state_change.kwargs\n
-software_release_url = state_change.kwargs["software_release_url"]\n
-\n
-portal = computer.getPortalObject()\n
-\n
-# Only get one software release\n
-software_release_document_result = computer.portal_catalog(\n
-  portal_type=\'Software Release\', # validation_state=(\'shared\', \'released\', \'published\', \'shared_alive\', \'released_alive\', \'published_alive\'),\n
-  url_string=software_release_url, limit=2)\n
-if len(software_release_document_result) != 1:\n
-  raise ValueError("No software release found for %s %s" % (computer.getRelativeUrl(), software_release_url))\n
-else:\n
-  software_release_document = software_release_document_result[0]\n
-\n
-# Software installation service\n
-service_relative_url = portal.portal_preferences.\\\n
-                            getPreferredSoftwareSetupResource()\n
-service = portal.restrictedTraverse(service_relative_url)\n
-service_uid = service.getUid()\n
-\n
-# Packing List valid state\n
-state_list = []\n
-state_list.extend(portal.getPortalReservedInventoryStateList())\n
-state_list.extend(portal.getPortalTransitInventoryStateList())\n
-\n
-packing_list_line = portal.portal_catalog.getResultValue(\n
-  portal_type=\'Purchase Packing List Line\',\n
-  simulation_state=state_list,\n
-  default_resource_uid=service_uid,\n
-  sort_on=((\'movement.start_date\', \'DESC\'),),\n
-  aggregate_relative_url=ComplexQuery(\n
-    Query(aggregate_relative_url=software_release_document.getRelativeUrl()),\n
-    Query(aggregate_relative_url=computer.getRelativeUrl()),\n
-    operator="AND"),\n
-)\n
-if packing_list_line is None:\n
+portal = context.getPortalObject()\n
+packing_list_line_list = context.Computer_getSoftwarePackingListLineList(\n
+  state_change,\n
+  service_uid_list=[portal.restrictedTraverse(portal.portal_preferences.getPreferredSoftwareSetupResource()).getUid()],\n
+  limit=1)\n
+if len(packing_list_line_list) == 0:\n
   raise ValueError("No purchase packing list line found for %s %s" % (computer.getRelativeUrl(), software_release_document.getRelativeUrl()))\n
 else:\n
-  return packing_list_line\n
+  return packing_list_line_list[0].getObject()\n
 </string> </value>
         </item>
         <item>

master/bt5/vifib_slap/bt/revision

-676
\ No newline at end of file
+677
\ No newline at end of file