[Erp5-report] r18797 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jan 18 18:16:45 CET 2008
Author: jerome
Date: Fri Jan 18 18:16:44 2008
New Revision: 18797
URL: http://svn.erp5.org?rev=18797&view=rev
Log:
PaymentTransaction_selectMovement could select movements by date
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_selectMovement.xml
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_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_selectMovement.xml?rev=18797&r1=18796&r2=18797&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_selectMovement.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_selectMovement.xml Fri Jan 18 18:16:44 2008
@@ -70,9 +70,11 @@
kw[\'parent_specialise_portal_type\'] = \'Payment Rule\'\n
kw[\'portal_type\'] = \'Simulation Movement\'\n
kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
+kw[\'max_movement_date\'] = DateTime() + 30\n
\n
+LOG("SQL used = %s"%context.PaymentTransaction_zSelectMovement(src__=1, **kw))\n
movement_list = [x.getObject() for x in context.PaymentTransaction_zSelectMovement(**kw)]\n
-LOG("SQL used = %s"%context.PaymentTransaction_zSelectMovement(src__=1, **kw))\n
+\n
LOG("movement_list = %s"%movement_list)\n
return movement_list\n
</string> </value>
@@ -124,6 +126,7 @@
<string>_getattr_</string>
<string>_apply_</string>
<string>context</string>
+ <string>DateTime</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
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=18797&r1=18796&r2=18797&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 Fri Jan 18 18:16:44 2008
@@ -49,6 +49,12 @@
</value>
</item>
<item>
+ <key> <string>max_movement_date</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
<key> <string>order_by_expression</string> </key>
<value>
<dictionary/>
@@ -70,6 +76,7 @@
<string>from_table_list</string>
<string>where_expression</string>
<string>order_by_expression</string>
+<string>max_movement_date</string>
</list>
</value>
</item>
@@ -88,7 +95,8 @@
<key> <string>arguments_src</string> </key>
<value> <string>from_table_list:list\r\n
where_expression\r\n
-order_by_expression</string> </value>
+order_by_expression\r\n
+max_movement_date</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -153,17 +161,23 @@
AND <dtml-var where_expression> \n
</dtml-if>\n
\n
- AND parent.uid = catalog.parent_uid\n
+ AND parent.uid = catalog.parent_uid\n
AND grandparent.uid = parent.parent_uid\n
- AND grandparent.simulation_state in (\'confirmed\', \'stopped\', \'delivered\')\n
-\n
- AND movement.source_uid is not NULL\n
+\n
+ AND ((\n
+ grandparent.simulation_state NOT IN (\'cancelled\', \'deleted\')\n
+ AND ( movement.start_date < <dtml-sqlvar max_movement_date type="datetime"> OR \n
+ movement.stop_date < <dtml-sqlvar max_movement_date type="datetime"> )\n
+ ) OR (\n
+ grandparent.simulation_state in (\'confirmed\', \'stopped\', \'delivered\')\n
+ ))\n
+\n
AND movement.uid = catalog.uid\n
AND movement.resource_uid is not NULL\n
AND category.category_uid is NULL\n
\n
<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
+ ORDER BY <dtml-var order_by_expression>\n
</dtml-if>
]]></string> </value>
@@ -229,17 +243,23 @@
AND <dtml-var where_expression> \n
</dtml-if>\n
\n
- AND parent.uid = catalog.parent_uid\n
+ AND parent.uid = catalog.parent_uid\n
AND grandparent.uid = parent.parent_uid\n
- AND grandparent.simulation_state in (\'confirmed\', \'stopped\', \'delivered\')\n
-\n
- AND movement.source_uid is not NULL\n
+\n
+ AND ((\n
+ grandparent.simulation_state NOT IN (\'cancelled\', \'deleted\')\n
+ AND ( movement.start_date < <dtml-sqlvar max_movement_date type="datetime"> OR \n
+ movement.stop_date < <dtml-sqlvar max_movement_date type="datetime"> )\n
+ ) OR (\n
+ grandparent.simulation_state in (\'confirmed\', \'stopped\', \'delivered\')\n
+ ))\n
+\n
AND movement.uid = catalog.uid\n
AND movement.resource_uid is not NULL\n
AND category.category_uid is NULL\n
\n
<dtml-if order_by_expression>\n
-ORDER BY <dtml-var order_by_expression>\n
+ ORDER BY <dtml-var order_by_expression>\n
</dtml-if>
]]></string> </value>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=18797&r1=18796&r2=18797&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Fri Jan 18 18:16:44 2008
@@ -1,1 +1,1 @@
-546
+547
More information about the Erp5-report
mailing list