Index: openacs-4/packages/invoices/invoices.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/invoices.info,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/invoices/invoices.info	18 May 2006 12:48:45 -0000	1.26
+++ openacs-4/packages/invoices/invoices.info	5 Jun 2006 14:07:36 -0000	1.27
@@ -7,15 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="1.0d8" url="http://openacs.org/repository/download/apm/invoices-1.0d8.apm">
+    <version name="1.0d9" url="http://openacs.org/repository/download/apm/invoices-1.0d9.apm">
         <owner url="mailto:timo@timohentschel.de">Timo Hentschel</owner>
         <summary>Invoices package that will collect costs to invoice items in invoices and store data about received payment.</summary>
         <release-date>2005-11-15</release-date>
         <vendor url="http://www.cognovis.de">Cognovis</vendor>
         <description format="text/plain">Collect costs to invoice items and invoices, store payment information.</description>
         <maturity>0</maturity>
 
-        <provides url="invoices" version="1.0d8"/>
+        <provides url="invoices" version="1.0d9"/>
         <requires url="acs-content-repository" version="5.1.4d3"/>
         <requires url="acs-kernel" version="5.0d13"/>
         <requires url="acs-templating" version="5.1.5d1"/>
@@ -25,7 +25,7 @@
         <requires url="organizations" version="0.5d2"/>
         <requires url="ref-currency" version="0.2d"/>
         <requires url="contacts" version="1.1d11"/>
-	
+
         <callbacks>
             <callback type="after-install"  proc="iv::install::create_install"/>
             <callback type="after-instantiate"  proc="iv::install::package_instantiate"/>
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.37 -r1.38
--- openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	29 May 2006 16:09:56 -0000	1.37
+++ openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	5 Jun 2006 14:07:36 -0000	1.38
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="invoices" package_version="1.0d7" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="invoices" package_version="1.0d8" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="accepted">Auftragsbest�tigungen</msg>
   <msg key="Accepted_date">Akzeptiert am</msg>
@@ -115,6 +115,14 @@
   <msg key="iv_cost_Title">Title</msg>
   <msg key="iv_cost_variable_cost_p">Fixed cost?</msg>
   <msg key="iv_cost_View">View Cost</msg>
+  <msg key="iv_credit_amount">Gutschriftsbetrag</msg>
+  <msg key="iv_credit_amount_help">Betrag der dem Kunden gutgeschrieben wird. Cent Betr�ge getrennt durch Punkt, nicht Komma. &lt;br&gt;&lt;font color=&quot;red&quot;&gt;Keinen negativen Betrag eingeben&lt;/font&gt;&lt;/br&gt;</msg>
+  <msg key="iv_credit_due_date">Gutschriftsdatum</msg>
+  <msg key="iv_credit_due_date_help">Tag an welchem die Gutschrift erstellt wird.</msg>
+  <msg key="iv_credit_invoice_nr">Gutschriftsnummer</msg>
+  <msg key="iv_credit_invoice_nr_help">Nummer der Gutschrift. Wird aus dem fortlaufenden Rechnungsnummernkreis gezogen.</msg>
+  <msg key="iv_credit_recipient">Gutschriftsempf�nger</msg>
+  <msg key="iv_credit_recipient_help">Empf�nger der Gutschrift</msg>
   <msg key="iv_display_price_list">Preisliste anzeigen</msg>
   <msg key="iv_from_last_years">Rechnungen der letzten %last_years% years Jahre:</msg>
   <msg key="iv_invoice_1">Rechnung</msg>
@@ -127,6 +135,7 @@
   <msg key="iv_invoice_amount_sum">Summe</msg>
   <msg key="iv_invoice_cancel_1">Storno</msg>
   <msg key="iv_invoice_cancel_Add">Storno hinzuf�gen</msg>
+  <msg key="iv_invoice_cancel_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Stornorechnung&lt;/h3&gt;%data.contact_salutation%,&lt;p&gt;anbei finden Sie die Stornorechnung %data.invoice_nr%.&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;br&gt;WIENERS + WIENERS GmbH&lt;br&gt;&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_invoice_cancel_email_subject">Stornorechnung # %invoice_nr%</msg>
   <msg key="iv_invoice_cancellation">Storno durch</msg>
   <msg key="iv_invoice_cancelled_invoice">Storno f�r</msg>
