Index: openacs-4/packages/invoices/lib/offer-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/offer-list.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/invoices/lib/offer-list.xql	11 Oct 2005 15:23:28 -0000	1.5
+++ openacs-4/packages/invoices/lib/offer-list.xql	14 Oct 2005 06:25:03 -0000	1.6
@@ -20,10 +20,12 @@
 	   to_char(o.creation_date, :timestamp_format) as creation_date,
 	   to_char(t.accepted_date, :timestamp_format) as accepted_date,
 	   to_char(t.finish_date, :timestamp_format) as finish_date,
-           pi.item_id as project_id, pr.title as project_title, t.status
+           pi.item_id as project_id, pr.title as project_title, t.status,
+           pp.contact_id, p2.first_names as contact_first_names,
+           p2.last_name as contact_last_name
     from cr_folders cf, cr_revisions cr, iv_offers t,
          acs_objects o, persons p, cr_items ci, acs_rels r,
-         cr_items pi, cr_revisions pr, pm_projects pp
+         cr_items pi, cr_revisions pr, pm_projects pp, persons p2
     where cr.revision_id = ci.latest_revision
     and t.offer_id = cr.revision_id
     and ci.parent_id = cf.folder_id
@@ -34,6 +36,7 @@
     and r.object_id_two = pi.item_id
     and pr.revision_id = pi.latest_revision
     and pp.project_id = pr.revision_id
+    and p2.person_id = pp.contact_id
     [template::list::filter_where_clauses -and -name iv_offer]
     [template::list::page_where_clause -and -name iv_offer -key cr.item_id]
     [template::list::orderby_clause -name iv_offer -orderby]
@@ -47,7 +50,7 @@
     select cr.item_id as offer_id
     from cr_folders cf, cr_revisions cr, iv_offers t,
          acs_objects o, persons p, cr_items ci, acs_rels r,
-         cr_items pi, cr_revisions pr, pm_projects pp
+         cr_items pi, cr_revisions pr, pm_projects pp, persons p2
     where cr.revision_id = ci.latest_revision
     and t.offer_id = cr.revision_id
     and ci.parent_id = cf.folder_id
@@ -58,6 +61,7 @@
     and r.object_id_two = pi.item_id
     and pr.revision_id = pi.latest_revision
     and pp.project_id = pr.revision_id
+    and p2.person_id = pp.contact_id
     [template::list::filter_where_clauses -and -name iv_offer]
     [template::list::orderby_clause -name iv_offer -orderby]