Index: openacs-4/packages/invoices/invoices.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/invoices.info,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/invoices/invoices.info	4 Aug 2006 15:43:42 -0000	1.29
+++ openacs-4/packages/invoices/invoices.info	10 Aug 2006 07:34:59 -0000	1.30
@@ -7,15 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="1.0a4" url="http://openacs.org/repository/download/apm/invoices-1.0a4.apm">
+    <version name="1.0a5" url="http://openacs.org/repository/download/apm/invoices-1.0a5.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.0a4"/>
+        <provides url="invoices" version="1.0a5"/>
         <requires url="acs-content-repository" version="5.1.4d3"/>
         <requires url="acs-kernel" version="5.0d13"/>
         <requires url="acs-templating" version="5.1.5d1"/>
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.41 -r1.42
--- openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	4 Aug 2006 15:38:49 -0000	1.41
+++ openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	10 Aug 2006 07:34:59 -0000	1.42
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="invoices" package_version="1.0a1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="invoices" package_version="1.0a4" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="accepted">Auftragsbest�tigungen</msg>
   <msg key="Accepted_date">Akzeptiert am</msg>
@@ -144,6 +144,7 @@
   <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_help">Storniert</msg>
   <msg key="iv_invoice_cancelled_invoice">Storno f�r</msg>
   <msg key="iv_invoice_closed_date">beendet am</msg>
   <msg key="iv_invoice_contact">Kundenkontakt</msg>
@@ -154,13 +155,15 @@
   <msg key="iv_invoice_creation_date">erstellt am</msg>
   <msg key="iv_invoice_creation_date_help">Datum an dem die Rechnung angelegt wurde</msg>
   <msg key="iv_invoice_creation_user">erstellt von</msg>
+  <msg key="iv_invoice_creation_user_help">Ersteller der Rechnung</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>
   <msg key="iv_invoice_currency">W�hrung</msg>
+  <msg key="iv_invoice_currency_help">W�hrung der Rechnung</msg>
   <msg key="iv_invoice_Delete">Rechnung l�schen</msg>
   <msg key="iv_invoice_Description">Beschreibung</msg>
   <msg key="iv_invoice_Description_help">Beschreibung auf der Rechnung</msg>
@@ -254,7 +257,7 @@
   <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;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;p&gt;%am_name;noquote%&lt;br&gt;Kundenberatung&lt;br/&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;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_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>
@@ -286,14 +289,15 @@
   <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;Wenn Sie das Angebot akzeptieren und den Auftrag erteilen m�chten, klicken Sie bitte &lt;a href=&quot;%accept_link%&quot;&gt;hier&lt;/a&gt;.&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&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;Wenn Sie das Angebot akzeptieren und den Auftrag erteilen m�chten, klicken Sie bitte &lt;a href=&quot;%accept_link;noquote%&quot;&gt;hier&lt;/a&gt;.&lt;p&gt;Sollte der Link nicht funktionieren, klicken Sie auf folgende URL:&lt;br&gt;%accept_link;noquote%&lt;p&gt;Oder kopieren Sie diese URL in Ihren Browser.&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>
   <msg key="iv_offer_file_delete_help">Zum L�schen von Dateien die entsprechende Checkbox markieren.</msg>
   <msg key="iv_offer_file_help">Dateien zur internen Verwendung - diese werden nicht mit dem Angebot verschickt!</msg>
   <msg key="iv_offer_file_view">Dateien</msg>
+  <msg key="iv_offer_file_view_help">Angebotsdatei ansehen</msg>
   <msg key="iv_offer_finish_date">Lieferdatum</msg>
   <msg key="iv_offer_finish_date_help">Abgabetermin, zu dem das Projekt an den Kunden ausgeliefert werden muss</msg>
   <msg key="iv_offer_finish_time">Timing Uhrzeit</msg>
@@ -412,6 +416,8 @@
   <msg key="iv_reports">Rechnungs Report</msg>
   <msg key="last_years">Letztes Jahr</msg>
   <msg key="Link_instances">Anwendungen verlinken</msg>
