[Erp5-report] r18781 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jan 17 18:23:53 CET 2008
Author: jerome
Date: Thu Jan 17 18:23:52 2008
New Revision: 18781
URL: http://svn.erp5.org?rev=18781&view=rev
Log:
Simplify PaymentTransaction_zSelectMovement
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml?rev=18781&r1=18780&r2=18781&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml Thu Jan 17 18:23:52 2008
@@ -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 @@
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 @@
<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 @@
\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 @@
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 @@
<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 @@
\n
<dtml-if order_by_expression>\n
ORDER BY <dtml-var order_by_expression>\n
-</dtml-if>\n
-
+</dtml-if>
]]></string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=18781&r1=18780&r2=18781&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Thu Jan 17 18:23:52 2008
@@ -1,1 +1,1 @@
-542
+543
More information about the Erp5-report
mailing list