Rename to avoid conflict.

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/Computer_getSoftwareReleaseState.xml → master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/Computer_getSoftwareReleaseRequestedState.xml

@@ -86,7 +86,7 @@ else:\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Computer_getSoftwareReleaseState</string> </value>
+            <value> <string>Computer_getSoftwareReleaseRequestedState</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/Computer_getSoftwareReleaseUrlStringList.xml

@@ -52,8 +52,8 @@
             <key> <string>_body</string> </key>
             <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery\n
 computer = context\n
-\n
 portal = context.getPortalObject()\n
+script.log(state_list)\n
 if len(state_list) == 1:\n
   state_string = "= \'%s\'" % state_list[0]\n
 else:\n

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/Computer_viewCurrentUsage.xml

@@ -94,6 +94,7 @@
                         <string>listbox_image</string>
                         <string>listbox_parent_state</string>
                         <string>listbox_software_release</string>
+                        <string>listbox_installation_state</string>
                       </list>
                     </value>
                 </item>

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/Computer_viewCurrentUsage/listbox.xml

@@ -108,6 +108,14 @@
                           <string>url_string</string>
                           <string>URL</string>
                         </tuple>
+                        <tuple>
+                          <string>installation_state</string>
+                          <string>Installation State</string>
+                        </tuple>
+                        <tuple>
+                          <string>usage</string>
+                          <string>Usage</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>
@@ -157,6 +165,14 @@
                           <string>image</string>
                           <string></string>
                         </tuple>
+                        <tuple>
+                          <string>installation_state</string>
+                          <string></string>
+                        </tuple>
+                        <tuple>
+                          <string>usage</string>
+                          <string></string>
+                        </tuple>
                       </list>
                     </value>
                 </item>

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/OpenSaleOrder_findPartition.xml

@@ -83,6 +83,7 @@ if offset >= SQL_WINDOW_SIZE:\n
 else:\n
   limit = (0, SQL_WINDOW_SIZE)\n
 \n
+script.log(query_kw)\n
 for computer_partition_candidate in context.portal_catalog(\n
                                          limit=limit, **query_kw):\n
   computer_partition_candidate = computer_partition_candidate.getObject()    \n

master/bt5/vifib_base/bt/revision

-419
\ No newline at end of file
+420
\ No newline at end of file

master/product/Vifib/Tool/SlapTool.py

@@ -1014,7 +1014,7 @@ class SlapTool(BaseTool):
           software_release=software_release_url_string,
           computer_guid=computer_reference)
       software_release_response._requested_state = \
-        computer_document.Computer_getSoftwareReleaseState(
+        computer_document.Computer_getSoftwareReleaseRequestedState(
           software_release_url_string)
       software_release_list.append(software_release_response)
     return software_release_list