Index: openacs-4/packages/invoices/www/invoice-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-ae.tcl,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/invoices/www/invoice-ae.tcl	6 Nov 2006 15:41:12 -0000	1.43
+++ openacs-4/packages/invoices/www/invoice-ae.tcl	8 Nov 2006 14:42:07 -0000	1.44
@@ -462,10 +462,14 @@
 
 
 ad_form -extend -name iv_invoice_form -new_request {
-    set opening_p 0
+    if {$recipient_id eq $contact_id} {
+	set opening_p 0
+    } else {
+	set opening_p 1
+    }
     set invoice_p 1
     set copy_p 0
-    set email_p j
+    set email_p f
 
     if {[exists_and_not_null project_id]} {
 	set description [lang::util::localize [join [db_list project_titles {}] ",\n"]]
@@ -722,11 +726,6 @@
 	}
     }
 
-    # Force opening if different recipient
-    if {![string eq $recipient_id $contact_id]} {
-	set opening_p 1
-    }
-
     if {[empty_string_p $return_url]} {
 	set return_url "/contacts/$organization_id/"
     }
Index: openacs-4/packages/invoices/www/invoice-cancellation.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-cancellation.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/invoices/www/invoice-cancellation.xql	15 Mar 2006 17:05:06 -0000	1.6
+++ openacs-4/packages/invoices/www/invoice-cancellation.xql	8 Nov 2006 14:42:07 -0000	1.7
@@ -36,7 +36,7 @@
 <fullquery name="get_credit_offer">
       <querytext>
 
-		select of.offer_id as credit_offer_rev_id
+		select max(of.offer_id) as credit_offer_rev_id
 		from iv_offers of, cr_items oi, acs_data_links r,
 		     acs_objects o, pm_projects p, cr_items pi
 		where r.object_id_one = pi.item_id
Index: openacs-4/packages/invoices/www/mass-invoice.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/mass-invoice.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/invoices/www/mass-invoice.tcl	6 Nov 2006 15:38:44 -0000	1.9
+++ openacs-4/packages/invoices/www/mass-invoice.tcl	8 Nov 2006 14:42:07 -0000	1.10
@@ -304,7 +304,7 @@
 	    
 	    if {[catch {
 		foreach document_file_one $document_file {
-		    util_unlist [contact::oo::import_oo_pdf_using_jooconverter -oo_file $document_file_one -printer_name "pdfconv" -title $file_title -parent_id $invoice_id -return_pdf_with_id] file_item_id file_mime_type file_name
+		    util_unlist [contact::oo::import_oo_pdf -oo_file $document_file_one -printer_name "pdfconv" -title $file_title -parent_id $invoice_id -return_pdf_with_id] file_item_id file_mime_type file_name
 		    
 		    lappend files $file_name
 		}
Index: openacs-4/packages/invoices/www/offer-accepted.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-accepted.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/invoices/www/offer-accepted.tcl	4 Jul 2006 10:26:38 -0000	1.3
+++ openacs-4/packages/invoices/www/offer-accepted.tcl	8 Nov 2006 14:42:07 -0000	1.4
@@ -29,9 +29,7 @@
 set page_title "[_ invoices.offer_accept]"
 
 if {$valid_x_p && [empty_string_p $template_src]} {
-    db_transaction {
-	iv::offer::accept -offer_id $offer_id
-	callback iv::offer_accept -offer_id $offer_id
-	callback iv::offer_accepted -offer_id $offer_id -comment ""
-    }
+    iv::offer::accept -offer_id $offer_id
+    callback iv::offer_accept -offer_id $offer_id
+    callback iv::offer_accepted -offer_id $offer_id -comment ""
 }