[Erp5-report] r17506 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Nov 9 19:57:59 CET 2007


Author: jerome
Date: Fri Nov  9 19:57:59 2007
New Revision: 17506

URL: http://svn.erp5.org?rev=17506&view=rev
Log:
Fix stats on accounting module when filtering by node.
(the functional test failure)

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=17506&r1=17505&r2=17506&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml Fri Nov  9 19:57:59 2007
@@ -513,26 +513,45 @@
   </dtml-if>\n
 \n
   <dtml-if node>\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 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
-  </dtml-if>\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 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
@@ -701,26 +720,45 @@
   </dtml-if>\n
 \n
   <dtml-if node>\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 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
-  </dtml-if>\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 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

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=17506&r1=17505&r2=17506&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Fri Nov  9 19:57:59 2007
@@ -1,1 +1,1 @@
-497
+498




More information about the Erp5-report mailing list