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.16 -r1.17
--- openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	15 Dec 2005 22:34:46 -0000	1.16
+++ openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	16 Dec 2005 08:16:23 -0000	1.17
@@ -140,9 +140,6 @@
   <msg key="iv_invoice_item_rebate">Rabatt</msg>
   <msg key="iv_invoice_item_sort_order">Nummer</msg>
   <msg key="iv_invoice_item_Title">Titel</msg>
-  <msg key="iv_invoice_item_title_cat_1">Lektorat</msg>
-  <msg key="iv_invoice_item_title_cat_2">Adaption</msg>
-  <msg key="iv_invoice_item_title_category">Sprachen</msg>
   <msg key="iv_invoice_item_vat">Mehrwertsteuer</msg>
   <msg key="iv_invoice_item_View">Rechnungsposition ansehen</msg>
   <msg key="iv_invoice_New">Neue Rechnung</msg>
@@ -249,6 +246,10 @@
   <msg key="iv_offer_item_rebate_help">Rabatt, der auf dieses Angebot/diese Rechnung gegeben wird (in Prozent)</msg>
   <msg key="iv_offer_item_sort_order">Nummer</msg>
   <msg key="iv_offer_item_Title">Titel</msg>
+  <msg key="iv_offer_item_title_cat">Positions-Titel</msg>
+  <msg key="iv_offer_item_title_cat_1">Lektorat</msg>
+  <msg key="iv_offer_item_title_cat_2">Adaption</msg>
+  <msg key="iv_offer_item_title_category">Sprachen</msg>
   <msg key="iv_offer_item_Title_help">Titel, der in dem Angebot/der Rechnung angezeigt wird</msg>
   <msg key="iv_offer_item_vat">Mehrwertsteuer</msg>
   <msg key="iv_offer_item_View">Kostenposition ansehen</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.20 -r1.21
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	15 Dec 2005 18:58:42 -0000	1.20
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	16 Dec 2005 08:16:23 -0000	1.21
@@ -140,9 +140,6 @@
   <msg key="iv_invoice_item_rebate">Rebate</msg>
   <msg key="iv_invoice_item_sort_order">Sort order</msg>
   <msg key="iv_invoice_item_Title">Title</msg>
-  <msg key="iv_invoice_item_title_cat_1">Editing</msg>
-  <msg key="iv_invoice_item_title_cat_2">Translation</msg>
-  <msg key="iv_invoice_item_title_category">Languages</msg>
   <msg key="iv_invoice_item_vat">VAT</msg>
   <msg key="iv_invoice_item_View">View Invoice Item</msg>
   <msg key="iv_invoice_New">New Invoice</msg>
@@ -249,6 +246,10 @@
   <msg key="iv_offer_item_rebate_help">Rebate given on this offer/invoice item in percent.</msg>
   <msg key="iv_offer_item_sort_order">Sort order</msg>
   <msg key="iv_offer_item_Title">Title</msg>
+  <msg key="iv_offer_item_title_cat">Offer Item Title</msg>
+  <msg key="iv_offer_item_title_cat_1">Editing</msg>
+  <msg key="iv_offer_item_title_cat_2">Translation</msg>
+  <msg key="iv_offer_item_title_category">Languages</msg>
   <msg key="iv_offer_item_Title_help">Title that is shown in the offer/invoice</msg>
   <msg key="iv_offer_item_vat">VAT</msg>
   <msg key="iv_offer_item_View">View Cost Item</msg>
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.8 -r1.9
--- openacs-4/packages/invoices/tcl/iv-install-procs.tcl	15 Dec 2005 23:04:13 -0000	1.8
+++ openacs-4/packages/invoices/tcl/iv-install-procs.tcl	16 Dec 2005 08:16:24 -0000	1.9
@@ -251,7 +251,7 @@
 	    }
 	    0.01d19 0.01d20 {
 		foreach package_id [apm_package_id_from_key invoices] {
-		    set offer_item_title_id [package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "Invoice Items Default Object"]] acs_object]
+		    set offer_item_title_id [package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "Offer Items Title Default Object"]] acs_object]
 
 		    db_dml set_offer_item_title_id {
 			update iv_default_objects
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.12 -r1.13
--- openacs-4/packages/invoices/www/offer-ae.tcl	15 Dec 2005 22:44:35 -0000	1.12
+++ openacs-4/packages/invoices/www/offer-ae.tcl	16 Dec 2005 08:16:24 -0000	1.13
@@ -558,14 +558,14 @@
 	    if {[empty_string_p $item(title)]} {
 		# if only single category
 		if {[llength $title_cat] == 1} {
-		    set item(title) "#invoices.iv_invoice_item_title_cat_1# ([category::get_name [lindex $title_cat 0]])"
+		    set item(title) "#invoices.iv_offer_item_title_cat_1# ([category::get_name [lindex $title_cat 0]])"
 		}
 
 		# if two categories selected
 		if {[llength $title_cat] == 2} {
 		    set from_cat [category::get_name [lindex $title_cat 0]]
 		    set to_cat [category::get_name [lindex $title_cat 1]]
-		    set item(title) "#invoices.iv_invoice_item_title_cat_2# ($from_cat -> $to_cat)"
+		    set item(title) "#invoices.iv_offer_item_title_cat_2# ($from_cat -> $to_cat)"
 		}
 	    }
 
Index: openacs-4/packages/invoices/www/admin/categories-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/admin/categories-admin.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/www/admin/categories-admin.adp	16 Aug 2005 20:04:35 -0000	1.1
+++ openacs-4/packages/invoices/www/admin/categories-admin.adp	16 Dec 2005 08:16:25 -0000	1.2
@@ -8,6 +8,7 @@
 <li><a href="@cost_url@">#invoices.iv_cost_2#</a></li>
 <li><a href="@offer_url@">#invoices.iv_offer_2#</a></li>
 <li><a href="@offer_item_url@">#invoices.iv_offer_item_2#</a></li>
+<li><a href="@offer_item_title_url@">#invoices.iv_offer_item_title_cat#</a></li>
 <li><a href="@invoice_url@">#invoices.iv_invoice_2#</a></li>
 <li><a href="@invoice_item_url@">#invoices.iv_invoice_item_2#</a></li>
 <li><a href="@payment_url@">#invoices.iv_payment_2#</a></li>
Index: openacs-4/packages/invoices/www/admin/categories-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/admin/categories-admin.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/www/admin/categories-admin.tcl	16 Aug 2005 20:04:35 -0000	1.1
+++ openacs-4/packages/invoices/www/admin/categories-admin.tcl	16 Dec 2005 08:16:25 -0000	1.2
@@ -23,6 +23,7 @@
 set cost_url "$categories_url[export_vars -base cadmin/one-object {{object_id $container_objects(cost_id)}}]"
 set offer_url "$categories_url[export_vars -base cadmin/one-object {{object_id $container_objects(offer_id)}}]"
 set offer_item_url "$categories_url[export_vars -base cadmin/one-object {{object_id $container_objects(offer_item_id)}}]"
+set offer_item_title_url "$categories_url[export_vars -base cadmin/one-object {{object_id $container_objects(offer_item_title_id)}}]"
 set invoice_url "$categories_url[export_vars -base cadmin/one-object {{object_id $container_objects(invoice_id)}}]"
 set invoice_item_url "$categories_url[export_vars -base cadmin/one-object {{object_id $container_objects(invoice_item_id)}}]"
 set payment_url "$categories_url[export_vars -base cadmin/one-object {{object_id $container_objects(payment_id)}}]"