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 149d5cef3ae65cbc2b22e43d7862211fb2bfb11f..ed12946de4749ee612fe6e33c87bddd4ea61da1c 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 @@ -230,12 +230,6 @@ </dictionary> </value> </item> - <item> - <key> <string>select_expression</string> </key> - <value> - <dictionary/> - </value> - </item> <item> <key> <string>selection</string> </key> <value> @@ -333,7 +327,6 @@ <string>selection_domain</string> <string>selection_report</string> <string>selection_params</string> - <string>select_expression</string> <string>from_date</string> <string>at_date</string> <string>to_date</string> @@ -379,7 +372,6 @@ selection_name=None\r\n selection_domain\r\n selection_report\r\n selection_params=""\r\n -select_expression\r\n from_date=""\r\n at_date=""\r\n to_date=""\r\n @@ -463,7 +455,8 @@ destination_section_where_expression</string> </value> <dtml-elif count>\n COUNT(DISTINCT catalog.uid) AS count\n <dtml-else>\n - <dtml-if select_expression><dtml-var select_expression>\n + <dtml-in "portal_catalog.getSQLCatalog().getCatalogSearchResultKeys()"> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n + <dtml-if "query[\'select_expression\']">,<dtml-var "query[\'select_expression\']">\n <dtml-else>\n DISTINCT\n <dtml-in "search_result_keys">\n @@ -641,7 +634,8 @@ destination_section_where_expression</string> </value> SELECT COUNT(DISTINCT uid) AS count FROM (\n <dtml-else>\n SELECT\n - <dtml-if select_expression><dtml-var select_expression>\n + <dtml-in "portal_catalog.getSQLCatalog().getCatalogSearchResultKeys()"> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n + <dtml-if "query[\'select_expression\']">,<dtml-var "query[\'select_expression\']">\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 @@ -1130,7 +1124,8 @@ UNION\n <dtml-elif count>\n COUNT(DISTINCT catalog.uid) AS count\n <dtml-else>\n - <dtml-if select_expression><dtml-var select_expression>\n + <dtml-in "portal_catalog.getSQLCatalog().getCatalogSearchResultKeys()"> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n + <dtml-if "query[\'select_expression\']">,<dtml-var "query[\'select_expression\']">\n <dtml-else>\n DISTINCT\n <dtml-in "search_result_keys">\n @@ -1308,7 +1303,8 @@ UNION\n SELECT COUNT(DISTINCT uid) AS count FROM (\n <dtml-else>\n SELECT\n - <dtml-if select_expression><dtml-var select_expression>\n + <dtml-in "portal_catalog.getSQLCatalog().getCatalogSearchResultKeys()"> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n + <dtml-if "query[\'select_expression\']">,<dtml-var "query[\'select_expression\']">\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 diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 872362fa15d58b62629786cae412c8e6f08a1760..7ff9fa9bd870374d4773866c2746abb552fa7cf5 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1226 \ No newline at end of file +1227 \ No newline at end of file