[Erp5-report] r35654 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed May 26 18:02:24 2010
New Revision: 35654

URL: http://svn.erp5.org?rev=35654&view=rev
Log:
previous attempt on fixing the regression in change state dialog in 35652 was completly wrong. this is the proper fix

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml?rev=35654&r1=35653&r2=35654&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml [utf8] Wed May 26 18:02:24 2010
@@ -455,8 +455,12 @@
       <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 @@
           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 @@
       <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 @@
           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

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=35654&r1=35653&r2=35654&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed May 26 18:02:24 2010
@@ -1,1 +1,1 @@
-1227
+1229