[Erp5-report] r23785 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 24 17:34:35 CEST 2008
Author: jerome
Date: Wed Sep 24 17:34:26 2008
New Revision: 23785
URL: http://svn.erp5.org?rev=23785&view=rev
Log:
when searching by date, use start_date for source section, and stop_date for destination section. Also use DateTime.latestTime instead of DateTime + 1
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=23785&r1=23784&r2=23785&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 Wed Sep 24 17:34:26 2008
@@ -15,12 +15,6 @@
<list>
<string>Member</string>
</list>
- </value>
- </item>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
@@ -358,12 +352,6 @@
</dictionary>
</state>
</object>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
@@ -767,16 +755,11 @@
AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
</dtml-if>\n
\n
- <dtml-comment>\n
- -- FIXME: we want stop date when we are destination_section and start_date when\n
- -- we are source_section (one solution is to read in stock.date, but we try\n
- -- to avoid the use of stock table here)\n
- </dtml-comment>\n
<dtml-if from_date>\n
AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n
<dtml-if to_date>\n
- AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
+ AND movement.start_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n
@@ -956,19 +939,14 @@
AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
</dtml-if>\n
\n
- <dtml-comment>\n
- -- FIXME: we want stop date when we are destination_section and start_date when\n
- -- we are source_section (one solution is to read in stock.date, but we try\n
- -- to avoid the use of stock table here)\n
- </dtml-comment>\n
<dtml-if from_date>\n
- AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
+ AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n
<dtml-if to_date>\n
- AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
+ AND movement.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
- AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n
+ AND movement.stop_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n
<dtml-if node>\n
@@ -1426,16 +1404,11 @@
AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
</dtml-if>\n
\n
- <dtml-comment>\n
- -- FIXME: we want stop date when we are destination_section and start_date when\n
- -- we are source_section (one solution is to read in stock.date, but we try\n
- -- to avoid the use of stock table here)\n
- </dtml-comment>\n
<dtml-if from_date>\n
AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n
<dtml-if to_date>\n
- AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
+ AND movement.start_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n
@@ -1615,19 +1588,14 @@
AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
</dtml-if>\n
\n
- <dtml-comment>\n
- -- FIXME: we want stop date when we are destination_section and start_date when\n
- -- we are source_section (one solution is to read in stock.date, but we try\n
- -- to avoid the use of stock table here)\n
- </dtml-comment>\n
<dtml-if from_date>\n
- AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
+ AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n
<dtml-if to_date>\n
- AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
+ AND movement.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
- AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n
+ AND movement.stop_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n
<dtml-if node>\n
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=23785&r1=23784&r2=23785&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Wed Sep 24 17:34:26 2008
@@ -1,1 +1,1 @@
-779
+780
More information about the Erp5-report
mailing list