From 07a508a303ed8c7906cb04132520a2d99a70b70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Wed, 31 Oct 2007 16:09:39 +0000
Subject: [PATCH] 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.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17320 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...ccountingTransactionModule_zGetAccountingTransactionList.xml | 2 ++
bt5/erp5_accounting/bt/revision | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
index 56b411a14a..b101d6535f 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
@@ -478,6 +478,7 @@ WHERE\n
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 @@ WHERE\n
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
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index 495ae252f0..88101bccd4 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-464
\ No newline at end of file
+465
\ No newline at end of file
--
2.30.9