[Erp5-report] r17320 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Oct 31 17:09:39 2007
New Revision: 17320

URL: http://svn.erp5.org?rev=17320&view=rev
Log:
When searching by date, this use the movement table. This is not good, because it can match invoice lines, for now adds "movement.is_accountable" in WHERE clause not to select them.

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=17320&r1=17319&r2=17320&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 Oct 31 17:09:39 2007
@@ -478,6 +478,7 @@
     AND catalog.creation_date <\n
         <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n
   <dtml-if use_movement_table>\n
+    AND movement.is_accountable\n
     AND movement.explanation_uid = catalog.uid </dtml-if>\n
   <dtml-if resource> AND movement.resource_uid =\n
       <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n
@@ -665,6 +666,7 @@
     AND catalog.creation_date <\n
         <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n
   <dtml-if use_movement_table>\n
+    AND movement.is_accountable\n
     AND movement.explanation_uid = catalog.uid </dtml-if>\n
   <dtml-if resource> AND movement.resource_uid =\n
       <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=17320&r1=17319&r2=17320&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Wed Oct 31 17:09:39 2007
@@ -1,1 +1,1 @@
-464
+465