diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_birth_detail.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_birth_detail.xml
index cee9383081aab13891400e231e9f652df296d0dd..891194dcfabcfb9195ab4913b092e1c148694b08 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_birth_detail.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_birth_detail.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>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_egov.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_egov.xml
index be92b16490dbaef6c2cac83288906a9e2e575514..45250a1bc5d240a9af556028f08f2c7d476addfc 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_egov.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_egov.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>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_list.catalog_keys.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_list.catalog_keys.xml
index 6e8165180964919b173761f221525257ddf54df4..c95a68655e4b28b9b03081ca25caf201b2237d18 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_list.catalog_keys.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_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: context.getPortalType() == 'Person'</value>
- </item>
</catalog_method>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_list.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_list.xml
index 78613888e970b90c109c2ad1553f7bd5007d4f2c..d67407d3e48db640bd27ac467d85c9eb68225ed2 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_list.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_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>
@@ -40,6 +40,26 @@ getBirthplaceAddressCity</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() == \'Person\'</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_birth_detail_list</string> </value>
@@ -52,10 +72,33 @@ getBirthplaceAddressCity</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: context.getPortalType() == \'Person\'</string> </value>
+ </item>
</dictionary>
</pickle>
</record>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml
index 86cefcf9c2442a5d8b53b746a3aac88c32598ced..c95a68655e4b28b9b03081ca25caf201b2237d18 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_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() in ('Organisation', 'Assignment') or (lambda type_info: type_info is not None and type_info.getPortalType() == 'EGov Type')(context.getTypeInfo())</value>
- </item>
- <item key="_filter_expression_cache_key_archive" type="tuple">
- <value>portal_type</value>
- </item>
</catalog_method>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
index d55ce104af5c0ae9b7dca3c1dc5800a77973d23a..31a9a1b14b278783865a8eaeab19bbaee0a2458e 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_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>
@@ -47,6 +47,28 @@ modification_date </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() in (\'Organisation\', \'Assignment\') or (lambda type_info: type_info is not None and type_info.getPortalType() == \'EGov Type\')(context.getTypeInfo())</string> </value>
+ </item>
+ <item>
+ <key> <string>expression_cache_key</string> </key>
+ <value>
+ <tuple>
+ <string>portal_type</string>
+ </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_egov_list</string> </value>
@@ -59,10 +81,33 @@ modification_date </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: context.getPortalType() in (\'Organisation\', \'Assignment\') or (lambda type_info: type_info is not None and type_info.getPortalType() == \'EGov Type\')(context.getTypeInfo())</string> </value>
+ </item>
</dictionary>
</pickle>
</record>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.xml
index 0a7c9045964fac1d01e2f60b06fcca427d1d1e0e..f708ffc253492bd3e163f652cdbe748b2ddae00c 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.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>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
index 5edc7103f304cdae4e30c444d4dfad53f692a1aa..ea5e622e18a063f5d63c0f9d374f80d6f61b68fd 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.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>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_birth_detail.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_birth_detail.xml
index 01aace48cc7d735e6205777b843be03b249695d0..70a31617c0e2849d143ed19348fcbfc1cf9f4b09 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_birth_detail.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_birth_detail.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_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_egov.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_egov.xml
index 60d99925b3f428454f0fe22f3bd49e1b6362c9e0..d2fdaa7249779a213da40603fdfc1fee5d0c5195 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_egov.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_egov.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>