@@ -140,6 +149,7 @@
   <msg key="iv_invoice_creation_user">erstellt von</msg>
   <msg key="iv_invoice_credit_1">Gutschrift</msg>
   <msg key="iv_invoice_credit_Add">Gutschrift erstellen</msg>
+  <msg key="iv_invoice_credit_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Gutschrift&lt;/h3&gt;%data.contact_salutation%,&lt;p&gt;anbei finden Sie die Rechnungsgutschrift %data.invoice_nr%.&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;br&gt;WIENERS + WIENERS GmbH&lt;br&gt;&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_invoice_credit_email_subject">Gutschrift # %invoice_nr%</msg>
   <msg key="iv_invoice_credit_New">Neue Gutschrift</msg>
   <msg key="iv_invoice_credit_New2">Neue Gutschrift erstellen</msg>
@@ -152,6 +162,7 @@
   <msg key="iv_invoice_due_date_help">An welchem Tag wird die Rechnung f�llig</msg>
   <msg key="iv_invoice_Edit">Rechnung �ndern</msg>
   <msg key="iv_invoice_edit_error">Sie d�rfen keine bezahlte oder stornierte Rechnung �ndern.</msg>
+  <msg key="iv_invoice_email">&lt;html&gt;&lt;body&gt;%data.contact_salutation%,&lt;p&gt;anbei finden Sie die Rechnung %data.invoice_nr%.&lt;p&gt;Mit freundlichen Gr��en&lt;p&gt;%am_name;noquote%&lt;br&gt;Kundenberatung&lt;br/&gt; Durchwahl: %am_directphoneno%&lt;br&gt;&lt;b&gt;WIENERS+WIENERS GmbH&lt;/b&gt;&lt;/body&gt;&lt;/html&gt;</msg>
   <msg key="iv_invoice_email_p">Email schicken</msg>
   <msg key="iv_invoice_email_subject">Rechnung # %invoice_nr%</msg>
   <msg key="iv_invoice_end_date">Enddatum</msg>
@@ -212,13 +223,15 @@
   <msg key="iv_invoice_Title">Titel</msg>
   <msg key="iv_invoice_Title_help">Titel der Rechnung</msg>
   <msg key="iv_invoice_total_amount">Rechnungsbetrag netto</msg>
+  <msg key="iv_invoice_total_amount_help">Betrag der dem Kunden gutgeschrieben wird. Cent Betr�ge getrennt durch Punkt, nicht Komma. &lt;br&gt;&lt;font color=&quot;red&quot;&gt;Keinen negativen Betrag eingeben&lt;/font&gt;&lt;/br&gt;</msg>
   <msg key="iv_invoice_url">Invoices</msg>
   <msg key="iv_invoice_url2">Rechnungen, Preislisten, Reports</msg>
   <msg key="iv_invoice_vat">Mehrwertsteuer</msg>
   <msg key="iv_invoice_vat_percent">Mehrwertsteuersatz</msg>
   <msg key="iv_invoice_vat_percent_help">Mehrwertsteuersatz welcher der Rechnung hinzugef�gt wird</msg>
   <msg key="iv_invoice_View">Rechnung ansehen</msg>
   <msg key="iv_invoice_view">Rechnungen ansehen</msg>
+  <msg key="iv_invoices_email">&lt;html&gt;&lt;body&gt;%contact.salutation%,&lt;p&gt;anbei finden Sie die Rechnungen %invoice_nrs%.&lt;p&gt;Mit freundlichen Gr��en&lt;p&gt;%am_name;noquote%&lt;br&gt;Kundenberatung&lt;br/&gt; Durchwahl: %am_directphoneno%&lt;br&gt;&lt;b&gt;WIENERS+WIENERS GmbH&lt;/b&gt;&lt;/body&gt;&lt;/html&gt;</msg>
   <msg key="iv_invoices_email_subject">Rechnungen # %invoice_nrs%</msg>
   <msg key="iv_join_invoice">Vorbereitete Rechnungen laden</msg>
   <msg key="iv_journal">Rechnungsbuch</msg>
