From: Bernd Blessmann <bibi@online.de>
Date: Mon, 16 Jan 2012 10:55:06 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~32^2~9
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7c7d58ebe9550b153ec01f5e10e512da57612648;hp=8242726b1ba5810ae12f3a8f27431115d166f58f;p=kivitendo-erp.git

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

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 2ace9a7b4..25831b2ea 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -463,10 +463,11 @@ sub update {
 
   $main::auth->assert('vendor_invoice_edit');
 
-#  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining);
-
   &check_name('vendor');
 
+  if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
+    $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate});
+  }
   $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'sell');
   $form->{exchangerate} = $form->{forex} if $form->{forex};
 
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index bcbf10782..f438f1c9b 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -485,8 +485,6 @@ sub update {
 
   my ($recursive_call) = @_;
 
-  $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate}) unless $recursive_call;
-
   $form->{print_and_post} = 0         if $form->{second_run};
   my $taxincluded         = $form->{taxincluded} ? "checked" : '';
   $form->{update} = 1;
@@ -495,6 +493,9 @@ sub update {
 
   $form->{taxincluded} ||= $taxincluded;
 
+  if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
+    $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate}) unless $recursive_call;
+  }
   $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
   $form->{exchangerate} = $form->{forex} if $form->{forex};
 
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 40a9b4e02..aa6df6d61 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -536,11 +536,13 @@ sub update {
 
   set_headings($form->{"id"} ? "edit" : "add");
 
-  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call;
   $form->{update} = 1;
 
   &check_name($form->{vc});
 
+  if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
+    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call;
+  }
   my $buysell           = 'buy';
   $buysell              = 'sell' if ($form->{vc} eq 'vendor');
   $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell);
diff --git a/doc/changelog b/doc/changelog
index c19e8c4c1..e85c85e23 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -87,6 +87,7 @@
   - Bugfix 1752: Rechnung -> Druckvorschau ignoriert Änderung des Steuersatz beim Beleg
   - Bugfix 1708: Fehlender Übertrag der Lieferadresse von Angebot -> Auftragsbestätigung
   - Bugfix 1648: bebuchte Konten sollten nicht in Überschriften umgewandelt werden können
+  - Bugfix 1775: Wechselkurs in Einkaufrechnung kann nicht eingegeben werden
 
 
 2011-06-15 - Release 2.6.3