X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fwh.pl;h=477ab0bceca9021e05652975b04a3dd92890d58b;hb=58265754620f2c93d858a062eadfd3e16812099c;hp=8f312c8590c009dcafa965c9ac7b01e8491ba6a0;hpb=eb3f8a469fc97e8a1eb73f50a63b18a7eb2567e6;p=kivitendo-erp.git

diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 8f312c859..477ab0bce 100644
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -150,13 +150,14 @@ sub transfer_or_removal_prepare_contents {
 
   $form->show_generic_error($locale->text("The source warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
 
-  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber partunit);
+  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber partunit ean);
 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id},
                                            "bin_id"       => $form->{bin_id},
                                            "chargenumber" => $form->{chargenumber},
-                                           "partnumber"   => $form->{partnumber},
+					   "partnumber"   => $form->{partnumber},
+					   "ean"   	  => $form->{ean},
                                            "description"  => $form->{description});
 
   $form->show_generic_error($locale->text("The selected warehouse is empty.")) if (0 == scalar(@contents));
@@ -287,7 +288,7 @@ sub transfer_stock_update_part {
   } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description}) {
 
     $form->{no_services}   = 1;
-    $form->{no_assemblies} = 1;
+    $form->{no_assemblies} = 0;	# assemblies duerfen eingelagert werden (z.B. bei retouren)
 
     my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);
 
@@ -842,7 +843,7 @@ sub generate_report {
 sub show_no_warehouses_error {
   $lxdebug->enter_sub();
 
-  my $msg = $locale->text('No warehouse has been created yet.') . ' ';
+  my $msg = $locale->text('No warehouse has been created yet or the quantity of the bins is not configured yet.') . ' ';
 
   if ($auth->check_right($form->{login}, 'config')) {
     $msg .= $locale->text('You can create warehouses and bins via the menu "System -> Warehouses".');