From d84bdb1bda86929356d218117c4992ab66f2246e Mon Sep 17 00:00:00 2001 From: einhverfr Date: Tue, 1 Jul 2008 20:56:40 +0000 Subject: Correcting conflict from Aurynn's commit git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2181 4979c152-3d1c-0410-bac9-87ea11338e46 --- sql/modules/Voucher.sql | 1 - 1 file changed, 1 deletion(-) (limited to 'sql') diff --git a/sql/modules/Voucher.sql b/sql/modules/Voucher.sql index 5c236ed5..f4a30595 100644 --- a/sql/modules/Voucher.sql +++ b/sql/modules/Voucher.sql @@ -231,7 +231,6 @@ BEGIN FROM batch b JOIN batch_class c ON (b.batch_class_id = c.id) LEFT JOIN users u ON (u.entity_id = b.created_by) - JOIN voucher v ON (v.batch_id = b.id) WHERE (c.id = in_class_id OR in_class_id IS NULL) AND (b.description LIKE '%' || in_description || '%' OR -- cgit v1.2.3