Index: openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	28 Sep 2005 17:19:11 -0000	1.4
+++ openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	5 Oct 2005 12:08:24 -0000	1.5
@@ -155,7 +155,7 @@
   <msg key="iv_offer_Description_help">Beschreibung der Kostenaufstellung</msg>
   <msg key="iv_offer_Edit">Projektaufstellung �ndern</msg>
   <msg key="iv_offer_edit_error">Sie d�rfen keine akzeptierte oder berechnete Kostenaufstellung �ndern.</msg>
-  <msg key="iv_offer_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Angebot&lt;/h3&gt;%offer_text%&lt;/html&gt;&lt;/body&gt;</msg>
+  <msg key="iv_offer_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Angebot&lt;/h3&gt;%offer_text%&lt;p&gt;Um dieses Angebot anzunehmen, klicken Sie bitte &lt;a href="%accept_link%"&gt;hier&lt;/a&gt;.&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_offer_finish_date">Timing Datum</msg>
   <msg key="iv_offer_finish_date_help">Abgabetermin zu dem das Projekt an den Kunden ausgeliefert werden muss</msg>
   <msg key="iv_offer_finish_time">Timing Uhrzeit</msg>
Index: openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	1 Oct 2005 11:05:05 -0000	1.4
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	5 Oct 2005 12:08:24 -0000	1.5
@@ -158,7 +158,7 @@
   <msg key="iv_offer_Description_help">Description of the cost sheet</msg>
   <msg key="iv_offer_Edit">Edit Cost Sheet</msg>
   <msg key="iv_offer_edit_error">You are not allowed to edit an accepted or invoiced cost sheet</msg>
-  <msg key="iv_offer_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Offer&lt;/h3&gt;%offer_text%&lt;/html&gt;&lt;/body&gt;</msg>
+  <msg key="iv_offer_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Offer&lt;/h3&gt;%offer_text%&lt;p&gt;To accept this offer, click &lt;a href="%accept_link%"&gt;here&lt;/a&gt;.&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_offer_finish_date">Finish on</msg>
   <msg key="iv_offer_finish_date_help">Deadline until which the project has to be delivered to the client</msg>
   <msg key="iv_offer_finish_time">Finish time</msg>
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.3 -r1.4
--- openacs-4/packages/invoices/lib/offer-list.xql	1 Oct 2005 11:05:05 -0000	1.3
+++ openacs-4/packages/invoices/lib/offer-list.xql	5 Oct 2005 12:08:24 -0000	1.4
@@ -35,7 +35,7 @@
     and pr.revision_id = pi.latest_revision
     and pp.project_id = pr.revision_id
     [template::list::filter_where_clauses -and -name iv_offer]
-    [template::list::page_where_clauses -and -name iv_offer -key cr.item_id]
+    [template::list::page_where_clause -and -name iv_offer -key cr.item_id]
     [template::list::orderby_clause -name iv_offer -orderby]
     
       </querytext>
Index: openacs-4/packages/invoices/lib/projects-billable.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/projects-billable.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/lib/projects-billable.xql	16 Aug 2005 20:04:31 -0000	1.1
+++ openacs-4/packages/invoices/lib/projects-billable.xql	5 Oct 2005 12:08:24 -0000	1.2
@@ -9,10 +9,10 @@
     from (
     select oi.item_id as offer_id, pr.revision_id, o.creation_date,
 	   sum(ofi.item_units * ofi.price_per_unit * (1-(ofi.rebate/100))) as amount_open,
-           p.customer_id , (oz.name ) as name
+           p.customer_id, oz.name
     from cr_items pi, cr_revisions pr, pm_projects p,
          acs_objects o, acs_rels r, iv_offer_items ofi,
-         acs_objects oo, cr_items oi , organizations oz
+         acs_objects oo, cr_items oi, organizations oz
     where pi.latest_revision = pr.revision_id
     and p.project_id = pr.revision_id
     and o.object_id = p.project_id
Index: openacs-4/packages/invoices/www/invoice-send.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-send.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/invoices/www/invoice-send.tcl	28 Sep 2005 17:19:12 -0000	1.3
+++ openacs-4/packages/invoices/www/invoice-send.tcl	5 Oct 2005 12:08:24 -0000	1.4
@@ -24,7 +24,11 @@
     set pdf_file [text_templates::create_pdf_from_html -html_content "$invoice_text"]
     if {![empty_string_p $pdf_file]} {
 	set file_size [file size $pdf_file]
-	set file_ids [cr_import_content -title "Invoice $invoice_id" -description "PDF version of <a href=[export_vars -base "/invoices/invoice-ae" -url {{mode display} invoice_id}]>this offer</a>" $invoice_id $pdf_file $file_size application/pdf "[clock seconds]-[expr round([ns_rand]*100000)]"]
+	set root_folder_id [lindex [application_data_link::get_linked -from_object_id $organization_id -to_object_type content_folder] 0]
+	set invoice_folder_id [lindex [application_data_link::get_linked -from_object_id $root_folder_id -to_object_type content_folder] 0]
+
+	set file_ids [cr_import_content -title "Invoice $invoice_id" -description "PDF version of <a href=[export_vars -base "/invoices/invoice-ae" -url {{mode display} invoice_id}]>this offer</a>" $invoice_folder_id $pdf_file $file_size application/pdf "[clock seconds]-[expr round([ns_rand]*100000)]"]
+	application_data_link::new -this_object_id $invoice_id -target_object_id $file_ids
     }
 }