@@ -230,6 +243,8 @@
   <msg key="iv_offer_accept">Angebot akzeptieren</msg>
   <msg key="iv_offer_accepted_date">Auftragsdatum</msg>
   <msg key="iv_offer_accepted_date_help">Datum der Annahme</msg>
+  <msg key="iv_offer_accepted_email">&lt;html&gt;&lt;body&gt;%data.contact_salutation%, &lt;p&gt;vielen Dank f�r Ihren Auftrag!&lt;p&gt;
+Die Details entnehmen Sie bitte der angeh�ngten PDF-Datei.&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&lt;p&gt;%am_name;noquote%&lt;br&gt;Kundenberatung&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_offer_accepted_email_subject">Auftragsbest�tigung # %offer_nr%</msg>
   <msg key="iv_offer_accepted_thanks">Vielen Dank f�r die Annahme unseres Angebots. Wir werden Sie so schnell wie m�glich diesbez�glich kontaktieren.</msg>
   <msg key="iv_offer_Add">Kostenaufstellung f�r &quot;%organization_name%&quot;</msg>
@@ -259,7 +274,8 @@
   <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;%data.contact_salutation%,&lt;p&gt;anbei erhalten Sie das gew�nschte Angebot als PDF-Datei.&lt;p&gt;Um das Angebot freizugeben, klicken Sie bitte &lt;a href=&quot;%accept_link%&quot;&gt;hier&lt;/a&gt;.&lt;p&gt;Viele Gr&uuml;&szlig;e&lt;p&gt;%am_name;noquote%&lt;br&gt;Kundenberatung&lt;br/&gt;
+  <msg key="iv_offer_email">&lt;html&gt;&lt;body&gt;%data.contact_salutation%,&lt;p&gt;anbei erhalten Sie das gew�nschte Angebot als PDF-Datei.&lt;p&gt;Um das Angebot freizugeben, klicken Sie bitte &lt;a href=&quot;%accept_link%&quot;&gt;hier&lt;/a&gt;.&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&lt;p&gt;%am_name;noquote%&lt;br&gt;Kundenberatung&lt;br/&gt;
+Durchwahl: %am_directphoneno%&lt;br&gt;&lt;b&gt;WIENERS+WIENERS GmbH&lt;/b&gt;&lt;/body&gt;&lt;/html&gt;</msg>
   <msg key="iv_offer_email_subject">Angebot # %offer_nr%</msg>
   <msg key="iv_offer_file">Datei anh�ngen</msg>
   <msg key="iv_offer_file_delete">Dateien l�schen</msg>
@@ -334,8 +350,6 @@
   <msg key="iv_offer_send">Angebot schicken</msg>
   <msg key="iv_offer_send_accepted">Auftragsbest�tigung schicken</msg>
   <msg key="iv_offer_send_again">Angebot erneut schicken</msg>
-  <msg key="iv_offer_show_sum_p">Gesamtsumme im Angebot</msg>
-  <msg key="iv_offer_show_sum_p_help">Soll die Gesamtsumme im Angebots-PDF angezeigt werden</msg>
   <msg key="iv_offer_subproject_finish_date_help">Interne Deadline des Subprojektes</msg>
   <msg key="iv_offer_template">Angebotsvorlage</msg>
   <msg key="iv_offer_Title">Titel</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.39 -r1.40
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	24 May 2006 09:40:37 -0000	1.39
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	5 Jun 2006 14:07:36 -0000	1.40
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="invoices" package_version="1.0d7" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="invoices" package_version="1.0d8" locale="en_US" charset="ISO-8859-1">
 
   <msg key="accepted">Order confirmation</msg>
   <msg key="Accepted_date">Accepted on</msg>
@@ -115,6 +115,14 @@
   <msg key="iv_cost_Title">Title</msg>
   <msg key="iv_cost_variable_cost_p">Fixed cost?</msg>
   <msg key="iv_cost_View">View Cost</msg>