+  <msg key="lt_empty_offer_id">In der URL ist leider die Angebotsnummer nicht enthalten. M�glicherweise hat Ihr E-Mail-Programm beim Anklicken des Links nicht die gesamte URL �bergeben - einige E-Mail-Programme umbrechen die URLs, dann geht beim Klick auf den Link die zweite Zeile verloren. In diesem Fall bitte den zweiten Teil der URL einfach kopieren und im Browser an den ersten Teil anh�ngen. Vielen Dank!</msg>
+  <msg key="lt_no_org_for_invoice">Leider konnten wir keine Organisation als Rechnungsempf�nger finden. Bitte stellen Sie sicher, das der Rechnungsempf�nger als Angestellter einer Firma im System hinterlegt ist (�ber eine employment_relationship)</msg>
   <msg key="lt_no_such_invoice_no">Leider k�nnen wir die von Ihnen angeforderte Rechnungsnummer nicht in unserem System finden. Bitte �berpr�fen Sie ob die Nummer richtig ist.</msg>
   <msg key="Mapped">Verbunden</msg>
   <msg key="mass_invoice_email_body">Die Stapelverarbeitung der Rechungen ist abschlossen. &lt;p&gt; %failed_projects_html%</msg>
@@ -425,6 +431,7 @@
   <msg key="New">Neu</msg>
   <msg key="New_clients">Neue Kunden</msg>
   <msg key="no">Nein</msg>
+  <msg key="no_organization_for_invoice">Keine Organisation f�r die Rechnung gefunden.</msg>
   <msg key="no_such_invoice_no">Unbekannte Rechnungsnummer</msg>
   <msg key="None">Keine</msg>
   <msg key="Number_of_units">Anzahl Stunden</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.43 -r1.44
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	4 Aug 2006 15:38:49 -0000	1.43
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	10 Aug 2006 07:34:59 -0000	1.44
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="invoices" package_version="1.0a1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="invoices" package_version="1.0a4" locale="en_US" charset="ISO-8859-1">
 
   <msg key="accepted">Order confirmation</msg>
   <msg key="Accepted_date">Accepted on</msg>
@@ -144,6 +144,7 @@
   <msg key="iv_invoice_cancel_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Cancellation&lt;/h3&gt;%data.contact_salutation%,&lt;p&gt;see attached invoice cancellation %data.invoice_nr%.&lt;p&gt;Best wishes,&lt;br&gt;WIENERS + WIENERS GmbH&lt;br&gt;&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_invoice_cancel_email_subject">Cancellation # %invoice_nr%</msg>
   <msg key="iv_invoice_cancellation">Canceled by</msg>
+  <msg key="iv_invoice_cancelled_help">Cancelled</msg>
   <msg key="iv_invoice_cancelled_invoice">Cancelled invoice</msg>
   <msg key="iv_invoice_closed_date">Finished on</msg>
   <msg key="iv_invoice_contact">Invoice Contact</msg>
@@ -154,13 +155,15 @@
   <msg key="iv_invoice_creation_date">Created on</msg>
   <msg key="iv_invoice_creation_date_help">Date the invoice was created</msg>
   <msg key="iv_invoice_creation_user">Created by</msg>
+  <msg key="iv_invoice_creation_user_help">Creation user of the invoice</msg>
   <msg key="iv_invoice_credit_1">Credit</msg>
   <msg key="iv_invoice_credit_Add">Add invoice credit</msg>
   <msg key="iv_invoice_credit_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Credit&lt;/h3&gt;%data.contact_salutation%,&lt;p&gt;see attached invoice credit %data.invoice_nr%.&lt;p&gt;Best wishes,&lt;br&gt;WIENERS + WIENERS GmbH&lt;br&gt;&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_invoice_credit_email_subject">Credit # %invoice_nr%</msg>
   <msg key="iv_invoice_credit_New">New Credit</msg>
   <msg key="iv_invoice_credit_New2">Create New Credit</msg>
   <msg key="iv_invoice_currency">Currency</msg>
+  <msg key="iv_invoice_currency_help">Currency of the invoice</msg>
   <msg key="iv_invoice_Delete">Delete Invoice</msg>
   <msg key="iv_invoice_Description">Description</msg>
   <msg key="iv_invoice_Description_help">Description on the invoice</msg>
@@ -284,13 +287,14 @@
   <msg key="iv_offer_Description_help">Description of the cost sheet</msg>
   <msg key="iv_offer_Edit">Edit Cost Sheet</msg>
   <msg key="iv_offer_edit_error">You are not allowed to edit an accepted or invoiced cost sheet</msg>
