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.21 -r1.22 --- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml 16 Dec 2005 08:16:23 -0000 1.21 +++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml 27 Dec 2005 16:39:34 -0000 1.22 @@ -1,5 +1,5 @@ - + Accepted Offers Accepted on @@ -26,6 +26,7 @@ Category clear Client Account Manager + Contact Continue with Offer Acceptance Continue with Delete Cost @@ -50,6 +51,13 @@ Edit Template Number of files + Invoice + Cancellation + Invoice_Copy + Credit + Invoice_Opening + Offer + Accepted_Offer Final Amount Finish date Fixed cost? @@ -99,16 +107,19 @@ Amount sum Cancellation Add invoice cancellation - <html><body><h3>Cancellation</h3>%invoice_text%</html></body> + <html><body><h3>Cancellation</h3>%data.contact_salutation%,<p>see attached invoice cancellation %data.invoice_nr%.<p>Best wishes,<br>WIENERS + WIENERS GmbH<br></html></body> Cancellation # %invoice_nr% Finished on + Invoice Contact + Email recipient of this invoice + Send Invoice Copy Billed items Total items Created on Created by Credit Add invoice credit - <html><body><h3>Credit</h3>%invoice_text%</html></body> + <html><body><h3>Credit</h3>%data.contact_salutation%,<p>see attached invoice credit %data.invoice_nr%.<p>Best wishes,<br>WIENERS + WIENERS GmbH<br></html></body> Credit # %invoice_nr% New Credit Create New Credit @@ -120,7 +131,7 @@ Daten when the invoice is due. Edit Invoice You are not allowed to edit a paid or cancelled invoice - <html><body><h3>Invoice</h3>%invoice_text%</html></body> + <html><body><h3>Invoice</h3>%data.contact_salutation%,<p>see attached invoice %data.invoice_nr%.<p>Best wishes,<br>WIENERS + WIENERS GmbH<br></html></body> Invoice # %invoice_nr% Invoice number Number of the Invoice. Needs to be unique for accounting purposes. @@ -144,8 +155,10 @@ View Invoice Item New Invoice Create New Invoice + Send Opening Page Customer Client for whom to create the invoice + Send Invoice Amount paid Currency paid Invoice reference @@ -182,7 +195,7 @@ Cost Sheets Accept Offer Accepted on - <html><body><h3>Accepted Offer</h3>%recipient_salutation% %recipient_name%,<p>thank you for your order. We will contact you as soon as possible.</html></body> + <html><body><h3>Accepted Offer</h3>%data.contact_salutation%, <p>thank you for your order. We will contact you as soon as possible.<p>Best wishes,<br>WIENERS + WIENERS GmbH<br></html></body> Offer acceptance # %offer_nr% Thank you for accepting our offer. We will contact you as soon as possible. Cost Sheet for "%organization_name%" @@ -207,8 +220,11 @@ Description of the cost sheet Edit Cost Sheet You are not allowed to edit an accepted or invoiced cost sheet - <html><body><h3>Offer</h3>%offer_text%<p>To accept this offer, click <a href="%accept_link%">here</a>.</html></body> + <html><body><h3>Offer</h3>%data.contact_salutation%, <p>see our attached offer.<p>To accept this offer, click <a href="%accept_link%">here</a>.<p>Best wishes,<br>WIENERS + WIENERS GmbH<br></html></body> Offer # %offer_nr% + File upload + Delete Files + Files Finish on Deadline until which the project has to be delivered to the client Finish time @@ -250,6 +266,7 @@ Editing Translation Languages + Alternatively to the title provide a source and destination language. Title that is shown in the offer/invoice VAT View Cost Item @@ -318,6 +335,7 @@ Mapped Month Month + More than one customer New New Clients No @@ -369,4 +387,5 @@ VAT amount Year Yes + You have selected more than one customer. This is not allowed (how would you bill two different customers with the same invoice)