From: G. Richardson <information@lx-office-hosting.de>
Date: Thu, 23 Feb 2012 12:10:30 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~354
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/36dcbd724cb061f35c22d5a31c1a47aba30f348c?hp=-c

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

36dcbd724cb061f35c22d5a31c1a47aba30f348c
diff --combined templates/print/RB/english.tex
index d57cd824a,901fbd2a2..6bb2ce431
--- a/templates/print/RB/english.tex
+++ b/templates/print/RB/english.tex
@@@ -39,7 -39,8 +39,8 @@@
  \newcommand{\weiteraufnaechsterseite} {to be continued on next page  ..}
  
  \newcommand{\zahlung} {Payment terms:}
- 
+ \newcommand{\textTelefon} {Tel.:}
+ \newcommand{\textFax} {Fax:}
  
  % angebot (sales_quotion)
  \newcommand{\angebot} {Quotation}
@@@ -70,8 -71,8 +71,8 @@@
  \newcommand{\zwischensumme} {Subtotal}
  \newcommand{\leistungsdatumGleichRechnungsdatum} {The date of service corresponds to that of the invoice.}
  \newcommand{\unserebankverbindung} {Our bank details}
 -\newcommand{\textKontonummer} {Accout no.:}
 -\newcommand{\textBank} {bei der}
 +\newcommand{\textKontonummer} {Account no.:}
 +\newcommand{\textBank} {at}
  \newcommand{\textBankleitzahl} {Bank code:}
  \newcommand{\textBic} {BIC:}
  \newcommand{\textIban} {IBAN:}
@@@ -89,7 -90,7 +90,7 @@@
  
  % sammelrechnung (statement)
  \newcommand{\sammelrechnung} {Statement}
 -\newcommand{\sammelrechnungsformel} {please note that following invoices are outstanding:}
 +\newcommand{\sammelrechnungsformel} {please note that the following invoices are outstanding:}
  \newcommand{\faellig} {Due}
  \newcommand{\aktuell} {Current}
  \newcommand{\asDreissig} {30}
@@@ -99,7 -100,7 +100,7 @@@
  % zahlungserinnerung (Mahnung)
  \newcommand{\mahnung} {Payment reminder}
  \newcommand{\mahnungsformel} {our records show that the following invoices are still outstanding:}
 -\newcommand{\beruecksichtigtBis} {We have taken into account payments received up to}
 +\newcommand{\beruecksichtigtBis} {We have taken into account payments received up until}
  \newcommand{\schonGezahlt} {If you have already paid in the meantime, please ignore this payment reminder.}
  
  % zahlungserinnerung_invoice (Rechnung zur Mahnung)