X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=837b842b4585690d089586e2aeaeb48561074941;hb=937e37ad007405c6a3a389ee18006379ffecc073;hp=5269d09fc07c354ccb18bc037a36ac065dfbc466;hpb=82c4717d48bbdb8d30c9671e71ecb0d6d8eac963;p=kivitendo-erp.git

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 5269d09fc..837b842b4 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1489,8 +1489,7 @@ sub link_part {
   IC->create_links("IC", \%myconfig, \%$form);
 
   # currencies
-  map({ $form->{selectcurrency} .= "<option>$_\n" }
-      split(/:/, $form->{currencies}));
+  map({ $form->{selectcurrency} .= "<option>$_\n" } $::form->get_all_currencies());
 
   # parts and assemblies have the same links
   my $item = $form->{item};
@@ -1594,9 +1593,11 @@ sub form_header {
   my $no_default_bin_entry = { 'id' => '0', description => '--', 'BINS' => [ { id => '0', description => ''} ] };
   push @ { $form->{WAREHOUSES} }, $no_default_bin_entry;
   if (my $max = scalar @{ $form->{WAREHOUSES} }) {
-
-    my $default_warehouse_id = $::instance_conf->get_default_warehouse_id;
-    my $default_bin_id       = $::instance_conf->get_default_bin_id;
+    my ($default_warehouse_id, $default_bin_id);
+    if ($form->{action} eq 'add') { # default only for new entries
+      $default_warehouse_id = $::instance_conf->get_default_warehouse_id;
+      $default_bin_id       = $::instance_conf->get_default_bin_id;
+    }
     $form->{warehouse_id} ||= $default_warehouse_id || $form->{WAREHOUSES}->[$max -1]->{id};
     $form->{bin_id}       ||= $default_bin_id       ||  $form->{WAREHOUSES}->[$max -1]->{BINS}->[0]->{id};
   }