Index: openacs-4/packages/invoices/www/offer-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-ae.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/invoices/www/offer-ae.adp	2 May 2006 12:07:11 -0000	1.6
+++ openacs-4/packages/invoices/www/offer-ae.adp	22 May 2006 11:06:02 -0000	1.7
@@ -85,7 +85,7 @@
     var form = document.forms.iv_offer_form;
     var total = 0.;
 
-    for (i=1; i<2+@start@; i++) {
+    for (i=1; i<@finish@; i++) {
       units = form["item_units."+i].value
       price = form["item_price."+i].value
       item_amount = form["amount_sum."+i].value
Index: openacs-4/packages/invoices/www/offer-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-ae.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/invoices/www/offer-ae.tcl	18 May 2006 12:48:46 -0000	1.27
+++ openacs-4/packages/invoices/www/offer-ae.tcl	22 May 2006 11:06:02 -0000	1.28
@@ -571,6 +571,7 @@
 ad_form -extend -name iv_offer_form -new_request {
     if {[exists_and_not_null _project_id]} {
 	db_1row get_project_description {}
+	set comment [ad_html_to_text -- $comment]
     } else {
 	set comment ""
     }
@@ -612,7 +613,9 @@
     set title [lang::util::localize $title]
     set description [lang::util::localize $description]
     set creator_name "$first_names $last_name"
-    set vat_percent [format "%.1f" $vat_percent]
+    set customer_percent [ams::value -object_id [content::item::get_best_revision -item_id $organization_id] -attribute_name "vat_percent"]
+#    set vat_percent [format "%.1f" $vat_percent]
+    set vat_percent  [format "%.1f" $customer_percent]
     set vat [format "%.2f" $vat]
     if {$amount_total == 0} {
 	set amount_total $amount_sum