From: G. Richardson <information@lx-office-hosting.de>
Date: Wed, 29 Feb 2012 09:34:05 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~348
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/46b00bb49d5514f00c8ebf70c19b0e929b6a5a9b?hp=682454ce7c16b199ce028caa069b0fc9aaa6b70b

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

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index d99d1eb37..66aa4b8f2 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -576,7 +576,7 @@ sub update {
 
         $form->{creditremaining} -= $amount;
 
-        map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice lastcost);
+        map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice lastcost);
 
         $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
 
@@ -938,6 +938,12 @@ sub credit_note {
 #  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
 #    qw(creditlimit creditremaining);
 
+  for my $i (1 .. $form->{rowcount}) {
+    for (qw(listprice)) {
+      $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"};
+    }
+  }
+
   my $currency = $form->{currency};
   &invoice_links;
 
diff --git a/doc/UPGRADE b/doc/UPGRADE
index e8b4ffcd4..85b91d3e8 100644
--- a/doc/UPGRADE
+++ b/doc/UPGRADE
@@ -32,6 +32,10 @@ Upgrade auf v2.7.0
   werden, oder auf anderem Wege erstellt werden. Der Prozess dazu wird sich in
   einer kommenden Version ändern.
 
+* Die Namen der von LaTeX generierten PDF-Dateien sind jetzt in der
+  eingestellten Dokumentensprache, nicht mehr in der Oberflächensprache des
+  Bearbeiters.
+
 * Neue Abhängigkeiten
 
   * JSON
diff --git a/templates/print/RB/english.tex b/templates/print/RB/english.tex
index 901fbd2a2..6bb2ce431 100644
--- a/templates/print/RB/english.tex
+++ b/templates/print/RB/english.tex
@@ -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:}
@@ -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}
@@ -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)