+  <msg key="iv_credit_amount">Gutschriftsbetrag</msg>
+  <msg key="iv_credit_amount_help">Betrag der dem Kunden gutgeschrieben wird. Cent Betr�ge getrennt durch Punkt, nicht Komma. &lt;br&gt;&lt;font color=&quot;red&quot;&gt;Keinen negativen Betrag eingeben&lt;/font&gt;&lt;/br&gt;</msg>
+  <msg key="iv_credit_due_date">Credit date</msg>
+  <msg key="iv_credit_due_date_help">Date when the credit is issued.</msg>
+  <msg key="iv_credit_invoice_nr">Gutschriftsnummer</msg>
+  <msg key="iv_credit_invoice_nr_help">Credit invoice number. Taken from the invoice number cycle.</msg>
+  <msg key="iv_credit_recipient">Credit Recipient</msg>
+  <msg key="iv_credit_recipient_help">Recipient of the credit</msg>
   <msg key="iv_display_price_list">Display price list</msg>
   <msg key="iv_from_last_years">Invoices from the last %last_years% years:</msg>
   <msg key="iv_invoice_1">Invoice</msg>
@@ -215,6 +223,7 @@
   <msg key="iv_invoice_Title">Title</msg>
   <msg key="iv_invoice_Title_help">Title for the invoice</msg>
   <msg key="iv_invoice_total_amount">Total amount</msg>
+  <msg key="iv_invoice_total_amount_help">Betrag der dem Kunden gutgeschrieben wird. Cent Betr�ge getrennt durch Punkt, nicht Komma. &lt;br&gt;&lt;font color=&quot;red&quot;&gt;Keinen negativen Betrag eingeben&lt;/font&gt;&lt;/br&gt;</msg>
   <msg key="iv_invoice_url">Invoices</msg>
   <msg key="iv_invoice_url2">Rechnungen, Preislisten, Reports</msg>
   <msg key="iv_invoice_vat">VAT</msg>
Index: openacs-4/packages/invoices/lib/offer-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/offer-list.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/invoices/lib/offer-list.tcl	24 May 2006 09:40:38 -0000	1.14
+++ openacs-4/packages/invoices/lib/offer-list.tcl	5 Jun 2006 14:07:36 -0000	1.15
@@ -126,7 +126,7 @@
 	}
 	project_contact {
 	    label {[_ invoices.iv_offer_project_contact]}
-	    display_template {<a href="@iv_offer.contact_link@">@iv_offer.contact_first_names@ @iv_offer.contact_last_name@</a>&nbsp;<if @iv_offer.contact_phone@ not nil><a href="phone:@iv_offer.contact_phone@"><img src="/resources/wieners/telephone.png" border=0 alt="@iv_offer.contact_phone;noquote@"></a></if>}
+	    display_template {<a href="@iv_offer.contact_link@">@iv_offer.contact_first_names@ @iv_offer.contact_last_name@</a>&nbsp;<if @iv_offer.contact_phone@ not nil><a href="phone:@iv_offer.contact_phone@"><img src="/resources/invoices/telephone.png" border=0 alt="@iv_offer.contact_phone;noquote@"></a></if>}
 	}
         amount_total {
 	    label {[_ invoices.iv_offer_amount_total]}
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.32 -r1.33
--- openacs-4/packages/invoices/www/invoice-ae.tcl	31 May 2006 17:15:41 -0000	1.32
+++ openacs-4/packages/invoices/www/invoice-ae.tcl	5 Jun 2006 14:07:36 -0000	1.33
@@ -314,7 +314,7 @@
 
 	# get all subprojects marked for no invoice to display warning
 	foreach main_project_id $project_id {
-	    set subprojects [wieners::process::subprojects -project_id $main_project_id]
+	    set subprojects [pm::project:subprojects -project_id $main_project_id]
 
 	    db_foreach not_invoiceable_subprojects {} {
 		set offer_url [export_vars -base offer-ae {offer_id {mode display}}]
Index: openacs-4/packages/invoices/www/resources/telephone.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/resources/telephone.png,v
diff -u
Binary files differ