Simplify PaymentTransaction_zSelectMovement

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

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml

@@ -67,9 +67,9 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>from_table_list</string>
-                            <string>where_expression</string>
-                            <string>order_by_expression</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
                           </list>
                         </value>
                     </item>
@@ -138,8 +138,6 @@ FROM\n
     movement\n
   , catalog as parent\n
   , catalog as grandparent\n
-  , catalog as grandgrandparent\n
-  , catalog as grandgrandgrandparent\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
@@ -154,11 +152,10 @@ WHERE\n
   <dtml-if where_expression>\n
     AND <dtml-var where_expression> \n
   </dtml-if>\n
-  AND parent.uid = catalog.parent_uid\n
+\n
+    AND parent.uid = catalog.parent_uid\n
   AND grandparent.uid = parent.parent_uid\n
-  AND grandgrandparent.uid = grandparent.parent_uid\n
-  AND grandgrandgrandparent.uid = grandgrandparent.parent_uid\n
-  AND grandgrandgrandparent.simulation_state = "confirmed"\n
+  AND grandparent.simulation_state  in (\'confirmed\', \'stopped\', \'delivered\')\n
 \n
   AND movement.source_uid is not NULL\n
   AND movement.uid = catalog.uid\n
@@ -167,8 +164,7 @@ WHERE\n
 \n
 <dtml-if order_by_expression>\n
 ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>\n
-
+</dtml-if>
 
 ]]></string> </value>
         </item>
@@ -218,8 +214,6 @@ FROM\n
     movement\n
   , catalog as parent\n
   , catalog as grandparent\n
-  , catalog as grandgrandparent\n
-  , catalog as grandgrandgrandparent\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
@@ -234,11 +228,10 @@ WHERE\n
   <dtml-if where_expression>\n
     AND <dtml-var where_expression> \n
   </dtml-if>\n
-  AND parent.uid = catalog.parent_uid\n
+\n
+    AND parent.uid = catalog.parent_uid\n
   AND grandparent.uid = parent.parent_uid\n
-  AND grandgrandparent.uid = grandparent.parent_uid\n
-  AND grandgrandgrandparent.uid = grandgrandparent.parent_uid\n
-  AND grandgrandgrandparent.simulation_state = "confirmed"\n
+  AND grandparent.simulation_state  in (\'confirmed\', \'stopped\', \'delivered\')\n
 \n
   AND movement.source_uid is not NULL\n
   AND movement.uid = catalog.uid\n
@@ -247,8 +240,7 @@ WHERE\n
 \n
 <dtml-if order_by_expression>\n
 ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>\n
-
+</dtml-if>
 
 ]]></string> </value>
                     </item>

bt5/erp5_accounting/bt/revision

-542
\ No newline at end of file
+543
\ No newline at end of file