Index: openacs-4/packages/invoices/www/journal-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/journal-add.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/invoices/www/journal-add.xql	19 Apr 2006 14:23:12 -0000	1.2
+++ openacs-4/packages/invoices/www/journal-add.xql	19 Apr 2006 15:00:03 -0000	1.3
@@ -31,11 +31,9 @@
       <querytext>
 
     select o.organization_id, oi.latest_revision as orga_revision_id, p.email
-    from organizations o, cr_items oi, parties p, acs_objects oo, group_member_map g
+    from organizations o, cr_items oi, parties p, group_member_map g
     where oi.item_id = o.organization_id
     and p.party_id = o.organization_id
-    and oo.object_id = oi.latest_revision
-    and oo.creation_date > to_timestamp(:last_checkout, 'YYYY-MM-DD HH24:MI:SS')
     and g.member_id = o.organization_id
     and g.group_id = :customer_group_id
     and o.organization_id in (select distinct i.recipient_id
@@ -44,15 +42,6 @@
 			      and o.object_id = ii.item_id
 			      and i.status in ('billed', 'cancelled', 'paid')
 			      and o.creation_date > to_timestamp(:last_checkout, 'YYYY-MM-DD HH24:MI:SS'))
-    union
-    select o.organization_id, oi.latest_revision as orga_revision_id, p.email
-    from organizations o, cr_items oi, parties p, acs_objects ro, group_member_map g
-    where oi.item_id = o.organization_id
-    and p.party_id = o.organization_id
-    and g.member_id = o.organization_id
-    and g.group_id = :customer_group_id
-    and g.rel_id = ro.object_id
-    and ro.creation_date > to_timestamp(:last_checkout, 'YYYY-MM-DD HH24:MI:SS')
 
       </querytext>
 </fullquery>