previous attempt on fixing the regression in change state dialog in 35652 was...

previous attempt on fixing the regression in change state dialog in 35652 was completly wrong. this is the proper fix

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35654 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml

@@ -455,8 +455,12 @@ destination_section_where_expression</string> </value>
       <dtml-elif count>\n
         COUNT(DISTINCT catalog.uid) AS count\n
       <dtml-else>\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-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
@@ -634,8 +638,9 @@ destination_section_where_expression</string> </value>
           SELECT COUNT(DISTINCT uid) AS count FROM (\n
         <dtml-else>\n
           SELECT\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-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
@@ -1124,8 +1129,12 @@ UNION\n
       <dtml-elif count>\n
         COUNT(DISTINCT catalog.uid) AS count\n
       <dtml-else>\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-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
@@ -1303,8 +1312,9 @@ UNION\n
           SELECT COUNT(DISTINCT uid) AS count FROM (\n
         <dtml-else>\n
           SELECT\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-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

bt5/erp5_accounting/bt/revision

-1227
+1229
\ No newline at end of file