XML chnage.

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_data_analysis.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,6 +50,10 @@
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_data_analysis.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,6 +50,10 @@
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_data_analysis_list.catalog_keys.xml

@@ -2,13 +2,4 @@
  <item key="sql_catalog_object_list" type="int">
   <value>1</value>
  </item>
- <item key="_is_filtered_archive" type="int">
-  <value>1</value>
- </item>
- <item key="_filter_expression_archive" type="str">
-  <value>python: context.getPortalType() == 'Data Analysis'</value>
- </item>
- <item key="_filter_expression_cache_key_archive" type="tuple">
-  <value>portal_type</value>
- </item>
 </catalog_method>

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_data_analysis_list.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -39,6 +39,22 @@ getRefreshState</string> </value>
             <key> <string>connection_id</string> </key>
             <value> <string>erp5_sql_connection</string> </value>
         </item>
+        <item>
+            <key> <string>expression</string> </key>
+            <value> <string>python: context.getPortalType() == \'Data Analysis\'</string> </value>
+        </item>
+        <item>
+            <key> <string>expression_cache_key</string> </key>
+            <value>
+              <tuple>
+                <string>portal_type</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>filtered</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>z_catalog_data_analysis_list</string> </value>
@@ -51,10 +67,20 @@ getRefreshState</string> </value>
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_data_analysis.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -56,6 +56,10 @@
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_item.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -50,6 +50,10 @@
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_item_aggregate.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,6 +54,10 @@ query_table="catalog"</string> </value>
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_item_destination_project.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -55,6 +55,10 @@ query_table="catalog"</string> </value>
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>

bt5/erp5_wendelin/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_item_source.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+      <global name="SQL Method" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -55,6 +55,10 @@ query_table="catalog"</string> </value>
             <key> <string>max_rows_</string> </key>
             <value> <int>1000</int> </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>SQL Method</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>

bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArray.xml

@@ -104,11 +104,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -121,7 +123,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArrayLine.xml

@@ -100,11 +100,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -117,7 +119,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArrayLineExistenceConstraint.xml

@@ -102,11 +102,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -119,7 +121,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataBucketStream.xml

@@ -103,11 +103,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -120,7 +122,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataStream.xml

@@ -102,11 +102,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -119,7 +121,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.IngestionPolicy.xml

@@ -98,11 +98,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -115,7 +117,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.IngestionPolicyTool.xml

@@ -100,11 +100,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -117,7 +119,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/ExtensionTemplateItem/portal_components/extension.erp5.Wendelin.xml

@@ -100,11 +100,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -117,7 +119,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/PathTemplateItem/portal_gadgets/WendelinInformationGadget.xml

@@ -163,11 +163,13 @@
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -217,7 +219,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="7" aka="AAAAAAAAAAc=">

bt5/erp5_wendelin/PathTemplateItem/web_page_module/wendelin_information_gadget.html.xml

@@ -292,11 +292,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -481,7 +483,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_wendelin/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -60,8 +60,8 @@
   <item>Data Set</item>
  </portal_type>
  <portal_type id="Data Stream Module">
-  <item>Data Stream</item>
   <item>Data Bucket Stream</item>
+  <item>Data Stream</item>
  </portal_type>
  <portal_type id="Data Supply">
   <item>Data Supply Line</item>

bt5/erp5_wendelin/TestTemplateItem/portal_components/test.erp5.testWendelin.xml

@@ -102,11 +102,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -119,7 +121,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>