diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_preferred_gap.xml b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_preferred_gap.xml
index f00a023bf1358a181361ee7c3f1f5c11e93d3be8..e0c0d998f76d6fbb37d4446e8b2029300ed0cd91 100644
--- a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_preferred_gap.xml
+++ b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_preferred_gap.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -75,56 +32,6 @@ AND <dtml-var table_0>.uid = catalog.uid
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-<dtml-if expr="portal_preferences.getPreferredAccountingTransactionGap()">\n
- AND <dtml-var table_1>.relative_url LIKE <dtml-sqlvar expr="portal_preferences.getPreferredAccountingTransactionGap()+\'%\'" type="string">\n
-</dtml-if>\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.gap.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_preferred_gap.xml b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_preferred_gap.xml
index fb969a3a2a7ac212d0c5bd7616dacd089e57787c..90b6dfe77cd654c94ab587cca2e25f10d17d2d8f 100644
--- a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_preferred_gap.xml
+++ b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_preferred_gap.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -77,58 +34,6 @@ AND <dtml-var table_0>.category_strict_membership = 1\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-<dtml-if expr="portal_preferences.getPreferredAccountingTransactionGap()">\n
- AND <dtml-var table_1>.relative_url LIKE <dtml-sqlvar expr="portal_preferences.getPreferredAccountingTransactionGap()+\'%\'" type="string">\n
-</dtml-if>\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.gap.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.uid\n
-AND <dtml-var table_0>.category_strict_membership = 1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zDistinctSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zDistinctSectionList.xml
index fcdebf4f3971fdcf4d0e647ac54cbc654097b74a..69efc403cae25bfbb8de372db26d901672c6cd32 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zDistinctSectionList.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zDistinctSectionList.xml
@@ -14,73 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>at_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>node_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>section_uid</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>node_uid</string>
- <string>at_date</string>
- <string>section_uid</string>
- <string>simulation_state</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -219,93 +152,6 @@ ORDER BY\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery())">\n
-SELECT DISTINCT\n
- catalog.relative_url,\n
- catalog.path,\n
- catalog.title,\n
- catalog.portal_type,\n
- catalog.validation_state\n
-FROM\n
- <dtml-in prefix="table" expr="query[\'from_table_list\']">\n
- <dtml-if "table_key not in (\'stock\', \'catalog\')">\n
- <dtml-var table_item> AS <dtml-var table_key>,\n
- </dtml-if>\n
- </dtml-in>\n
- catalog,\n
- stock\n
-WHERE\n
- stock.mirror_section_uid = catalog.uid\n
-<dtml-if node_uid>\n
- AND stock.node_uid = <dtml-sqlvar node_uid type="string">\n
-</dtml-if>\n
-<dtml-if at_date>\n
- AND stock.date <= <dtml-sqlvar at_date type="datetime">\n
-</dtml-if>\n
-<dtml-if simulation_state>\n
- AND ( stock.simulation_state IN (<dtml-in simulation_state><dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end>, </dtml-unless></dtml-in>) )\n
-</dtml-if>\n
-\n
-<dtml-if section_uid>\n
- AND (\n
- stock.section_uid IN ( <dtml-in section_uid><dtml-sqlvar sequence-item type="int">\n
- <dtml-unless sequence-end>, </dtml-unless> </dtml-in> )\n
- )\n
-</dtml-if>\n
-\n
- AND stock.portal_type in ( <dtml-in getPortalAccountingMovementTypeList><dtml-sqlvar\n
- sequence-item type="string"><dtml-unless sequence-end>, </dtml-unless></dtml-in> )\n
-<dtml-if "query[\'where_expression\']">\n
- AND <dtml-var "query[\'where_expression\']">\n
-</dtml-if>\n
-ORDER BY\n
- catalog.portal_type, catalog.title\n
-</dtml-let>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
index ebd5e0c79e38a66ec1d95c923702a03c41865045..39a1ffaae2d4224a5e66920380f0ccd6e5e218fa 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
@@ -14,348 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>amount</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>amount_range_max</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>amount_range_min</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>at_date</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>count</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>creation_date_range_max</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>creation_date_range_min</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>delivery_mirror_section_title</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>destination_section_where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>entity</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>from_date</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>group_by</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>node</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>omit_input</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>omit_output</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>resource</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>search_result_keys</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string encoding="base64">Jyc=</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>section_category</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>section_category_strict</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>selection</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_name</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>None</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>selection_params</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>source_section_where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>specific_reference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>stat</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>to_date</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>transaction_uid</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>selection</string>
- <string>selection_name</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>selection_params</string>
- <string>from_date</string>
- <string>at_date</string>
- <string>to_date</string>
- <string>node</string>
- <string>resource</string>
- <string>entity</string>
- <string>stat</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>amount</string>
- <string>amount_range_min</string>
- <string>amount_range_max</string>
- <string>creation_date_range_min</string>
- <string>creation_date_range_max</string>
- <string>section_category</string>
- <string>section_category_strict</string>
- <string>count</string>
- <string>transaction_uid</string>
- <string>specific_reference</string>
- <string>group_by</string>
- <string>search_result_keys</string>
- <string>delivery_mirror_section_title</string>
- <string>source_section_where_expression</string>
- <string>destination_section_where_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -1070,685 +728,6 @@ UNION\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), select_expression_key=(\'operation_date\', \'specific_reference\', \'delivery_mirror_section_title\',), **selection_params)">\n
-<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n
-<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
-<dtml-let accounting_movement_list="portal_url.getPortalObject().getPortalAccountingMovementTypeList()">\n
-\n
-\n
-<dtml-comment>\n
-#################################################\n
-# #\n
-# If both entity and section_category are NOT #\n
-# #\n
-#################################################\n
-</dtml-comment>\n
-<dtml-if "not (entity or section_category)">\n
- SELECT\n
- <dtml-if stat>\n
- SUM(stock.total_price) AS total_price\n
- <dtml-elif count>\n
- COUNT(DISTINCT catalog.uid) AS count\n
- <dtml-else>\n
- <dtml-if "query[\'select_expression\']">\n
- <dtml-var "query[\'select_expression\']">\n
- <dtml-in "search_result_keys">,<dtml-var sequence-item></dtml-in>\n
- , delivery.start_date as operation_date\n
- , \'source\' as section_mark\n
- , catalog.reference as specific_reference\n
- <dtml-else>\n
- DISTINCT\n
- <dtml-in "search_result_keys">\n
- <dtml-unless sequence-start>,</dtml-unless>\n
- <dtml-var sequence-item>\n
- </dtml-in>\n
- , delivery.start_date as operation_date\n
- , \'source\' as section_mark\n
- , catalog.reference as specific_reference\n
- </dtml-if>\n
- </dtml-if>\n
- \n
- FROM\n
- <dtml-in prefix="table" expr="query[\'from_table_list\']">\n
- <dtml-if "table_key not in (\'delivery\', \'catalog\')">\n
- <dtml-var table_item> AS <dtml-var table_key>,\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if selection_domain>\n
- <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)">,\n
- </dtml-if>\n
- <dtml-if selection_report>\n
- <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)">,\n
- </dtml-if>\n
- <dtml-if use_movement_table> movement, </dtml-if>\n
- <dtml-if "stat or omit_input or omit_output or node">\n
- stock, catalog as child,\n
- <dtml-unless section_category>category,</dtml-unless>\n
- </dtml-if>\n
- <dtml-if "section_category">category, catalog as section, </dtml-if>\n
- catalog,\n
- delivery\n
- \n
- WHERE\n
- delivery.uid = catalog.uid\n
- <dtml-if "query[\'where_expression\']">\n
- AND <dtml-var "query[\'where_expression\']">\n
- </dtml-if>\n
- <dtml-if selection_domain>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n
- </dtml-if>\n
- <dtml-if selection_report>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
- </dtml-if>\n
- <dtml-if specific_reference> AND (\n
- catalog.source_reference LIKE\n
- <dtml-sqlvar specific_reference type="string">\n
- OR catalog.destination_reference LIKE\n
- <dtml-sqlvar specific_reference type="string"> )</dtml-if>\n
- <dtml-if transaction_uid>\n
- AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
- <dtml-if amount>\n
- AND ABS(movement.quantity) = <dtml-sqlvar amount type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_min>\n
- AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float">\n
- </dtml-if>\n
- <dtml-if amount_range_max>\n
- AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float">\n
- </dtml-if>\n
- <dtml-if creation_date_range_min>\n
- AND catalog.creation_date >=\n
- <dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n
- <dtml-if creation_date_range_max>\n
- AND catalog.creation_date <\n
- <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n
- <dtml-if use_movement_table>\n
- AND movement.is_accountable\n
- AND movement.explanation_uid = catalog.uid </dtml-if>\n
- <dtml-if resource> AND movement.resource_uid =\n
- <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n
- <dtml-if entity> AND (\n
- delivery.destination_section_uid =\n
- <dtml-var "restrictedTraverse(entity).getUid()">\n
- OR delivery.source_section_uid =\n
- <dtml-var "restrictedTraverse(entity).getUid()">\n
- )</dtml-if>\n
- <dtml-if section_category> AND (\n
- ( category.uid = delivery.destination_section_uid\n
- ) OR ( category.uid = delivery.source_section_uid ) )\n
- AND section.portal_type = "Organisation"\n
- AND section.uid = category.uid\n
- AND category.category_uid =\n
- <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
- <dtml-if "section_category_strict">AND category.category_strict_membership = 1</dtml-if>\n
- </dtml-if>\n
- \n
- <dtml-if from_date>\n
- AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n
- </dtml-if>\n
- <dtml-if to_date>\n
- AND delivery.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
- </dtml-if>\n
- <dtml-if at_date>\n
- AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n
- </dtml-if>\n
- \n
- <dtml-if node>\n
- <dtml-if stat>\n
- AND stock.uid IN (\n
- SELECT child.uid from catalog as child\n
- WHERE category.uid = stock.section_uid\n
- AND child.parent_uid = catalog.uid\n
- HAVING (SELECT count(stock.uid) from stock, catalog as child\n
- WHERE stock.uid = child.uid \n
- AND child.parent_uid = catalog.uid\n
- AND (\n
- <dtml-in node>\n
- <dtml-unless sequence-start>OR</dtml-unless>\n
- stock.node_uid =\n
- <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n
- </dtml-in> )\n
- )\n
- )\n
- <dtml-else>\n
- AND category.uid = stock.section_uid\n
- AND child.uid = stock.uid\n
- AND child.parent_uid = catalog.uid\n
- AND (\n
- <dtml-in node>\n
- <dtml-unless sequence-start>OR</dtml-unless>\n
- stock.node_uid =\n
- <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n
- </dtml-in> )\n
- </dtml-if>\n
- </dtml-if>\n
- \n
- <dtml-if stat>\n
- AND category.uid = stock.section_uid\n
- AND child.uid = stock.uid\n
- AND child.parent_uid = catalog.uid\n
- AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
- <dtml-if omit_input> AND stock.total_price < 0\n
- AND stock.uid = movement.uid\n
- </dtml-if>\n
- <dtml-if omit_output> AND stock.total_price > 0\n
- AND stock.uid = movement.uid\n
- </dtml-if>\n
- </dtml-if>\n
- <dtml-if expr="selection_name is not None and portal_selections.getSelectionInvertModeFor(selection_name) and len(portal_selections.getSelectionInvertModeUidListFor(selection_name)) > 0">\n
- AND ( 0 = 1\n
- <dtml-in expr="portal_selections.getSelectionInvertModeUidListFor(selection_name)">\n
- OR catalog.uid = <dtml-var sequence-item>\n
- </dtml-in>\n
- )\n
- </dtml-if>\n
- \n
- <dtml-unless count>\n
- <dtml-if "query[\'order_by_expression\']">\n
- ORDER BY <dtml-var "query[\'order_by_expression\']">\n
- </dtml-if>\n
- <dtml-if "query[\'limit_expression\']">\n
- LIMIT <dtml-var "query[\'limit_expression\']">\n
- </dtml-if>\n
- </dtml-unless>\n
-\n
-</dtml-if>\n
-\n
-\n
-\n
-\n
-<dtml-comment>\n
-#################################################\n
-# #\n
-# If entity or section_category IS EXISTS #\n
-# #\n
-#################################################\n
-</dtml-comment>\n
-<dtml-if "entity or section_category">\n
-\n
- <dtml-if stat>\n
- SELECT SUM(total_price) AS total_price FROM (\n
- SELECT DISTINCT total_price, uid FROM (\n
- <dtml-elif count>\n
- SELECT COUNT(DISTINCT uid) AS count FROM (\n
- <dtml-else>\n
- SELECT\n
- <dtml-if "query[\'select_expression\']">\n
- <dtml-var "query[\'select_expression\']">\n
- <dtml-in "search_result_keys">,<dtml-var sequence-item></dtml-in>\n
- <dtml-else>\n
- catalog.*,\n
- ( SELECT title FROM catalog as mirror_catalog WHERE mirror_catalog.uid=catalog.delivery_mirror_section_uid ) AS delivery_mirror_section_title,\n
- ( SELECT IFNULL(SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price > 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS debit,\n
- ( SELECT IFNULL(-SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price < 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS credit\n
- </dtml-if>\n
- FROM (\n
- SELECT *\n
- FROM (\n
- </dtml-if>\n
-\n
-<dtml-comment>\n
- ##################\n
- # #\n
- # Source Section #\n
- # #\n
- ##################\n
-</dtml-comment>\n
-\n
- (\n
- SELECT\n
- <dtml-if stat>\n
- stock.total_price, child.uid\n
- <dtml-elif count>\n
- catalog.uid\n
- <dtml-else>\n
- DISTINCT\n
- delivery.start_date as operation_date\n
- , delivery.destination_section_uid as delivery_mirror_section_uid\n
- , \'source\' as section_mark\n
- , catalog.source_reference as specific_reference\n
- , catalog.*\n
- <dtml-if "section_category">, category.uid as category_uid</dtml-if>\n
- <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
- <dtml-unless "\'operation_date\' in _[\'sequence-item\'] or \'specific_reference\' in _[\'sequence-item\'] or \'`catalog`.\' in _[\'sequence-item\']">\n
- , <dtml-var expr="_[\'sequence-item\'].split(\' \')[0]">\n
- </dtml-unless>\n
- </dtml-in>\n
- </dtml-if>\n
- </dtml-if>\n
- \n
- FROM\n
- <dtml-in prefix="table" expr="query[\'from_table_list\']">\n
- <dtml-if "table_key not in (\'delivery\', \'catalog\')">\n
- <dtml-var table_item> AS <dtml-var table_key>,\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if selection_domain>\n
- <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)">,\n
- </dtml-if>\n
- <dtml-if selection_report>\n
- <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)">,\n
- </dtml-if>\n
- <dtml-if use_movement_table> movement, </dtml-if>\n
- <dtml-if "stat or omit_input or omit_output or node">\n
- stock, catalog as child, </dtml-if>\n
- <dtml-if "section_category">category, catalog as section, </dtml-if>\n
- <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n
- catalog,\n
- delivery\n
- \n
- WHERE\n
- delivery.uid = catalog.uid\n
- <dtml-if "query[\'where_expression\']">\n
- AND <dtml-var "query[\'where_expression\']">\n
- </dtml-if>\n
- <dtml-if source_section_where_expression>\n
- AND <dtml-var source_section_where_expression>\n
- </dtml-if>\n
- <dtml-if selection_domain>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n
- </dtml-if>\n
- <dtml-if selection_report>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
- </dtml-if>\n
- <dtml-if specific_reference>\n
- AND catalog.source_reference LIKE <dtml-sqlvar specific_reference type="string">\n
- </dtml-if>\n
- <dtml-if transaction_uid>\n
- AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
- <dtml-if "amount or amount_range_min or amount_range_max">\n
- AND EXISTS\n
- (SELECT * FROM stock, catalog as child WHERE\n
- stock.uid=child.uid AND child.parent_uid=catalog.uid AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
- <dtml-if amount>\n
- AND <dtml-sqltest amount column="ABS(stock.total_price)" type=float op=eq>\n
- </dtml-if>\n
- <dtml-if amount_range_min>\n
- AND <dtml-sqltest amount_range_min column="ABS(stock.total_price)" type=float op=ge>\n
- </dtml-if>\n
- <dtml-if amount_range_max>\n
- AND <dtml-sqltest amount_range_max column="ABS(stock.total_price)" type=float op=lt>\n
- </dtml-if>\n
- )\n
- </dtml-if>\n
- <dtml-if creation_date_range_min>\n
- AND catalog.creation_date >=\n
- <dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n
- <dtml-if creation_date_range_max>\n
- AND catalog.creation_date <\n
- <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n
- <dtml-if use_movement_table>\n
- AND movement.is_accountable\n
- AND movement.explanation_uid = catalog.uid </dtml-if>\n
- <dtml-if resource> AND movement.resource_uid =\n
- <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n
- -- SOURCE SECTION!!!!!\n
- <dtml-if entity>\n
- AND delivery.destination_section_uid =<dtml-var "restrictedTraverse(entity).getUid()">\n
- </dtml-if>\n
- <dtml-if section_category>\n
- AND category.uid = delivery.source_section_uid\n
- AND section.portal_type = "Organisation"\n
- AND section.uid = category.uid\n
- AND category.category_uid =\n
- <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
- <dtml-if "section_category_strict">AND category.category_strict_membership = 1</dtml-if>\n
- </dtml-if>\n
- <dtml-if "delivery_mirror_section_title">\n
- AND mirror_section_catalog.uid = mirror_section_delivery.destination_section_uid\n
- AND mirror_section_delivery.uid = catalog.uid\n
- AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
- </dtml-if>\n
- \n
- <dtml-if from_date>\n
- AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n
- </dtml-if>\n
- <dtml-if to_date>\n
- AND delivery.start_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
- </dtml-if>\n
- <dtml-if at_date>\n
- AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n
- </dtml-if>\n
- \n
- <dtml-if node>\n
- <dtml-if stat>\n
- AND stock.uid IN (\n
- SELECT child.uid from catalog as child\n
- WHERE category.uid = stock.section_uid\n
- AND child.parent_uid = catalog.uid\n
- HAVING (SELECT count(stock.uid) from stock, catalog as child\n
- WHERE stock.uid = child.uid \n
- AND child.parent_uid = catalog.uid\n
- AND (\n
- <dtml-in node>\n
- <dtml-unless sequence-start>OR</dtml-unless>\n
- stock.node_uid =\n
- <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n
- </dtml-in> )\n
- )\n
- )\n
- <dtml-else>\n
- AND category.uid = stock.section_uid\n
- AND child.uid = stock.uid\n
- AND child.parent_uid = catalog.uid\n
- AND (\n
- <dtml-in node>\n
- <dtml-unless sequence-start>OR</dtml-unless>\n
- stock.node_uid =\n
- <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n
- </dtml-in> )\n
- </dtml-if>\n
- </dtml-if>\n
- \n
- <dtml-if stat>\n
- AND category.uid = stock.section_uid\n
- AND child.uid = stock.uid\n
- AND child.parent_uid = catalog.uid\n
- AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
- <dtml-if omit_input> AND stock.total_price < 0\n
- AND stock.uid = movement.uid\n
- </dtml-if>\n
- <dtml-if omit_output> AND stock.total_price > 0\n
- AND stock.uid = movement.uid\n
- </dtml-if>\n
- </dtml-if>\n
- <dtml-if expr="selection_name is not None and portal_selections.getSelectionInvertModeFor(selection_name) and len(portal_selections.getSelectionInvertModeUidListFor(selection_name)) > 0">\n
- AND ( 0 = 1\n
- <dtml-in expr="portal_selections.getSelectionInvertModeUidListFor(selection_name)">\n
- OR catalog.uid = <dtml-var sequence-item>\n
- </dtml-in>\n
- )\n
- </dtml-if>\n
-\n
- <dtml-if "not (count or stat) and query[\'limit_expression\'] and query[\'limit_expression\'].startswith(\'0\')">\n
- <dtml-if "query[\'order_by_expression\']">\n
- ORDER BY <dtml-var "query[\'order_by_expression\']">\n
- </dtml-if>\n
- LIMIT <dtml-var "query[\'limit_expression\']">\n
- </dtml-if>\n
- )\n
-\n
-\n
-\n
-UNION\n
-\n
-\n
-\n
-<dtml-comment>\n
- #######################\n
- # #\n
- # Destination Section #\n
- # #\n
- #######################\n
-</dtml-comment>\n
-\n
- (\n
- SELECT\n
- <dtml-if stat>\n
- stock.total_price, child.uid\n
- <dtml-elif count>\n
- catalog.uid\n
- <dtml-else>\n
- DISTINCT\n
- delivery.stop_date as operation_date\n
- , delivery.source_section_uid as delivery_mirror_section_uid\n
- , \'destination\' as section_mark\n
- , catalog.destination_reference as specific_reference\n
- , catalog.*\n
- <dtml-if "section_category">, category.uid as category_uid</dtml-if>\n
- <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
- <dtml-unless "\'operation_date\' in _[\'sequence-item\'] or \'specific_reference\' in _[\'sequence-item\'] or \'`catalog`.\' in _[\'sequence-item\']">\n
- , <dtml-var expr="_[\'sequence-item\'].split(\' \')[0]">\n
- </dtml-unless>\n
- </dtml-in>\n
- </dtml-if>\n
- </dtml-if>\n
- \n
- FROM\n
- <dtml-in prefix="table" expr="query[\'from_table_list\']">\n
- <dtml-if "table_key not in (\'delivery\', \'catalog\')">\n
- <dtml-var table_item> AS <dtml-var table_key>,\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if selection_domain>\n
- <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)">,\n
- </dtml-if>\n
- <dtml-if selection_report>\n
- <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)">,\n
- </dtml-if>\n
- <dtml-if use_movement_table> movement, </dtml-if>\n
- <dtml-if "stat or omit_input or omit_output or node">\n
- stock, catalog as child, </dtml-if>\n
- <dtml-if "section_category">category, catalog as section, </dtml-if>\n
- <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n
- catalog,\n
- delivery\n
- \n
- WHERE\n
- delivery.uid = catalog.uid\n
- <dtml-if "query[\'where_expression\']">\n
- AND <dtml-var "query[\'where_expression\']">\n
- </dtml-if>\n
- <dtml-if destination_section_where_expression>\n
- AND <dtml-var destination_section_where_expression>\n
- </dtml-if>\n
- <dtml-if selection_domain>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n
- </dtml-if>\n
- <dtml-if selection_report>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
- </dtml-if>\n
- <dtml-if specific_reference>\n
- AND catalog.destination_reference LIKE <dtml-sqlvar specific_reference type="string">\n
- </dtml-if>\n
- <dtml-if transaction_uid>\n
- AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
- <dtml-if "amount or amount_range_min or amount_range_max">\n
- AND EXISTS\n
- (SELECT * FROM stock, catalog as child WHERE\n
- stock.uid=child.uid AND child.parent_uid=catalog.uid AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
- <dtml-if amount>\n
- AND <dtml-sqltest amount column="ABS(stock.total_price)" type=float op=eq>\n
- </dtml-if>\n
- <dtml-if amount_range_min>\n
- AND <dtml-sqltest amount_range_min column="ABS(stock.total_price)" type=float op=ge>\n
- </dtml-if>\n
- <dtml-if amount_range_max>\n
- AND <dtml-sqltest amount_range_max column="ABS(stock.total_price)" type=float op=lt>\n
- </dtml-if>\n
- )\n
- </dtml-if>\n
- <dtml-if creation_date_range_min>\n
- AND catalog.creation_date >=\n
- <dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n
- <dtml-if creation_date_range_max>\n
- AND catalog.creation_date <\n
- <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n
- <dtml-if use_movement_table>\n
- AND movement.is_accountable\n
- AND movement.explanation_uid = catalog.uid </dtml-if>\n
- <dtml-if resource> AND movement.resource_uid =\n
- <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n
- -- DESTINATION SECTION!!!!!\n
- <dtml-if entity>\n
- AND delivery.source_section_uid = <dtml-var "restrictedTraverse(entity).getUid()">\n
- </dtml-if>\n
- <dtml-if section_category>\n
- AND category.uid = delivery.destination_section_uid\n
- AND section.portal_type = "Organisation"\n
- AND section.uid = category.uid\n
- AND category.category_uid =\n
- <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
- <dtml-if "section_category_strict">AND category.category_strict_membership = 1</dtml-if>\n
- </dtml-if>\n
- <dtml-if "delivery_mirror_section_title">\n
- AND mirror_section_catalog.uid = mirror_section_delivery.source_section_uid\n
- AND mirror_section_delivery.uid = catalog.uid\n
- AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
- </dtml-if>\n
-\n
- <dtml-if from_date>\n
- AND delivery.stop_date >= <dtml-sqlvar from_date type="datetime">\n
- </dtml-if>\n
- <dtml-if to_date>\n
- AND delivery.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
- </dtml-if>\n
- <dtml-if at_date>\n
- AND delivery.stop_date < <dtml-sqlvar at_date type="datetime">\n
- </dtml-if>\n
- \n
- <dtml-if node>\n
- <dtml-if stat>\n
- AND stock.uid IN (\n
- SELECT child.uid from catalog as child\n
- WHERE category.uid = stock.section_uid\n
- AND child.parent_uid = catalog.uid\n
- HAVING (SELECT count(stock.uid) from stock, catalog as child\n
- WHERE stock.uid = child.uid \n
- AND child.parent_uid = catalog.uid\n
- AND (\n
- <dtml-in node>\n
- <dtml-unless sequence-start>OR</dtml-unless>\n
- stock.node_uid =\n
- <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n
- </dtml-in> )\n
- )\n
- )\n
- <dtml-else>\n
- AND category.uid = stock.section_uid\n
- AND child.uid = stock.uid\n
- AND child.parent_uid = catalog.uid\n
- AND (\n
- <dtml-in node>\n
- <dtml-unless sequence-start>OR</dtml-unless>\n
- stock.node_uid =\n
- <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n
- </dtml-in> )\n
- </dtml-if>\n
- </dtml-if>\n
- \n
- <dtml-if stat>\n
- AND category.uid = stock.section_uid\n
- AND child.uid = stock.uid\n
- AND child.parent_uid = catalog.uid\n
- AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n
- <dtml-if omit_input> AND stock.total_price < 0\n
- AND stock.uid = movement.uid\n
- </dtml-if>\n
- <dtml-if omit_output> AND stock.total_price > 0\n
- AND stock.uid = movement.uid\n
- </dtml-if>\n
- </dtml-if>\n
- <dtml-if expr="selection_name is not None and portal_selections.getSelectionInvertModeFor(selection_name) and len(portal_selections.getSelectionInvertModeUidListFor(selection_name)) > 0">\n
- AND ( 0 = 1\n
- <dtml-in expr="portal_selections.getSelectionInvertModeUidListFor(selection_name)">\n
- OR catalog.uid = <dtml-var sequence-item>\n
- </dtml-in>\n
- )\n
- </dtml-if>\n
-\n
- <dtml-if "not (count or stat) and query[\'limit_expression\'] and query[\'limit_expression\'].startswith(\'0\')">\n
- <dtml-if "query[\'order_by_expression\']">\n
- ORDER BY <dtml-var "query[\'order_by_expression\']">\n
- </dtml-if>\n
- LIMIT <dtml-var "query[\'limit_expression\']">\n
- </dtml-if>\n
-\n
- )\n
-\n
-\n
-<dtml-comment>\n
- ##################\n
- # #\n
- # ORDER, LIMIT #\n
- # #\n
- ##################\n
-</dtml-comment>\n
-\n
-\n
- <dtml-if "count">\n
- ) as catalog\n
- <dtml-elif "stat">\n
- ) as sb\n
- ) as catalog\n
- <dtml-else>\n
- ) as catalog\n
- </dtml-if>\n
-\n
- <dtml-if "not (stat or count)">\n
- GROUP BY uid\n
- <dtml-if "query[\'order_by_expression\']">\n
- ORDER BY\n
- <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
- <dtml-if "\'.\' in _[\'sequence-item\']">\n
- <dtml-var expr="_[\'sequence-item\'].split(\'.\')[1]">\n
- <dtml-else>\n
- <dtml-var sequence-item>\n
- </dtml-if><dtml-unless sequence-end>,</dtml-unless>\n
- </dtml-in>\n
- </dtml-if>\n
- <dtml-if "query[\'limit_expression\']">\n
- LIMIT <dtml-var "query[\'limit_expression\']">\n
- </dtml-if>\n
- ) as catalog\n
- <dtml-if expr="query[\'group_by_expression\']">\n
- GROUP BY <dtml-var expr="query[\'group_by_expression\']">\n
- </dtml-if>\n
-\n
- </dtml-if>\n
-\n
-</dtml-if>\n
-</dtml-let></dtml-let></dtml-let></dtml-let>\n
-\n
-<dtml-comment> vim: syntax=dtml\n
-</dtml-comment>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml
index 8bd449b942edda09a630d2b69f540af748ce4a1d..d8628520812fff33c41e47e9def6e48df43ff344 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml
@@ -14,134 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>at_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getParentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>node_uid</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>omit_input</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_output</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>query</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>resource_uid</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>stat</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>to_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>getUid</string>
- <string>getParentUid</string>
- <string>query</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>resource_uid</string>
- <string>from_date</string>
- <string>at_date</string>
- <string>to_date</string>
- <string>simulation_state</string>
- <string>node_uid</string>
- <string>stat</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -292,140 +164,6 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-if getParentUid>\n
-SELECT\n
-<dtml-if stat>\n
- SUM(stock.quantity) AS quantity\n
-<dtml-else>\n
- catalog.uid\n
- , catalog.path\n
- , stock.date as date\n
- , section.title as section_title\n
- , IF(delivery.source_section_uid = stock.section_uid,\n
- catalog.source_reference,\n
- catalog.destination_reference) AS specific_reference\n
- , IFNULL(SUM(IF(stock.quantity > 0, stock.quantity, 0)), 0) AS debit\n
- , IFNULL(SUM(IF(stock.quantity < 0, - stock.quantity, 0)), 0) AS credit\n
- , - IFNULL(SUM(IF(stock.quantity < 0, - stock.quantity, 0)), 0)\n
- + IFNULL(SUM(IF(stock.quantity > 0, stock.quantity, 0)), 0) AS balance \n
-</dtml-if>\n
-FROM\n
- movement\n
- , catalog AS child\n
- , catalog\n
- , catalog AS node\n
- , category AS node_category\n
- , delivery\n
- , stock\n
- LEFT JOIN catalog AS section\n
- ON stock.mirror_section_uid = section.uid\n
-<dtml-if query>\n
- , category\n
-</dtml-if>\n
-WHERE stock.section_uid = <dtml-var getParentUid>\n
- AND stock.payment_uid = <dtml-var getUid>\n
- AND delivery.uid = catalog.uid\n
- AND child.uid = stock.uid\n
- AND child.parent_uid = catalog.uid\n
- AND movement.uid = stock.uid\n
- AND movement.is_accountable = 1\n
- AND node.uid = stock.node_uid\n
- AND node.uid = node_category.uid\n
- AND node_category.category_uid = <dtml-sqlvar\n
- "portal_categories.account_type.asset.cash.bank.getUid()" type="int">\n
-<dtml-if node_uid>\n
- AND (\n
- <dtml-in node_uid>\n
- stock.node_uid = <dtml-sqlvar sequence-item type="int">\n
- <dtml-unless sequence-end> OR </dtml-unless>\n
- </dtml-in>\n
- )\n
-</dtml-if>\n
-<dtml-if resource_uid>\n
- AND (\n
- <dtml-in resource_uid>\n
- movement.resource_uid = <dtml-sqlvar sequence-item type="int">\n
- <dtml-unless sequence-end> OR </dtml-unless>\n
- </dtml-in>\n
- )\n
-</dtml-if>\n
-<dtml-if from_date>\n
- AND stock.date >= <dtml-sqlvar from_date type="datetime">\n
-</dtml-if>\n
-<dtml-if at_date>\n
- AND stock.date <= <dtml-sqlvar at_date type="datetime">\n
-</dtml-if>\n
-<dtml-if to_date>\n
- AND stock.date < <dtml-sqlvar to_date type="datetime">\n
-</dtml-if>\n
-<dtml-if omit_input>\n
- AND stock.quantity > 0\n
-</dtml-if>\n
-<dtml-if omit_output>\n
- AND stock.quantity < 0\n
-</dtml-if>\n
-<dtml-if simulation_state>\n
- AND (\n
- <dtml-in simulation_state>\n
- catalog.simulation_state = <dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end> OR </dtml-unless>\n
- </dtml-in>\n
- )\n
-</dtml-if>\n
-<dtml-if query>\n
- AND category.uid = stock.section_uid\n
- AND <dtml-var query>\n
-</dtml-if>\n
-<dtml-unless stat>\n
- GROUP BY catalog.uid\n
-</dtml-unless>\n
- ORDER BY stock.date, movement.uid\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml
index 647a7bbfe3e2ec10325126f47ff19edcbc0ac965..650530af96df493b3914d2b6b17a81c028fa8237 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml
@@ -14,90 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>at_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>node_uid</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>section_uid</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>node_uid</string>
- <string>section_uid</string>
- <string>simulation_state</string>
- <string>portal_type</string>
- <string>at_date</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -239,136 +155,6 @@ ORDER BY mirror_section_title, date
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>Returns all movements <= at_date which does not have a grouping\n
-reference or having a grouping reference with movements where date is after the\n
-at_date. \n
-\n
-Here, a group of movement means:\n
- section_uid is from section_uid:list, or is the same if section_uid is not passed.\n
- mirror_section_uid is the same\n
- node_uid is the same\n
- grouping_reference is the same\n
-</dtml-comment>\n
-\n
-( SELECT catalog.path as path,\n
- catalog.uid as uid,\n
- mirror_section.relative_url as mirror_section_relative_url,\n
- mirror_section.title as mirror_section_title,\n
- stock.date as date,\n
- IFNULL(stock.total_price, 0) as total_price,\n
- IFNULL(stock.quantity, 0) as total_quantity\n
-\n
- FROM catalog, stock LEFT JOIN catalog AS mirror_section on \n
- ( stock.mirror_section_uid = mirror_section.uid )\n
-\n
- WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
- <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
- <dtml-if simulation_state>\n
- stock.simulation_state in (<dtml-in simulation_state>\n
- <dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
- </dtml-if>\n
- stock.portal_type in (<dtml-in portal_type>\n
- <dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
- <dtml-if section_uid>\n
- stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
- <dtml-unless sequence-end>, </dtml-unless> </dtml-in section_uid> ) and\n
- </dtml-if>\n
- catalog.uid=stock.uid and\n
- stock.date <= <dtml-sqlvar "at_date" type="datetime"> and\n
- catalog.grouping_reference is NULL\n
-) UNION (\n
- SELECT\n
- catalog.path as path,\n
- catalog.uid as uid,\n
- mirror_section.relative_url as mirror_section_relative_url,\n
- mirror_section.title as mirror_section_title,\n
- stock.date as date,\n
- IFNULL(stock.total_price, 0) as total_price,\n
- IFNULL(stock.quantity, 0) as total_quantity\n
-\n
- FROM catalog AS catalog_2, stock AS stock_2, \n
- catalog AS catalog, stock AS stock LEFT JOIN catalog AS mirror_section\n
- ON ( stock.mirror_section_uid = mirror_section.uid )\n
-\n
- WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
- <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
- <dtml-if simulation_state>\n
- stock.simulation_state in (<dtml-in simulation_state>\n
- <dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
- </dtml-if>\n
- stock.portal_type in (<dtml-in portal_type>\n
- <dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
- <dtml-if section_uid>\n
- stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
- <dtml-unless sequence-end>, </dtml-unless> </dtml-in section_uid> ) and\n
- </dtml-if>\n
- stock.date <= <dtml-sqlvar "at_date" type="datetime"> and\n
- catalog.uid = stock.uid and\n
- catalog_2.uid = stock_2.uid and\n
- catalog.grouping_reference = catalog_2.grouping_reference and\n
- catalog.grouping_reference is not NULL and\n
- <dtml-if section_uid>\n
- stock_2.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
- <dtml-unless sequence-end>, </dtml-unless> </dtml-in section_uid> ) and\n
- <dtml-else>\n
- stock_2.section_uid = stock.section_uid and\n
- </dtml-if>\n
- stock.mirror_section_uid = stock_2.mirror_section_uid and\n
- stock_2.simulation_state != \'cancelled\' and\n
- stock.node_uid = stock_2.node_uid\n
- GROUP BY catalog.uid, stock.uid\n
- HAVING max(stock_2.date) > <dtml-sqlvar "at_date" type="datetime">\n
-)\n
-\n
-ORDER BY mirror_section_title, date
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml
index c905b585dd67024876c050e7a016bfb5efa54c5a..8d28cee2709f3e1b67e3c50b89ee8b6ba96dc753 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml
@@ -14,68 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>max_movement_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- <string>max_movement_date</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -173,93 +111,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.relative_url,\n
- catalog.id\n
-\n
-FROM\n
- movement\n
- , catalog as parent\n
- , catalog as grandparent\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key not in (\'catalog\', \'movement\')">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- , catalog\n
- LEFT JOIN category \n
- ON (catalog.uid = category.uid\n
- AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
-WHERE\n
- 1=1\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression> \n
- </dtml-if>\n
-\n
- AND parent.uid = catalog.parent_uid\n
- AND grandparent.uid = parent.parent_uid\n
-\n
- AND ((\n
- grandparent.simulation_state NOT IN (\'cancelled\', \'deleted\')\n
- AND ( movement.start_date < <dtml-sqlvar max_movement_date type="datetime"> OR \n
- movement.stop_date < <dtml-sqlvar max_movement_date type="datetime"> )\n
- ) OR (\n
- grandparent.simulation_state in (\'confirmed\', \'stopped\', \'delivered\')\n
- ))\n
-\n
- AND movement.uid = catalog.uid\n
- AND movement.resource_uid is not NULL\n
- AND category.category_uid is NULL\n
-\n
-<dtml-if order_by_expression>\n
- ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index 478c1d4122b42c8e7816b57fc57d824fd73edef3..3d33af84e1ac18736a4ee49ba031373d69c6fcb4 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-1411
\ No newline at end of file
+1412
\ No newline at end of file
diff --git a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/z_refresh_roles_and_users.xml b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/z_refresh_roles_and_users.xml
index 76e6a7a7c8a9249bbe9dbe07c1be43f0d41d610a..95eb88717b2830d25688cce30c4866dbce4a2430 100644
--- a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/z_refresh_roles_and_users.xml
+++ b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/z_refresh_roles_and_users.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -65,57 +38,6 @@ INSERT INTO roles_and_users (uid, allowedRolesAndUsers) VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM roles_and_users\n
-<dtml-var sql_delimiter>\n
-INSERT INTO roles_and_users (uid, allowedRolesAndUsers) VALUES\n
-<dtml-in expr="getPortalObject().portal_catalog.getSQLCatalog().getRoleAndSecurityUidList()">\n
-(<dtml-sqlvar sequence-item type="int">,<dtml-sqlvar sequence-key type="string">)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-\n
-</dtml-in>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_administration/bt/revision b/bt5/erp5_administration/bt/revision
index 6d3e9dc78d4961c7934c3a850541613398863921..8306ec157b98723c6204c6395c9bce44649681f6 100644
--- a/bt5/erp5_administration/bt/revision
+++ b/bt5/erp5_administration/bt/revision
@@ -1 +1 @@
-129
\ No newline at end of file
+130
\ No newline at end of file
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getBankAccountUidList.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getBankAccountUidList.xml
index aa91c0651d83f7492cabf097926134ae82c98754..90d24068e0b0322c6c4de2ca2df2ac3f5a3bd4a9 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getBankAccountUidList.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getBankAccountUidList.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -104,47 +77,6 @@
<key> <string>src</string> </key>
<value> <string>select catalog.uid from catalog where portal_type = "Bank Account" or portal_type = "Account"</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>select catalog.uid from catalog where portal_type = "Bank Account" or portal_type = "Account"</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getNodeUidList.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getNodeUidList.xml
index 2386177359d379da02f8223df376b49a4728554e..277655b75ea3b1fd8b54667675fcf1f9112c8685 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getNodeUidList.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getNodeUidList.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>account_node_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>account_uid_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>account_uid_list</string>
- <string>account_node_uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -142,68 +99,6 @@ where \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-select distinct(stock.node_uid) \n
-from stock \n
-where \n
- (1)\n
- <dtml-if account_uid_list>\n
- or \n
- (stock.payment_uid not in ( \n
- <dtml-in account_uid_list>\n
- <dtml-unless sequence-start>, </dtml-unless>\n
- <dtml-sqlvar sequence-item type="int">\n
- </dtml-in>\n
- ) \n
- or stock.payment_uid is NULL\n
- or stock.payment_uid = "")\n
- </dtml-if>\n
- <dtml-if account_node_uid>\n
- and stock.node_uid != <dtml-sqlvar account_node_uid type="int" >\n
- </dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getPaymentUidList.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getPaymentUidList.xml
index e5cdc52cd4ceaf0cafb02c9c70463a621c5f0b26..f955f2e65baa2cdca65ef51dcc8b1ddd6cff336a 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getPaymentUidList.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getPaymentUidList.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>account_uid_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>account_uid_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -131,65 +95,6 @@ where \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-select distinct(stock.payment_uid) \n
-from stock \n
-where \n
- (1)\n
- <dtml-if account_uid_list>\n
- and\n
- stock.payment_uid in (\n
- <dtml-in account_uid_list>\n
- <dtml-unless sequence-start>, </dtml-unless>\n
- <dtml-sqlvar sequence-item type="int">\n
- </dtml-in>\n
- ) \n
- </dtml-if>\n
- and stock.payment_uid is not NULL \n
- and stock.payment_uid != ""
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_archive/bt/revision b/bt5/erp5_archive/bt/revision
index 27a37eb577dd83f8d4da502a4c1cacd0d7dbcb83..bd753ccc4b9f3ab7d4f134e4994d77da191b3537 100644
--- a/bt5/erp5_archive/bt/revision
+++ b/bt5/erp5_archive/bt/revision
@@ -1 +1 @@
-93
\ No newline at end of file
+94
\ No newline at end of file
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.xml
index 8469204f86c0b57fb65adab1bf57805b10f69457..b5b1aa8487206f10c36aabd48d75ca9a001ac36c 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_default_email.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>query_table</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>query_table</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -83,56 +33,6 @@ AND <dtml-var table_0>.id = \'default_email\'\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = <dtml-var table_1>.uid\n
-AND <dtml-var table_0>.parent_uid = <dtml-var query_table>.uid\n
-AND <dtml-var table_0>.portal_type = \'Email\'\n
-AND <dtml-var table_0>.id = \'default_email\'\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.xml
index d8e80068d2e6caacc2f90769d8642d47cc5958ed..983adaeaae902f15414593f7f68bb367bcb9de75 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_destination_person.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -107,56 +64,6 @@ AND <dtml-var table_1>.portal_type = \'Person\'\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.uid\n
-AND <dtml-var table_1>.portal_type = \'Person\'\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml
index eeafbb75ea9b7a7d692e07299751b938adebf47c..f1cd8223952cdf31fbe8d40ae5bbc2c58070ddf6 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>query_table</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>query_table</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -71,52 +28,6 @@ AND <dtml-var table_0>.portal_type = \'Person\'
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var query_table>.owner = <dtml-var table_0>.reference\n
-AND <dtml-var table_0>.portal_type = \'Person\'
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml
index d57a6d9fd7b43b915695ccfc41d444a6facd8467..810b613aed01600f7acbdbe3888a8c37239dc990 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml
@@ -6,63 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_3</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- <string>table_3</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -91,56 +34,6 @@ AND <dtml-var table_1>.category_uid = <dtml-var table_3>.uid
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.resource.getUid()">\n
-AND <dtml-var table_0>.category_uid=<dtml-var table_2>.uid\n
-AND <dtml-var table_1>.uid = <dtml-var table_2>.uid\n
-AND <dtml-var table_1>.base_category_uid = <dtml-var "portal_categories.use.getUid()">\n
-AND <dtml-var table_1>.category_uid = <dtml-var table_3>.uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
index 6dada6c117c828a693903e18053ab98567e4ef66..a48a6820542b9118c61648bd9301e9ffc2d64e60 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -107,56 +64,6 @@ AND <dtml-var table_1>.portal_type = \'Organisation\'\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.uid\n
-AND <dtml-var table_1>.portal_type = \'Organisation\'\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.xml
index bca5dc905da98d5f00bc9bc5a3f697914587f9f8..ad4009e433e04d8cd239fba8c8219e2d31443a98 100644
--- a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.xml
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_person.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -107,56 +64,6 @@ AND <dtml-var table_1>.portal_type = \'Person\'\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.uid\n
-AND <dtml-var table_1>.portal_type = \'Person\'\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index a13b1ebe37306a7ba016b98538aa1b1fdeb935a1..06c2b90374ee0ce20ae79eafa0491567391ee404 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-913
\ No newline at end of file
+914
\ No newline at end of file
diff --git a/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml b/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
index d7a9b493ca7c46688128a4be6ca44143cc9365ff..586fd09de37cf67b68b264d618f429a753e6095a 100644
--- a/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
+++ b/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
@@ -6,217 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>asMovementList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationFunctionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationInventoriatedTotalAssetPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationPaymentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationProjectUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getInventoriatedQuantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPortalType</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getResourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSimulationState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceFunctionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceInventoriatedTotalAssetPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourcePaymentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceProjectUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSubVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isAccountable</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isCancellationAmount</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isInventoryMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getResourceUid</string>
- <string>getInventoriatedQuantity</string>
- <string>getSourceUid</string>
- <string>getDestinationUid</string>
- <string>getSourceSectionUid</string>
- <string>getDestinationSectionUid</string>
- <string>isMovement</string>
- <string>isCancellationAmount</string>
- <string>isInventoryMovement</string>
- <string>getSourcePaymentUid</string>
- <string>getDestinationPaymentUid</string>
- <string>getSourceFunctionUid</string>
- <string>getDestinationFunctionUid</string>
- <string>getSourceProjectUid</string>
- <string>getDestinationProjectUid</string>
- <string>getSimulationState</string>
- <string>getSourceInventoriatedTotalAssetPrice</string>
- <string>getDestinationInventoriatedTotalAssetPrice</string>
- <string>getStartDate</string>
- <string>getStopDate</string>
- <string>isAccountable</string>
- <string>getPortalType</string>
- <string>getVariationText</string>
- <string>getSubVariationText</string>
- <string>asMovementList</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -388,145 +177,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM\n
- stock\n
-WHERE\n
-<dtml-in uid>\n
- uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-;\n
-\n
-<dtml-var "\'\\0\'">\n
-\n
-<dtml-let row_list="[]" uid_dict="{}">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "not(isInventoryMovement[loop_item]) and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
- <dtml-in prefix="mov" expr="asMovementList[loop_item]" no_push_item>\n
- <dtml-if "getDestinationUid[loop_item]">\n
- <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
- <dtml-call expr="row_list.append([\n
- uid[loop_item],\n
- uid_dict[uid[loop_item]],\n
- getDestinationUid[loop_item],\n
- getDestinationSectionUid[loop_item],\n
- getDestinationPaymentUid[loop_item],\n
- getDestinationFunctionUid[loop_item],\n
- getDestinationProjectUid[loop_item],\n
- getSourceSectionUid[loop_item],\n
- getSourceUid[loop_item],\n
- getResourceUid[loop_item],\n
- getInventoriatedQuantity[loop_item],\n
- isCancellationAmount[loop_item],\n
- mov_item.getStopDate(),\n
- mov_item.getStartDate(),\n
- getDestinationInventoriatedTotalAssetPrice[loop_item],\n
- getPortalType[loop_item],\n
- getSimulationState[loop_item],\n
- getVariationText[loop_item],\n
- getSubVariationText[loop_item]])">\n
- </dtml-if>\n
- <dtml-if "getSourceUid[loop_item]">\n
- <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
- <dtml-call expr="row_list.append([\n
- uid[loop_item],\n
- uid_dict[uid[loop_item]],\n
- getSourceUid[loop_item],\n
- getSourceSectionUid[loop_item],\n
- getSourcePaymentUid[loop_item],\n
- getSourceFunctionUid[loop_item],\n
- getSourceProjectUid[loop_item],\n
- getDestinationSectionUid[loop_item],\n
- getDestinationUid[loop_item],\n
- getResourceUid[loop_item],\n
- -(getInventoriatedQuantity[loop_item] or 0),\n
- isCancellationAmount[loop_item],\n
- mov_item.getStartDate(),\n
- mov_item.getStopDate(),\n
- getSourceInventoriatedTotalAssetPrice[loop_item],\n
- getPortalType[loop_item],\n
- getSimulationState[loop_item],\n
- getVariationText[loop_item],\n
- getSubVariationText[loop_item]])">\n
- </dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
- </dtml-in>\n
-\n
- <dtml-if "row_list">\n
-INSERT INTO\n
- stock\n
-VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(\n
- <dtml-sqlvar expr="row_item[0]" type="int">,\n
- <dtml-sqlvar expr="row_item[1]" type="int">,\n
- <dtml-sqlvar expr="row_item[2]" type="int">, \n
- <dtml-sqlvar expr="row_item[3]" type="int" optional>, \n
- <dtml-sqlvar expr="row_item[4]" type="int" optional>, \n
- <dtml-sqlvar expr="row_item[5]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[6]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[7]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[8]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[9]" type="int">, \n
- <dtml-sqlvar expr="row_item[10]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[11]" type="int">, \n
- <dtml-sqlvar expr="row_item[12]" type="datetime" optional>,\n
- <dtml-sqlvar expr="row_item[13]" type="datetime" optional>,\n
- <dtml-sqlvar expr="row_item[14]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[15]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[16]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[17]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[18]" type="string" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetApproximatedAvailableTime.xml b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetApproximatedAvailableTime.xml
index a30ff50c298ac1aa4a741d2e33189c407e766246..a5e6515a67f6faccc98191e7fccd20adc1245e05 100644
--- a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetApproximatedAvailableTime.xml
+++ b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetApproximatedAvailableTime.xml
@@ -14,85 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>node</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>resource</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>to_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_date</string>
- <string>to_date</string>
- <string>node</string>
- <string>resource</string>
- <string>portal_type</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -187,89 +108,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- CASE \n
- WHEN (mirror_date=date) THEN \n
- SUM(quantity)\n
- ELSE\n
- SUM(quantity * TIME_TO_SEC(TIMEDIFF(LEAST(<dtml-sqlvar expr="to_date" type="datetime">, mirror_date), \n
- GREATEST(date, <dtml-sqlvar expr="from_date" type="datetime">))) / \n
- TIME_TO_SEC(TIMEDIFF(mirror_date, date)))\n
- END AS total_quantity,\n
- <dtml-sqlvar expr="from_date" type="datetime"> AS from_date,\n
- <dtml-sqlvar expr="to_date" type="datetime"> AS to_date\n
-FROM\n
- stock\n
-WHERE\n
- (date < <dtml-sqlvar expr="to_date" type="datetime">) \n
-AND \n
- (mirror_date >= <dtml-sqlvar expr="from_date" type="datetime">)\n
-AND\n
- node_uid in (\n
- <dtml-in node>\n
- <dtml-sqlvar sequence-item type="int">\n
- <dtml-unless sequence-end>, </dtml-unless> \n
- </dtml-in node> )\n
-\n
-<dtml-if resource>\n
- AND\n
- resource_uid in (\n
- <dtml-in resource>\n
- <dtml-sqlvar sequence-item type="int">\n
- <dtml-unless sequence-end>, </dtml-unless> \n
- </dtml-in resource> )\n
-</dtml-if>\n
-\n
-AND\n
- portal_type in (\n
- <dtml-in portal_type>\n
- <dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end>, </dtml-unless> \n
- </dtml-in portal_type> )
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTime.xml b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTime.xml
index e95e17bc6d6931fd8cc3daa2d7b73de6e0864a87..20f84fc86e974bfd037672d51dfdd51357c46cc7 100644
--- a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTime.xml
+++ b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTime.xml
@@ -14,97 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>node</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>resource</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>to_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_date</string>
- <string>to_date</string>
- <string>node</string>
- <string>resource</string>
- <string>portal_type</string>
- <string>simulation_state</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -268,159 +177,6 @@ ORDER BY date ASC, mirror_date ASC) AS calculated_result LIMIT 1
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>\n
-Calculate the exact time available between 2 dates.\n
-First, sort all stock rows by ascending start date.\n
-Then, walk through them, and increase or not the result, depending on the current and previous rows.\n
-\n
-If a row has a negative value, the result is not increased.\n
-If a row has a positive value, the result is increased, if:\n
- - no other intersecting positive interval had already been added,\n
- - it does not intersect with a negative interval.\n
-\n
-Don\'t hesitate to draw this on a paper in order to debug this query.\n
-</dtml-comment>\n
-\n
-SET @result := 0,\n
- @current_start_date := <dtml-sqlvar expr="from_date" type="datetime">,\n
- @current_stop_date := <dtml-sqlvar expr="from_date" type="datetime">,\n
- @countable := -1;\n
-<dtml-var sql_delimiter>\n
-\n
-SELECT \n
- @result :=\n
- IF(@countable <= 0,\n
- @result,\n
- @result + TIME_TO_SEC(TIMEDIFF(@current_stop_date, @current_start_date))) AS result,\n
- CASE WHEN @result < 0 THEN\n
- 0\n
- ELSE\n
- <dtml-comment>CAST to num explicitly otherwise it may be treated as binary in MySQL-5.0.x</dtml-comment>\n
- 0 + @result\n
- END AS total_quantity,\n
-\n
- <dtml-sqlvar expr="from_date" type="datetime"> AS from_date,\n
- <dtml-sqlvar expr="to_date" type="datetime"> AS to_date\n
-FROM (\n
-\n
-SELECT\n
- @date := GREATEST(date, <dtml-sqlvar expr="from_date" type="datetime">) AS current_c_date,\n
- @mirror_date := LEAST(<dtml-sqlvar expr="to_date" type="datetime">, mirror_date) AS current_mirror_date,\n
- \n
- @next_countable :=\n
- IF(@date >= @current_stop_date,\n
- quantity,\n
- IF((@mirror_date >= @current_stop_date) AND (quantity * @countable < 0),\n
- quantity,\n
- @countable\n
- )) AS next_countable, \n
-\n
- @next_start_date :=\n
- IF(@date >= @current_stop_date,\n
- @date,\n
- IF(quantity * @countable < 0, \n
- IF(@countable > 0,\n
- @mirror_date,\n
- @current_stop_date),\n
- @current_start_date)) AS next_start_date,\n
-\n
- @next_stop_date :=\n
- IF((@date >= @current_stop_date) OR (@mirror_date >= @current_stop_date),\n
- @mirror_date,\n
- @current_stop_date) AS next_stop_date,\n
-\n
- @result :=\n
- IF((@date < @current_start_date) OR (@countable <= 0),\n
- @result,\n
- IF(@date >= @current_stop_date,\n
- @result + TIME_TO_SEC(TIMEDIFF(@current_stop_date, @current_start_date)),\n
- @result + TIME_TO_SEC(TIMEDIFF(@date, @current_start_date)))) AS result,\n
-\n
- @countable := @next_countable AS countable,\n
- @current_start_date := @next_start_date AS current_start_date,\n
- @current_stop_date := @next_stop_date AS current_stop_date\n
-FROM\n
- stock\n
-WHERE\n
- (date < <dtml-sqlvar expr="to_date" type="datetime">)\n
-AND\n
- (mirror_date >= <dtml-sqlvar expr="from_date" type="datetime">)\n
-AND\n
- node_uid in (\n
- <dtml-in node>\n
- <dtml-sqlvar sequence-item type="int">\n
- <dtml-unless sequence-end>, </dtml-unless>\n
- </dtml-in node> )\n
-\n
-<dtml-if resource>\n
- AND\n
- resource_uid in (\n
- <dtml-in resource>\n
- <dtml-sqlvar sequence-item type="int">\n
- <dtml-unless sequence-end>, </dtml-unless>\n
- </dtml-in resource> )\n
-</dtml-if>\n
-\n
-<dtml-if simulation_state>\n
- AND\n
- simulation_state in (\n
- <dtml-in simulation_state>\n
- <dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end>, </dtml-unless>\n
- </dtml-in simulation_state> )\n
-</dtml-if>\n
-\n
-AND\n
- portal_type in (\n
- <dtml-in portal_type>\n
- <dtml-sqlvar sequence-item type="string">\n
- <dtml-unless sequence-end>, </dtml-unless>\n
- </dtml-in portal_type> )\n
-ORDER BY date ASC, mirror_date ASC) AS calculated_result LIMIT 1
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTimeSequence.xml b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTimeSequence.xml
index 7919eb290e31517c11264a6ed661d6db4a724439..b25d1529d188e00773eea84a0c1f9dd1d43b33ea 100644
--- a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTimeSequence.xml
+++ b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTimeSequence.xml
@@ -6,83 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>node</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>period_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>resource</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>period_list</string>
- <string>node</string>
- <string>portal_type</string>
- <string>resource</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -147,60 +70,6 @@ resource:list</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-in period_list prefix="loop">\n
- (\n
- <dtml-var expr="Person_zGetAvailableTime(from_date=loop_key, to_date=loop_item, \n
- node=node, portal_type=portal_type,\n
- resource=resource,\n
- src__=1)">\n
- )\n
- <dtml-unless sequence-end> UNION ALL </dtml-unless> \n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_calendar/bt/revision b/bt5/erp5_calendar/bt/revision
index e8930b6df94cf1501f2663918ee3ceb4d40c709a..55f04f2ae2c5d17c6b2a2616018b96f869677221 100644
--- a/bt5/erp5_calendar/bt/revision
+++ b/bt5/erp5_calendar/bt/revision
@@ -1 +1 @@
-364
\ No newline at end of file
+365
\ No newline at end of file
diff --git a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_content_translation.xml b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_content_translation.xml
index b88b7b5167d19cc795101dc82e7334cf382201dc..c3703f2b1d9f7f1d4f195a0020504f6ce9f58b24 100644
--- a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_content_translation.xml
+++ b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_content_translation.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -87,47 +60,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS content_translation</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS content_translation</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_content_translation.xml b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_content_translation.xml
index 0a0db22c5cead595722f451daf7dfad99d0da1f4..d3298ec468cc2e9dfcf106b4eb68fa2b3fa311d1 100644
--- a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_content_translation.xml
+++ b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_content_translation.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ DELETE FROM content_translation WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM content_translation WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_content_translation_list.xml b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_content_translation_list.xml
index 31d3081dd3883bbf82ca118e8de1f741c32aad08..73d1291b27a2165bd887b5c077ac4a1fce429213 100644
--- a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_content_translation_list.xml
+++ b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_content_translation_list.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>Base_getContentTranslationTargetObject</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>Base_getContentTranslationTargetObject</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>Base_getContentTranslationTargetObject</string> </value>
@@ -76,65 +40,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let content_translation_dict_list="CatalogTool_getContentTranslationDictList(Base_getContentTranslationTargetObject)">\n
-<dtml-if "content_translation_dict_list">\n
-REPLACE INTO content_translation\n
-VALUES\n
-<dtml-in "content_translation_dict_list">\n
-(<dtml-sqlvar "_[\'sequence-item\'][\'uid\']" type=int>,\n
- <dtml-sqlvar "_[\'sequence-item\'][\'property_name\']" type=string>,\n
- <dtml-sqlvar "_[\'sequence-item\'][\'content_language\']" type=string>,\n
- <dtml-sqlvar "_[\'sequence-item\'][\'translated_text\']" type=string>\n
-)\n
-<dtml-unless sequence-end>,</dtml-unless>\n
-</dtml-in>\n
-</dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml
index 6ed39739bfe4cd9e3b0441527a7949d30abd426a..23f709ca2113674675f0b453e9e60d570136243d 100644
--- a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml
+++ b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -95,55 +68,6 @@
) TYPE=MyISAM;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `content_translation` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `property_name` VARCHAR(100),\n
- `content_language` VARCHAR(100),\n
- `translated_text` TEXT,\n
- PRIMARY KEY (`uid`, `property_name`, `content_language`),\n
- FULLTEXT `Translated Text` (`translated_text`)\n
-) TYPE=MyISAM;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_content_translation/bt/revision b/bt5/erp5_content_translation/bt/revision
index 86ee83a4a26867a79e0a5a8948153cff8f4cf9a4..aaa6442fe902e96a5233b136b973b96a4011fc18 100644
--- a/bt5/erp5_content_translation/bt/revision
+++ b/bt5/erp5_content_translation/bt/revision
@@ -1 +1 @@
-40
\ No newline at end of file
+41
\ No newline at end of file
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_event_causality_ticket.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_event_causality_ticket.xml
index f6738288fcbb10e37583d3ddd425bf22cbad1eb7..76eff6fc7dc74a4a1b30be871b29ac43582312f9 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_event_causality_ticket.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_event_causality_ticket.xml
@@ -6,63 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_3</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- <string>table_3</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -104,69 +47,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_3>.uid = <dtml-var table_2>.category_uid\n
-AND <dtml-var table_1>.uid = <dtml-var table_2>.uid\n
-AND <dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.causality.getUid()">\n
-AND catalog.uid = <dtml-var table_0>.uid\n
-AND (<dtml-in "portal_catalog.getPortalEventTypeList()">\n
- <dtml-if sequence-start>\n
- <dtml-var table_1>.portal_type = \'<dtml-var sequence-item>\'\n
- <dtml-else>\n
- OR <dtml-var table_1>.portal_type = \'<dtml-var sequence-item>\'\n
- </dtml-if>\n
-</dtml-in>)\n
-AND\n
- (SELECT count(*) from category as sub_category\n
- WHERE sub_category.uid = catalog.uid\n
- AND sub_category.base_category_uid = <dtml-var "portal_categories.follow_up.getUid()">\n
- AND sub_category.category_uid = <dtml-var table_3>.uid\n
- LIMIT 1 ) = 0\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_decision_or_destination_decision.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_decision_or_destination_decision.xml
index aebc5ddbb70bbdd01e9e1a9465832ad1b5f0b2d7..4b7c4b355f51adb8b56bcf2b980cd00998b91129 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_decision_or_destination_decision.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_decision_or_destination_decision.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -93,66 +43,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>\n
-table_0 : category as source_decision or destination_decision\n
-table_1 : catalog as category\n
-table_2 : catalog as object_uid\n
-</dtml-comment>\n
-\n
-( \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source_decision.getUid()">\n
- OR \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_decision.getUid()">\n
-)\n
-AND\n
-<dtml-var table_0>.category_uid = <dtml-var table_2>.uid AND\n
-<dtml-var table_0>.uid = <dtml-var table_1>.uid AND\n
-<dtml-var table_1>.uid = catalog.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_destination.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_destination.xml
index b5babfe60f15693968053e15489992a52dc1fbd7..7c27de6c79883e71645a1959baefeec34d9fcd17 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_destination.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_destination.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -125,66 +75,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>\n
-table_0 : category as source or destination\n
-table_1 : catalog as category\n
-table_2 : catalog as object_uid\n
-</dtml-comment>\n
-\n
-( \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
- OR \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">\n
-)\n
-AND\n
-<dtml-var table_0>.category_uid = <dtml-var table_2>.uid AND\n
-<dtml-var table_0>.uid = <dtml-var table_1>.uid AND\n
-<dtml-var table_1>.uid = catalog.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_decision_or_destination_or_destination_decision.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_decision_or_destination_or_destination_decision.xml
index 5824b71b1b267beb9f8b155c2f8af94e4c87944e..3f3052f9630d66426af3d576deda15d49b8e8afb 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_decision_or_destination_or_destination_decision.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_decision_or_destination_or_destination_decision.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -96,69 +46,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>\n
-table_0 : category as source or destination or source_decision or destination_decision\n
-table_1 : catalog as category\n
-table_2 : catalog as object_uid\n
-</dtml-comment>\n
-\n
-( \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
- OR \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">\n
- OR\n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source_decision.getUid()">\n
- OR \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_decision.getUid()">\n
-)\n
-AND\n
-<dtml-var table_0>.category_uid = <dtml-var table_2>.uid AND\n
-<dtml-var table_0>.uid = <dtml-var table_1>.uid AND\n
-<dtml-var table_1>.uid = catalog.uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml
index f43d8f80c1d463cf1287e4a96d9aed6caadcb303..fd8f60ac9088019b7541ed38c1be5a05bcd76791 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -96,69 +46,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>\n
-table_0 : category as source or source_section or destination or destination_section\n
-table_1 : catalog as category\n
-table_2 : catalog as object_uid\n
-</dtml-comment>\n
-\n
-( \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
- OR \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source_section.getUid()">\n
- OR\n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">\n
- OR \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_section.getUid()">\n
-)\n
-AND\n
-<dtml-var table_0>.category_uid = <dtml-var table_2>.uid AND\n
-<dtml-var table_0>.uid = <dtml-var table_1>.uid AND\n
-<dtml-var table_1>.uid = catalog.uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
index 6dada6c117c828a693903e18053ab98567e4ef66..a48a6820542b9118c61648bd9301e9ffc2d64e60 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_organisation.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -107,56 +64,6 @@ AND <dtml-var table_1>.portal_type = \'Organisation\'\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.uid\n
-AND <dtml-var table_1>.portal_type = \'Organisation\'\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_section_or_destination_section.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_section_or_destination_section.xml
index 0653d9852d44888e5a8678422f91af6b00d98139..8db5ef8748eeb4f2777c0f43185d581c21827dae 100644
--- a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_section_or_destination_section.xml
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_section_or_destination_section.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -93,66 +43,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>\n
-table_0 : category as source_section or destination_section\n
-table_1 : catalog as category\n
-table_2 : catalog as object_uid\n
-</dtml-comment>\n
-\n
-( \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source_section.getUid()">\n
- OR \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_section.getUid()">\n
-)\n
-AND\n
-<dtml-var table_0>.category_uid = <dtml-var table_2>.uid AND\n
-<dtml-var table_0>.uid = <dtml-var table_1>.uid AND\n
-<dtml-var table_1>.uid = catalog.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index eed0d1a4ad7e661b71455c98ccdb75bad624088c..5da127eea415025aa9bc10424531ced8f40ae638 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-506
\ No newline at end of file
+507
\ No newline at end of file
diff --git a/bt5/erp5_development_wizard/SkinTemplateItem/portal_skins/erp5_development/Base_zExecuteSQL.xml b/bt5/erp5_development_wizard/SkinTemplateItem/portal_skins/erp5_development/Base_zExecuteSQL.xml
index 9f22e2780e4effb060140876686edee66c9c5329..568f1b1eee04b69f5b94ae14c0548db68d6db741 100644
--- a/bt5/erp5_development_wizard/SkinTemplateItem/portal_skins/erp5_development/Base_zExecuteSQL.xml
+++ b/bt5/erp5_development_wizard/SkinTemplateItem/portal_skins/erp5_development/Base_zExecuteSQL.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>sql_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>sql_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -663,51 +627,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var sql_expression>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Execute passed SQL code</string> </value>
diff --git a/bt5/erp5_development_wizard/bt/revision b/bt5/erp5_development_wizard/bt/revision
index 2fb681e3f93b6b7e6441bd64271813a1ec293b5b..9cd72aa941214d4cb8522dda34eb12cf878e3e8b 100644
--- a/bt5/erp5_development_wizard/bt/revision
+++ b/bt5/erp5_development_wizard/bt/revision
@@ -1 +1 @@
-71
\ No newline at end of file
+72
\ No newline at end of file
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_zGetImplicitPredecessorValueList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_zGetImplicitPredecessorValueList.xml
index 4a7e9e7f67f9453a886adcdfd0a6f6c63247de75..db4386a3451d5f648bd042a994319b5b85c6dcef 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_zGetImplicitPredecessorValueList.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_zGetImplicitPredecessorValueList.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>reference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>reference</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -141,97 +105,6 @@ LIMIT 1000\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SET @current_path = NULL; <dtml-var sql_delimiter>\n
-SET @current_reference = NULL; <dtml-var sql_delimiter>\n
-\n
-<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(), portal_type=getPortalDocumentTypeList())">\n
-<dtml-let user_language="Localizer.get_selected_language()">\n
-SELECT path, uid\n
-FROM\n
-(\n
-SELECT DISTINCT\n
-path,\n
-(select uid from catalog where catalog.path=sub.path) as uid\n
-FROM\n
-( SELECT\n
- @current_path:=IF(@current_reference = reference, @current_path, path) AS path,\n
- @current_reference:=reference AS reference\n
- FROM (\n
- SELECT\n
- reference,\n
- path,\n
- catalog.uid,\n
- CASE language WHEN <dtml-sqlvar user_language type=string> THEN 1 WHEN \'en\' THEN 0 ELSE -1 END as language_order\n
- FROM\n
- catalog, versioning, full_text\n
- WHERE\n
- catalog.uid = versioning.uid\n
- AND\n
- catalog.uid = full_text.uid\n
- <dtml-if "query[\'where_expression\']">\n
- AND <dtml-var "query[\'where_expression\']">\n
- </dtml-if>\n
- AND\n
- MATCH(SearchableText) AGAINST(<dtml-sqlvar reference type=string>)\n
- AND\n
- <dtml-sqltest reference op=ne type=string>\n
- ORDER BY reference, language_order DESC, version DESC, revision DESC\n
- ) AS innersub\n
-)\n
-AS sub\n
-)\n
-AS main\n
-WHERE\n
-<dtml-sqltest "getUid()" column=uid op=ne type=int>\n
-LIMIT 1000\n
-\n
-</dtml-let>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_zGetImplicitSuccessorValueList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_zGetImplicitSuccessorValueList.xml
index b8e316b780b10a2c91287f06517b5ad9c8104d16..2c925bec2adcd7f1283f8e3b2dcc25e2da26bad5 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_zGetImplicitSuccessorValueList.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_zGetImplicitSuccessorValueList.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>reference_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>reference_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -142,98 +106,6 @@ LIMIT 1000\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SET @current_path = NULL; <dtml-var sql_delimiter>\n
-SET @current_reference = NULL; <dtml-var sql_delimiter>\n
-\n
-<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(), portal_type=getPortalDocumentTypeList())">\n
-<dtml-let user_language="Localizer.get_selected_language()">\n
-SELECT path, uid\n
-FROM\n
-(\n
-SELECT DISTINCT\n
-path,\n
-(select uid from catalog where catalog.path=sub.path) as uid\n
-FROM\n
-( SELECT\n
- @current_path:=IF(@current_reference = reference, @current_path, path) AS path,\n
- @current_reference:=reference AS reference\n
- FROM (\n
- SELECT\n
- reference,\n
- path,\n
- catalog.uid,\n
- CASE language WHEN <dtml-sqlvar user_language type=string> THEN 1 WHEN \'en\' THEN 0 ELSE -1 END as language_order\n
- FROM\n
- catalog, versioning\n
- WHERE\n
- catalog.uid = versioning.uid\n
- <dtml-if "query[\'where_expression\']">\n
- AND <dtml-var "query[\'where_expression\']">\n
- </dtml-if>\n
- AND\n
- (\n
- <dtml-in reference_list>\n
- <dtml-sqltest "_[\'sequence-item\']" column=reference op=eq type=string>\n
- <dtml-unless sequence-end> OR </dtml-unless>\n
- </dtml-in>\n
- )\n
- ORDER BY reference, language_order DESC, version DESC, revision DESC\n
- ) AS innersub\n
-)\n
-AS sub\n
-)\n
-AS main\n
-WHERE\n
-<dtml-sqltest "getUid()" column=uid op=ne type=int>\n
-LIMIT 1000\n
-\n
-</dtml-let>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision
index 7ff9fa9bd870374d4773866c2746abb552fa7cf5..1fdcf1cce934dab948ba081d1d626e16417718a1 100644
--- a/bt5/erp5_dms/bt/revision
+++ b/bt5/erp5_dms/bt/revision
@@ -1 +1 @@
-1227
\ No newline at end of file
+1228
\ No newline at end of file
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 ec1a8fe5e7c37bc28f8210a4297b3feb967ce830..7260e98b845a7cd3b17b534de6b7bfba82f9c78b 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
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -88,48 +61,6 @@
<value> <string>DROP TABLE IF EXISTS birth_detail\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS birth_detail\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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 42b9f2f8dce736fc115ae76c56eed828568c36e1..7b3ca8e29b2cdef48c962b6097531ec38f0b1173 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
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -88,48 +61,6 @@
<value> <string>DROP TABLE IF EXISTS egov\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS egov\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_birth_detail_list.xml
index 1b58079033ccb512ce76fe4e56c733bc00a7e460..5bb550e8ebbe41002d1b3a722e6dda3ac392a936 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
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getBirthplaceAddressCity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getStartDate</string>
- <string>getBirthplaceAddressCity</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -123,64 +73,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-if expr="_.len(_.range(_.len(uid))) > 0">\n
-REPLACE INTO\n
- birth_detail\n
-VALUES\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-( \n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getBirthplaceAddressCity[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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_egov_list.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
index be301e582e36ff518ac266465c4e7e62296c5837..1998364d143c4af400cafda919159ce6f5afe9fd 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
@@ -6,63 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getPortalType</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTranslatedValidationStateTitle</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>modification_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getPortalType</string>
- <string>getTranslatedValidationStateTitle</string>
- <string>modification_date</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -138,65 +81,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-if expr="_.len(_.range(_.len(uid))) > 0">\n
-REPLACE INTO\n
- egov\n
-VALUES\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-( \n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getTranslatedValidationStateTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="modification_date[loop_item]" type="datetime" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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_birth_detail.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.xml
index c8d5d13bf9519d773b0d52a66c688876372844b5..66ecc39e3e134ec772c2a6194e73f01809d5351f 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
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -95,55 +68,6 @@
) TYPE=InnoDB\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `birth_detail` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `birthplace_city` VARCHAR(255) DEFAULT \'\',\n
- `birth_date` datetime DEFAULT NULL,\n
- PRIMARY KEY (`uid`),\n
- KEY `birthplace` (`birthplace_city`),\n
- KEY `birth_date` (`birth_date`)\n
-) TYPE=InnoDB\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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 dc5db7ca79760f344b72c5699d010831ebff6943..5e2935610844f350cc6a654d5665921440782e6e 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
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -94,54 +67,6 @@
) TYPE=InnoDB\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `egov` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `portal_type` VARCHAR(255) DEFAULT \'\',\n
- `translated_validation_state_title` VARCHAR(255) DEFAULT \'\',\n
- `modification_date` DATETIME,\n
- PRIMARY KEY (`uid`)\n
-) TYPE=InnoDB\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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 ee358597601cb287273e4b46d5f11ea4499169bf..c5db5e0ebbca3d2373fa19eb5a0a22d0d0b1b976 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
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@ DELETE FROM birth_detail WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM birth_detail WHERE <dtml-sqltest uid op=eq type=int>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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 14b097e16e0b4e96fe7aed5825f1c8879fe6eea9..f37eef6a67ddd6df21358ffc3a965d689a673e72 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
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@ DELETE FROM egov WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM egov WHERE <dtml-sqltest uid op=eq type=int>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/bt/revision b/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
index dc7b54ad014355b948b93c4c6c5891da053d5fdd..3e932fe8f188bb6dbcb02afe1306fa6e0b90357b 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
+++ b/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-33
\ No newline at end of file
+34
\ No newline at end of file
diff --git a/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.xml b/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.xml
index c9c94486fa5c8beb33551591df28643a3b9864f0..b386d33008c9664d6821e0f6ae7ea754ff32cad4 100644
--- a/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.xml
+++ b/bt5/erp5_forge/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_validation_state_title.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -117,58 +67,6 @@ AND <dtml-var table_0>.uid = catalog.uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_2>.original_message = <dtml-var table_1>.validation_state\n
-AND <dtml-var table_2>.message_context = "validation_state_title"\n
-AND <dtml-var table_2>.portal_type = catalog.portal_type\n
-AND <dtml-var table_2>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">\n
-AND <dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.causality.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml
index 4f10a4bd2261de8dff05123f9895ccc34d1940fd..96a1c9d6c8a513ec083176a8c22ae9c4c70383a2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml
@@ -6,47 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>selection_params</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>selection_params</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -184,77 +143,6 @@ having\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), **selection_params)">\n
-\n
-select distinct\n
- catalog.path, catalog.uid, count(*)-1 as num_of_duplicates\n
-from\n
- <dtml-in prefix="table" expr="query[\'from_table_list\']">\n
- <dtml-if "table_key not in (\'catalog\',)">\n
- <dtml-var table_item> AS <dtml-var table_key>,\n
- </dtml-if>\n
- </dtml-in>\n
- catalog\n
-where\n
- catalog.portal_type=\'Glossary Term\'\n
- and catalog.validation_state in (\'draft\', \'validated\')\n
- and related_language_title_category.category_strict_membership = 1\n
- and related_business_field_title_category.category_strict_membership = 1\n
- <dtml-if "query[\'where_expression\']">\n
- AND <dtml-var "query[\'where_expression\']">\n
- </dtml-if>\n
-group by\n
- catalog.reference, related_language_title_category.category_uid, related_business_field_title_category.category_uid\n
-having\n
- count(*) > 1\n
-<dtml-if "query[\'order_by_expression\']">\n
- order by <dtml-var "query[\'order_by_expression\']">\n
-</dtml-if>\n
-</dtml-let>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision
index dc9e6b20e2c6548bf01f9ae63108c9574d102a0e..b697ae4122fcdfdbac82d12992705514b0f2cb07 100644
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
@@ -1 +1 @@
-634
\ No newline at end of file
+635
\ No newline at end of file
diff --git a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.xml b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.xml
index 21119ebf3ef8126b9556989e886ef6c313aded1c..bba46da89fa2192efde5e84c76ad3b302d3a7211 100644
--- a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.xml
+++ b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_aggregate.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -105,54 +62,6 @@ AND <dtml-var table_0>.uid = catalog.uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.aggregate.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_immobilisation_state_title.xml b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_immobilisation_state_title.xml
index 7dfb15d5ae2785a2fd5d986dbfc8d3aee78985b9..0989a09562247af3c124a39861bef3530d0ba37e 100644
--- a/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_immobilisation_state_title.xml
+++ b/bt5/erp5_immobilisation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_immobilisation_state_title.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.immobilisation_state\n
- AND <dtml-var table_0>.message_context = "immobilisation_state_title"\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml
index dd471558b9649ec166c8600dffb51210eed304c8..ef837e8c190ce5e1f12937387deb3158f2046a39 100644
--- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml
+++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml
@@ -6,61 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -142,78 +87,6 @@ ORDER BY <dtml-var order_by_expression>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.relative_url,\n
- catalog.id\n
-\n
-FROM\n
- movement as simulation_movement\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key != \'catalog\'">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- , catalog\n
- LEFT JOIN category \n
- ON (catalog.uid = category.uid\n
- AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
-WHERE\n
- 1=1\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression> \n
- </dtml-if>\n
- AND simulation_movement.uid = catalog.uid\n
- AND category.category_uid is NULL\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_immobilisation/bt/revision b/bt5/erp5_immobilisation/bt/revision
index 7b27b2519708501bbe7893dc04388ba380c65f9e..4a8d924028a2939d1a825e445ab19cb445b03a93 100644
--- a/bt5/erp5_immobilisation/bt/revision
+++ b/bt5/erp5_immobilisation/bt/revision
@@ -1 +1 @@
-173
\ No newline at end of file
+174
\ No newline at end of file
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml
index b3546fb6a717129e5ad0f6bb6f38d6a8b4d7be16..8d2e7d5e35e333e2f74a3f83dc1238d8c17fa26d 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -55,47 +28,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS email;</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS email;</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml
index 8a24c75305dd17511348e93af096d1703b74031f..750f38c9921838998e12e679b25f4d2849b7d948 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid</string> </value>
@@ -62,51 +26,6 @@ DELETE FROM email WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM email WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml
index e353fe4e372c654c2e39c983bfa8fcc87cdcd91c..e329112551f75999192128ac41131ba097c17f87 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getPortalType</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getUrlString</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getUrlString</string>
- <string>getPortalType</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
@@ -96,69 +46,6 @@ getPortalType</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let email_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if expr="getPortalType[loop_item]==\'Email\'">\n
- <dtml-call expr="email_list.append(loop_item)">\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="_.len(email_list) > 0">\n
- REPLACE INTO\n
- email\n
- VALUES\n
- <dtml-in prefix="loop" expr="email_list">\n
- (\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="getUrlString[loop_item]" type="string" optional>\n
- )\n
- <dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml
index a43057ff289ab6af6858ac4d7b2f84e163dcd2fb..895172ce009e55d4b2714d09c6888c35b1a30bdc 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -60,52 +33,6 @@
KEY `url_string` (`url_string`)\n
) TYPE = InnoDB;</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `email` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `url_string` varchar(255),\n
- PRIMARY KEY `uid` (`uid`),\n
- KEY `url_string` (`url_string`)\n
-) TYPE = InnoDB;</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision
index 978b4e8e518d1242cbf102a1bebdb52e41705102..a5c750feac4168f62cfd29aa62b4624f0a430cd5 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-26
\ No newline at end of file
+27
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent.xml b/bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent.xml
index e8dc80743e166728272457b57f868aca7e7da5fd..bd4a008d9ab6f609c9116c820db3fd113810b624 100644
--- a/bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent.xml
+++ b/bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent.xml
@@ -6,63 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_3</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- <string>table_3</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -123,56 +66,6 @@ AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.parent_uid\n
-AND <dtml-var table_1>.uid = <dtml-var table_0>.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_parent_specialise.xml b/bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_parent_specialise.xml
index ce288fb7122d21841c808036994b69252a125240..243977563578f1d733e6e151d099d638e997d11a 100644
--- a/bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_parent_specialise.xml
+++ b/bt5/erp5_invoicing/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_parent_specialise.xml
@@ -6,63 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_3</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- <string>table_3</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -123,56 +66,6 @@ AND <dtml-var table_3>.uid = <dtml-var table_0>.category_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.specialise.getUid()">\n
-AND <dtml-var table_0>.uid = <dtml-var table_2>.parent_uid\n
-AND <dtml-var table_1>.uid = catalog.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_0>.category_uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_zSelectMovement.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_zSelectMovement.xml
index 2399654127f4bfa5df15bdb69badab10830ad07e..d7cbc8995557e4bd294de6a3307844151f342418 100644
--- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_zSelectMovement.xml
+++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_zSelectMovement.xml
@@ -14,61 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -154,82 +99,6 @@ ORDER BY <dtml-var order_by_expression>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.relative_url,\n
- catalog.id\n
-\n
-FROM\n
- movement\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key not in (\'catalog\', \'movement\')">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- , catalog\n
- LEFT JOIN category \n
- ON (catalog.uid = category.uid\n
- AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
-WHERE\n
- 1=1\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression> \n
- </dtml-if>\n
- \n
- AND movement.uid = catalog.uid\n
- AND movement.resource_uid is not NULL\n
- AND category.category_uid is NULL\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision
index 25417dad5587609021599a8b8631c25059c0065c..8c19d14d40779bd8ae1e74d19dc262579ea0d10b 100644
--- a/bt5/erp5_invoicing/bt/revision
+++ b/bt5/erp5_invoicing/bt/revision
@@ -1 +1 @@
-368
\ No newline at end of file
+369
\ No newline at end of file
diff --git a/bt5/erp5_item/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_item_catalog.xml b/bt5/erp5_item/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_item_catalog.xml
index 02ad7439f830ef2cc51be7429869ad52b6ce5266..91790ae0619889f01065c60251dfdc3233f42290 100644
--- a/bt5/erp5_item/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_item_catalog.xml
+++ b/bt5/erp5_item/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_item_catalog.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = item_catalog.uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision
index 9754915269eca9a8e68210cbe363f9fa9be817e1..ddc17b20b78d2bacaba1fee53301ffb2a7955fec 100644
--- a/bt5/erp5_item/bt/revision
+++ b/bt5/erp5_item/bt/revision
@@ -1 +1 @@
-259
\ No newline at end of file
+260
\ No newline at end of file
diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_zSelectMovement.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_zSelectMovement.xml
index 6c0512de7a82d470caa349dab15c463a4c1673e3..142d9db13fd1031e60913270735edb1036f652c2 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_zSelectMovement.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_zSelectMovement.xml
@@ -6,61 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -142,80 +87,6 @@ ORDER BY <dtml-var order_by_expression>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.relative_url,\n
- catalog.id\n
-\n
-FROM\n
- movement as simulation_movement\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key != \'catalog\'">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- , catalog\n
- LEFT JOIN category \n
- ON (catalog.uid = category.uid\n
- AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
-WHERE\n
- 1=1\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression> \n
- </dtml-if>\n
- AND simulation_movement.uid = catalog.uid\n
- AND category.category_uid is NULL\n
- AND simulation_movement.resource_uid is not NULL\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index ee2b8364542e6512c6ff1d906cfa3787731f3ec2..2da432533140eaf6c69faa66982fee3287473121 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-456
\ No newline at end of file
+457
\ No newline at end of file
diff --git a/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/DeliveryBuilder_zSelectOpenSaleOrderSimulationMovementList.xml b/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/DeliveryBuilder_zSelectOpenSaleOrderSimulationMovementList.xml
index 8fc6438b616f874965ae82df5de3a127a893fddd..ef0a99578799299d3c851c67da4819393bac4ff8 100644
--- a/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/DeliveryBuilder_zSelectOpenSaleOrderSimulationMovementList.xml
+++ b/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/DeliveryBuilder_zSelectOpenSaleOrderSimulationMovementList.xml
@@ -6,61 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -145,83 +90,6 @@ ORDER BY <dtml-var order_by_expression>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.relative_url,\n
- catalog.id\n
-\n
-FROM\n
- movement as simulation_movement\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key != \'catalog\'">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- , catalog\n
- LEFT JOIN category \n
- ON (catalog.uid = category.uid\n
- AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
-WHERE\n
- 1=1\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression> \n
- </dtml-if>\n
- AND catalog.simulation_state = \'started\'\n
- AND simulation_movement.source_uid <> simulation_movement.destination_uid\n
- AND simulation_movement.source_uid is not NULL\n
- AND simulation_movement.destination_uid is not NULL\n
- AND simulation_movement.uid = catalog.uid\n
- AND simulation_movement.resource_uid is not NULL\n
- AND category.category_uid is NULL\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_open_trade/bt/revision b/bt5/erp5_open_trade/bt/revision
index 7d37386284a97324cbac474cb5ea5360d361d104..abc4eff6ac83026669840d289fce80cc9a42baaa 100644
--- a/bt5/erp5_open_trade/bt/revision
+++ b/bt5/erp5_open_trade/bt/revision
@@ -1 +1 @@
-45
\ No newline at end of file
+46
\ No newline at end of file
diff --git a/bt5/erp5_payroll/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.xml b/bt5/erp5_payroll/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.xml
index 691a921b783cc9650ef9d10b442e676099e7ac87..18b8f2bc4a0dcf55065808cf294c2fe53bc49e7a 100644
--- a/bt5/erp5_payroll/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.xml
+++ b/bt5/erp5_payroll/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -106,55 +63,6 @@ AND <dtml-var table_0>.uid = catalog.parent_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.base_contribution.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.parent_uid\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index bc6a950bffcdca9ee6558c3dc1acf6765157b5b4..83be903e06482de431c208dafff94d7f91c6f676 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-569
\ No newline at end of file
+570
\ No newline at end of file
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml
index a322a21161e840b69c8813cf1988112c935785d6..ae574343b93f72b89435d8982a2bb6a184e4edcd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetCommonMetricTypeList.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>resource_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>resource_uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -707,63 +671,6 @@ WHERE catalog.uid = measure.metric_type_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT catalog.*\n
-FROM (SELECT metric_type_uid,\n
- COUNT(DISTINCT resource_uid) AS resource_count\n
- FROM measure\n
- WHERE <dtml-sqltest resource_uid type="int" multiple>\n
- GROUP BY metric_type_uid\n
- ) AS measure,\n
- catalog\n
-WHERE catalog.uid = measure.metric_type_uid\n
- AND <dtml-sqltest column="measure.resource_count"\n
- expr="_.len(resource_uid)"\n
- type="int">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetQuantityUnitDefinitionRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetQuantityUnitDefinitionRatio.xml
index ed32358a2a2bdf622b80d6c64f249ac498fe0767..80add1213fdda41337cd40d628bf09a24b3bf60f 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetQuantityUnitDefinitionRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ResourceModule_zGetQuantityUnitDefinitionRatio.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>quantity_unit_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>resource_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>resource_uid</string>
- <string>quantity_unit_uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>resource_uid\r\n
@@ -73,54 +30,6 @@ where \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-select quantity from quantity_unit_conversion\n
-where \n
- <dtml-sqltest resource_uid type="int"> and\n
- <dtml-sqltest quantity_unit_uid type="int">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceList.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceList.xml
index b0c593aebe3f7b4acf06fe5d46ab6cf5a58c91f1..d50233dde68594ebc9ad3dc353310a8c23309820 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceList.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceList.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>resource_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>resource_uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -113,59 +77,6 @@ where\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-select distinct\n
- catalog.uid, catalog.relative_url, catalog.title\n
-from\n
- transformation \n
-join \n
- catalog on transformation.transformed_uid=catalog.uid\n
-\n
-where\n
- <dtml-sqltest resource_uid column="transformation.uid" type=int multiple>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceRatio.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceRatio.xml
index e9f107074b0bbbfa63dd9bf7ced1a6fd084c2eda..0822fe3bf03d64d019fa30725814c18e07edd4dc 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceRatio.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_zGetTransformedResourceRatio.xml
@@ -6,63 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>transformed_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>transformed_variation_text</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>variation_text</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>variation_text</string>
- <string>transformed_uid</string>
- <string>transformed_variation_text</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
@@ -91,56 +34,6 @@ and <dtml-sqltest transformed_variation_text type="string">
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-select transformation.quantity from transformation\n
-where\n
-<dtml-sqltest uid type="int">\n
-and <dtml-sqltest variation_text type="string">\n
-and <dtml-sqltest transformed_uid type="int">\n
-and <dtml-sqltest transformed_variation_text type="string">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_pdm/bt/revision b/bt5/erp5_pdm/bt/revision
index 3e990b743e961c843004fbca714976a274c86afd..28621d35adae761a9610140bce7572be86f10c78 100644
--- a/bt5/erp5_pdm/bt/revision
+++ b/bt5/erp5_pdm/bt/revision
@@ -1 +1 @@
-541
\ No newline at end of file
+542
\ No newline at end of file
diff --git a/bt5/erp5_project/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_project_or_destination_project.xml b/bt5/erp5_project/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_project_or_destination_project.xml
index 935474435e851e0dbef723b494e848d3ef21deab..d6ea4c93a844b3ca286b6e5e8eec2dd14ce71f5f 100644
--- a/bt5/erp5_project/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_project_or_destination_project.xml
+++ b/bt5/erp5_project/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_project_or_destination_project.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -125,66 +75,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>\n
-table_0 : category as source or destination\n
-table_1 : catalog as category\n
-table_2 : catalog as object_uid\n
-</dtml-comment>\n
-\n
-( \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source_project.getUid()">\n
- OR \n
- <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_project.getUid()">\n
-)\n
-AND\n
-<dtml-var table_0>.category_uid = <dtml-var table_2>.uid AND\n
-<dtml-var table_0>.uid = <dtml-var table_1>.uid AND\n
-<dtml-var table_1>.uid = catalog.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_zSelectMovement.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_zSelectMovement.xml
index 8198cbae971cd1e89c276e17d82435ee239166a9..6e1b7cdeeffab24d6b887c4b26634f562afa81ea 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_zSelectMovement.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_zSelectMovement.xml
@@ -6,61 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -143,81 +88,6 @@ ORDER BY <dtml-var order_by_expression>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.relative_url,\n
- catalog.id\n
-\n
-FROM\n
- movement as simulation_movement\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key != \'catalog\'">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- , catalog\n
- LEFT JOIN category \n
- ON (catalog.uid = category.uid\n
- AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
-WHERE\n
- 1=1\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression> \n
- </dtml-if>\n
- AND simulation_movement.source_uid is not NULL\n
- AND simulation_movement.destination_uid is not NULL\n
- AND simulation_movement.uid = catalog.uid\n
- AND simulation_movement.resource_uid is not NULL\n
- AND category.category_uid is NULL\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 64c6e93534a3034a0aad5ef17cf35af8a7ae8c46..eb90589d8d59ab4e3bd0e568e76a2d6779227996 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-779
\ No newline at end of file
+780
\ No newline at end of file
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 c89381947891012443447141c7b756128958f408..cb64dcb2dfe00b9d351190b2aa65e720704941b9 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
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS reporting_outcome</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS reporting_outcome</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml
index 0e569e63fb9a8034bb860bda21f0edb4486c91d8..b9c9b873f0078b153e8ba86e3cde824c25e2bf54 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
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@ DELETE FROM reporting_outcome WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM reporting_outcome WHERE <dtml-sqltest uid op=eq type=int>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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/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 77261643bb46c0dc1ba3ca3428431d5439e74d62..15ad4ee839c137c7b38440c4c6d1aebbf0270903 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
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getOutcomeDescription</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>getOutcomeDescription</string>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -113,62 +70,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-REPLACE INTO\n
- reporting_outcome\n
- (`uid`, `outcome_description`)\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="getOutcomeDescription[loop_item]" type="string" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </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/z_create_reporting_outcome.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
index 28dea23262d752ec896db534312018681baa321c..d9a11b58ed3ed86267283a77491256cf279a36ba 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
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -86,52 +59,6 @@
) TYPE=InnoDB; \n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE reporting_outcome (\n
- uid BIGINT UNSIGNED NOT NULL,\n
- outcome_description VARCHAR(255),\n
- PRIMARY KEY `uid` (`uid`)\n
-) TYPE=InnoDB; \n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/bt/revision b/bt5/erp5_project_mysql_innodb_catalog/bt/revision
index 2edeafb09db0093bae6ff060e2dcd2166f5c9387..b5045cc4046dbc1d7cafa4c603fd3cdf35dc5dde 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/bt/revision
+++ b/bt5/erp5_project_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-20
\ No newline at end of file
+21
\ No newline at end of file
diff --git a/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Person_zGetPersonCareerLog.xml b/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Person_zGetPersonCareerLog.xml
index fe27ade858ce8e5c3d06be7fa18d622224bd5dc8..bd9b50b117fcb3efca0972dbed9db22986b7b9fd 100644
--- a/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Person_zGetPersonCareerLog.xml
+++ b/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Person_zGetPersonCareerLog.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -84,50 +57,6 @@ FROM catalog \n
WHERE portal_type = \'Assignment\'\n
ORDER BY Date</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>SELECT *\n
-FROM catalog \n
-WHERE portal_type = \'Assignment\'\n
-ORDER BY Date</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Registre du personnel</string> </value>
diff --git a/bt5/erp5_registry_ohada/bt/revision b/bt5/erp5_registry_ohada/bt/revision
index 36699e756182a2189e770f0eced5e5070555cca6..7e4cc17117820a4baa52971bb84298fd6af14f7b 100644
--- a/bt5/erp5_registry_ohada/bt/revision
+++ b/bt5/erp5_registry_ohada/bt/revision
@@ -1 +1 @@
-933
\ No newline at end of file
+934
\ No newline at end of file
diff --git a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/BusinessPath_zSelectBuildableMovementList.xml b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/BusinessPath_zSelectBuildableMovementList.xml
index d4d26e049f9751e68e75158d81701eaf87dca36a..73cca34722ff779d82649401f5573e83ca1c7311 100644
--- a/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/BusinessPath_zSelectBuildableMovementList.xml
+++ b/bt5/erp5_simulation_legacy/SkinTemplateItem/portal_skins/erp5_simulation_legacy/BusinessPath_zSelectBuildableMovementList.xml
@@ -6,63 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>business_path_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>predecessor_uid_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>business_path_uid</string>
- <string>predecessor_uid_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -177,112 +120,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.relative_url,\n
- catalog.id\n
-\n
-FROM\n
- movement\n
- , category as causality\n
- , catalog\n
- LEFT JOIN category as delivery ON (\n
- catalog.uid = delivery.uid\n
- AND <dtml-sqltest "portal_categories.delivery.getUid()" column="delivery.base_category_uid" type="int">\n
- )\n
-<dtml-if from_table_list>\n
-<dtml-in prefix="table" expr="from_table_list">\n
- <dtml-if expr="table_key not in (\'catalog\', \'movement\')">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
-</dtml-if>\n
- LEFT JOIN (\n
- /*\n
- predecessor movements that are not delivered\n
- (to be used to discard related movements)\n
- */\n
- select\n
- SUBSTRING_INDEX(catalog.path, "/", <dtml-sqlvar "len(portal_simulation.getPhysicalPath()) + 1" type="int">) as root_applied_rule_path\n
- from\n
- movement\n
- , category as causality\n
- , catalog\n
- LEFT JOIN category as delivery ON (\n
- catalog.uid = delivery.uid\n
- AND <dtml-sqltest "portal_categories.delivery.getUid()" column="delivery.base_category_uid" type="int">\n
- )\n
- WHERE\n
- delivery.category_uid is NULL\n
-\n
- AND catalog.uid = movement.uid\n
- AND movement.resource_uid is not NULL\n
-\n
- AND catalog.uid = causality.uid\n
- AND <dtml-sqltest "portal_categories.causality.getUid()" column="causality.base_category_uid" type="int">\n
- AND <dtml-sqltest predecessor_uid_list column="causality.category_uid" multiple type="int">\n
- ) AS non_delivered_predecessor ON\n
- root_applied_rule_path = SUBSTRING_INDEX(catalog.path, "/", <dtml-sqlvar "len(portal_simulation.getPhysicalPath()) + 1" type="int">)\n
-\n
-WHERE\n
- delivery.category_uid is NULL\n
-\n
- AND catalog.uid = causality.uid\n
- AND <dtml-sqltest "portal_categories.causality.getUid()" column="causality.base_category_uid" type="int">\n
- AND <dtml-sqltest business_path_uid column="causality.category_uid" type="int">\n
-\n
- AND catalog.uid = movement.uid\n
- AND movement.resource_uid is not NULL\n
-\n
- AND root_applied_rule_path is NULL\n
-\n
- <dtml-if where_expression>AND <dtml-var where_expression> </dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_simulation_legacy/bt/revision b/bt5/erp5_simulation_legacy/bt/revision
index 7813681f5b41c028345ca62a2be376bae70b7f61..62f9457511f879886bb7728c986fe10b0ece6bcb 100644
--- a/bt5/erp5_simulation_legacy/bt/revision
+++ b/bt5/erp5_simulation_legacy/bt/revision
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_zGetTotal.xml
index 2767bbfbd0b6a236dbf7797d8bac9585923d318b..46fb02b1845cad2fbe97d7c9003a62a894da12a4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_zGetTotal.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -101,58 +65,6 @@ AND\t\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT \n
-\tSUM(quantity) AS total_quantity\n
-FROM catalog, movement\n
-WHERE \n
-\tcatalog.parent_uid = <dtml-sqlvar uid type="int">\n
-AND\t\n
-\tcatalog.uid = movement.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_zGetTotal.xml
index 16e2d70e37296ed3007d1e5a687ef5b9747a53bf..3e3ef13eabe228d89065e97d0c690f7f3c0972e7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_zGetTotal.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -116,73 +80,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
-\tSUM(movement.quantity) AS total_quantity\n
-FROM\n
-\tcatalog AS container_cell, catalog AS container_line, movement\n
-WHERE\n
-\tmovement.explanation_uid = <dtml-sqlvar getDeliveryUid type="int">\n
- AND\n
- ((\n
- container_cell.parent_uid = container_line.uid \n
- AND container_line.parent_uid = <dtml-sqlvar uid type="int">\n
- AND movement.uid = container_cell.uid\n
- AND container_cell.portal_type = "Container Cell"\n
- )\n
- OR\n
- (\n
- container_line.parent_uid = <dtml-sqlvar uid type="int">\n
- AND container_line.uid = container_cell.uid\n
- AND movement.uid = container_cell.uid\n
- AND container_cell.has_cell_content = 0\n
- AND container_line.portal_type = "Container Line"\n
- ))\n
- AND container_cell.portal_type <> "Container"\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.xml
index 82503501a87f26ae4fa2b74e2c6ce5dbbcd05055..86994f8e9314182a0a9a5f8e9f6c828a707bb9f7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -102,61 +66,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- SUM(movement.quantity) AS quantity\n
-FROM\n
- category, movement\n
-WHERE\n
- category.category_uid = <dtml-sqlvar uid type="int">\n
-AND\n
- category.uid = movement.uid\n
-AND\n
- category.base_category_uid = <dtml-sqlvar expr="portal_categories.delivery.getUid()" type="int">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetTotal.xml
index b831d548c7b47acf0754b38164d56adea7711004..3ca99d574259031ecd00bf23aca99d98a4bf2196 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_zGetTotal.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -103,60 +67,6 @@ AND\t\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT \n
-\tSUM(quantity) AS total_quantity, \n
-\tSUM(quantity * price) AS total_price, \n
-\tAVG(price) AS average_price\n
-FROM catalog, movement\n
-WHERE \n
-\tcatalog.parent_uid = <dtml-sqlvar uid type="int">\n
-AND\t\n
-\tcatalog.uid = movement.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_zGetTotal.xml
index 56fb00f5b6e942cb6e444c9380fe510082d05c83..cdd74f7e9140ee803901123dee4d6cdd1798f887 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_zGetTotal.xml
@@ -6,61 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -135,71 +80,6 @@ ORDER BY <dtml-var order_by_expression>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- SUM(movement.quantity) AS inventory,\n
- SUM(movement.quantity) AS total_quantity,\n
- SUM(movement.price * movement.quantity) AS total_price,\n
- AVG(movement.price) AS average_price\n
-\n
-FROM\n
-<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
-\n
-WHERE\n
- 1=1\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression> \n
- </dtml-if>\n
- AND catalog.has_cell_content = 0\n
- AND catalog.portal_type NOT IN ("Container", "Container Line", "Container Cell", "Simulation Movement")\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_zGetTotal.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_zGetTotal.xml
index 74ef4024c0d01a2c14229072290c49310139a726..c947e88e962f3bf5d0154cf684abb79ca419b20a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_zGetTotal.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_zGetTotal.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -102,61 +66,6 @@ AND\t\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT \n
-\tSUM(inventory) AS total_inventory, \n
-\tSUM(inventory * price) AS total_price, \n
-\tAVG(price) AS average_price\n
-FROM\n
- catalog, movement\n
-WHERE \n
-\tcatalog.parent_uid = <dtml-sqlvar uid type="int">\n
-AND\t\n
-\tcatalog.uid = movement.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_zGetPackedQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_zGetPackedQuantity.xml
index 43adb4c245e043bde5d7719c44dec0d35d90dd69..aef29362cdbc3264242dd5d63b3f6fdd44892f5a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_zGetPackedQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_zGetPackedQuantity.xml
@@ -18,56 +18,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>explanation_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>resource_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>variation_text</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>explanation_uid</string>
- <string>resource_uid</string>
- <string>variation_text</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -139,68 +89,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
-\tSUM(movement.quantity) AS quantity\n
-FROM\n
-\tcatalog AS container_cell, movement\n
-WHERE\n
-\tmovement.explanation_uid = <dtml-sqlvar explanation_uid type="int">\n
- AND container_cell.has_cell_content = 0\n
- AND container_cell.uid = movement.uid\n
- AND\t(container_cell.portal_type = "Container Cell" \n
- OR container_cell.portal_type = "Container Line")\n
-\n
-<dtml-if resource_uid>\n
- AND movement.resource_uid = <dtml-sqlvar resource_uid type="int">\n
-</dtml-if>\n
-<dtml-if variation_text>\n
- AND movement.variation_text = <dtml-sqlvar variation_text type="string">\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_zGetRelatedQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_zGetRelatedQuantity.xml
index 5928a1009184b6668043f0b742aac8fa92e1ef4e..f052b9948cd0f63f85e287fe6a431ba026e5221e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_zGetRelatedQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_zGetRelatedQuantity.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -102,61 +66,6 @@ AND\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- SUM(movement.quantity) AS quantity\n
-FROM\n
- category, movement\n
-WHERE\n
- category.category_uid = <dtml-sqlvar uid type="int">\n
-AND\n
- category.uid = movement.uid\n
-AND\n
- category.base_category_uid = <dtml-sqlvar expr="portal_categories.order.getUid()" type="int">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml
index b981fa83c3cd52cf8893b09021667f6975015481..994001cb38977628ae7e73e854a32cefc66cea59 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml
@@ -6,61 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -146,82 +91,6 @@ ORDER BY <dtml-var order_by_expression>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.relative_url,\n
- catalog.id\n
-\n
-FROM\n
- movement as simulation_movement\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key != \'catalog\'">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- , catalog\n
- LEFT JOIN category \n
- ON (catalog.uid = category.uid\n
- AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
-WHERE\n
- 1=1\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression> \n
- </dtml-if>\n
- AND simulation_movement.source_uid <> simulation_movement.destination_uid\n
- AND simulation_movement.source_uid is not NULL\n
- AND simulation_movement.destination_uid is not NULL\n
- AND simulation_movement.uid = catalog.uid\n
- AND simulation_movement.resource_uid is not NULL\n
- AND category.category_uid is NULL\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index c9eee69c937caa86e24a543810bc72ca713dd424..87e831c3189b75e49891ca61d16057e690159c63 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-1093
\ No newline at end of file
+1094
\ No newline at end of file
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_zGetModifiedFooList.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_zGetModifiedFooList.xml
index ce54092966d789c844df36c0a45fc96290661e42..b67067925e5782ef6d2e4105132bce4872d06bb1 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_zGetModifiedFooList.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_zGetModifiedFooList.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>context</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>context</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -164,61 +128,6 @@ LIMIT 1000\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- uid, path, CONCAT(\'Foo \', title) AS title\n
-FROM\n
- catalog\n
-WHERE\n
- portal_type = \'Foo\'\n
- AND parent_uid = <dtml-var "context.getUid()">\n
-ORDER BY\n
- id\n
-LIMIT 1000\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision
index 0c1a9b6f06b7455bfa5e5419b38675b5d46eb95a..dbda17fdf0528084d5e3c96218f76386d7741756 100644
--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
@@ -1 +1 @@
-645
\ No newline at end of file
+646
\ No newline at end of file
diff --git a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ActivityTool_showMessageQueueTableColumns.xml b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ActivityTool_showMessageQueueTableColumns.xml
index ea3799f2758d3afff77bcb106f3e56ab4e6dffe2..83f8ab1fb9ee5403be844f9f1cbf77afe975778c 100644
--- a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ActivityTool_showMessageQueueTableColumns.xml
+++ b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ActivityTool_showMessageQueueTableColumns.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -164,47 +137,6 @@
<key> <string>src</string> </key>
<value> <string>show columns from message_queue</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>show columns from message_queue</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ActivityTool_upgradeMessageQueueTable.xml b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ActivityTool_upgradeMessageQueueTable.xml
index b9c090aefd799d33b1481cea46f1ed3a3037ab0e..f25f298c4d428aa1ed384482b8d0e23d8282fe52 100644
--- a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ActivityTool_upgradeMessageQueueTable.xml
+++ b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ActivityTool_upgradeMessageQueueTable.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>alter table message_queue add column `group_method_id` VARCHAR(255) NOT NULL DEFAULT \'\' AFTER `priority`</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>alter table message_queue add column `group_method_id` VARCHAR(255) NOT NULL DEFAULT \'\' AFTER `priority`</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_upgrader/bt/revision b/bt5/erp5_upgrader/bt/revision
index 64ae959863dcac3ad1fb16033d832a15df40679c..ea5ca3642f81687180522c5054a661171fa6dea2 100644
--- a/bt5/erp5_upgrader/bt/revision
+++ b/bt5/erp5_upgrader/bt/revision
@@ -1 +1 @@
-546
\ No newline at end of file
+547
\ No newline at end of file
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
index 00918cdb1237c67a019ab77e5acacd3d76a897a5..c306d3f61ca7f6fea7ff0fb48603257c529e7d8a 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
@@ -14,56 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>all_languages</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>kw</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>language</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>language</string>
- <string>all_languages</string>
- <string>kw</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -202,135 +152,6 @@ kw</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let query="buildSQLQuery(query=portal_catalog.getSecurityQuery(**kw), **kw)"\n
- is_translation_order_by="query[\'order_by_expression\'] is not None and\n
- \'translated_message\' in query[\'order_by_expression\']">\n
-\n
- <dtml-comment>\n
- Currently, there is no other choice to implement this method as an SQL catalog until SQLCatalog\n
- can support more features which are needed here. Once SQLCatalog supports those feature,\n
- this method should be refactored to use catalog only.\n
-\n
- The subquery is named catalog to prevent use another LEFT JOIN.\n
-\n
- XXX This query heavily depends on MySQL implementation, \n
- as it seems that the "GROUP BY reference" returns the first line of the subselect \n
- (which is the expected one due to "ORDER BY priority DESC").\n
- But, without any explicit reference of this behaviour in MySQL\n
- documentation, wrong results may be returned with another MySQL version.\n
- </dtml-comment>\n
-\n
- SELECT\n
- *\n
- FROM\n
- (\n
- SELECT\n
- catalog.uid,\n
- catalog.path,\n
- catalog.int_index,\n
- catalog.modification_date,\n
- catalog.reference,\n
- catalog.creation_date,\n
- catalog.title,\n
- CONCAT(CASE my_versioning.language\n
- WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
- WHEN \'en\' THEN \'2\'\n
- ELSE \'1\' END,\n
- my_versioning.version) AS priority\n
- <dtml-if is_translation_order_by>\n
- , related_translation_intermediate.translated_message\n
- </dtml-if>\n
- FROM\n
- <dtml-in prefix="table" expr="query[\'from_table_list\']">\n
- <dtml-var table_item> AS <dtml-var table_key>,\n
- </dtml-in>\n
- versioning AS my_versioning\n
- <dtml-if is_translation_order_by>\n
- , translation AS related_translation_intermediate\n
- </dtml-if>\n
- WHERE\n
- my_versioning.uid = catalog.uid\n
- <dtml-if "query[\'where_expression\']">\n
- AND <dtml-var "query[\'where_expression\']">\n
- </dtml-if>\n
-\n
- <dtml-if all_languages>\n
- <dtml-else>\n
- AND my_versioning.language = <dtml-sqlvar language type="string">\n
- </dtml-if>\n
-\n
- <dtml-if is_translation_order_by>\n
- AND catalog.validation_state = related_translation_intermediate.original_message\n
- </dtml-if>\n
-\n
- ORDER BY\n
- priority DESC\n
-\n
- ) AS catalog\n
-\n
- GROUP BY reference\n
-\n
- <dtml-if "query[\'order_by_expression\']">\n
- ORDER BY\n
- <dtml-if is_translation_order_by>\n
- translated_message\n
- <dtml-else>\n
- <dtml-var "query[\'order_by_expression\']">\n
- </dtml-if>\n
- </dtml-if>\n
-\n
- <dtml-if "query[\'limit_expression\']">\n
- LIMIT <dtml-var "query[\'limit_expression\']">\n
- <dtml-else>\n
- LIMIT 1000\n
- </dtml-if>\n
-\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision
index a141b9a0cb0bd69f4cf3b514b9b2974bfe63b9ee..2ba2c947522cae24d8c98da52fe506e7841cc0ae 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-1006
\ No newline at end of file
+1007
\ No newline at end of file
diff --git a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml
index dfabd1f8eecddf569f0f40bf4b98d6d4aeccd9bc..c635515f2cc21e8a6665aac3408283ddeac92d39 100644
--- a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml
+++ b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zClearWorklistTable.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>DELETE FROM worklist_cache</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DELETE FROM worklist_cache</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml
index 592f41240ca82be346ad30090fb42307faadb29c..9c77d5022dc3202cc33d2def1d018ab90f2519dd 100644
--- a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml
+++ b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -91,83 +64,6 @@ CREATE TABLE `worklist_cache` (\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DROP TABLE IF EXISTS worklist_cache\n
-<dtml-var sql_delimiter>\n
-CREATE TABLE `worklist_cache` (\n
- `count` INT UNSIGNED NOT NULL,\n
- `owner` VARCHAR(32) DEFAULT \'\',\n
- `viewable_owner` VARCHAR(32) NOT NULL DEFAULT \'\',\n
- `security_uid` INT UNSIGNED NOT NULL,\n
- `portal_type` VARCHAR(255) NOT NULL,\n
- `validation_state` VARCHAR(255) NULL,\n
- `simulation_state` VARCHAR(255) NULL,\n
- `parent_uid` BIGINT UNSIGNED default \'0\',\n
- `title` varchar(255) default \'\',\n
- `opportunity_state` varchar(255) default \'\',\n
- `causality_state` varchar(255) default \'\',\n
- `invoice_state` varchar(255) default \'\',\n
- `payment_state` varchar(255) default \'\',\n
- `event_state` varchar(255) default \'\',\n
- `immobilisation_state` varchar(255) default \'\',\n
- `reference` varchar(255) binary default \'\',\n
- `grouping_reference` varchar(255) default \'\',\n
- `source_reference` varchar(255) default \'\',\n
- `destination_reference` varchar(255) default \'\',\n
- `string_index` varchar(255),\n
- `int_index` INT,\n
- `float_index` real,\n
- `has_cell_content` bool,\n
- `creation_date` datetime,\n
- `modification_date` datetime,\n
- KEY `portal_simulation_security` (`portal_type`, `simulation_state`, `security_uid`),\n
- KEY `portal_simulation_owner` (`portal_type`, `simulation_state`, `viewable_owner`),\n
- KEY `portal_validation_security` (`portal_type`, `validation_state`, `security_uid`),\n
- KEY `portal_validation_owner` (`portal_type`, `validation_state`, `viewable_owner`)\n
-) TYPE=InnoDB
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zGetCountFromWorklistTable.xml b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zGetCountFromWorklistTable.xml
index 0f7ac1170aea55e17f1092b9e6ddc75ea7e394eb..61c53e37f61f28616896681417e38e53179d3b64 100644
--- a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zGetCountFromWorklistTable.xml
+++ b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zGetCountFromWorklistTable.xml
@@ -24,56 +24,6 @@
</tuple>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>select_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>select_expression</string>
- <string>where_expression</string>
- <string>group_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -134,59 +84,6 @@ GROUP BY\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- <dtml-var select_expression>\n
-FROM\n
- worklist_cache\n
-WHERE\n
- <dtml-var where_expression>\n
-GROUP BY\n
- <dtml-var group_by_expression>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml
index ebed559755d22df9874aa47bf9dad8281beadc3d..2eb787487dda2e6d18e324481bb5876ceab3b40b 100644
--- a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml
+++ b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml
@@ -6,210 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>causality_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>count</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>creation_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>destination_reference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>event_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>float_index</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>grouping_reference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>has_cell_content</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>immobilisation_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>int_index</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>invoice_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>modification_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>opportunity_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>owner</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>parent_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>payment_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>reference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>security_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>simulation_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>source_reference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>string_index</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>validation_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>viewable_owner</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>count</string>
- <string>security_uid</string>
- <string>portal_type</string>
- <string>simulation_state</string>
- <string>validation_state</string>
- <string>owner</string>
- <string>viewable_owner</string>
- <string>parent_uid</string>
- <string>title</string>
- <string>opportunity_state</string>
- <string>causality_state</string>
- <string>invoice_state</string>
- <string>payment_state</string>
- <string>event_state</string>
- <string>immobilisation_state</string>
- <string>reference</string>
- <string>grouping_reference</string>
- <string>source_reference</string>
- <string>destination_reference</string>
- <string>string_index</string>
- <string>int_index</string>
- <string>float_index</string>
- <string>has_cell_content</string>
- <string>creation_date</string>
- <string>modification_date</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>count\r\n
@@ -289,86 +85,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- worklist_cache\n
- (`count`, `owner`, `viewable_owner`, `security_uid`, `portal_type`, `validation_state`, `simulation_state`, `parent_uid`, `title`,`opportunity_state`, `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`,\n
- `source_reference`, `destination_reference`, `string_index`, `int_index`, `float_index`, `has_cell_content`, `creation_date`,\n
- `modification_date`)\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(count))">\n
- (\n
- <dtml-sqlvar expr="count[loop_item]" type="int">,\n
- <dtml-sqlvar expr="owner[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="viewable_owner[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="portal_type[loop_item]" type="string">,\n
- <dtml-sqlvar expr="validation_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="simulation_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="parent_uid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="title[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="opportunity_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="causality_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="invoice_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="payment_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="event_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="immobilisation_state[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="reference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="grouping_reference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="source_reference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="destination_reference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="string_index[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="int_index[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="float_index[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="has_cell_content[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="creation_date[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="modification_date[loop_item]" type="datetime" optional>\n
- )\n
- <dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/bt5/erp5_worklist_sql/bt/revision b/bt5/erp5_worklist_sql/bt/revision
index dce6588ca1420a69eea5699f2ec5d666daf16a6a..7c091989d018956d085a80a955a265ebbb0d0a49 100644
--- a/bt5/erp5_worklist_sql/bt/revision
+++ b/bt5/erp5_worklist_sql/bt/revision
@@ -1 +1 @@
-36
\ No newline at end of file
+37
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zGetAlarmDate.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zGetAlarmDate.xml
index 0761e7e8f981083ffa8ec4a7152a7bd56e9ecf99..63519d9102294b9375e2210b1b6ec150eda3a268 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zGetAlarmDate.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zGetAlarmDate.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alarm_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>alarm_date</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -105,56 +62,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT \n
- alarm_date\n
-FROM\n
- alarm\n
-WHERE\n
- uid = <dtml-sqlvar uid type="int">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zUpdateAlarmDate.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zUpdateAlarmDate.xml
index 53478ede3b6d95300cb0e148b1d703d207045fa5..c21c96e95a2318de10d72377567e9f4d18533346 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zUpdateAlarmDate.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zUpdateAlarmDate.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alarm_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>alarm_date</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
@@ -73,54 +30,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-REPLACE INTO\n
- alarm (uid, alarm_date)\n
-VALUES\n
- (<dtml-sqlvar uid type="int">, <dtml-sqlvar alarm_date type="datetime" optional>)
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zCountByWorkflowState.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zCountByWorkflowState.xml
index 1507c3963de1295a07ee72350b27f7372b37fb91..d393af98dab4fa2d07b333a9a21591d3e9313a4b 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zCountByWorkflowState.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zCountByWorkflowState.xml
@@ -6,59 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>state_name</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>portal_type</string>
- <string>state_name</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -162,60 +109,6 @@ GROUP BY catalog.<dtml-var expr="state_name">\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT catalog.<dtml-var expr="state_name">, count(*)\n
-FROM catalog\n
-\n
-WHERE\n
-\n
-catalog.portal_type = "<dtml-var expr="portal_type">"\n
-\n
-GROUP BY catalog.<dtml-var expr="state_name">\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategory.xml
index da2adf5d88a8eda4aaf167c4523e216012958938..2d0b965f942388f2ab17438ded22b80635627472 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategory.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategory.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>category_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>category_uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -99,58 +63,6 @@ AND category.category_uid = <dtml-sqlvar category_uid type="int">
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT\n
- catalog.uid, catalog.path\n
-FROM\n
- catalog, category\n
-WHERE\n
- catalog.path != \'deleted\'\n
-AND catalog.uid = category.uid\n
-AND category.category_uid = <dtml-sqlvar category_uid type="int">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Search Category</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml
index 0ebb09cd37f53f7aebd01fe6b2e1a58505dc56eb..423e0c13a703b1d8333dddb1db7e2bbcc8946c69 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml
@@ -6,70 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>category_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>strict_membership</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>category_list</string>
- <string>portal_type</string>
- <string>strict_membership</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -146,71 +82,6 @@ ORDER BY\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT catalog.uid, catalog.path, portal_type\n
-FROM catalog, category\n
-WHERE catalog.uid = category.uid\n
- <dtml-if portal_type>\n
- AND\n
- (<dtml-in portal_type>\n
- <dtml-unless sequence-start> OR </dtml-unless>\n
- catalog.portal_type=\'<dtml-var sequence-item>\'\n
- </dtml-in>)\n
- </dtml-if>\n
- AND (<dtml-var "portal_categories.buildSQLSelector(category_list)">)\n
- <dtml-if strict_membership>\n
- AND category.category_strict_membership = 1\n
- </dtml-if>\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
- </dtml-if>\n
-<dtml-if order_by_expression>\n
-ORDER BY\n
- <dtml-var order_by_expression>\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Search Category</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByPredicate.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByPredicate.xml
index 1d2994df1be24e7fdc257e5dad0b1126f5c377a3..721c1b87da90702dfef3653a1ec4e514bdadb766 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByPredicate.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByPredicate.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>category_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>category_uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -99,58 +63,6 @@ AND category.category_uid = <dtml-sqlvar category_uid type="int">
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT\n
- catalog.uid, catalog.path\n
-FROM\n
- catalog, predicate_category AS category\n
-WHERE\n
- catalog.path != \'deleted\'\n
-AND catalog.uid = category.uid\n
-AND category.category_uid = <dtml-sqlvar category_uid type="int">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Search Predicate</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_zGetLatestIndexedObjectList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_zGetLatestIndexedObjectList.xml
index e0a948ef4b1e01b96716d4e72629fcca2f00c78b..fd6d904646e18743b8233f88e414feec10961564 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_zGetLatestIndexedObjectList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_zGetLatestIndexedObjectList.xml
@@ -6,51 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>delta</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>0</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>delta</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -134,59 +89,6 @@ ORDER BY\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- uid, path\n
-FROM\n
- catalog\n
-WHERE\n
- path != \'reserved\'\n
- AND CURRENT_TIMESTAMP - indexation_timestamp <= <dtml-sqlvar delta type="int">\n
-ORDER BY\n
- indexation_timestamp DESC
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCommit.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCommit.xml
index 7a2b0e5a141d336ccbbb4ed89433c0f0b6f63469..fc8ce59c3bf84f185373e3078582cd7e44c10f04 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCommit.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCommit.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>commit</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>commit</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateEmptyTable.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateEmptyTable.xml
index bde31ee960cb1c5a1917390ac747eceb6b606f54..7dd0aae9d7468d6a3176bc7d76aad8674384a237 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateEmptyTable.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateEmptyTable.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -91,51 +64,6 @@
PRIMARY KEY (`id_group`)\n
) TYPE=InnoDB;</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `portal_ids` (\n
- `id_group` VARBINARY(255),\n
- `last_id` BIGINT UNSIGNED,\n
- PRIMARY KEY (`id_group`)\n
-) TYPE=InnoDB;</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateTable.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateTable.xml
index cce793ef45747744a6df1d5cc819e99d0737457e..c7c1cab8b5172aa1190e26d5e299019abd0f9ee6 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateTable.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateTable.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -101,61 +74,6 @@ COMMIT
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-CREATE TABLE `portal_ids` (\n
- `id_group` VARBINARY(255),\n
- `last_id` BIGINT UNSIGNED,\n
- PRIMARY KEY (`id_group`)\n
-) TYPE=InnoDB\n
-<dtml-var sql_delimiter>\n
-<dtml-in expr="getPortalObject().portal_ids.getDictLengthIdsItems()">\n
-INSERT INTO `portal_ids` (`id_group`, `last_id`) VALUES (<dtml-sqlvar sequence-key type="string">, <dtml-sqlvar sequence-item type="int">)\n
-<dtml-var sql_delimiter>\n
-</dtml-in>\n
-COMMIT
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zDropTable.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zDropTable.xml
index fb9d66ca99ccfa161ea54c88a519cf5a00752ada..6b4d109920d045664f2f6247703d8c7885e675c1 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zDropTable.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zDropTable.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS portal_ids</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS portal_ids</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zDump.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zDump.xml
index 488eef0486d135b06079c61b583fe7b92b768e0c..c118579855726b9a5e86edab000c3204187aa802 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zDump.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zDump.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>select id_group, last_id from portal_ids</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>select id_group, last_id from portal_ids</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGenerateId.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGenerateId.xml
index a4aa3009458583475643d178f432fb543fe05ee1..28ca1212c3c12066d3ce05ba1fdcac8893657d5f 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGenerateId.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGenerateId.xml
@@ -6,74 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>0</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id_count</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>1</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id_group</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>id_group</string>
- <string>id_count</string>
- <string>default</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>id_group\r\n
@@ -107,62 +39,6 @@ SELECT `last_id` AS `LAST_INSERT_ID()` FROM portal_ids\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-# DO NOT FORGET TO COMMIT AFTER !!\n
-# commit ZSQL method should be IdTool_zCommit\n
-\n
-BEGIN\n
-<dtml-var sql_delimiter>\n
-INSERT INTO portal_ids (`id_group`, `last_id`)\n
- VALUES (<dtml-sqlvar id_group type="string">, <dtml-sqlvar expr="id_count - 1 + default" type="int">)\n
- ON DUPLICATE KEY UPDATE `last_id` = `last_id` + <dtml-sqlvar id_count type="int">\n
-<dtml-var sql_delimiter>\n
-SELECT `last_id` AS `LAST_INSERT_ID()` FROM portal_ids\n
- WHERE `id_group` = <dtml-sqlvar id_group type="string">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGetLastId.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGetLastId.xml
index 01726468feea939751b1b43fba85e0d42c122116..2f9421987c56430edf5341de6522638f49e5130b 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGetLastId.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGetLastId.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>id_group</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>id_group</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -92,56 +56,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- last_id AS `LAST_INSERT_ID()`\n
-FROM portal_ids\n
-WHERE\n
- `id_group` = <dtml-sqlvar id_group type="string">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGetValueList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGetValueList.xml
index ffa4f34698cdd37be9eea237cad6324cac224872..6fbfb37e4b5ff03ef9aa0b7dc101221efafd9b6d 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGetValueList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zGetValueList.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>select id_group, last_id from portal_ids</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>select id_group, last_id from portal_ids</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zSetLastId.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zSetLastId.xml
index 40c65452339c5c33f94b6134a689da15130579b5..5ca1f1337f8075529c66fdc5f5c04c87e24251fb 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zSetLastId.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zSetLastId.xml
@@ -6,58 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>id_group</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>last_id</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>0</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>id_group</string>
- <string>last_id</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>id_group\r\n
@@ -85,57 +33,6 @@ COMMIT
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-BEGIN\n
-<dtml-var sql_delimiter>\n
-INSERT INTO portal_ids (`id_group`, `last_id`)\n
- VALUES (<dtml-sqlvar id_group type="string">, <dtml-sqlvar last_id type="int">)\n
- ON DUPLICATE KEY UPDATE `last_id` = <dtml-sqlvar last_id type="int">\n
-<dtml-var sql_delimiter>\n
-COMMIT
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetAssetPrice.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetAssetPrice.xml
index 5a2d499eb1eca299482d659f57f5f45b28e711d9..165839b65b10d4684663f43b5a39d1ee552ec878 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetAssetPrice.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetAssetPrice.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>valuation_method</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>where_expression</string>
- <string>valuation_method</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>where_expression\r\n
@@ -236,217 +193,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-if "\'WeightedAverage\' in valuation_method">\n
-\n
-/*\n
-Almost the same SQL for WeightedAverage/MonthlyWeightedAverage\n
-since they rely on the same kind of "split by period" model.\n
-\n
-First split timeframe into Year (or Month) periods, and fold all movements\n
-during each period.\n
-Then perform a weighted average over all periods.\n
-*/\n
-\n
-set @total_asset_price=0, @total_quantity=0\n
-<dtml-var sql_delimiter>\n
-select\n
- byperiod.*,\n
- (@unit_price:=(@total_asset_price+incoming_total_price)/(@total_quantity+incoming_total_quantity)) as unit_price,\n
- (@total_asset_price:=\n
- @total_asset_price +\n
- incoming_total_price +\n
- outgoing_total_quantity * @unit_price) as total_asset_price,\n
- (@total_quantity:=@total_quantity+quantity_diff) as total_quantity\n
-from\n
- (\n
- select\n
- month(date) as d_month,\n
- year(date) as d_year,\n
- SUM(IF(quantity>0, total_price, 0)) as incoming_total_price,\n
- SUM(IF(quantity>0, quantity, 0)) as incoming_total_quantity,\n
- SUM(IF(quantity>0, 0, quantity)) as outgoing_total_quantity,\n
- SUM(quantity) as quantity_diff\n
- from\n
- stock, catalog\n
- where\n
- <dtml-var where_expression>\n
- group by\n
- d_year<dtml-if "\'Monthly\' in valuation_method">, d_month</dtml-if>\n
- order by\n
- d_year<dtml-if "\'Monthly\' in valuation_method">, d_month</dtml-if>\n
- ) as byperiod\n
-order by d_year<dtml-if "\'Monthly\' in valuation_method">, d_month</dtml-if>\n
-\n
-\n
-<dtml-elif "\'MovingAverage\'==valuation_method">\n
-/*\n
-Very similar to (Monthly)WeightedAverage except that we do not have to\n
-split the timeframe / fold movements and simply perform a weighted average\n
-on all single movements.\n
-*/\n
-\n
-set @total_asset_price=0, @total_quantity=0\n
-<dtml-var sql_delimiter>\n
-select\n
- (@incoming_total_price:=IF(quantity>0, total_price, 0)) as incoming_total_price,\n
-\n
- @unit_price:=((@total_asset_price+@incoming_total_price)/(@total_quantity+GREATEST(0, quantity))) as unit_price,\n
- (@total_asset_price:=\n
- @total_asset_price +\n
- @incoming_total_price +\n
- LEAST(0, quantity) * @unit_price) as total_asset_price,\n
- (@total_quantity:=@total_quantity+quantity) as dummy\n
-from\n
- stock, catalog\n
-where\n
- <dtml-var where_expression>\n
-order by date\n
-\n
-<dtml-elif "valuation_method==\'Fifo\'">\n
-\n
-/*\n
-FIFO inventory valuation is about finding out the price of items in\n
-inventory that stay until t=END after transactions from t=0.\n
-For we care only about items found in inventory at t=END, it\n
-is interesting to notice that a few of the earliest movements can be\n
-discarded along the way of our computation:\n
-\n
-1)Assume that you know the @total_output_quantity during the considered\n
- timeframe.\n
-2)Now notice that in this model you can fold all outgoing movements into a single\n
- big movement of @total_output_quantity taking place a t=END, and obtain the\n
- same, yet simpler to compute valuation.\n
-3)It is then easy to see that while the sum of quantities of incoming\n
- movements accounts for less than @total_output_quantity, items queued in by\n
- these movements will be completely removed by the final outgoing movement.\n
- It is safe to ignore those first movements in our computation.\n
-\n
-This means that when iterating forward over incoming movements, from t=0 to t=END,\n
-incoming movements can be ignored until their cumulative quantity sum is larger\n
-than the total output quantity. After this, each incoming movement will stay\n
-forever in inventory.\n
-\n
-Thus, each movement has a value of:\n
- max(0, (quantity-@unbalanced_output) * unit_price)\n
-if @unbalanced_output is initialized to @total_output_quantity and reduced by\n
-quantity at each step:\n
- unbalanced_output=max(0, unbalanced_output-quantity)\n
-*/\n
-SET\n
- @unbalanced_output:=\n
- (SELECT\n
- SUM(-quantity)\n
- FROM\n
- stock, catalog\n
- WHERE\n
- quantity < 0\n
- AND\n
- <dtml-var where_expression>\n
- ),\n
- @total_asset_price=0\n
-<dtml-var sql_delimiter>\n
-\n
-SELECT\n
-\n
- (@total_asset_price:=@total_asset_price + \n
- GREATEST(0, (quantity-@unbalanced_output) * total_price/quantity)\n
- ) AS total_asset_price,\n
- (@unbalanced_output:=GREATEST(0, @unbalanced_output-quantity)) as dummy\n
- \n
-FROM\n
- stock, catalog\n
-WHERE\n
- quantity > 0\n
-AND\n
- <dtml-var where_expression>\n
-order by date\n
-\n
-<dtml-elif "valuation_method==\'Filo\'">\n
-\n
-\n
-/*\n
-What matters for FILO inventory value is the amount that never goes out of inventory\n
-and stays in at the bottom of the pile until t=END:\n
-If, for each incoming movement, we are able to tell how many items of this movement\n
-are taken out of inventory in future, then we are finished: the remaining quantity\n
-of this movement will be found in the final inventory and should be counted in the\n
-valuation.\n
-\n
-To know the future/destiny of each incoming movement, the easier way is to\n
-iterate movements in a backwards fashion, from latest (t=END) to earliest (t=0),\n
-and remember how many items are removed from the inventory by outgoing movements.\n
-\n
-We sum in @unbalanced_output the (absolute) sum of outgoing movements quantities\n
-until we reach an incoming movement. Then:\n
- - if incoming_movement.quantity > @unbalanced_output, we know for sure that\n
- (quantity-@unbalanced_output) WILL remain in the inventory at t=END. We can thus\n
- add (quantity-@unbalanced_output)*unit_price to asset_price, and reset\n
- @unbalanced_output to zero.\n
- - if incoming_movement.quantity <= @unbalanced_output then all of the current\n
- movement got out of inventory between t=current and T=END. These items are not\n
- present in the final inventory and can be discarded.\n
- @unbalanced_inventory=@unbalanced_inventory - quantity\n
-*/\n
-\n
-SET @unbalanced_output=0, @total_asset_price=0\n
-<dtml-var sql_delimiter>\n
-SELECT\n
- (@total_asset_price:=@total_asset_price +\n
- IF(quantity <= 0, 0,\n
- total_price/quantity * GREATEST(0, quantity-@unbalanced_output))) as total_asset_price,\n
- (@unbalanced_output:=GREATEST(0, @unbalanced_output-quantity)) as dummy\n
-FROM\n
- stock, catalog\n
-WHERE\n
- <dtml-var where_expression>\n
-\n
-\n
-\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml
index 871aefcf341a4e4fd5cf1e153c6c4bbd9629ae6d..d3ff4a7dfc52c31813d1fe8f49572c93e8ae2000 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml
@@ -6,92 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>column_id_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>column_value_list_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>delivered</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>column_value_list_list</string>
- <string>column_id_list</string>
- <string>group_by_expression</string>
- <string>date</string>
- <string>simulation_state</string>
- <string>where_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>column_value_list_list:list\r\n
@@ -143,77 +57,6 @@ GROUP BY\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- MAX(date) as date,\n
- <dtml-var group_by_expression>\n
-FROM\n
- inventory\n
-WHERE\n
- is_full_inventory = TRUE\n
- <dtml-if simulation_state>\n
- AND simulation_state = <dtml-sqlvar simulation_state type="string">\n
- </dtml-if>\n
- <dtml-in prefix="loop" expr="_.range(_.len(column_id_list))">\n
- AND <dtml-var expr="column_id_list[loop_item]"> IN (\n
- <dtml-in expr="column_value_list_list[loop_item]">\n
- <dtml-sqlvar sequence-item type="int">\n
- <dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- )\n
- </dtml-in>\n
- <dtml-if date>\n
- AND date <= <dtml-sqlvar date type="string">\n
- </dtml-if>\n
- <dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
- </dtml-if>\n
-GROUP BY\n
- <dtml-var group_by_expression>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
index 78ac90aca3591499ccb0a1a1a190ed6f6c989e97..6518a08b41c7c72457e2fcbf701198393da76d39 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
@@ -6,155 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>ignore_variation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>input_simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>omit_input</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_output</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>output_simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>precision</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>section_filtered</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>standardize</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>ignore_variation</string>
- <string>standardize</string>
- <string>omit_simulation</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>section_filtered</string>
- <string>input_simulation_state</string>
- <string>output_simulation_state</string>
- <string>group_by_expression</string>
- <string>precision</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -323,153 +174,6 @@ ORDER BY\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
-<dtml-if expr="precision is not None">\n
- SUM(ROUND(stock.quantity, <dtml-var precision>)) AS inventory,\n
- SUM(ROUND(stock.quantity, <dtml-var precision>)) AS total_quantity,\n
- SUM(ROUND(stock.total_price, <dtml-var precision>)) AS total_price,\n
-<dtml-else>\n
- SUM(stock.quantity) AS inventory,\n
- SUM(stock.quantity) AS total_quantity,\n
- SUM(stock.total_price) AS total_price,\n
-</dtml-if>\n
- COUNT(DISTINCT node.title) AS node_title,\n
- COUNT(DISTINCT node.relative_url) AS node_relative_url,\n
- COUNT(DISTINCT section.title) AS section_title,\n
- COUNT(DISTINCT section.relative_url) AS section_relative_url,\n
- COUNT(DISTINCT resource.title) AS resource_title,\n
- COUNT(DISTINCT resource.relative_url) AS resource_relative_url,\n
- COUNT(DISTINCT stock.variation_text) AS variation_text,\n
- MAX(stock.resource_uid) AS resource_uid,\n
- COUNT(DISTINCT stock.uid) AS stock_uid,\n
- MAX(stock.date) AS date\n
-\n
-FROM\n
- stock\n
- <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if>\n
- JOIN catalog AS section ON (section.uid = stock.section_uid)\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key != \'stock\'">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- <dtml-if selection_domain>,\n
- <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
- <dtml-if selection_report>,\n
- <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
- , catalog as node, catalog as resource\n
-\n
-WHERE\n
- 1 = 1\n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-\n
- AND node.uid = stock.node_uid\n
- AND resource.uid = stock.resource_uid\n
-\n
-<dtml-if omit_simulation>\n
- AND catalog.portal_type != \'Simulation Movement\'\n
-</dtml-if>\n
-\n
-<dtml-if omit_input>\n
- AND ( ( stock.is_cancellation AND stock.quantity > 0 )\n
- OR ( not stock.is_cancellation AND stock.quantity < 0 ))\n
- AND ( stock.node_uid <> stock.mirror_node_uid\n
- OR stock.section_uid <> stock.mirror_section_uid\n
- OR stock.mirror_node_uid IS NULL\n
- OR stock.mirror_section_uid IS NULL\n
- OR stock.payment_uid IS NOT NULL )\n
-</dtml-if>\n
-<dtml-if omit_output>\n
- AND ( ( stock.is_cancellation AND stock.quantity < 0 )\n
- OR ( not stock.is_cancellation AND stock.quantity > 0 ))\n
- AND ( stock.node_uid <> stock.mirror_node_uid\n
- OR stock.section_uid <> stock.mirror_section_uid\n
- OR stock.mirror_node_uid IS NULL\n
- OR stock.mirror_section_uid IS NULL\n
- OR stock.payment_uid IS NOT NULL )\n
-</dtml-if>\n
-\n
-<dtml-if input_simulation_state>\n
- <dtml-if output_simulation_state>\n
- <dtml-if "input_simulation_state == output_simulation_state">\n
- AND (<dtml-in input_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'<dtml-unless sequence-end> OR </dtml-unless></dtml-in>)\n
- <dtml-else>\n
- AND ((stock.quantity>0\n
- AND (<dtml-in input_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'<dtml-unless sequence-end> OR </dtml-unless></dtml-in>))\n
- OR (stock.quantity<0\n
- AND (<dtml-in output_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'<dtml-unless sequence-end> OR </dtml-unless></dtml-in>)))\n
- </dtml-if>\n
- <dtml-else>\n
- AND stock.quantity>0\n
- AND (<dtml-in input_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'<dtml-unless sequence-end> OR </dtml-unless></dtml-in>)\n
- </dtml-if>\n
-<dtml-elif output_simulation_state>\n
- AND stock.quantity<0\n
- AND (<dtml-in output_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'<dtml-unless sequence-end> OR </dtml-unless></dtml-in>)\n
-</dtml-if>\n
-\n
-<dtml-if selection_domain>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'stock\', join_column=\'node_uid\')">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
-</dtml-if>\n
-\n
-<dtml-if group_by_expression>\n
-GROUP BY <dtml-var group_by_expression>\n
-</dtml-if>\n
-<dtml-if order_by_expression>\n
-ORDER BY\n
- <dtml-var order_by_expression>\n
-</dtml-if>\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
index 9b018939a007278c22f825e414a20ac5ef58dbd1..8b2a8692ff30974133beb88058c823618f7e4339 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
@@ -14,216 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>convert_quantity_result</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>ignore_variation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>input_simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>inventory_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_input</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_output</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>output_simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>precision</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>quantity_unit_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>section_filtered</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>select_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>standardize</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>statistic</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>stock_table_id</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>stock</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>transformed_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>transformed_variation_text</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- <string>group_by_expression</string>
- <string>selection_domain</string>
- <string>select_expression</string>
- <string>selection_report</string>
- <string>ignore_variation</string>
- <string>standardize</string>
- <string>omit_simulation</string>
- <string>section_filtered</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>input_simulation_state</string>
- <string>output_simulation_state</string>
- <string>precision</string>
- <string>inventory_list</string>
- <string>statistic</string>
- <string>convert_quantity_result</string>
- <string>quantity_unit_uid</string>
- <string>stock_table_id</string>
- <string>transformed_uid</string>
- <string>transformed_variation_text</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -430,183 +220,6 @@ ORDER BY\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
-<dtml-if expr="precision is not None">\n
- SUM(ROUND(<dtml-var stock_table_id>.quantity\n
- <dtml-if transformed_uid> * transformation.quantity</dtml-if>, <dtml-var precision>)) AS inventory,\n
- SUM(ROUND(<dtml-var stock_table_id>.quantity\n
- <dtml-if transformed_uid> * transformation.quantity</dtml-if>, <dtml-var precision>)) AS total_quantity,\n
- <dtml-if convert_quantity_result>\n
- SUM(ROUND(<dtml-var stock_table_id>.quantity * measure.quantity \n
- <dtml-if quantity_unit_uid> / quantity_unit_conversion.quantity</dtml-if>\n
- <dtml-if transformed_uid> * transformation.quantity</dtml-if>, <dtml-var precision>))\n
- AS converted_quantity,\n
- </dtml-if>\n
- SUM(ROUND(<dtml-var stock_table_id>.total_price, <dtml-var precision>)) AS total_price\n
-<dtml-else>\n
- SUM(<dtml-var stock_table_id>.quantity <dtml-if transformed_uid> * transformation.quantity</dtml-if>) AS inventory,\n
- SUM(<dtml-var stock_table_id>.quantity <dtml-if transformed_uid> * transformation.quantity</dtml-if>) AS total_quantity,\n
- <dtml-if convert_quantity_result>\n
- ROUND(SUM(<dtml-var stock_table_id>.quantity * measure.quantity\n
- <dtml-if quantity_unit_uid> / quantity_unit_conversion.quantity</dtml-if>\n
- <dtml-if transformed_uid> * transformation.quantity</dtml-if>), 12)\n
- AS converted_quantity,\n
- </dtml-if>\n
- SUM(<dtml-var stock_table_id>.total_price) AS total_price\n
-</dtml-if>\n
-<dtml-if inventory_list>\n
- ,node.title AS node_title,\n
- node.uid AS node_uid,\n
- node.relative_url AS node_relative_url,\n
- section.title AS section_title,\n
- section.uid AS section_uid,\n
- section.relative_url AS section_relative_url,\n
- resource.title AS resource_title,\n
- resource.relative_url AS resource_relative_url,\n
-<dtml-if transformed_uid>\n
- transformed_resource.title AS transformed_resource_title,\n
- transformed_resource.relative_url AS transformed_resource_relative_url,\n
- transformation.transformed_uid AS transformed_resource_uid,\n
- transformation.transformed_variation_text AS transformed_variation_text,\n
-</dtml-if>\n
- <dtml-var stock_table_id>.resource_uid AS resource_uid,\n
- <dtml-var stock_table_id>.variation_text AS variation_text,\n
- <dtml-var stock_table_id>.sub_variation_text AS sub_variation_text,\n
- <dtml-var stock_table_id>.uid AS stock_uid,\n
- <dtml-var stock_table_id>.date as date,\n
- <dtml-var stock_table_id>.simulation_state as simulation_state,\n
- <dtml-var stock_table_id>.mirror_section_uid as mirror_section_uid,\n
- <dtml-var stock_table_id>.payment_uid as payment_uid,\n
- <dtml-var stock_table_id>.mirror_node_uid as mirror_node_uid,\n
- <dtml-var stock_table_id>.function_uid as function_uid,\n
- <dtml-var stock_table_id>.project_uid as project_uid,\n
- catalog.path as path\n
-</dtml-if>\n
-<dtml-if statistic>\n
- ,\n
- COUNT(DISTINCT node.title) AS node_title,\n
- COUNT(DISTINCT node.relative_url) AS node_relative_url,\n
- COUNT(DISTINCT section.title) AS section_title,\n
- COUNT(DISTINCT section.relative_url) AS section_relative_url,\n
- COUNT(DISTINCT resource.title) AS resource_title,\n
- COUNT(DISTINCT resource.relative_url) AS resource_relative_url,\n
- COUNT(DISTINCT <dtml-var stock_table_id>.variation_text) AS variation_text,\n
- MAX(<dtml-var stock_table_id>.resource_uid) AS resource_uid,\n
- COUNT(DISTINCT <dtml-var stock_table_id>.uid) AS stock_uid,\n
- MAX(<dtml-var stock_table_id>.date) AS date\n
-</dtml-if>\n
-<dtml-if select_expression>, <dtml-var select_expression></dtml-if>\n
-\n
-FROM\n
- catalog, <dtml-var stock_table_id>\n
- <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if> \n
- JOIN catalog AS section ON (section.uid = <dtml-var stock_table_id>.section_uid)\n
-<dtml-if quantity_unit_uid>\n
- LEFT JOIN quantity_unit_conversion ON \n
- (quantity_unit_conversion.resource_uid = <dtml-var stock_table_id>.resource_uid\n
- AND quantity_unit_conversion.quantity_unit_uid = <dtml-sqlvar quantity_unit_uid type=int>)\n
-</dtml-if>\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key not in (\'catalog\', stock_table_id)">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
- , catalog as node, catalog as resource <dtml-if transformed_uid>, transformation, catalog as transformed_resource</dtml-if>\n
-\n
-WHERE\n
- <dtml-var stock_table_id>.uid = catalog.uid\n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-\n
- AND node.uid = <dtml-var stock_table_id>.node_uid\n
-\n
-<dtml-if transformed_uid>\n
- AND transformation.uid = <dtml-var stock_table_id>.resource_uid\n
- AND resource.uid = transformation.uid\n
- AND <dtml-var stock_table_id>.variation_text = transformation.variation_text\n
-\n
- AND transformed_resource.uid = transformation.transformed_uid\n
- AND <dtml-sqltest transformed_uid column="transformation.transformed_uid" type=int multiple>\n
- <dtml-if transformed_variation_text>\n
- AND <dtml-sqltest transformed_variation_text column="transformation.transformed_variation_text" type=string>\n
- </dtml-if>\n
-<dtml-else>\n
- AND resource.uid = <dtml-var stock_table_id>.resource_uid\n
-</dtml-if>\n
-\n
-<dtml-if omit_simulation>\n
- AND catalog.portal_type != \'Simulation Movement\'\n
-</dtml-if>\n
-\n
-<dtml-if selection_domain>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=stock_table_id, join_column=\'node_uid\')">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
-</dtml-if>\n
-\n
-<dtml-if convert_quantity_result>\n
- AND concat(<dtml-var stock_table_id>.variation_text,\'\\n\') REGEXP measure.variation\n
-</dtml-if>\n
-\n
-\n
-<dtml-if group_by_expression>\n
-GROUP BY\n
- <dtml-if transformed_uid>transformation.transformed_uid,</dtml-if>\n
- <dtml-var group_by_expression>\n
-</dtml-if>\n
-<dtml-if order_by_expression>\n
-ORDER BY\n
- <dtml-var order_by_expression>\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
index ece44f0537a3a158491be1fc8666dc197aa4f1cf..42508bbe824134edc23cf1431ba824e60088bb53 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
@@ -6,190 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>ignore_variation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>initial_running_total_price</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>initial_running_total_quantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>input_simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>limit_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_asset_decrease</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_asset_increase</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_input</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_output</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>output_simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>precision</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>section_filtered</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>standardize</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- <string>group_by_expression</string>
- <string>limit_expression</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>ignore_variation</string>
- <string>standardize</string>
- <string>omit_simulation</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>omit_asset_increase</string>
- <string>omit_asset_decrease</string>
- <string>section_filtered</string>
- <string>initial_running_total_quantity</string>
- <string>initial_running_total_price</string>
- <string>input_simulation_state</string>
- <string>output_simulation_state</string>
- <string>precision</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -809,196 +625,6 @@ LIMIT\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SET @running_total_quantity := <dtml-var initial_running_total_quantity>,\n
- @running_total_price := <dtml-var initial_running_total_price>;\n
-<dtml-var sql_delimiter>\n
-\n
-SELECT \n
- q1.*,\n
- @running_total_quantity := q1.total_quantity + \n
- @running_total_quantity AS running_total_quantity,\n
- @running_total_price := IFNULL(q1.total_price, 0) + \n
- @running_total_price AS running_total_price\n
-FROM (\n
-SELECT\n
- catalog.path as path,\n
- catalog.uid as uid,\n
- catalog.relative_url as relative_url,\n
- stock.date AS date,\n
-<dtml-if expr="precision is not None">\n
- <dtml-if group_by_expression>SUM</dtml-if>(ROUND(stock.quantity, <dtml-var precision>)) AS total_quantity,\n
- <dtml-if group_by_expression>SUM</dtml-if>(ROUND(stock.total_price, <dtml-var precision>)) AS total_price,\n
-<dtml-else>\n
- <dtml-if group_by_expression>SUM</dtml-if>(stock.quantity) AS total_quantity,\n
- <dtml-if group_by_expression>SUM</dtml-if>(stock.total_price) AS total_price,\n
-</dtml-if>\n
- stock.variation_text AS variation_text,\n
- stock.simulation_state AS simulation_state,\n
- stock.mirror_section_uid AS mirror_section_uid,\n
- stock.mirror_node_uid AS mirror_node_uid,\n
- stock.function_uid AS function_uid,\n
- stock.project_uid AS project_uid,\n
- node.uid AS node_uid,\n
- node.title AS node_title,\n
- node.relative_url AS node_relative_url,\n
- section.uid AS section_uid,\n
- section.title AS section_title,\n
- section.relative_url AS section_relative_url\n
-FROM\n
- stock\n
- <dtml-if section_filtered> INNER <dtml-else> LEFT </dtml-if> \n
- JOIN catalog AS section ON (section.uid = stock.section_uid)\n
-<dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key != \'stock\'">\n
- , <dtml-var table_item> AS <dtml-var table_key>\n
- </dtml-if>\n
-</dtml-in>\n
- <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
- , catalog as node, catalog as resource\n
-\n
-WHERE\n
- 1 = 1\n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-\n
- AND node.uid = stock.node_uid\n
- AND resource.uid = stock.resource_uid\n
-\n
-<dtml-if omit_simulation>\n
- AND catalog.portal_type != \'Simulation Movement\'\n
-</dtml-if>\n
-\n
-<dtml-if omit_input>\n
- AND ( ( stock.is_cancellation AND stock.quantity > 0 )\n
- OR ( not stock.is_cancellation AND stock.quantity < 0 ))\n
- AND ( stock.node_uid <> stock.mirror_node_uid\n
- OR stock.section_uid <> stock.mirror_section_uid\n
- OR stock.mirror_node_uid IS NULL\n
- OR stock.mirror_section_uid IS NULL\n
- OR stock.payment_uid IS NOT NULL )\n
-</dtml-if>\n
-<dtml-if omit_output>\n
- AND ( ( stock.is_cancellation AND stock.quantity < 0 )\n
- OR ( not stock.is_cancellation AND stock.quantity > 0 ))\n
- AND ( stock.node_uid <> stock.mirror_node_uid\n
- OR stock.section_uid <> stock.mirror_section_uid\n
- OR stock.mirror_node_uid IS NULL\n
- OR stock.mirror_section_uid IS NULL\n
- OR stock.payment_uid IS NOT NULL )\n
-</dtml-if>\n
-<dtml-if omit_asset_increase>\n
- AND ( ( stock.is_cancellation AND stock.total_price > 0 )\n
- OR ( not stock.is_cancellation AND stock.total_price < 0 ))\n
- AND ( stock.node_uid <> stock.mirror_node_uid\n
- OR stock.section_uid <> stock.mirror_section_uid\n
- OR stock.mirror_node_uid IS NULL\n
- OR stock.mirror_section_uid IS NULL\n
- OR stock.payment_uid IS NOT NULL )\n
-</dtml-if>\n
-<dtml-if omit_asset_decrease>\n
- AND ( ( stock.is_cancellation AND stock.total_price < 0 )\n
- OR ( not stock.is_cancellation AND stock.total_price > 0 ))\n
- AND ( stock.node_uid <> stock.mirror_node_uid\n
- OR stock.section_uid <> stock.mirror_section_uid\n
- OR stock.mirror_node_uid IS NULL\n
- OR stock.mirror_section_uid IS NULL\n
- OR stock.payment_uid IS NOT NULL )\n
-</dtml-if>\n
-\n
-<dtml-if input_simulation_state>\n
- <dtml-if output_simulation_state>\n
- <dtml-if "input_simulation_state == output_simulation_state">\n
- AND (<dtml-in input_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'\n
- <dtml-unless sequence-end> OR </dtml-unless></dtml-in>)\n
- <dtml-else>\n
- AND ((stock.quantity>0\n
- AND (<dtml-in input_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'\n
- <dtml-unless sequence-end> OR </dtml-unless></dtml-in>))\n
- OR (stock.quantity<0\n
- AND (<dtml-in output_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'\n
- <dtml-unless sequence-end> OR </dtml-unless></dtml-in>)))\n
- </dtml-if>\n
- <dtml-else>\n
- AND stock.quantity>0\n
- AND (<dtml-in input_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'\n
- <dtml-unless sequence-end> OR </dtml-unless></dtml-in>)\n
- </dtml-if>\n
-<dtml-elif output_simulation_state>\n
- AND stock.quantity<0\n
- AND (<dtml-in output_simulation_state>stock.simulation_state = \'<dtml-var sequence-item>\'\n
- <dtml-unless sequence-end> OR </dtml-unless></dtml-in>)\n
-</dtml-if>\n
-\n
-<dtml-if selection_domain>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'stock\', join_column=\'node_uid\')">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
-</dtml-if>\n
-\n
-<dtml-if group_by_expression>\n
-GROUP BY\n
- <dtml-var group_by_expression>\n
-</dtml-if>\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY\n
- <dtml-var order_by_expression>\n
-</dtml-if>\n
-\n
-<dtml-if limit_expression>\n
-LIMIT\n
- <dtml-var limit_expression>\n
-</dtml-if>\n
-\n
-) AS q1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
index ea28ce563e8913782a5da9f8847c95ceed72549d..e56436cebad72e64d5f35831b7b5fdbd5c49992c 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
@@ -14,143 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>at_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>date_condition_in_join</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>input</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>join_on_item</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>order_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>output</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>simulation_state_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>to_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>from_date</string>
- <string>at_date</string>
- <string>to_date</string>
- <string>input</string>
- <string>output</string>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>order_by_expression</string>
- <string>group_by_expression</string>
- <string>join_on_item</string>
- <string>date_condition_in_join</string>
- <string>simulation_state_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -467,135 +330,6 @@ ORDER BY item.date DESC\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT \n
- item.aggregate_uid AS uid,\n
- item_catalog.path AS path,\n
- item.date AS date,\n
- item.node_uid AS node_uid,\n
- item.section_uid AS section_uid,\n
- item.resource_uid AS resource_uid,\n
- item.variation_text AS variation_text,\n
- item.uid AS delivery_uid\n
-FROM\n
- catalog as item_catalog\n
-<dtml-if from_table_list>\n
- <dtml-in prefix="table" expr="from_table_list"> \n
- <dtml-if expr="table_key != \'item\'">, <dtml-var table_item> AS <dtml-var table_key></dtml-if>\n
- </dtml-in>\n
-</dtml-if>\n
-<dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
-<dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
-, item\n
-\n
-\n
-<dtml-if join_on_item>\n
- LEFT JOIN \n
- item AS next_item\n
- ON (\n
- <dtml-if date_condition_in_join>\n
- <dtml-if expr="at_date is not None">\n
- next_item.date <= <dtml-sqlvar at_date type="string">\n
- <dtml-else>\n
- next_item.date < <dtml-sqlvar to_date type="string">\n
- </dtml-if>\n
- AND\n
- </dtml-if>\n
- next_item.aggregate_uid = item.aggregate_uid\n
- AND\n
- <dtml-if input>\n
- next_item.date < item.date\n
- <dtml-else>\n
- next_item.date > item.date\n
- </dtml-if>\n
- <dtml-if simulation_state_list>\n
- AND (\n
- <dtml-in simulation_state_list>\n
- next_item.simulation_state = <dtml-sqlvar sequence-item type="string"> \n
- <dtml-if sequence-end>\n
- <dtml-else>\n
- OR \n
- </dtml-if>\n
- </dtml-in>\n
- )\n
- </dtml-if>\n
- )\n
-</dtml-if>\n
-\n
-WHERE\n
- 1 = 1\n
-\n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-\n
- AND item_catalog.uid = item.aggregate_uid\n
-\n
-<dtml-if join_on_item>\n
- AND next_item.uid IS NULL\n
-</dtml-if>\n
-\n
-\n
-<dtml-if selection_domain>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'item\', join_column=\'node_uid\')">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
-</dtml-if>\n
-\n
-<dtml-if group_by_expression>\n
-GROUP BY <dtml-var group_by_expression>\n
-</dtml-if>\n
-\n
-<dtml-if order_by_expression>\n
-ORDER BY\n
- <dtml-var order_by_expression>\n
-<dtml-else>\n
-ORDER BY item.date DESC\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
index 189dc61171f24b2a514d828a3898188787819c4f..47a2bfed136c54b84711a7d380cc81f138984e2f 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
@@ -14,162 +14,6 @@
</list>
</value>
</item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>at_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>closed_summary</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_input</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_output</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>query</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>resource_uid</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>section_category</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_uids</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>simulation_state</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>to_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>query</string>
- <string>resource_uid</string>
- <string>from_date</string>
- <string>at_date</string>
- <string>to_date</string>
- <string>omit_simulation</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>simulation_state</string>
- <string>section_category</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>closed_summary</string>
- <string>where_expression</string>
- <string>from_table_list</string>
- <string>selection_uids</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -344,158 +188,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- IFNULL(COUNT(DISTINCT stock.uid), 0) AS count,\n
- IFNULL(SUM(stock.quantity), 0.00) AS quantity,\n
- IFNULL(SUM(stock.total_price), 0.00) AS total_price\n
-\n
-FROM\n
- <dtml-unless from_table_list>\n
- catalog,\n
- </dtml-unless>\n
- catalog AS child,\n
- stock,\n
- catalog AS node\n
- <dtml-if section_category>\n
- , catalog AS section_c\n
- , catalog AS section_bc\n
- , category AS section_membership\n
- , catalog AS section\n
- </dtml-if>\n
- <dtml-if query>\n
- , category\n
- </dtml-if>\n
- <dtml-if from_table_list>\n
- <dtml-in from_table_list>\n
- , <dtml-var sequence-item> AS <dtml-var sequence-key>\n
- </dtml-in>\n
- </dtml-if>\n
- <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
-\n
-WHERE\n
- child.uid = stock.uid\n
- AND catalog.uid = stock.node_uid\n
- <dtml-if where_expression> AND <dtml-var where_expression></dtml-if>\n
- <dtml-if resource_uid>\n
- AND\n
- (\n
- <dtml-in resource_uid>\n
- stock.resource_uid = <dtml-sqlvar sequence-item type="int">\n
- <dtml-if sequence-end><dtml-else> OR </dtml-if>\n
- </dtml-in>\n
- )\n
- </dtml-if>\n
- AND node.uid = stock.node_uid\n
- <dtml-if from_date>\n
- AND stock.date >= <dtml-sqlvar from_date type="datetime">\n
- </dtml-if>\n
- <dtml-if at_date>\n
- AND stock.date <= <dtml-sqlvar at_date type="datetime">\n
- </dtml-if>\n
- <dtml-if to_date>\n
- AND stock.date < <dtml-sqlvar to_date type="datetime">\n
- </dtml-if>\n
- <dtml-if omit_simulation>\n
- AND catalog.portal_type != \'Simulation Movement\'\n
- </dtml-if>\n
- <dtml-if omit_input>\n
- AND stock.quantity < 0\n
- AND (stock.node_uid <> stock.mirror_node_uid\n
- OR stock.section_uid <> stock.mirror_section_uid\n
- OR stock.mirror_node_uid IS NULL\n
- OR stock.mirror_section_uid IS NULL\n
- OR stock.payment_uid IS NOT NULL\n
- )\n
- </dtml-if>\n
- <dtml-if omit_output>\n
- AND stock.quantity > 0\n
- AND (stock.node_uid <> stock.mirror_node_uid\n
- OR stock.section_uid <> stock.mirror_section_uid\n
- OR stock.mirror_node_uid IS NULL\n
- OR stock.mirror_section_uid IS NULL\n
- OR stock.payment_uid IS NOT NULL\n
- )\n
- </dtml-if>\n
- <dtml-if simulation_state>\n
- AND\n
- (\n
- <dtml-in simulation_state>\n
- stock.simulation_state = <dtml-sqlvar sequence-item type="string">\n
- <dtml-if sequence-end><dtml-else> OR </dtml-if></dtml-in>\n
- )\n
- </dtml-if>\n
- <dtml-if section_category>\n
- AND section.uid = stock.section_uid\n
- AND section_c.relative_url = <dtml-sqlvar section_category type="string">\n
- AND section_membership.category_uid = section_c.uid\n
- AND section_membership.base_category_uid = section_bc.uid\n
- AND section_membership.uid = section.uid\n
- </dtml-if>\n
- <dtml-if query>\n
- AND category.uid = node.uid\n
- AND <dtml-var query>\n
- </dtml-if>\n
-\n
-<dtml-if selection_domain>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report)">\n
-</dtml-if>\n
-<dtml-if selection_uids>\n
- AND\n
- (\n
- <dtml-in selection_uids>\n
- node.uid = <dtml-sqlvar sequence-item type="int">\n
- <dtml-if sequence-end><dtml-else> OR </dtml-if></dtml-in>\n
- )\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 67ca558fb132b85ecc6761ce9c8f48240471fc28..ebe506e52533e5d94e00c1b11f93cac7abe50bd8 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-40838
\ No newline at end of file
+40839
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_alarm.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_alarm.xml
index e7b9287431530c0430bfec48540d6d439ad42e3c..0635bf74ad1c1c83c0eb550d9abe672fdc44429c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_alarm.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_alarm.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS alarm</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS alarm</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_catalog.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_catalog.xml
index da33ed31b72aa29faeaf271e10eca16bf3bc95b2..9bd892f1da5102dafb6ba96d94d0c479862907ba 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_catalog.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_catalog.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS catalog</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS catalog</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_category.xml
index a71ea0838a55e72b21c5985d2015c1df74ef1ab8..1f58caf8e2989428374800f56a54d0d7714ef3d4 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_category.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS category</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS category</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_delivery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_delivery.xml
index c09eaed0da2d5c1ac1d8ac442a62ec61bf653289..1af16bc5f1f9f862b2fff97f23114499684dcef3 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_delivery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_delivery.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -82,48 +55,6 @@
<value> <string>DROP TABLE IF EXISTS delivery\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS delivery\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.xml
index 63bca5a38cc745c77d76114c410259958387f60b..c9a106278b67975e5bbabedef7e9d418d063af10 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_fulltext.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS full_text</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS full_text</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_inventory.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_inventory.xml
index a1e16533614d7aa6945854d52dac9c31c2827ce9..2a1e83ef97201c89f8a1bb00fc9b05f5e88ede9e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_inventory.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_inventory.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS inventory</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS inventory</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_inventory_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_inventory_stock.xml
index 3b227eba13ff6e3293da1fd8971a82ee1ffff49c..526585076535ea500ad15d83b95711813e49da8f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_inventory_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_inventory_stock.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS inventory_stock</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS inventory_stock</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_item.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_item.xml
index 9464414f28d02951c998cfd8e9fa86c169e974aa..2a89347f0cd13b7db48a2f1fd048727a84e1ad95 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_item.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_item.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -82,48 +55,6 @@
<value> <string>DROP TABLE IF EXISTS item\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS item\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_measure.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_measure.xml
index 30700c076b5a9b73cb5ca876ce7c34a3e0866d4b..e04432372c87f796a1e4b016ce367a13298cf433 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_measure.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_measure.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS measure</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS measure</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_movement.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_movement.xml
index 7a2061a15d12f1c24e6c101eed7758907103d8fa..b4b6df0da9b6bca6d0b0bc47043cc0a3449fea98 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_movement.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_movement.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS movement</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS movement</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_predicate.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_predicate.xml
index d4c8514f28a224998addcfd8d7aceff0e45281d9..03728b61e1c2088f90c69efdd0106d4b3c9b6026 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_predicate.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_predicate.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -82,48 +55,6 @@
<value> <string>DROP TABLE IF EXISTS predicate\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS predicate\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_predicate_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_predicate_category.xml
index e84b987c321328ba515f6ab8deaa5215161bb96d..69c9972e7bd2c3dd9425b5b0244f1a17cc13b1ae 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_predicate_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_predicate_category.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -82,48 +55,6 @@
<value> <string>DROP TABLE IF EXISTS predicate_category\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS predicate_category\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_quantity_unit_conversion.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_quantity_unit_conversion.xml
index f65eda884f61280e99d3422f53e392b7908d3c31..86056a33abf8566f0256a45e64c5b42e59ef14db 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_quantity_unit_conversion.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_quantity_unit_conversion.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS quantity_unit_conversion</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS quantity_unit_conversion</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_record.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_record.xml
index 97f1632c7ddcdabe4c09ae3a66c0882e704000d1..933395036323cb0d4326f11c0952f57ef66c03b9 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_record.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_record.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS record</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS record</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_roles_and_users.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_roles_and_users.xml
index 8e68d6cce064c61c4f3a8ebb863229defa243873..397bda02e0fd6cafcb19f10ae130b0a98b4baf16 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_roles_and_users.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_roles_and_users.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS roles_and_users</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS roles_and_users</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_stock.xml
index 0425aa40eda199ae8ae607de7d4dd787434f2498..23905ad4cf48a4f05425d256fb9cb021698e96c6 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_stock.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS stock</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS stock</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.xml
index 60d88e084fb1cd308850dd069e20b9bee1857cc5..85123edde492eb48c82b761022aeb13f4a7613eb 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_subject.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS subject</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS subject</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_transformation.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_transformation.xml
index f4a9ac30ea027b896d0ab165c45a0de1afa9b8c3..e74dcc4271952f53b1d3985d2c10a066f298e18b 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_transformation.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_transformation.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS transformation</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS transformation</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_translation.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_translation.xml
index e5d527928f4e264fdd773ec2dd3ff9c196761bd6..a0d4c083ac61085ac16bb92f7c71ab83d4082e5f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_translation.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_translation.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -87,47 +60,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS translation</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS translation</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_versioning.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_versioning.xml
index 02951668666964873cec39cc7bb47c8f212a1624..5fd8941f5e2d4dc327346866b89640f43a1127f1 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_versioning.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_versioning.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -49,47 +22,6 @@
<key> <string>src</string> </key>
<value> <string>DROP TABLE IF EXISTS versioning;</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DROP TABLE IF EXISTS versioning;</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_alarm.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_alarm.xml
index 99de31a35e85aff91b53e8849826a3bfad7059f7..d2d7299e193261ff70fa17c565ff2692b7e23fa0 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_alarm.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_alarm.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@ DELETE FROM alarm WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM alarm WHERE <dtml-sqltest uid op=eq type=int>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_category.xml
index 5acd20c5ec38f9b30aa0e5b81bba35d8900db25d..31a097e6a8b5b3b2dda49fb6d3f646ff59777192 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_category.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM category WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.xml
index 1a6b44f88f23301def1c55f5561a5888cf9e639a..d707d07629ce0b4fa909276ced8863cc413c698e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_fulltext.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ DELETE FROM full_text WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM full_text WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory.xml
index efd80358f868258630f0660d3202cd332eee974f..e6accaafedfa40078305057a16c0ccc4c4d36733 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid</string> </value>
@@ -62,51 +26,6 @@ DELETE FROM inventory WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM inventory WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.xml
index 01880c3fbde932a412e106fdfaaa29c9e54a0716..2b98f796deff8208acba452d39cb82685388e9ea 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid</string> </value>
@@ -62,51 +26,6 @@ DELETE FROM inventory_stock WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM inventory_stock WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_item.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_item.xml
index a650dd0e5cbd6c2f48d6e8b52a47c7509c6caca2..fca3388f94ee8b448a3a5e66021adad7bbd07afc 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_item.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_item.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@ DELETE FROM item WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM item WHERE <dtml-sqltest uid op=eq type=int>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_measure.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_measure.xml
index 4f761f7996d2beec80eb85e4ec424e0e12acd7f0..441dfb8150ad3a63501784a203091157ae7e2d62 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_measure.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_measure.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -104,61 +68,6 @@ WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>\n
- JM: Since unindexing a measure triggers the reindexing of the related\n
- resource (what will clean the measure table - cf z0_catalog_measure_list),\n
- is it required to delete according to uid column?\n
- The test against metric_type_uid is there in case we delete a metric_type_uid\n
- category that is used as an implicit measure.\n
-</dtml-comment>\n
-DELETE FROM measure\n
-WHERE <dtml-sqltest uid op=eq type=int>\n
- OR <dtml-sqltest uid op=eq type=int column="metric_type_uid">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_movement.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_movement.xml
index d1b9bfd82a74808eb79a295ef6a75ac782ce2ce9..2446d3c624b59c3a250bc7e3ca27338f3ff78d64 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_movement.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_movement.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM movement WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_predicate.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_predicate.xml
index 8f421fa770fdbef391f61203304b281f5771623d..925bb599c11d41bc92c39ee32fe7bd0592d12c5c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_predicate.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_predicate.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@ DELETE FROM predicate WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM predicate WHERE <dtml-sqltest uid op=eq type=int>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_predicate_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_predicate_category.xml
index ebd0aacf4b0aa6f16b5cabc66e43455e39c39c5e..5897f0c9f4bb9ef53a26b76c58387480d1cda22e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_predicate_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_predicate_category.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@ DELETE FROM predicate_category WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM predicate_category WHERE <dtml-sqltest uid op=eq type=int>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_quantity_unit_conversion.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_quantity_unit_conversion.xml
index 7f1ca88b70bf0962a46f217ab4fcc7fffcbbb28d..bee1cafd9a010f1c15f075210aca772f8b40e705 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_quantity_unit_conversion.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_quantity_unit_conversion.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid</string> </value>
@@ -63,52 +27,6 @@ WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM quantity_unit_conversion\n
-WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_stock.xml
index 1784a58be1824462e9c60d2f1c166c764c20eb03..1bff1076df06fe2a8032e947bd4472b342811185 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM stock WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_transformation.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_transformation.xml
index 251182b570b9baca3a0d0f4ec615a55d8e817142..b1f6d7d00d8ba3631899e6413fba96f77231cd0b 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_transformation.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_transformation.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid</string> </value>
@@ -63,52 +27,6 @@ WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM transformation\n
-WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_versioning.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_versioning.xml
index dce84bd7563e31c17eb401818b1139c877454f4f..60765083f325dc2795d9c6f3b3d5c2039a289c33 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_versioning.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_versioning.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ DELETE FROM versioning WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM versioning WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_alarm_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_alarm_list.xml
index 347e5de47ff7a27adc268acb6373cdf137538145..f1a1e20a44579dcbe2f956e2983dc89667860937 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_alarm_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_alarm_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getAlarmDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getAlarmDate</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -112,61 +69,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-REPLACE INTO\n
- alarm (uid, alarm_date)\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getAlarmDate[loop_item]" type="datetime" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml
index 4d50ed7b226c9061fd3db982f9e137e95be38288..649aaf493ffef4a0bd79c7e5b7a60525c0c8c6d2 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml
@@ -6,126 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getDestinationSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getResourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDateRangeMax</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDateRangeMin</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDateRangeMax</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDateRangeMin</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isDelivery</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>isDelivery</string>
- <string>uid</string>
- <string>getSourceUid</string>
- <string>getDestinationUid</string>
- <string>getSourceSectionUid</string>
- <string>getDestinationSectionUid</string>
- <string>getResourceUid</string>
- <string>getStartDate</string>
- <string>getStartDateRangeMin</string>
- <string>getStartDateRangeMax</string>
- <string>getStopDate</string>
- <string>getStopDateRangeMin</string>
- <string>getStopDateRangeMax</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -219,80 +99,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let delivery_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isDelivery[loop_item]">\n
- <dtml-call expr="delivery_list.append(loop_item)">\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="_.len(delivery_list) > 0">\n
-REPLACE INTO\n
- delivery\n
-VALUES\n
- <dtml-in prefix="loop" expr="delivery_list">\n
-( \n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getSourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getSourceSectionUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStartDateRangeMin[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStartDateRangeMax[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStopDateRangeMin[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStopDateRangeMax[loop_item]" type="datetime" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.xml
index 20992f198c29775acc0e61abf57ce788b3461469..9615d9d7e9b11dc691124067cf85d87d0fdf837a 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_fulltext_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>SearchableText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>SearchableText</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -115,64 +72,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-REPLACE INTO\n
- full_text\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="SearchableText[loop_item]" type="string" optional>\n
-)\n
-<dtml-if sequence-end>\n
-<dtml-else>\n
-,\n
-</dtml-if>\n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml
index f894e34b21620e2a7c90477c2f95f642610fb9c3..78e01d5bbc481fcf3e5ebec8a5a98c92626d5b40 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_list.xml
@@ -6,91 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getDestinationPaymentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSimulationState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isFullInventory</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isInventory</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>isInventory</string>
- <string>uid</string>
- <string>getDestinationUid</string>
- <string>getDestinationSectionUid</string>
- <string>getDestinationPaymentUid</string>
- <string>getStartDate</string>
- <string>isFullInventory</string>
- <string>getSimulationState</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>isInventory\r\n
@@ -151,84 +66,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let row_list="[]">\n
-\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if expr="isInventory[loop_item]">\n
- <dtml-if expr="getStartDate[loop_item] is not None">\n
- <dtml-call expr="row_list.append((\n
- uid[loop_item],\n
- getDestinationUid[loop_item],\n
- getDestinationSectionUid[loop_item],\n
- getDestinationPaymentUid[loop_item],\n
- getStartDate[loop_item],\n
- isFullInventory[loop_item],\n
- getSimulationState[loop_item]))">\n
- </dtml-if>\n
- </dtml-if>\n
-</dtml-in>\n
-\n
-<dtml-if expr="len(row_list)">\n
-REPLACE INTO\n
- inventory\n
- (`uid`, `node_uid`, `section_uid`, `payment_uid`, `date`, `is_full_inventory`, `simulation_state`)\n
-VALUES\n
-<dtml-in prefix="row" expr="row_list">\n
- (<dtml-sqlvar expr="row_item[0]" type="int">,\n
- <dtml-sqlvar expr="row_item[1]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[2]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[3]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[4]" type="datetime">,\n
- <dtml-sqlvar expr="row_item[5] or 0" type="int">,\n
- <dtml-sqlvar expr="row_item[6]" type="string">\n
- )<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-</dtml-if>\n
-</dtml-let>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml
index bc688e852f321d3da3a8243a6711331e3e61f57f..6bf523ad91647452dc2297235362f348a6d5a036 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml
@@ -6,196 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getDestinationFunctionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationInventoriatedTotalAssetPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationPaymentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationProjectUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getInventoriatedQuantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPortalType</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getResourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSimulationState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceFunctionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceInventoriatedTotalAssetPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourcePaymentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceProjectUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSubVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isAccountable</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getResourceUid</string>
- <string>getInventoriatedQuantity</string>
- <string>getSourceUid</string>
- <string>getDestinationUid</string>
- <string>getSourceSectionUid</string>
- <string>getDestinationSectionUid</string>
- <string>isMovement</string>
- <string>getSourcePaymentUid</string>
- <string>getDestinationPaymentUid</string>
- <string>getSourceFunctionUid</string>
- <string>getDestinationFunctionUid</string>
- <string>getSourceProjectUid</string>
- <string>getDestinationProjectUid</string>
- <string>getSimulationState</string>
- <string>getSourceInventoriatedTotalAssetPrice</string>
- <string>getDestinationInventoriatedTotalAssetPrice</string>
- <string>getStartDate</string>
- <string>getStopDate</string>
- <string>isAccountable</string>
- <string>getPortalType</string>
- <string>getVariationText</string>
- <string>getSubVariationText</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
@@ -326,139 +136,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM\n
- inventory_stock\n
-WHERE\n
-<dtml-in uid>\n
- uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-\n
-<dtml-var sql_delimiter>\n
-\n
-<dtml-let row_list="[]" uid_dict="{}">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
- <dtml-if "getDestinationUid[loop_item]">\n
- <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
- <dtml-call expr="row_list.append([\n
- uid[loop_item], \n
- uid_dict[uid[loop_item]],\n
- getDestinationUid[loop_item],\n
- getDestinationSectionUid[loop_item],\n
- getDestinationPaymentUid[loop_item],\n
- getDestinationFunctionUid[loop_item],\n
- getDestinationProjectUid[loop_item], \n
- getSourceSectionUid[loop_item], \n
- getSourceUid[loop_item], \n
- getResourceUid[loop_item],\n
- getInventoriatedQuantity[loop_item],\n
- getStopDate[loop_item], \n
- getStartDate[loop_item], \n
- getDestinationInventoriatedTotalAssetPrice[loop_item], \n
- getPortalType[loop_item], \n
- getSimulationState[loop_item], \n
- getVariationText[loop_item],\n
- getSubVariationText[loop_item]])">\n
- </dtml-if>\n
- <dtml-if "getSourceUid[loop_item]">\n
- <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
- <dtml-call expr="row_list.append([\n
- uid[loop_item], \n
- uid_dict[uid[loop_item]],\n
- getSourceUid[loop_item],\n
- getSourceSectionUid[loop_item],\n
- getSourcePaymentUid[loop_item],\n
- getSourceFunctionUid[loop_item],\n
- getSourceProjectUid[loop_item], \n
- getDestinationSectionUid[loop_item], \n
- getDestinationUid[loop_item], \n
- getResourceUid[loop_item],\n
- -(getInventoriatedQuantity[loop_item] or 0), \n
- getStartDate[loop_item], \n
- getStopDate[loop_item],\n
- getSourceInventoriatedTotalAssetPrice[loop_item], \n
- getPortalType[loop_item], \n
- getSimulationState[loop_item], \n
- getVariationText[loop_item],\n
- getSubVariationText[loop_item]])">\n
- </dtml-if>\n
- </dtml-if>\n
- </dtml-in> \n
- \n
- <dtml-if "row_list">\n
-INSERT INTO\n
- inventory_stock\n
-VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(\n
- <dtml-sqlvar expr="row_item[0]" type="int">,\n
- <dtml-sqlvar expr="row_item[1]" type="int">,\n
- <dtml-sqlvar expr="row_item[2]" type="int">,\n
- <dtml-sqlvar expr="row_item[3]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[4]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[5]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[6]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[7]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[8]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[9]" type="int">, \n
- <dtml-sqlvar expr="row_item[10]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[11]" type="datetime" optional>,\n
- <dtml-sqlvar expr="row_item[12]" type="datetime" optional>,\n
- <dtml-sqlvar expr="row_item[13]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[14]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[15]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[16]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[17]" type="string" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml
index 758e8577b3047692f1dd24f8536bbb28684efdf6..26332af8132aaf8c6f964440cb0a711ff9f87e97 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml
@@ -6,105 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getAggregateUidList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getResourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSimulationState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isAccountable</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>isMovement</string>
- <string>isAccountable</string>
- <string>uid</string>
- <string>getStopDate</string>
- <string>getDestinationUid</string>
- <string>getDestinationSectionUid</string>
- <string>getResourceUid</string>
- <string>getVariationText</string>
- <string>getSimulationState</string>
- <string>getAggregateUidList</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -210,95 +111,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM\n
- item\n
-WHERE\n
-<dtml-in uid>\n
- uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-;\n
-\n
-<dtml-var "\'\\0\'">\n
-\n
-<dtml-let movement_list="[]" uid_dict="{}">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isMovement[loop_item] and isAccountable[loop_item] and getAggregateUidList[loop_item]">\n
- <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
- <dtml-call expr="movement_list.append(loop_item)">\n
-\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="_.len(movement_list) > 0">\n
-INSERT INTO\n
- item\n
-VALUES\n
- <dtml-in prefix="loop" expr="movement_list">\n
- <dtml-in "getAggregateUidList[loop_item]">\n
- \n
-( \n
- <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="uid_dict[uid[loop_item]]" type="int">,\n
- <dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar sequence-item type="int" optional>,\n
- <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getSimulationState[loop_item]" type="string" optional>\n
-)\n
- <dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- <dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_measure_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_measure_list.xml
index cfd5fd86f3db5d57ae5e2499c95c902166cd1db7..5ab899e2da738c8e6a3bac0c0d12ff0600457e69 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_measure_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_measure_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getMeasureRowList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getMeasureRowList</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -128,77 +85,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM `measure` WHERE\n
- <dtml-sqltest uid column="resource_uid" type="int" multiple>;\n
-\n
-<dtml-let measure_list="[]">\n
- <dtml-in getMeasureRowList prefix="loop">\n
- <dtml-call expr="loop_item and measure_list.extend(loop_item)">\n
- </dtml-in>\n
-\n
- <dtml-if measure_list>\n
- <dtml-var sql_delimiter>\n
-\n
-INSERT INTO `measure`\n
-VALUES\n
- <dtml-in measure_list prefix="loop">\n
-(\n
- <dtml-sqlvar expr="loop_item[\'uid\']" type="int">,\n
- <dtml-sqlvar expr="loop_item[\'resource_uid\']" type="int">,\n
- <dtml-sqlvar expr="loop_item[\'variation\']" type="string">,\n
- <dtml-sqlvar expr="loop_item[\'metric_type_uid\']" type="int">,\n
- <dtml-sqlvar expr="loop_item[\'quantity\']" type="float">\n
-)\n
-<dtml-unless sequence-end>,</dtml-unless>\n
- </dtml-in>\n
-\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_category_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_category_list.xml
index 51e123100a369f23ae6c01c85b227358780f148c..8406a6e3502c1637082e2be44f9822abf55c6297 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_category_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_category_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getCategoryList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getCategoryList</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -124,73 +81,6 @@ INSERT INTO category VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM\n
- category\n
-WHERE\n
-<dtml-in uid>\n
- uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-;\n
-<dtml-var "\'\\0\'">\n
-<dtml-let category_list="[]">\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-<dtml-if expr="getCategoryList[loop_item]">\n
-<dtml-let uid_list="portal_categories.getCategoryParentUidList(getCategoryList[loop_item])">\n
-<dtml-if uid_list>\n
-<dtml-in prefix="uid" expr="uid_list">\n
-<dtml-call expr="category_list.append((uid[loop_item], uid_item[0], uid_item[1], uid_item[2]))">\n
-</dtml-in></dtml-if></dtml-let></dtml-if></dtml-in>\n
-<dtml-if expr="category_list">\n
-INSERT INTO category VALUES\n
-<dtml-in prefix="loop" expr="category_list">\n
-(<dtml-sqlvar expr="loop_item[0]" type="int">, <dtml-sqlvar expr="loop_item[1]" type="int">, <dtml-sqlvar expr="loop_item[2]" type="int">, <dtml-sqlvar expr="loop_item[3]" type="int">)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-</dtml-if>\n
-</dtml-let>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
index a3104a44a7f72958635a99793e700ad1768c5205..c41b2bb8335afcd8163fc5e9a43824e7362f437c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
@@ -6,126 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getExplanationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getQuantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getResourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isAccountable</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isDivergent</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>isMovement</string>
- <string>uid</string>
- <string>getExplanationUid</string>
- <string>getSourceUid</string>
- <string>getDestinationUid</string>
- <string>getResourceUid</string>
- <string>getQuantity</string>
- <string>getStartDate</string>
- <string>getStopDate</string>
- <string>getPrice</string>
- <string>isAccountable</string>
- <string>isDivergent</string>
- <string>getVariationText</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -227,88 +107,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM\n
- movement\n
-WHERE\n
-<dtml-in uid>\n
- uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-;\n
-\n
-<dtml-var "\'\\0\'"><dtml-let movement_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isMovement[loop_item]">\n
- <dtml-call expr="movement_list.append(loop_item)">\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="_.len(movement_list) > 0">\n
-INSERT INTO\n
- movement\n
-VALUES\n
- <dtml-in prefix="loop" expr="movement_list">\n
-( \n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getSourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getQuantity[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isDivergent[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_non_movement_category_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_non_movement_category_list.xml
index 827b57333ba8b985a57e57996571c9416eb75611..4a95e43c0aab581f51ca5d1cbc6de22c1335d72c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_non_movement_category_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_non_movement_category_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getAcquiredCategoryList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getAcquiredCategoryList</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -124,73 +81,6 @@ INSERT INTO category VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM\n
- category\n
-WHERE\n
-<dtml-in uid>\n
- uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-;\n
-<dtml-var "\'\\0\'">\n
-<dtml-let category_list="[]">\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-<dtml-if expr="getAcquiredCategoryList[loop_item]">\n
-<dtml-let uid_list="portal_categories.getCategoryParentUidList(getAcquiredCategoryList[loop_item])">\n
-<dtml-if uid_list>\n
-<dtml-in prefix="uid" expr="uid_list">\n
-<dtml-call expr="category_list.append((uid[loop_item], uid_item[0], uid_item[1], uid_item[2]))">\n
-</dtml-in></dtml-if></dtml-let></dtml-if></dtml-in> \n
-<dtml-if expr="category_list">\n
-INSERT INTO category VALUES\n
-<dtml-in prefix="loop" expr="category_list">\n
-(<dtml-sqlvar expr="loop_item[0]" type="int">, <dtml-sqlvar expr="loop_item[1]" type="int">, <dtml-sqlvar expr="loop_item[2]" type="int">, <dtml-sqlvar expr="loop_item[3]" type="int">)<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-</dtml-if>\n
-</dtml-let>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
index 9e9729fcfdd4684fc8ed73133cb128ee16833c47..bad9f8d78ba27422ae94ac6265e92fd5448bea9a 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
@@ -6,259 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getCausalityState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getCorporateRegistrationCode</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getCreationDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDescription</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationReference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getEan13Code</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getEventState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getFloatIndex</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getGroupingReference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getImmobilisationState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getIntIndex</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getInvoiceState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getModificationDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getOpportunityState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getOwnerInfo</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getParentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPath</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPaymentState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPortalType</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getReference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getRelativeUrl</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSimulationState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceReference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStringIndex</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getTitle</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getValidationState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getViewPermissionOwner</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>hasCellContent</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>meta_type</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>security_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>security_uid</string>
- <string>getOwnerInfo</string>
- <string>getViewPermissionOwner</string>
- <string>getPath</string>
- <string>getRelativeUrl</string>
- <string>getParentUid</string>
- <string>id</string>
- <string>getDescription</string>
- <string>getTitle</string>
- <string>meta_type</string>
- <string>getPortalType</string>
- <string>getOpportunityState</string>
- <string>getCorporateRegistrationCode</string>
- <string>getEan13Code</string>
- <string>getSimulationState</string>
- <string>getCausalityState</string>
- <string>getInvoiceState</string>
- <string>getValidationState</string>
- <string>getPaymentState</string>
- <string>getEventState</string>
- <string>getImmobilisationState</string>
- <string>getReference</string>
- <string>getGroupingReference</string>
- <string>getSourceReference</string>
- <string>getDestinationReference</string>
- <string>getStringIndex</string>
- <string>getIntIndex</string>
- <string>getFloatIndex</string>
- <string>hasCellContent</string>
- <string>getCreationDate</string>
- <string>getModificationDate</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -387,96 +134,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-REPLACE INTO\n
- catalog\n
- (`uid`, `security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,\n
- `portal_type`, `opportunity_state`, `corporate_registration_code`, `ean13_code`, `validation_state`, `simulation_state`,\n
- `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`,\n
- `source_reference`, `destination_reference`, `string_index`, `int_index`, `float_index`, `has_cell_content`, `creation_date`,\n
- `modification_date`)\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getOwnerInfo[loop_item][\'id\']" type="string">,\n
- <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or \'\'" type="string" optional>,\n
- <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
- <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
- <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDescription[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getTitle[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="meta_type[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getOpportunityState[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getEan13Code[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getValidationState[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getSimulationState[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getCausalityState[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getInvoiceState[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getPaymentState[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getEventState[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getImmobilisationState[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getGroupingReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getDestinationReference[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getIntIndex[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getFloatIndex[loop_item]" type="float" optional>,\n
- <dtml-sqlvar expr="hasCellContent[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getCreationDate[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getModificationDate[loop_item]" type="datetime" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_paths.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_paths.xml
index 3135fa7298ccabcd7b92e9b0521b0121dea8a799..6ff864fa64b695304d05b4dc3c3f6ea3c66e64d4 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_paths.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_paths.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>select distinct path from catalog</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>select distinct path from catalog</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_category_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_category_list.xml
index 62d1e3a74e961359b750946dd6328cf56ac93d6d..9954d9ff6bb9209dd4e5c3cc6e02915de8d54bbc 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_category_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_category_list.xml
@@ -6,63 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getObject</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isPredicate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>predicate_property_dict</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>predicate_property_dict</string>
- <string>isPredicate</string>
- <string>getObject</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -155,88 +98,6 @@ INSERT INTO predicate_category VALUES \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM\n
- predicate_category\n
-WHERE\n
-<dtml-in uid>\n
- uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-;\n
-\n
-<dtml-var "\'\\0\'">\n
-\n
-<dtml-let predicate_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isPredicate[loop_item]">\n
- <dtml-call expr="predicate_list.append(loop_item)">\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="_.len(predicate_list) > 0">\n
-INSERT INTO predicate_category VALUES \n
- <dtml-in prefix="loop" expr="predicate_list">\n
- <dtml-if sequence-start><dtml-else>,</dtml-if>\n
- <dtml-if "predicate_property_dict[loop_item].has_key(\'membership_criterion_category_list\')">\n
- <dtml-let uid_list="portal_categories.CategoryTool_getPreferredPredicateCategoryParentUidItemList(predicate_property_dict[loop_item][\'membership_criterion_category_list\'], getObject[loop_item])">\n
- <dtml-if uid_list>\n
- <dtml-in "uid_list">\n
-(<dtml-sqlvar expr="uid[loop_item]" type="int">, <dtml-var "_[\'sequence-item\'][0]" >, <dtml-var "_[\'sequence-item\'][1]" >, <dtml-var "_[\'sequence-item\'][2]" >)\n
- <dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in> \n
- <dtml-else>\n
-(<dtml-sqlvar expr="uid[loop_item]" type="int">, 0, 0,1)\n
- </dtml-if>\n
- </dtml-let>\n
- <dtml-else>\n
-(<dtml-sqlvar expr="uid[loop_item]" type="int">, 0, 0,1)\n
- </dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_list.xml
index e1078560147d84cb1655e2a2fd99ad7c4288f3d1..f86272b955dbe71db63f8fae45bb78fed1788ab4 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_list.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>isPredicate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>predicate_property_dict</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>isPredicate</string>
- <string>predicate_property_dict</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -132,73 +82,6 @@ REPLACE INTO predicate VALUES \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let predicate_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isPredicate[loop_item]">\n
- <dtml-call expr="predicate_list.append(loop_item)">\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="_.len(predicate_list) > 0">\n
-REPLACE INTO predicate VALUES \n
- <dtml-in prefix="loop" expr="predicate_list">\n
- <dtml-if sequence-start><dtml-else>,</dtml-if>\n
-( \n
- <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="predicate_property_dict[loop_item].get(\'quantity\', None)" type="float" optional>,\n
- <dtml-sqlvar expr="predicate_property_dict[loop_item].get(\'quantity_range_min\', None)" type="float" optional>,\n
- <dtml-sqlvar expr="predicate_property_dict[loop_item].get(\'quantity_range_max\', None)" type="float" optional>,\n
- <dtml-sqlvar expr="predicate_property_dict[loop_item].get(\'start_date\', None)" type="datetime" optional>,\n
- <dtml-sqlvar expr="predicate_property_dict[loop_item].get(\'start_date_range_min\', None)" type="datetime" optional>,\n
- <dtml-sqlvar expr="predicate_property_dict[loop_item].get(\'start_date_range_max\', None)" type="datetime" optional>\n
-)\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.xml
index a73cc892097c91dae8913251316f1f9bd2ccfa0b..480c6702f9cd20b0aa3f460cdf5f63d60b216e37 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getQuantityUnitConversionDefinitionRowList</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getQuantityUnitConversionDefinitionRowList</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
@@ -108,88 +65,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let quantity_unit_conversion_dict="{}" value_list="[]">\n
- <dtml-in getQuantityUnitConversionDefinitionRowList\n
- prefix="loop">\n
- <dtml-if loop_item>\n
- <dtml-comment>\n
- Make sure that we get no duplicates, and also aggregate the uids of the modified resources for deletion\n
- </dtml-comment>\n
- <dtml-in loop_item prefix="inner">\n
- <dtml-call expr="quantity_unit_conversion_dict.setdefault(inner_item[\'resource_uid\'], {}).setdefault(inner_item[\'quantity_unit_uid\'], inner_item)">\n
- </dtml-in>\n
- </dtml-if>\n
- </dtml-in>\n
-\n
-<dtml-if quantity_unit_conversion_dict>\n
-DELETE FROM `quantity_unit_conversion` WHERE\n
- <dtml-sqltest "quantity_unit_conversion_dict.keys()" column="resource_uid" type="int" multiple>;\n
-\n
-\n
- <dtml-var sql_delimiter>\n
-\n
-<dtml-in "quantity_unit_conversion_dict.values()" prefix="loop">\n
- <dtml-call "value_list.extend(loop_item.values())">\n
-</dtml-in>\n
-\n
-INSERT INTO `quantity_unit_conversion`\n
-VALUES\n
- <dtml-in "value_list" prefix="loop">\n
-(\n
- <dtml-sqlvar expr="loop_item[\'uid\']" type="int" optional>,\n
- <dtml-sqlvar expr="loop_item[\'resource_uid\']" type="int">,\n
- <dtml-sqlvar expr="loop_item[\'quantity_unit_uid\']" type="int">,\n
- <dtml-sqlvar expr="loop_item[\'quantity\']" type="float">\n
-)\n
-<dtml-unless sequence-end>,</dtml-unless>\n
- </dtml-in>\n
-</dtml-if>\n
-\n
-</dtml-let>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_roles_and_users_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_roles_and_users_list.xml
index 54a5989865fab866fa442818d00a957330535bed..ac44e094f7b8008b8762e5ad1f603532d0aef6ef 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_roles_and_users_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_roles_and_users_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>optimised_roles_and_users</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>security_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>security_uid</string>
- <string>optimised_roles_and_users</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -120,69 +77,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let row_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(security_uid))">\n
- <dtml-if expr="optimised_roles_and_users[loop_item]">\n
- <dtml-in prefix="role" expr="optimised_roles_and_users[loop_item]">\n
- <dtml-call expr="row_list.append([security_uid[loop_item], role_item])">\n
- </dtml-in>\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="row_list">\n
-INSERT INTO\n
- roles_and_users\n
-VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(<dtml-sqlvar expr="row_item[0]" type="string">, <dtml-sqlvar expr="row_item[1]" type="string">)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
index c75cd8ed9e67b2aa49357772a064810c95963447..4a297e668de2025b11fee3f0acde30def85a128f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
@@ -6,210 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getDestinationFunctionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationInventoriatedTotalAssetPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationPaymentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationProjectUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getDestinationUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getInventoriatedQuantity</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getPortalType</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getResourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSimulationState</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceFunctionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceInventoriatedTotalAssetPrice</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourcePaymentUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceProjectUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceSectionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSourceUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStartDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getStopDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getSubVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getVariationText</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isAccountable</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isCancellationAmount</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isInventoryMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getResourceUid</string>
- <string>getInventoriatedQuantity</string>
- <string>getSourceUid</string>
- <string>getDestinationUid</string>
- <string>getSourceSectionUid</string>
- <string>getDestinationSectionUid</string>
- <string>isMovement</string>
- <string>isCancellationAmount</string>
- <string>isInventoryMovement</string>
- <string>getSourcePaymentUid</string>
- <string>getDestinationPaymentUid</string>
- <string>getSourceFunctionUid</string>
- <string>getDestinationFunctionUid</string>
- <string>getSourceProjectUid</string>
- <string>getDestinationProjectUid</string>
- <string>getSimulationState</string>
- <string>getSourceInventoriatedTotalAssetPrice</string>
- <string>getDestinationInventoriatedTotalAssetPrice</string>
- <string>getStartDate</string>
- <string>getStopDate</string>
- <string>isAccountable</string>
- <string>getPortalType</string>
- <string>getVariationText</string>
- <string>getSubVariationText</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -378,143 +174,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM\n
- stock\n
-WHERE\n
-<dtml-in uid>\n
- uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-;\n
-\n
-<dtml-var "\'\\0\'">\n
-\n
-<dtml-let row_list="[]" uid_dict="{}">\n
- <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "not(isInventoryMovement[loop_item]) and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
- <dtml-if "getDestinationUid[loop_item]">\n
- <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
- <dtml-call expr="row_list.append([\n
- uid[loop_item], \n
- uid_dict[uid[loop_item]],\n
- getDestinationUid[loop_item],\n
- getDestinationSectionUid[loop_item],\n
- getDestinationPaymentUid[loop_item],\n
- getDestinationFunctionUid[loop_item],\n
- getDestinationProjectUid[loop_item], \n
- getSourceSectionUid[loop_item], \n
- getSourceUid[loop_item], \n
- getResourceUid[loop_item],\n
- getInventoriatedQuantity[loop_item],\n
- isCancellationAmount[loop_item],\n
- getStopDate[loop_item], \n
- getStartDate[loop_item], \n
- getDestinationInventoriatedTotalAssetPrice[loop_item], \n
- getPortalType[loop_item], \n
- getSimulationState[loop_item], \n
- getVariationText[loop_item],\n
- getSubVariationText[loop_item]])">\n
- </dtml-if>\n
- <dtml-if "getSourceUid[loop_item]">\n
- <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
- <dtml-call expr="row_list.append([\n
- uid[loop_item], \n
- uid_dict[uid[loop_item]],\n
- getSourceUid[loop_item],\n
- getSourceSectionUid[loop_item],\n
- getSourcePaymentUid[loop_item],\n
- getSourceFunctionUid[loop_item],\n
- getSourceProjectUid[loop_item], \n
- getDestinationSectionUid[loop_item], \n
- getDestinationUid[loop_item], \n
- getResourceUid[loop_item],\n
- -(getInventoriatedQuantity[loop_item] or 0), \n
- isCancellationAmount[loop_item],\n
- getStartDate[loop_item], \n
- getStopDate[loop_item],\n
- getSourceInventoriatedTotalAssetPrice[loop_item], \n
- getPortalType[loop_item], \n
- getSimulationState[loop_item], \n
- getVariationText[loop_item],\n
- getSubVariationText[loop_item]])">\n
- </dtml-if>\n
- </dtml-if>\n
- </dtml-in> \n
- \n
- <dtml-if "row_list">\n
-INSERT INTO\n
- stock\n
-VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(\n
- <dtml-sqlvar expr="row_item[0]" type="int">,\n
- <dtml-sqlvar expr="row_item[1]" type="int">,\n
- <dtml-sqlvar expr="row_item[2]" type="int">, \n
- <dtml-sqlvar expr="row_item[3]" type="int" optional>, \n
- <dtml-sqlvar expr="row_item[4]" type="int" optional>, \n
- <dtml-sqlvar expr="row_item[5]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[6]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[7]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[8]" type="int" optional>,\n
- <dtml-sqlvar expr="row_item[9]" type="int">, \n
- <dtml-sqlvar expr="row_item[10]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[11]" type="int">, \n
- <dtml-sqlvar expr="row_item[12]" type="datetime" optional>,\n
- <dtml-sqlvar expr="row_item[13]" type="datetime" optional>,\n
- <dtml-sqlvar expr="row_item[14]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[15]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[16]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[17]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[18]" type="string" optional>\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.xml
index becac6e8570c768af0928405cc9ef5a66781a732..533998cb8c0abc008e1a1a69905dc5686b980649 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_subject_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>optimised_subject_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>subject_set_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>subject_set_uid</string>
- <string>optimised_subject_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -121,70 +78,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let row_list="[]">\n
- <dtml-in prefix="loop" expr="_.range(_.len(subject_set_uid))">\n
- <dtml-if expr="optimised_subject_list[loop_item]">\n
- <dtml-in prefix="role" expr="optimised_subject_list[loop_item]">\n
- <dtml-call expr="row_list.append([subject_set_uid[loop_item], role_item])">\n
- </dtml-in>\n
- </dtml-if>\n
- </dtml-in>\n
- <dtml-if expr="row_list">\n
-INSERT INTO\n
- subject\n
- (`subject_set_uid`, `subject`)\n
-VALUES\n
- <dtml-in prefix="row" expr="row_list">\n
-(<dtml-sqlvar expr="row_item[0]" type="string">, <dtml-sqlvar expr="row_item[1]" type="string">)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
- </dtml-in>\n
- </dtml-if>\n
-</dtml-let>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_transformation_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_transformation_list.xml
index 50c99e0e429434b212b76fb8dc10786af150a18d..def7d9111326243d9abb8b14dcd8ca90a1209ad2 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_transformation_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_transformation_list.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>row_dict_dict_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>row_dict_dict_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -120,77 +84,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let row_list="[]">\n
-<dtml-in row_dict_dict_list prefix="outer">\n
-DELETE FROM `transformation` WHERE\n
- <dtml-sqltest expr="outer_item[\'uid\']" column="uid" type="int">\n
- AND\n
- <dtml-sqltest expr="outer_item[\'variation_text\']" column="variation_text" type="string">;\n
-<dtml-var sql_delimiter>\n
-<dtml-call "row_list.extend(outer_item[\'row_dict_list\'])">\n
-</dtml-in>\n
-\n
-<dtml-if "len(row_list)>0">\n
-<dtml-var sql_delimiter>\n
-\n
-INSERT INTO `transformation`\n
-VALUES\n
- <dtml-in row_list prefix="loop">\n
-(\n
- <dtml-sqlvar expr="loop_item[\'uid\']" type="int">,\n
- <dtml-sqlvar expr="loop_item[\'variation_text\']" type="string">,\n
- <dtml-sqlvar expr="loop_item[\'transformed_uid\']" type="int">,\n
- <dtml-sqlvar expr="loop_item[\'transformed_variation_text\']" type="string">,\n
- <dtml-sqlvar expr="loop_item[\'quantity\']" type="float">\n
-)\n
-<dtml-unless sequence-end>,</dtml-unless>\n
- </dtml-in>\n
-</dtml-if>\n
-</dtml-let>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_translation_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_translation_list.xml
index 0c584b0038e43b67bc9523cb4ab13c75b9ebc420..d574ea4d5af7c8b15271414047731c5a42356c0f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_translation_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_translation_list.xml
@@ -6,70 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>language</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>message_context</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>original_message</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>translated_message</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>language</string>
- <string>message_context</string>
- <string>portal_type</string>
- <string>original_message</string>
- <string>translated_message</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -137,62 +73,6 @@ INSERT INTO translation VALUES \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO translation VALUES \n
-<dtml-in prefix="loop" expr="_.range(_.len(language))">\n
-(\n
- <dtml-sqlvar expr="language[loop_item]" type="string">,\n
- <dtml-sqlvar expr="message_context[loop_item]" type="string">,\n
- <dtml-sqlvar expr="portal_type[loop_item]" type="string">,\n
- <dtml-sqlvar expr="original_message[loop_item]" type="string">,\n
- <dtml-sqlvar expr="translated_message[loop_item]" type="string">\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_versioning_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_versioning_list.xml
index 1dfb4b5ada87fdc28c26edf3846b604cb9fb4496..9dde770693f71f34c7e2c7a2cfe37f09a86ccab4 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_versioning_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_versioning_list.xml
@@ -6,98 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>getCreationDateIndex</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getEffectiveDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getExpirationDate</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getFrequencyIndex</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getLanguage</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getRevision</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getVersion</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>subject_set_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>getLanguage</string>
- <string>getVersion</string>
- <string>getRevision</string>
- <string>subject_set_uid</string>
- <string>getEffectiveDate</string>
- <string>getExpirationDate</string>
- <string>getCreationDateIndex</string>
- <string>getFrequencyIndex</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -187,73 +95,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-REPLACE INTO\n
- versioning\n
- (`uid`, `version`, `language`, `revision`, `subject_set_uid`, `effective_date`,\n
- `expiration_date`, `creation_date_index`, `frequency_index`)\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-(\n
- <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
- <dtml-sqlvar expr="getVersion[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getLanguage[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getRevision[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="subject_set_uid[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getEffectiveDate[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getExpirationDate[loop_item]" type="datetime" optional>,\n
- <dtml-sqlvar expr="getCreationDateIndex[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="getFrequencyIndex[loop_item]" type="int" optional>\n
-)\n
-<dtml-if sequence-end>\n
-<dtml-else>\n
-,\n
-</dtml-if>\n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_clear_reserved.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_clear_reserved.xml
index 4e1e2a874bbbadc171f023eaa1b51f960959dab9..7cd26367d52a53bacdf3407de82cd80b1e0b46ce 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_clear_reserved.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_clear_reserved.xml
@@ -6,61 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>count</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>thread_id</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>count</string>
- <string>thread_id</string>
- <string>date</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -115,51 +60,6 @@ WHERE\n
path = "reserved"\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DELETE FROM\n
- catalog\n
-WHERE\n
- path = "reserved"\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Clear Reserved Uids</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
index 583580746437614b9d9564a777bbd6fc20c58e46..ac0359abd524045d0d16506dfe1d55b5bb7a7a80 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
@@ -6,108 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>limit_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>select_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>valid_from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>where_expression</string>
- <string>select_expression</string>
- <string>group_by_expression</string>
- <string>from_table_list</string>
- <string>valid_from_table_list</string>
- <string>from_expression</string>
- <string>limit_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -217,102 +115,6 @@ LIMIT <dtml-var "limit_expression">\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
-<dtml-if select_expression>\n
- , <dtml-var select_expression>\n
-</dtml-if>\n
-FROM\n
- <dtml-if from_expression>\n
- <dtml-var from_expression>\n
- <dtml-else>\n
- <dtml-if valid_from_table_list>\n
- <dtml-in valid_from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
- <dtml-else>\n
- <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
- </dtml-if>\n
- </dtml-if>\n
- <dtml-if selection_domain>\n
- <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
- <dtml-if expression> , <dtml-var expression> </dtml-if>\n
- </dtml-let>\n
- </dtml-if>\n
- <dtml-if selection_report>\n
- <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
- <dtml-if expression> , <dtml-var expression> </dtml-if>\n
- </dtml-let>\n
- </dtml-if>\n
-WHERE\n
- 1 = 1\n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-<dtml-if selection_domain>\n
- <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
- <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
- </dtml-let>\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1, category_table_alias = \'report_category\')">\n
- <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
- </dtml-let>\n
-</dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
- <dtml-var sort_on>\n
-</dtml-if>\n
-<dtml-if group_by_expression>\n
-GROUP BY\n
- <dtml-var group_by_expression>\n
-</dtml-if>\n
-<dtml-if limit_expression>\n
-LIMIT <dtml-var "limit_expression">\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml
index 117d26326f83537f6595d236deb7d74ae45393c0..78e65f57e1744526473417c34f81438785685a4c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -96,56 +69,6 @@ CREATE TABLE `alarm` (\n
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'catalog\'\n
-#\n
-CREATE TABLE `alarm` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `alarm_date` DATETIME,\n
- PRIMARY KEY (`uid`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
index 888c6d9f0795bd66fb9203e2e39e1d834d4828cc..d43b8f0b25786d94a2dbfddcb253d0033ccc2f39 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -143,103 +116,6 @@ CREATE TABLE `catalog` (\n
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'catalog\'\n
-#\n
-CREATE TABLE `catalog` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `security_uid` INT UNSIGNED,\n
- `owner` varbinary(255) NOT NULL default \'\',\n
- `viewable_owner` varbinary(255) NOT NULL default \'\',\n
- `path` varchar(255) NOT NULL default \'\',\n
- `relative_url` varchar(255) NOT NULL default \'\',\n
- `parent_uid` BIGINT UNSIGNED default \'0\',\n
- `id` varchar(255) default \'\',\n
- `description` text,\n
- `title` varchar(255) default \'\',\n
- `meta_type` varchar(255) default \'\',\n
- `portal_type` varchar(255) default \'\',\n
- `opportunity_state` varchar(255) default \'\',\n
- `corporate_registration_code` varchar(255),\n
- `ean13_code` varchar(255),\n
- `validation_state` varchar(255) default \'\',\n
- `simulation_state` varchar(255) default \'\',\n
- `causality_state` varchar(255) default \'\',\n
- `invoice_state` varchar(255) default \'\',\n
- `payment_state` varchar(255) default \'\',\n
- `event_state` varchar(255) default \'\',\n
- `immobilisation_state` varchar(255) default \'\',\n
- `reference` varchar(255) binary default \'\',\n
- `grouping_reference` varchar(255) default \'\',\n
- `source_reference` varchar(255) default \'\',\n
- `destination_reference` varchar(255) default \'\',\n
- `string_index` varchar(255),\n
- `int_index` INT,\n
- `float_index` real,\n
- `has_cell_content` bool,\n
- `creation_date` datetime,\n
- `modification_date` datetime,\n
- `indexation_timestamp` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n
- PRIMARY KEY (`uid`),\n
- KEY `security_uid` (`security_uid`),\n
- KEY `owner` (`owner`),\n
- KEY `viewable_owner` (`viewable_owner`),\n
- KEY `Parent` (`parent_uid`),\n
- KEY `Path` (`path`),\n
- KEY `Title` (`title`),\n
- KEY `Reference` (`reference`),\n
- KEY `relative_url` (`relative_url`),\n
- KEY `Portal Type` (`portal_type`),\n
- KEY `opportunity_state` (`opportunity_state`),\n
- KEY `validation_state` (`validation_state`),\n
- KEY `simulation_state` (`simulation_state`),\n
- KEY `causality_state` (`causality_state`),\n
- KEY `invoice_state` (`invoice_state`),\n
- KEY `payment_state` (`payment_state`),\n
- KEY `event_state` (`event_state`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
index 570ccf63e13eed6658b961547f7ec1f6873a6cfc..ed2e9e21ca27c247f799c3e662f00b28fa948664 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -92,58 +65,6 @@ CREATE TABLE `category` (\n
KEY `Membership` (`category_uid`,`base_category_uid`)\n
) TYPE = InnoDB;</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host: \n
-# Database: test\n
-# Table: \'category\'\n
-# \n
-CREATE TABLE `category` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `category_uid` BIGINT UNSIGNED default \'0\',\n
- `base_category_uid` BIGINT UNSIGNED default \'0\',\n
- `category_strict_membership` tinyint(1) default \'0\',\n
- PRIMARY KEY (`uid`, `category_uid`, `base_category_uid`, `category_strict_membership`),\n
- KEY `Membership` (`category_uid`,`base_category_uid`)\n
-) TYPE = InnoDB;</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
index 770e8aee693d70517f19e120996de675d793aabd..d7cda01f0e335a26297ffeb3d1ee950aca06e0da 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -101,67 +74,6 @@
) TYPE=InnoDB\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `delivery` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `source_uid` BIGINT UNSIGNED default \'0\',\n
- `destination_uid` BIGINT UNSIGNED default \'0\',\n
- `source_section_uid` BIGINT UNSIGNED default \'0\',\n
- `destination_section_uid` BIGINT UNSIGNED default \'0\',\n
- `resource_uid` BIGINT UNSIGNED default \'0\',\n
- `start_date` datetime default NULL,\n
- `start_date_range_min` datetime default NULL,\n
- `start_date_range_max` datetime default NULL,\n
- `stop_date` datetime default NULL,\n
- `stop_date_range_min` datetime default NULL,\n
- `stop_date_range_max` datetime default NULL,\n
- PRIMARY KEY (`uid`),\n
- KEY `source_uid` (`source_uid`),\n
- KEY `destination_uid` (`destination_uid`),\n
- KEY `source_section_uid` (`source_section_uid`),\n
- KEY `destination_section_uid` (`destination_section_uid`),\n
- KEY `resource_uid` (`resource_uid`)\n
-) TYPE=InnoDB\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml
index 8cd32c56d68ad9ed65e48be6c59501cf10a7727c..93b0926b105e541ba3ed5af00946e6980b9691af 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -97,57 +70,6 @@ CREATE TABLE `full_text` (\n
) ENGINE=MyISAM;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'full_text\'\n
-#\n
-CREATE TABLE `full_text` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `SearchableText` text,\n
- PRIMARY KEY (`uid`),\n
- FULLTEXT `SearchableText` (`SearchableText`)\n
-) ENGINE=MyISAM;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml
index f2bc3a068bf97a229bd04da7253286589fe64f60..5ebb456585bfbdd925f3ceb3f55d4859b81dcdf5 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -61,59 +34,6 @@
KEY `payment_index` (`is_full_inventory`, `simulation_state`, `payment_uid`)\n
) ENGINE=InnoDB</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `inventory` (\n
- `uid` BIGINT(20) UNSIGNED NOT NULL,\n
- `node_uid` BIGINT(20) UNSIGNED NULL,\n
- `section_uid` BIGINT(20) UNSIGNED NULL,\n
- `payment_uid` BIGINT(20) UNSIGNED NULL,\n
- `date` DATETIME NOT NULL,\n
- `is_full_inventory` BOOL NOT NULL DEFAULT FALSE,\n
- `simulation_state` VARCHAR(255) NOT NULL DEFAULT \'\',\n
- PRIMARY KEY `uid` (`uid`),\n
- KEY `node_index` (`is_full_inventory`, `simulation_state`, `node_uid`),\n
- KEY `section_index` (`is_full_inventory`, `simulation_state`, `section_uid`),\n
- KEY `payment_index` (`is_full_inventory`, `simulation_state`, `payment_uid`)\n
-) ENGINE=InnoDB</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory_stock.xml
index 7a235b58f9dad092cda1ef8c818c86b9f4ea4fcf..1f37fcb60e064e997abb103c51a63ae1a45ab18f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory_stock.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string></string> </value>
@@ -83,81 +56,6 @@
) TYPE = InnoDB\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `inventory_stock` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `order_id` TINYINT UNSIGNED NOT NULL,\n
- `node_uid` BIGINT UNSIGNED,\n
- `section_uid` BIGINT UNSIGNED,\n
- `payment_uid` BIGINT UNSIGNED,\n
- `function_uid` BIGINT UNSIGNED,\n
- `project_uid` BIGINT UNSIGNED,\n
- `mirror_section_uid` BIGINT UNSIGNED,\n
- `mirror_node_uid` BIGINT UNSIGNED,\n
- `resource_uid` BIGINT UNSIGNED,\n
- `quantity` real ,\n
- `date` datetime,\n
- `mirror_date` datetime,\n
- `total_price` real ,\n
- `portal_type` VARCHAR(255),\n
- `simulation_state` varchar(255) default \'\',\n
- `variation_text` VARCHAR(255),\n
- `sub_variation_text` VARCHAR(255),\n
- PRIMARY KEY (`uid`, `order_id`),\n
- KEY `quantity` (`quantity`),\n
- KEY `section_uid` (`section_uid`),\n
- KEY `mirror_section_uid` (`mirror_section_uid`),\n
- KEY `mirror_node_uid` (`mirror_node_uid`),\n
- KEY `node_uid` (`node_uid`),\n
- KEY `payment_uid` (`payment_uid`),\n
- KEY `function_uid` (`function_uid`),\n
- KEY `project_uid` (`project_uid`),\n
- KEY `resource_uid` (`resource_uid`),\n
- KEY `simulation_state` (`simulation_state`),\n
- KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
- KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`),\n
- KEY `date` (`date`)\n
-) TYPE = InnoDB\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
index 2f67bdf3491a8ecc2e8e27f5c2806fd9a021a13d..dcb229354468d58695ee96c04b008aef5a4d93fc 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -102,68 +75,6 @@ CREATE TABLE `item` (\n
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'item\'\n
-#\n
-CREATE TABLE `item` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `order_id` TINYINT UNSIGNED NOT NULL,\n
- `date` datetime,\n
- `node_uid` BIGINT UNSIGNED default \'0\',\n
- `section_uid` BIGINT UNSIGNED default \'0\',\n
- `resource_uid` BIGINT UNSIGNED default \'0\',\n
- `aggregate_uid` BIGINT UNSIGNED default \'0\',\n
- `variation_text` VARCHAR(255),\n
- `simulation_state` VARCHAR(255) default \'\',\n
- PRIMARY KEY (`uid`, `aggregate_uid`,`order_id`),\n
- KEY `section_uid` (`section_uid`),\n
- KEY `resource_uid` (`resource_uid`),\n
- KEY `variation_text` (`variation_text`),\n
- KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n
- KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_measure.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_measure.xml
index bbeb09928e4e631e63b8a2eaecfaeefac69b1bcb..96f56cfd850a158b43fa1919f806dc832ee55730 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_measure.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_measure.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -90,56 +63,6 @@
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `measure` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `resource_uid` BIGINT UNSIGNED NOT NULL,\n
- `variation` VARCHAR(255),\n
- `metric_type_uid` BIGINT UNSIGNED NOT NULL,\n
- `quantity` REAL NOT NULL,\n
- PRIMARY KEY (`uid`, `variation`),\n
- KEY (`metric_type_uid`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml
index d1ef2b34ec2f9930634fa1c496d727942a6cab7b..1acedb69376c12ee7378375d26c18e514a5bf622 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -106,72 +79,6 @@ CREATE TABLE `movement` (\n
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'movement\'\n
-#\n
-CREATE TABLE `movement` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `explanation_uid` BIGINT UNSIGNED default \'0\',\n
- `source_uid` BIGINT UNSIGNED default \'0\',\n
- `destination_uid` BIGINT UNSIGNED default \'0\',\n
- `resource_uid` BIGINT UNSIGNED default \'0\',\n
- `quantity` real default \'0.0\',\n
- `start_date` datetime,\n
- `stop_date` datetime,\n
- `price` real,\n
- `is_accountable` bool,\n
- `is_divergent` bool,\n
- `variation_text` VARCHAR(255),\n
- PRIMARY KEY `uid` (`uid`),\n
- KEY `explanation_uid` (`explanation_uid`),\n
- KEY `source_uid` (`source_uid`),\n
- KEY `destination_uid` (`destination_uid`),\n
- KEY `resource_uid` (`resource_uid`),\n
- KEY `is_accountable` (`is_accountable`),\n
- KEY `variation_text` (`variation_text`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate.xml
index 171a57d1953592a34f4821aafaede41331b62382..a8359dee6d84ca8d3f1de18f9e6151da138d9c18 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -91,57 +64,6 @@
) TYPE=InnoDB; \n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE predicate (\n
- uid BIGINT UNSIGNED NOT NULL,\n
- `quantity` real ,\n
- `quantity_range_min` real ,\n
- `quantity_range_max` real ,\n
- `start_date` datetime,\n
- `start_date_range_min` datetime ,\n
- `start_date_range_max` datetime ,\n
- PRIMARY KEY `uid` (`uid`)\n
-) TYPE=InnoDB; \n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate_category.xml
index b1ceae3446cc6b66d10931376d951ea14a66e306..371bfd93fd4945d593dce48dae3303c50d845f47 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate_category.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,61 +68,6 @@ CREATE TABLE `predicate_category` (\n
) TYPE = InnoDB; \n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host: \n
-# Database: test\n
-# Table: \'category\'\n
-# \n
-CREATE TABLE `predicate_category` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `category_uid` BIGINT UNSIGNED default \'0\',\n
- `base_category_uid` BIGINT UNSIGNED default \'0\',\n
- `category_strict_membership` tinyint(1) default \'0\',\n
- PRIMARY KEY (`uid`, `category_uid`, `base_category_uid`, `category_strict_membership`),\n
- KEY `category_strict_membership` (`category_strict_membership`),\n
- KEY `Membership` (`category_uid`,`base_category_uid`),\n
- KEY `FuzzyMembership` (`category_uid`)\n
-) TYPE = InnoDB; \n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_quantity_unit_conversion.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_quantity_unit_conversion.xml
index ae1a8bbc35fe75caea4253849f75aa35bf864aa0..a98f476d567bd473585835e3ad17a57914aa1023 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_quantity_unit_conversion.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_quantity_unit_conversion.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -63,55 +36,6 @@
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `quantity_unit_conversion` (\n
- `uid` BIGINT UNSIGNED,\n
- `resource_uid` BIGINT UNSIGNED NOT NULL,\n
- `quantity_unit_uid` BIGINT UNSIGNED NOT NULL,\n
- `quantity` REAL NOT NULL,\n
- PRIMARY KEY (`resource_uid`, `quantity_unit_uid`),\n
- KEY (`uid`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_record.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_record.xml
index d5671287b603a3fd35984b6dbe74ffbeafb45d49..49679204abf3f597f138db1ec9be20b24989dc90 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_record.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_record.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,61 +68,6 @@ CREATE TABLE `record` (\n
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'record\'\n
-#\n
-CREATE TABLE `record` (\n
- `uid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,\n
- `path` varchar(255) NOT NULL default \'\',\n
- `catalog` BOOL NOT NULL default 0,\n
- `played` BOOL NOT NULL default 0,\n
- `date` DATETIME NOT NULL,\n
- PRIMARY KEY (`uid`),\n
- KEY `played` (`played`),\n
- KEY `date` (`date`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
index fb73690e1f0202a97e99772561a5aea9ecb46346..f347028ba052535980446c55d899610b686e0341 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -87,53 +60,6 @@
) TYPE=InnoDB; \n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE roles_and_users (\n
- uid INT UNSIGNED,\n
- allowedRolesAndUsers VARCHAR(255),\n
- KEY `uid` (`uid`),\n
- KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
-) TYPE=InnoDB; \n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
index f713523e2dd54ea0ea36feef1137a3e5e7fe0da0..2387946cbab24e26f4e46f0d370f25e76322dcc6 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -120,86 +93,6 @@ CREATE TABLE `stock` (\n
) TYPE = InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Host:\n
-# Database: test\n
-# Table: \'stock\'\n
-#\n
-CREATE TABLE `stock` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `order_id` TINYINT UNSIGNED NOT NULL,\n
- `node_uid` BIGINT UNSIGNED,\n
- `section_uid` BIGINT UNSIGNED,\n
- `payment_uid` BIGINT UNSIGNED,\n
- `function_uid` BIGINT UNSIGNED,\n
- `project_uid` BIGINT UNSIGNED,\n
- `mirror_section_uid` BIGINT UNSIGNED,\n
- `mirror_node_uid` BIGINT UNSIGNED,\n
- `resource_uid` BIGINT UNSIGNED,\n
- `quantity` real,\n
- `is_cancellation` BOOLEAN,\n
- `date` datetime,\n
- `mirror_date` datetime,\n
- `total_price` real ,\n
- `portal_type` VARCHAR(255),\n
- `simulation_state` varchar(255) default \'\',\n
- `variation_text` VARCHAR(255),\n
- `sub_variation_text` VARCHAR(255),\n
- PRIMARY KEY (`uid`, `order_id`),\n
- KEY `quantity` (`quantity`),\n
- KEY `section_uid` (`section_uid`),\n
- KEY `mirror_section_uid` (`mirror_section_uid`),\n
- KEY `mirror_node_uid` (`mirror_node_uid`),\n
- KEY `node_uid` (`node_uid`),\n
- KEY `payment_uid` (`payment_uid`),\n
- KEY `function_uid` (`function_uid`),\n
- KEY `project_uid` (`project_uid`),\n
- KEY `resource_uid` (`resource_uid`),\n
- KEY `simulation_state` (`simulation_state`),\n
- KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
- KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`),\n
- KEY `date` (`date`)\n
-) TYPE = InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml
index 36c874dc9c3803eaf16209e1570e888b7e739e5e..dd1fd2425418ed9756159b49e04b30dca3c21ca9 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -87,53 +60,6 @@
) TYPE=InnoDB; \n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE subject (\n
- subject_set_uid INT UNSIGNED NOT NULL,\n
- subject VARCHAR(255),\n
- KEY `subject_set_uid` (`subject_set_uid`),\n
- KEY `subject` (`subject`)\n
-) TYPE=InnoDB; \n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_transformation.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_transformation.xml
index 628e8559e83b04c0693376feb3befd5044021fcc..8385a97b53aa9c9e9e7b0648938208e1382baa41 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_transformation.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_transformation.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -64,56 +37,6 @@
) ENGINE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `transformation` (\n
- `uid` bigint(20) unsigned NOT NULL,\n
- `variation_text` varchar(255) default \'\',\n
- `transformed_uid` bigint(20) unsigned NOT NULL,\n
- `transformed_variation_text` varchar(255) default \'\',\n
- `quantity` double,\n
- KEY `resource` (`uid`, `variation_text`),\n
- KEY `transformed_resource` (`transformed_uid`, `transformed_variation_text`)\n
-) ENGINE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_translation.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_translation.xml
index b34748101fcdb07c224789d1ea9b4cf47f793749..5ebfcf3a1e237c6caabc87ada0d5edf568feb090 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_translation.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_translation.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -97,57 +70,6 @@
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE translation (\n
- language VARCHAR(255),\n
- message_context VARCHAR(50),\n
- portal_type VARCHAR(255),\n
- original_message VARCHAR(255),\n
- translated_message VARCHAR(255),\n
- KEY `message` (`translated_message`),\n
- KEY `original_message` (`original_message`),\n
- KEY `portal_type` (`portal_type`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_versioning.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_versioning.xml
index b1dc0a2875a851711d44faf8f30732fd7c726cbe..1fd8ad0d39aa9a20dbab4d9e338dcf230d6f0861 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_versioning.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_versioning.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -73,65 +46,6 @@
) TYPE=InnoDB;\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>CREATE TABLE `versioning` (\n
- `uid` BIGINT UNSIGNED NOT NULL,\n
- `version` varchar(10) default \'\',\n
- `language` varchar(5) default \'\',\n
- `revision` varchar(10) default \'\',\n
- `subject_set_uid` INT UNSIGNED,\n
- `effective_date` datetime default NULL,\n
- `expiration_date` datetime default NULL,\n
- `creation_date_index` INT,\n
- `frequency_index` INT,\n
- PRIMARY KEY (`uid`),\n
- KEY `version` (`version`),\n
- KEY `language` (`language`),\n
- KEY `subject_set_uid` (`subject_set_uid`),\n
- KEY `effective_date` (`effective_date`),\n
- KEY `expiration_date` (`effective_date`),\n
- KEY `frequency_index` (`creation_date_index`, `frequency_index`)\n
-) TYPE=InnoDB;\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_recorded_object_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_recorded_object_list.xml
index a9f91e8ae6b7bcaedc583eeef4cd4384165e4454..5f4c86b779d60951b11cffa82202a760a5050bed 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_recorded_object_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_recorded_object_list.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -103,60 +67,6 @@ WHERE\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-comment>Do not delete rows really, but just mark them as "played" to avoid dead locks</dtml-comment>\n
-UPDATE\n
- record\n
-SET\n
- played = 1\n
-WHERE\n
-<dtml-in uid_list>\n
- uid = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_translation_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_translation_list.xml
index d2ee28c5ffe9093df79af2f31c94e4b50c99dbd8..0cd8cbec07873fa22dad09978891e20b6076869b 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_translation_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_translation_list.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -82,48 +55,6 @@
<value> <string>DELETE FROM translation\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>DELETE FROM translation\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_uid.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_uid.xml
index b27ab1369f8bdd015f62c7f24a6c2993885adbb6..29ff2b665bec2b8a5704a11e2438c4a753583d3e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_uid.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_delete_uid.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -98,55 +62,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-REPLACE INTO\n
- catalog (uid, path,relative_url,security_uid,portal_type,parent_uid)\n
-VALUES\n
- (<dtml-sqlvar uid type="int">, \'deleted\',\'\',NULL,\'\',NULL)\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.xml
index fe124e22219e34158a5a8dbde1804e1469d1b590..7f4c3b218e79dd5a3bd14a29d2c60167b47a3e5e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_path.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>path</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>path_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid_only</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>path</string>
- <string>path_list</string>
- <string>uid_only</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -118,61 +68,6 @@ WHERE \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT <dtml-if uid_only>uid<dtml-else>uid,path</dtml-if> from catalog \n
-WHERE \n
- 1 = 1\n
-<dtml-if path>\n
- AND <dtml-sqltest path op=eq type="string">\n
-</dtml-if>\n
-<dtml-if path_list>\n
- AND path IN (<dtml-in path_list><dtml-sqlvar sequence-item type="string">\n
- <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.xml
index 513a62d6ca2545fb945d0cf9a6c34f0c74566bd3..78f3e6d2e9929a356e0179d46997d537412fc13b 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_getitem_by_uid.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>path_only</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>uid_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- <string>uid_list</string>
- <string>path_only</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -118,61 +68,6 @@ WHERE \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT <dtml-if path_only>path<dtml-else>uid,path</dtml-if> from catalog \n
-WHERE \n
- 1 = 1\n
-<dtml-if expr="uid is not None">\n
- AND <dtml-sqltest uid op=eq type="int">\n
-</dtml-if>\n
-<dtml-if uid_list>\n
- AND uid IN (<dtml-in uid_list><dtml-sqlvar sequence-item type="int">\n
- <dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_portal_ids_commit.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_portal_ids_commit.xml
index 79e6fb452cfbd9e09a094c6104b4dfed36df3f87..8f3f2c14a9c723636769df723a67bcffe914c691 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_portal_ids_commit.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_portal_ids_commit.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -58,50 +31,6 @@
\n
commit</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string># Warning : This method is obsolete, the new method is IdTool_zCommit\n
-# it\'s kept for backward compatiblity\n
-\n
-commit</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_portal_ids_generate_id.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_portal_ids_generate_id.xml
index 41df2dbef06c9e730f1d2d399de34f69d5cd791a..576b5d75b2e1b4a8d4262771f4cfab799349b1c6 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_portal_ids_generate_id.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_portal_ids_generate_id.xml
@@ -6,74 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>1</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id_count</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>default</string> </key>
- <value> <string>1</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id_group</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>id_group</string>
- <string>id_count</string>
- <string>default</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>id_group\r\n
@@ -110,65 +42,6 @@ SELECT `last_id` AS `LAST_INSERT_ID()` FROM portal_ids\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-# Warning : This method is obsolete, the new method is IdTool_zGenerateId\n
-# it\'s kept for backward compatiblity\n
-\n
-# DO NOT FORGET TO COMMIT AFTER !!\n
-# commit ZSQL method should be z_portal_ids_commit\n
-\n
-BEGIN\n
-<dtml-var sql_delimiter>\n
-INSERT INTO portal_ids (`id_group`, `last_id`)\n
- VALUES (<dtml-sqlvar id_group type="string">, <dtml-sqlvar expr="id_count + default" type="int">)\n
- ON DUPLICATE KEY UPDATE `last_id` = `last_id` + <dtml-sqlvar id_count type="int">\n
-<dtml-var sql_delimiter>\n
-SELECT `last_id` AS `LAST_INSERT_ID()` FROM portal_ids\n
- WHERE `id_group` = <dtml-sqlvar id_group type="string">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_produce_reserved_uid_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_produce_reserved_uid_list.xml
index 4c3ec94ed745e5fbf5f486af37f5f8c5f7cda58f..c7cc1544b8f8c70b3144d61a93e4e5cf411466c0 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_produce_reserved_uid_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_produce_reserved_uid_list.xml
@@ -6,54 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>count</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>int</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>instance_id</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>count</string>
- <string>instance_id</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -127,71 +79,6 @@ LIMIT\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- catalog (id, path)\n
-VALUES\n
-<dtml-in "_.range(count - 1)">\n
-( <dtml-sqlvar instance_id type="string"> , \'reserved\' ) ,\n
-</dtml-in>\n
-( <dtml-sqlvar instance_id type="string"> , \'reserved\' );\n
-\n
-<dtml-var "\'\\0\'">\n
-\n
-SELECT \n
- uid\n
-FROM \n
- catalog \n
-WHERE\n
- path = \'reserved\'\n
-AND\n
- id = <dtml-sqlvar instance_id type="string">\n
-LIMIT\n
- 10000\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_read_recorded_object_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_read_recorded_object_list.xml
index bf05693dee8e9683213038c93b479f7a1c256577..bbe925ce1fa55ae8b68a06320436e0f96197f0f7 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_read_recorded_object_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_read_recorded_object_list.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>catalog</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>catalog</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -103,60 +67,6 @@ ORDER BY\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- uid, path\n
-FROM\n
- record\n
-WHERE\n
- played = 0\n
- AND catalog = <dtml-sqlvar catalog type="int"> \n
-ORDER BY\n
- date\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_record_object_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_record_object_list.xml
index 2d392953899cf393f90adfb7f1db94d37862affb..da93ddb765c177e77c1452b130a66a217ea3ce31 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_record_object_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_record_object_list.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>catalog</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>path_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>path_list</string>
- <string>catalog</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -114,63 +71,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- record (path, catalog, played, date)\n
-VALUES\n
-<dtml-in path_list>\n
-(\n
- <dtml-sqlvar sequence-item type="string">,\n
- <dtml-sqlvar catalog type="int">,\n
- 0,\n
- NOW()\n
-)\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_base_category_id.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_base_category_id.xml
index c82d85adb191172550a161858527393b54eac645..0b6c60c806c94aafba5aa1394777ef13cf471008 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_base_category_id.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_base_category_id.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -105,54 +62,6 @@ table_1</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.portal_type = \'Base Category\' AND\n
-<dtml-var table_1>.uid = <dtml-var table_0>.base_category_uid AND\n
-<dtml-var table_0>.category_strict_membership = 1 AND\n
-<dtml-var table_0>.uid = catalog.uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_career_skill.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_career_skill.xml
index 7337af42609e31dab236567b57f3f43d54f68e35..55ebc66b53b2192cd2b56986e3b197556b25b3d2 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_career_skill.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_career_skill.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -117,57 +67,6 @@ AND <dtml-var table_1>.portal_type = \'Career\'\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_2>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.skill.getUid()">\n
-AND <dtml-var table_0>.uid = <dtml-var table_1>.uid\n
-AND <dtml-var table_1>.parent_uid = catalog.uid\n
-AND <dtml-var table_1>.portal_type = \'Career\'\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_explanation.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_explanation.xml
index 7d9b0ad56d176589a08cea8d558daf4530acd0f3..079ddfa415b24c3f3d3ec215eeaab9aed35cc507 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_explanation.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_explanation.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -104,53 +61,6 @@ table_1</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.uid\n
- AND <dtml-var table_1>.uid = <dtml-var table_0>.explanation_uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_function_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_function_uid_from_stock.xml
index 11871dfa4aa8fd410faec699534563295e825b79..9922ddd6fb02e4f05ee33f965d498f3ef24e876e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_function_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_function_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.function_uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.xml
index 8e1bdc94133b5040543deed5e3f52f5dc2f602ae..be95a4b9554546a4cb81b63562c94ae6cb38b69b 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.xml
@@ -6,77 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_3</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_4</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_5</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- <string>table_3</string>
- <string>table_4</string>
- <string>table_5</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -140,57 +69,6 @@ AND <dtml-var table_5>.uid = <dtml-var table_4>.parent_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.parent_uid\n
-AND <dtml-var table_1>.uid = <dtml-var table_0>.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
-AND <dtml-var table_4>.uid = <dtml-var table_3>.parent_uid\n
-AND <dtml-var table_5>.uid = <dtml-var table_4>.parent_uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.xml
index 4fe00eb0d5ab619cd101d58966939ef1e15c8c46..567b8d60fe434fd917d194905de193ab15450f2a 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.xml
@@ -6,77 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_3</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_4</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_5</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- <string>table_3</string>
- <string>table_4</string>
- <string>table_5</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -141,58 +70,6 @@ AND <dtml-var table_5>.uid = <dtml-var table_0>.category_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.specialise.getUid()">\n
-AND <dtml-var table_1>.uid = catalog.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
-AND <dtml-var table_4>.uid = <dtml-var table_3>.parent_uid\n
-AND <dtml-var table_0>.uid = <dtml-var table_4>.parent_uid\n
-AND <dtml-var table_5>.uid = <dtml-var table_0>.category_uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml
index 5c6d6c4c1b77026d1d41983adaa00620508e8259..227ed998db4452f3703dca51d6225a5793de0e9c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml
@@ -6,70 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_3</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_4</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- <string>table_3</string>
- <string>table_4</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -133,57 +69,6 @@ AND <dtml-var table_4>.uid = <dtml-var table_0>.category_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.delivery.getUid()">\n
-AND <dtml-var table_0>.uid = <dtml-var table_3>.parent_uid\n
-AND <dtml-var table_1>.uid = catalog.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
-AND <dtml-var table_4>.uid = <dtml-var table_0>.category_uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent.xml
index eee11f4f2cf9ba460d6f63be4ef3836c40192dd8..47d78af89915b85308d71bdaa14d8cf41eeea3b8 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -105,54 +62,6 @@ AND <dtml-var table_1>.uid = <dtml-var table_0>.parent_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.parent_uid\n
-AND <dtml-var table_1>.uid = <dtml-var table_0>.parent_uid\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml
index b6295f00a3996ffcfe68cf3dc6728b2fdc39fffb..203b3f8c8072dbfde17f8a1cc4244012707a70ee 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_2</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- <string>table_2</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -115,55 +65,6 @@ AND <dtml-var table_2>.uid = <dtml-var table_0>.category_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.delivery.getUid()">\n
-AND <dtml-var table_0>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_1>.uid = catalog.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_0>.category_uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_metric_type.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_metric_type.xml
index 40f8dab39af8ca9d102936739e903eb8a73fd3e8..865573a29a6f21a72423b90017b52a0483f8b1ca 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_metric_type.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_metric_type.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.resource_uid = resource.uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_mirror_section_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_mirror_section_uid_from_stock.xml
index 7cfaf4ddd8102c0c1596baba145b34772f9221ae..58f00b4f8a42cc9232077f7cb59705a9d09ad57a 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_mirror_section_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_mirror_section_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.mirror_section_uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_node_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_node_uid_from_stock.xml
index 87a075ac4c89bce2e0cf2a144fcbab96bab1eb3f..b20b3e9c68f6c0d3030d719abde8f749afe771e0 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_node_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_node_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.node_uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent.xml
index a40116868564de30bf0a257d3556d12591a87df4..702fbb098daba44f2b9480097aa83416e0571764 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>query_table</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>query_table</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -71,52 +28,6 @@ query_table</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = <dtml-var query_table>.parent_uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_specialise.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_specialise.xml
index d8f7138feb818da9aa6e27ed735327286ffe8e1f..56260a162c6058e1c065f9178e30b7740b86f2af 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_specialise.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_specialise.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -106,55 +63,6 @@ AND <dtml-var table_0>.uid = catalog.parent_uid\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.specialise.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.parent_uid\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_strict_group.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_strict_group.xml
index 3ed0b09ca33d724c4393e52f022fc2fa57f8f24c..9179a64e5e04ddee6cc1aca9a81c3a3a9badd820 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_strict_group.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_strict_group.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -107,56 +64,6 @@ AND <dtml-var table_0>.category_strict_membership = 1\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.group.getUid()">\n
-AND <dtml-var table_0>.uid = catalog.parent_uid\n
-AND <dtml-var table_0>.category_strict_membership = 1\n
-\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_payment_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_payment_uid_from_stock.xml
index 2901d3e0c302879718b3e79507f1bcc792e48414..7e18002abcdb7a2d6233765edf36f8e34ea07f00 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_payment_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_payment_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.payment_uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_predicate.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_predicate.xml
index 24bc218fc45d2fbfe130936116a97a5a7c7527c3..bf01a97177b3dbc2222d9a11897c6782be36a260 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_predicate.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_predicate.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_predicate_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_predicate_category.xml
index 4286f4b75c7395ab5c02b4487d41589d34bce508..b245d8c65aaa3591fde4399b5666a92b1a7c9609 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_predicate_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_predicate_category.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>query_table</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>query_table</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
@@ -71,52 +28,6 @@ query_table</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = <dtml-var query_table>.uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_project_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_project_uid_from_stock.xml
index a6bb43ef6fe9b10e01bc0e5287f17670d571ae71..f3003457477756fc6190e126f8c6a5bd3d86d982 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_project_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_project_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.project_uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_movement.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_movement.xml
index 865067e7979d4cdc386f8137cd8cc7962a70318e..4c8b46ca74ab88168b773c4b6b804b3484c73869 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_movement.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_from_movement.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -104,53 +61,6 @@ table_1</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.uid\n
- AND <dtml-var table_1>.uid = <dtml-var table_0>.resource_uid\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_uid_from_stock.xml
index f971a7a5c1fb5e6f4525fafa58828da181958ece..9f26645f6632068f873dd332cbae9051ca9ed512 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.resource_uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_section_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_section_uid_from_stock.xml
index 4c1d5140dc5101de0b7ac08a6804233a38aaab17..ac37f634d1c4e25483615b996df154ada3463392 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_section_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_section_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.section_uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_function_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_function_uid_from_stock.xml
index 83652f55a18df26f32b49580c28b01b2a289b155..6c3dee95bacd44e50f13e5220579678fd629cc88 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_function_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_function_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.function_uid AND\n
-<dtml-var table_0>.category_strict_membership = 1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_mirror_section_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_mirror_section_uid_from_stock.xml
index c50804ca4243f18e07322d112f372f7681215ccc..cc06108a0ad44cc89b28dab84637be4adaae9c27 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_mirror_section_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_mirror_section_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.mirror_section_uid AND\n
-<dtml-var table_0>.category_strict_membership = 1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_node_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_node_uid_from_stock.xml
index d76842c342de6e762d3a857923284163a8a4b762..cf204c26e91a98a353274b092e5a3172a65f388c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_node_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_node_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.node_uid AND\n
-<dtml-var table_0>.category_strict_membership = 1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_payment_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_payment_uid_from_stock.xml
index ac4722032214bc5994ec12d6ba64ee67a560eb5c..07d87c7176f2413549b21a89ab95228d87850802 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_payment_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_payment_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.payment_uid AND\n
-<dtml-var table_0>.category_strict_membership = 1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_project_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_project_uid_from_stock.xml
index 7931b043977a7eddd28a97536226f418b4e5acbc..babdf683b74500a42b7f30240ac9824fb07f1d22 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_project_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_project_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.project_uid AND\n
-<dtml-var table_0>.category_strict_membership = 1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_resource_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_resource_uid_from_stock.xml
index ca8bd987b04d136524128f45adf2e88f326c0a6a..5fd968693a04252f17ef6b2f4194de77e5dbe6b4 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_resource_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_resource_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.resource_uid AND\n
-<dtml-var table_0>.category_strict_membership = 1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_section_uid_from_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_section_uid_from_stock.xml
index 3c0f0b1817703f1055ac1c5cc007543aa56f9599..8421557bcde94c38d528858d3ed4ac6c32f4b81d 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_section_uid_from_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_strict_membership_section_uid_from_stock.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = stock.section_uid AND\n
-<dtml-var table_0>.category_strict_membership = 1\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_subject.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_subject.xml
index 49c8dde9e6f62b3f4322c4435b733ec0e46b214c..ba407875354186821cf74da6d11f228bda27eeed 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_subject.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_subject.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -103,52 +60,6 @@ table_1</string> </value>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.uid AND\n
-<dtml-var table_0>.subject_set_uid = <dtml-var table_1>.subject_set_uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_state.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_state.xml
index 92b6c4178ee482be91973d6e06ce07592b0c27fe..e3ac29b16d71e08137d7eaa8f0812d38627f108f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_state.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_state.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -97,54 +61,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.causality_state\n
- AND <dtml-var table_0>.message_context = "causality_state"\n
- AND <dtml-var table_0>.portal_type = catalog.portal_type\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_state_title.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_state_title.xml
index 32922d729af4f6988f9c7b9f2dfb9ee64f4bc44c..3dac59b457675656f1eba8d0349c695a93fed15a 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_state_title.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_causality_state_title.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -97,54 +61,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.causality_state\n
- AND <dtml-var table_0>.message_context = "causality_state_title"\n
- AND <dtml-var table_0>.portal_type = catalog.portal_type\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_opportunity_state.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_opportunity_state.xml
index bbf276a52f202f9e7602f70be053ba49ca937198..c68a8a82725ec29a5a53ea7b7b940ded76da770e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_opportunity_state.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_opportunity_state.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -98,55 +62,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.opportunity_state\n
- AND <dtml-var table_0>.message_context = "opportunity_state"\n
- AND <dtml-var table_0>.portal_type = catalog.portal_type\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_opportunity_state_title.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_opportunity_state_title.xml
index 4bb533dc8f31823f09a977c83ef5348f03b6dcc6..a2a5d7d2f0e61f53b2afd44c4b7f94fc38cc376f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_opportunity_state_title.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_opportunity_state_title.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -98,55 +62,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.opportunity_state\n
- AND <dtml-var table_0>.message_context = "opportunity_state_title"\n
- AND <dtml-var table_0>.portal_type = catalog.portal_type\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_portal_type.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_portal_type.xml
index f20cffa040a028a1ceae4d63e5a98a1efd238233..d33ef73af84f2cdb0c15eccf66957d9f61a27345 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_portal_type.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_portal_type.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -96,53 +60,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.portal_type\n
- AND <dtml-var table_0>.message_context = "portal_type"\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state.xml
index e39c16956b396f2618892291cf5fbaae7037689a..492b6db10e1906df4e4a7dcf485bffd6b3408a63 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -97,54 +61,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.simulation_state\n
- AND <dtml-var table_0>.message_context = "simulation_state"\n
- AND <dtml-var table_0>.portal_type = catalog.portal_type\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml
index 71ec0e67eb0512dd9a8ce6389013bf70ae0d05e8..4b40695eb4352dba18d56980d8bf526d6779fc51 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -98,55 +62,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.simulation_state\n
- AND <dtml-var table_0>.message_context = "simulation_state_title"\n
- AND <dtml-var table_0>.portal_type = catalog.portal_type\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_validation_state.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_validation_state.xml
index 0c48b89d2034d1cb3a0a2bd21d24c792562c5ad2..ea9b19d12712bf94eb38880c06d75ae5ab80c61a 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_validation_state.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_validation_state.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -97,54 +61,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.validation_state\n
- AND <dtml-var table_0>.message_context = "validation_state"\n
- AND <dtml-var table_0>.portal_type = catalog.portal_type\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_validation_state_title.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_validation_state_title.xml
index 8f3643bc5423e0dfe875e88d821f08c81083a6fa..5693511e354bf0654bec525c00b44981d826df11 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_validation_state_title.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_validation_state_title.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -97,54 +61,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.original_message = catalog.validation_state\n
- AND <dtml-var table_0>.message_context = "validation_state_title"\n
- AND <dtml-var table_0>.portal_type = catalog.portal_type\n
- AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_uid.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_uid.xml
index b0dd9789cecee7fbfd50d99ebd9d500c5068155e..b68036e3a626764a17e3a6c047055851defee91f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_uid.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_uid.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.uid
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_uid_or_parent_uid.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_uid_or_parent_uid.xml
index 5d3d8de7f0752435cc9bc7a980feb92060cf7eb5..4c6805e2a7aa10e34b7bf57399ec237b6793b01c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_uid_or_parent_uid.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_uid_or_parent_uid.xml
@@ -6,49 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table_0</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>table_1</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table_0</string>
- <string>table_1</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -111,60 +68,6 @@ AND <dtml-var table_0>.uid = <dtml-var table_1>.uid))\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-((<dtml-var table_0>.is_accountable = 0\n
-AND <dtml-var table_0>.uid = catalog.parent_uid\n
-AND <dtml-var table_0>.uid = <dtml-var table_1>.uid)\n
-\n
-OR\n
-\n
-(<dtml-var table_0>.is_accountable = 1\n
-AND <dtml-var table_0>.uid = catalog.uid\n
-AND <dtml-var table_0>.uid = <dtml-var table_1>.uid))\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_reserve_uid.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_reserve_uid.xml
index ae35b050338e27a8e2cf4710c7306237094197aa..247d8c63f1303470a4b793361177780808d03705 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_reserve_uid.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_reserve_uid.xml
@@ -6,47 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -105,57 +64,6 @@ VALUES\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-REPLACE INTO\n
- catalog (uid, id, path)\n
-VALUES\n
-<dtml-in uid>\n
- (<dtml-sqlvar sequence-item type="int">, \'used\', \'reserved\')\n
-<dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_folder.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_folder.xml
index dad3c9b8d7eb717c8fa56a66f83aa7c6d0cacfb2..65723ed9cfef68a2e41f11d4ee49b32d7b0cb531 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_folder.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_folder.xml
@@ -6,56 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>parent_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>query</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>sort_on</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>sort_on</string>
- <string>query</string>
- <string>parent_uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -122,63 +72,6 @@ SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<dtml-if sort_on>\n
-<dtml-if query>\n
-SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query> AND <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
-<dtml-else>\n
-SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
-</dtml-if>\n
-<dtml-else>\n
-<dtml-if query>\n
-SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> AND catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query>\n
-<dtml-else>\n
-SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int>\n
-</dtml-if>\n
-</dtml-if>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
index 9f4c717da2a80390329bba8a5c8d5036097d7d56..03e11d21f74140296d49e96062859379647ee1a3 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
@@ -6,122 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>from_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>limit_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>search_mode</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>select_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_domain</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>selection_report</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>sort_on</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>valid_from_table_list</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>type</string> </key>
- <value> <string>list</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>where_expression</string>
- <string>select_expression</string>
- <string>group_by_expression</string>
- <string>from_table_list</string>
- <string>valid_from_table_list</string>
- <string>from_expression</string>
- <string>sort_on</string>
- <string>limit_expression</string>
- <string>search_mode</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -235,102 +119,6 @@ LIMIT <dtml-var "limit_expression">\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT\n
- <dtml-in getCatalogSearchResultKeys> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
- <dtml-if select_expression>,<dtml-var select_expression></dtml-if>\n
-\n
-FROM\n
- <dtml-if from_expression>\n
- <dtml-var from_expression>\n
- <dtml-else>\n
- <dtml-if valid_from_table_list>\n
- <dtml-in valid_from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
- <dtml-else>\n
- <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
- </dtml-if>\n
- </dtml-if>\n
- <dtml-if selection_domain>\n
- <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
- <dtml-if expression> , <dtml-var expression> </dtml-if>\n
- </dtml-let>\n
- </dtml-if>\n
- <dtml-if selection_report>\n
- <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
- <dtml-if expression> , <dtml-var expression> </dtml-if>\n
- </dtml-let>\n
- </dtml-if>\n
-\n
-WHERE \n
- 1 = 1 \n
-<dtml-if where_expression>\n
- AND <dtml-var where_expression>\n
-</dtml-if>\n
-<dtml-if selection_domain>\n
- <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
- <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
- </dtml-let>\n
-</dtml-if>\n
-<dtml-if selection_report>\n
- <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1, category_table_alias = \'report_category\')">\n
- <dtml-if expression> AND <dtml-var expression> </dtml-if>\n
- </dtml-let>\n
-</dtml-if>\n
-<dtml-if group_by_expression>\n
-GROUP BY\n
- <dtml-var group_by_expression>\n
-</dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
- <dtml-var sort_on>\n
-</dtml-if>\n
-<dtml-if limit_expression>\n
-LIMIT <dtml-var "limit_expression">\n
-</dtml-if>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_security.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_security.xml
index 14cea9e52ed97f47da344ab91a99c9c44bf11730..25b15cdf3fbf0216cb1bcafc21853d9746a5e1d4 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_security.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_security.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>security_roles_list</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>security_roles_list</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -99,58 +63,6 @@ WHERE \n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT \n
- DISTINCT uid \n
-FROM \n
- roles_and_users \n
-WHERE \n
- allowedRolesAndUsers \n
- IN (<dtml-in security_roles_list><dtml-var sequence-item><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>)\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_category_columns.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_category_columns.xml
index ec61911abc113b2539a6ced6916be143d527d345..b7ba80eba94dacfa44fac3713f116ce8d9e56e96 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_category_columns.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_category_columns.xml
@@ -6,33 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -81,47 +54,6 @@
<key> <string>src</string> </key>
<value> <string>show columns from category</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>show columns from category</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_columns.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_columns.xml
index 6ee23bbced8dc65394836b412f9a060a4c7c2138..6b3867bb35d2306588fd0c0e0319c9c47e9e2df1 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_columns.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_columns.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ show columns from <dtml-var table>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-show columns from <dtml-var table>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_index.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_index.xml
index e6c2bebea56f720879c8704459f146fd139284a2..3e5f3a8f4ef6b98648d9dd26cc612fadd97e04ea 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_index.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_index.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>_col</string> </key>
<value>
@@ -285,51 +249,6 @@ show index from <dtml-var table>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-show index from <dtml-var table>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_tables.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_tables.xml
index d3f6f0dd00d4e3ac5da7948ca848ced635361923..8946619640a507c97b9b0535847dbffe1d07012f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_tables.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_show_tables.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>table</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>table</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -91,48 +55,6 @@
<value> <string>show tables\n
</string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string>show tables\n
-</string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_delivery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_delivery.xml
index 8a7bd01141a7133061dbef5fc21d80ee92d99721..10e1ab086717e0caf06ef9246c5ae5c0dd7a17ee 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_delivery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_delivery.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -95,52 +59,6 @@ DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>\n
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM delivery WHERE <dtml-sqltest uid op=eq type=int>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_object.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_object.xml
index db84fc7f86d04e0a1e7228f188aa5185c33476b6..c12b5a9437842a3a7df5de6889eddaf1c76c2650 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_object.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_uncatalog_object.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>uid</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM catalog WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_unique_values.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_unique_values.xml
index f92ea21744cd7721318a9969ca1b15763973f34e..987c1e4f231080354db73aeaa2f6f38b2da8ec90 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_unique_values.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_unique_values.xml
@@ -6,42 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>column</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
- <string>column</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
@@ -94,51 +58,6 @@ SELECT DISTINCT <dtml-var column> FROM catalog
]]></string> </value>
</item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT DISTINCT <dtml-var column> FROM catalog
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
index 55596b29f71b5dc7661cb817cf27a56f12e13d6a..1e3852840b57172af41e4323ea5262e777f99916 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-210
\ No newline at end of file
+211
\ No newline at end of file