-  <msg key="iv_offer_email">&lt;html&gt;&lt;body&gt;%data.contact_salutation%,&lt;p&gt;Please find attached the requested quote as a PDF file. If you would like to accept the quote and place the assignment with us, please click &lt;a href=&quot;%accept_link;noquote%&quot;&gt;here&lt;/a&gt;.&lt;p&gt;Yours sincerely,&lt;p&gt;%am_name;noquote%&lt;br&gt;Customer services&lt;br&gt;%am_directphoneno_int;noquote%&lt;/html&gt;&lt;/body&gt;</msg>
+  <msg key="iv_offer_email">&lt;html&gt;&lt;body&gt;%data.contact_salutation%,&lt;p&gt;Please find attached the requested quote as a PDF file. If you would like to accept the quote and place the assignment with us, please click &lt;a href=&quot;%accept_link;noquote%&quot;&gt;here&lt;/a&gt;.&lt;p&gt;If the link doesn't work, try clicking on the following URL:&lt;br&gt;%accept_link;noquote%&lt;p&gt;Alternatively, copy the URL onto your browser.&lt;p&gt;Yours sincerely,&lt;p&gt;%am_name;noquote%&lt;br&gt;Customer services&lt;br&gt;%am_directphoneno_int;noquote%&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_offer_email_subject">Offer # %offer_nr%</msg>
   <msg key="iv_offer_file">File upload</msg>
   <msg key="iv_offer_file_delete">Delete Files</msg>
   <msg key="iv_offer_file_delete_help">Zum L�schen von Dateien die entsprechende Checkbox markieren.</msg>
   <msg key="iv_offer_file_help">File Help</msg>
   <msg key="iv_offer_file_view">Files</msg>
+  <msg key="iv_offer_file_view_help">offer file view</msg>
   <msg key="iv_offer_finish_date">Finish on</msg>
   <msg key="iv_offer_finish_date_help">Deadline until which the project has to be delivered to the client</msg>
   <msg key="iv_offer_finish_time">Finish time</msg>
@@ -409,6 +413,8 @@
   <msg key="iv_reports">Invoice Reports</msg>
   <msg key="last_years">Last Years</msg>
   <msg key="Link_instances">Link package instances</msg>
+  <msg key="lt_empty_offer_id">Sorry, the offer_id cannot be found on the URL. It is possible that when you left clicked, your email program did not transfer the whole URL - some email programs break up the URLs, which means the second part is lost when you left click. If this is the case, please just copy the second part of the URL and attach it to the first part in the browser. Thank you!</msg>
+  <msg key="lt_no_org_for_invoice">Sadly we were not able to find an organization where to send the invoice to. Please make sure that the invoice recipient is working at an organization and has an employment_relationship.</msg>
   <msg key="lt_no_such_invoice_no">We are sorry but the invoice number you are searching for does not exist in our system.</msg>
   <msg key="Mapped">Mapped</msg>
   <msg key="mass_invoice_email_body">The mass generation of invoices is finished.&lt;p&gt; %failed_projects_html%</msg>
@@ -422,6 +428,7 @@
   <msg key="New">New</msg>
   <msg key="New_clients">New Clients</msg>
   <msg key="no">No</msg>
+  <msg key="no_organization_for_invoice">No organization for invoice found</msg>
   <msg key="no_such_invoice_no">No such invoice number</msg>
   <msg key="None">None</msg>
   <msg key="Number_of_units">Number of units</msg>
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.35 -r1.36
--- openacs-4/packages/invoices/www/invoice-ae.tcl	4 Aug 2006 15:36:38 -0000	1.35
+++ openacs-4/packages/invoices/www/invoice-ae.tcl	10 Aug 2006 07:34:59 -0000	1.36
@@ -526,11 +526,15 @@
 
     # Get the VAT percent from the recieving company
     if {[person::person_p -party_id $recipient_id]} {
-	set rec_organization_id [contact::util::get_employee_organization -employee_id $recipient_id]
+	set contacts_package_id [lindex [application_link::get_linked -from_package_id $package_id -to_package_key contacts] 0]
+	set rec_organization_id [contact::util::get_employee_organization -employee_id $recipient_id -package_id $contacts_package_id]
     } else {
 	set rec_organization_id $recipient_id
     }
 
+    if {$rec_organization_id eq ""} {
+	ad_return_error "[_ invoices.no_organization_for_invoice]" "[_ invoices.lt_no_org_for_invoice]"
+    }
     set rec_orga_rev_id [content::item::get_best_revision -item_id $rec_organization_id]
     set vat_percent [ams::value -object_id $rec_orga_rev_id -attribute_name vat_percent]