[Erp5-report] r24950 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Dec 19 13:38:40 CET 2008
Author: jerome
Date: Fri Dec 19 13:38:38 2008
New Revision: 24950
URL: http://svn.erp5.org?rev=24950&view=rev
Log:
use delivery table instead of movement table here, otherwise transactions without lines cannot be searched by date.
remove a very outdated FIXME comment
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=24950&r1=24949&r2=24950&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml [utf8] Fri Dec 19 13:38:38 2008
@@ -534,19 +534,14 @@
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\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 delivery.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 delivery.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
- AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n
+ AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n
<dtml-if node>\n
@@ -757,13 +752,13 @@
</dtml-if>\n
\n
<dtml-if from_date>\n
- AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
+ AND delivery.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.latestTime()" type="datetime">\n
+ AND delivery.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
+ AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n
<dtml-if node>\n
@@ -942,13 +937,13 @@
</dtml-if>\n
\n
<dtml-if from_date>\n
- AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n
+ AND delivery.stop_date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n
<dtml-if to_date>\n
- AND movement.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
+ AND delivery.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
- AND movement.stop_date < <dtml-sqlvar at_date type="datetime">\n
+ AND delivery.stop_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n
<dtml-if node>\n
@@ -1186,19 +1181,14 @@
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\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 delivery.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 delivery.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
- AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n
+ AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n
<dtml-if node>\n
@@ -1409,13 +1399,13 @@
</dtml-if>\n
\n
<dtml-if from_date>\n
- AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
+ AND delivery.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.latestTime()" type="datetime">\n
+ AND delivery.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
+ AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n
<dtml-if node>\n
@@ -1594,13 +1584,13 @@
</dtml-if>\n
\n
<dtml-if from_date>\n
- AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n
+ AND delivery.stop_date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n
<dtml-if to_date>\n
- AND movement.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
+ AND delivery.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
- AND movement.stop_date < <dtml-sqlvar at_date type="datetime">\n
+ AND delivery.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=24950&r1=24949&r2=24950&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Fri Dec 19 13:38:38 2008
@@ -1,1 +1,1 @@
-839
+840
More information about the Erp5-report
mailing list