Index: openacs-4/packages/invoices/tcl/invoice-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/invoice-procs.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/invoices/tcl/invoice-procs.tcl	19 Oct 2006 17:06:49 -0000	1.27
+++ openacs-4/packages/invoices/tcl/invoice-procs.tcl	1 Nov 2006 14:29:41 -0000	1.28
@@ -244,17 +244,28 @@
     }
 
     # invoice recipient data
+    # default is the organization who is associated with the project
+
+    set rec_organization_id $data(organization_id)
     if {[organization::organization_p -party_id $data(recipient_id)]} {
 	# recipient is organization
 	set rec_organization_id $data(recipient_id)
 	contact::employee::get -employee_id $data(recipient_id) -array recipient_data
 	set attribute_list {name company_name_ext address town_line country country_code salutation salutation_letter}
     } else {
 	# recipient is person
-	set rec_organization_id [contact::util::get_employee_organization -employee_id $data(recipient_id)]
+	set rec_organization_list [contact::util::get_employee_organization -employee_id $data(recipient_id)]
+	if {[llength $rec_organization_list] > 1} {
+	    if {[lsearch $rec_organization_list $data(organization_id)] > -1} {
+		set rec_organization_id $data(organization_id)
+	    } else {
+		set rec_organization_id [lindex $rec_organization_list 0]
+	    }
+	}
 	contact::employee::get -employee_id $data(recipient_id) -array recipient_data
 	set attribute_list {name company_name_ext address town_line country country_code salutation salutation_letter}
     }
+
     set rec_orga_revision_id [content::item::get_best_revision -item_id $rec_organization_id]
     set rec_client_id [ams::value -attribute_name "client_id" -object_id $rec_orga_revision_id -locale $rec_locale]
     set data(rec_vat_ident_number) [ams::value -attribute_name "VAT_ident_number" -object_id $rec_orga_revision_id -locale $rec_locale]
Index: openacs-4/packages/invoices/tcl/iv-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/iv-install-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/invoices/tcl/iv-install-procs.tcl	18 May 2006 12:48:46 -0000	1.13
+++ openacs-4/packages/invoices/tcl/iv-install-procs.tcl	1 Nov 2006 14:29:41 -0000	1.14
@@ -287,6 +287,7 @@
 } {
     Create new cost every time a project task is closed
 } {
+    if {0} {
     set task_rev_id [pm::task::get_revision_id -task_item_id $task_id]
     set project_rev_id [pm::project::get_project_id -project_item_id [pm::task::project_item_id -task_item_id $task_id]]
 
@@ -351,5 +352,6 @@
 
 	array unset price
     }
+    }
 }