diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.xml
index 01b8ed438e751b60e91b9297d34a3b37099dfca2..2e725fac547211878287bde09d96bf4c469bd405 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.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>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml
index 446ed602f7e4575ac9f9b5b2d61f677c601969c9..d29d36d9f07b76c1a31ae6bec739102b93101efd 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml
@@ -2,10 +2,4 @@
<item key="sql_uncatalog_object" 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: getattr(context, 'getOutcomeDescription', None) is not None</value>
- </item>
</catalog_method>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml
index a78491d946ec58a0f837f8a52661f4ba13ce5cfd..49a95cbd549a002ac2365621b3833db51ef1f4c7 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.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>
@@ -38,6 +38,26 @@
<key> <string>connection_id</string> </key>
<value> <string>erp5_sql_connection</string> </value>
</item>
+ <item>
+ <key> <string>expression</string> </key>
+ <value> <string>python: getattr(context, \'getOutcomeDescription\', None) is not None</string> </value>
+ </item>
+ <item>
+ <key> <string>expression_cache_key</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>expression_instance</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>filtered</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>z0_uncatalog_reporting_outcome</string> </value>
@@ -50,10 +70,33 @@
<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>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python: getattr(context, \'getOutcomeDescription\', None) is not None</string> </value>
+ </item>
</dictionary>
</pickle>
</record>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml
index 4da7bc1d6a9ad52b9a4322fbf9941c93ccac8721..c95a68655e4b28b9b03081ca25caf201b2237d18 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml
@@ -2,10 +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: getattr(context, 'getOutcomeDescription', None) is not None</value>
- </item>
</catalog_method>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml
index e5759f62d78470f51a57afdfe5c20e852ce4e9af..74848ccede858c22debf57f20c9831bb90b72a74 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_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,26 @@ uid</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: getattr(context, \'getOutcomeDescription\', None) is not None</string> </value>
+ </item>
+ <item>
+ <key> <string>expression_cache_key</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>expression_instance</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>filtered</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>z_catalog_reporting_outcome_list</string> </value>
@@ -51,10 +71,33 @@ uid</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>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python: getattr(context, \'getOutcomeDescription\', None) is not None</string> </value>
+ </item>
</dictionary>
</pickle>
</record>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
index 2cce189878f949f3fb51bb23254d846d56697f6b..c61666c6d31ea00471c41a3d2c3b108ede0cb68c 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
@@ -2,10 +2,16 @@
<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>
+ <item>
+ <key> <string>_col</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -50,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>