X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fwh.pl;h=f4971078554893cee622d2032ff57db942eabc38;hb=d18df453f55190d4807af324725ea82a8835d7fc;hp=5326cfb52c5115f7b7021a485a2fd6b525889d47;hpb=752642dd833d795ac8d97bfe2fd6e6d97e3de496;p=kivitendo-erp.git

diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 5326cfb52..f49710785 100644
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -49,6 +49,8 @@ use Data::Dumper;
 require "bin/mozilla/common.pl";
 require "bin/mozilla/reportgenerator.pl";
 
+use strict;
+
 # parserhappy(R):
 
 # contents of the "transfer_type" table:
@@ -69,9 +71,13 @@ require "bin/mozilla/reportgenerator.pl";
 # --------------------------------------------------------------------
 
 sub transfer_warehouse_selection {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('warehouse_management');
 
-  $auth->assert('warehouse_management');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->get_lists('warehouses' => { 'key'    => 'WAREHOUSES',
                                      'bins'   => 'BINS', });
@@ -79,7 +85,8 @@ sub transfer_warehouse_selection {
   show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} });
 
   my $units      = AM->retrieve_units(\%myconfig, $form);
-  $form->{UNITS} = AM->unit_select_data($units, $form->{unit}, 0, $form->{partunit});
+  # der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor
+  $form->{UNITS} = AM->unit_select_data($units, $form->{partunit}, 0, $form->{partunit});
 
   if (scalar @{ $form->{WAREHOUSES} }) {
     $form->{warehouse_id} ||= $form->{WAREHOUSES}->[0]->{id};
@@ -104,18 +111,25 @@ sub transfer_warehouse_selection {
     $form->{title}   = $locale->text('Transfer');
     $content         = $form->parse_html_template('wh/warehouse_selection');
 
+  } elsif ($form->{trans_type} eq 'assembly') {
+    $form->{title} = $locale->text('Produce Assembly');
+    $content       = $form->parse_html_template('wh/warehouse_selection_assembly');
   }
 
   $form->header();
   print $content;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub transfer_parts_selection {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('warehouse_management');
+  $main::auth->assert('warehouse_management');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   transfer_or_removal_prepare_contents('direction' => 'transfer');
 
@@ -123,16 +137,20 @@ sub transfer_parts_selection {
   $form->header();
   print $form->parse_html_template("wh/transfer_parts_selection");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub transfer_or_removal_prepare_contents {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('warehouse_management');
+  $main::auth->assert('warehouse_management');
 
   my %args = @_;
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
   $form->get_lists('warehouses' => { 'key'    => 'WAREHOUSES',
                                      'bins'   => 'BINS', });
 
@@ -147,16 +165,20 @@ 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 bestbefore partunit ean);
 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id},
                                            "bin_id"       => $form->{bin_id},
                                            "chargenumber" => $form->{chargenumber},
+                                           "bestbefore"   => $form->{bestbefore},
                                            "partnumber"   => $form->{partnumber},
+                                           "ean"          => $form->{ean},
                                            "description"  => $form->{description});
 
-  $form->show_generic_error($locale->text("The selected warehouse is empty.")) if (0 == scalar(@contents));
+  if (0 == scalar(@contents)) {
+    $form->show_generic_error($locale->text("The selected warehouse is empty, or no stocked items where found that match the filter settings."));
+  }
 
   my $all_units = AM->retrieve_units(\%myconfig, $form);
 
@@ -179,14 +201,18 @@ sub transfer_or_removal_prepare_contents {
   $form->{CONTENTS}       = \@contents;
   $form->{TRANSFER_TYPES} = $transfer_types;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 
 sub transfer_parts {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('warehouse_management');
 
-  $auth->assert('warehouse_management');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->get_lists('warehouses' => { 'key' => 'WAREHOUSES', 'bins' => 'BINS' });
 
@@ -197,7 +223,7 @@ sub transfer_parts {
 
   $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 bestbefore partunit);
 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id});
@@ -221,12 +247,12 @@ sub transfer_parts {
       'transfer_type_id' => $form->{transfer_type_id},
     };
 
-    map { $transfer->{$_} = $form->{"${_}_${row}"} } qw(src_bin_id chargenumber parts_id qty dst_warehouse_id dst_bin_id);
+    map { $transfer->{$_} = $form->{"${_}_${row}"} } qw(src_bin_id chargenumber bestbefore parts_id qty dst_warehouse_id dst_bin_id);
 
     my $entry;
 
     foreach (@contents) {
-      if (($_->{binid} == $transfer->{src_bin_id}) && ($_->{parts_id} == $transfer->{parts_id}) && ($_->{chargenumber} eq $transfer->{chargenumber})) {
+      if (($_->{binid} == $transfer->{src_bin_id}) && ($_->{parts_id} == $transfer->{parts_id}) && ($_->{chargenumber} eq $transfer->{chargenumber}) && $_->{bestbefore} eq $transfer->{bestbefore}) {
         $entry = $_;
         last;
       }
@@ -254,7 +280,7 @@ sub transfer_parts {
 
   if (!scalar @transfers) {
     $form->show_generic_information($locale->text('Nothing has been selected for transfer.'));
-    exit 0;
+    ::end_of_request();
   }
 
   WH->transfer(@transfers);
@@ -264,7 +290,7 @@ sub transfer_parts {
 
   transfer_warehouse_selection();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # --------------------------------------------------------------------
@@ -272,27 +298,75 @@ sub transfer_parts {
 # --------------------------------------------------------------------
 
 sub transfer_stock_update_part {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->{trans_type} = 'stock';
   $form->{qty}        = $form->parse_amount(\%myconfig, $form->{qty});
 
-  if (!$form->{partnumber} && !$form->{description}) {
-    delete @{$form}{qw(parts_id partunit)};
+  if (!$form->{partnumber} && !$form->{description} && !$form->{ean}) {
+    delete @{$form}{qw(parts_id partunit ean)};
     transfer_warehouse_selection();
 
-  } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description}) {
+  } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description} || $form->{ean}) {
 
-    $form->{no_services}   = 1;
-    $form->{no_assemblies} = 1;
+#    $form->{no_services}   = 1; # services may now be transfered. fix for Bug 1383.
+    $form->{no_assemblies} = 0; # assemblies duerfen eingelagert werden (z.B. bei retouren)
 
     my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);
 
+    if (!scalar @{ $parts }) {
+      new_item(action => "transfer_stock_update_part");
+    } elsif (scalar @{ $parts } == 1) {
+      @{$form}{qw(parts_id partnumber description ean)} = @{$parts->[0]}{qw(id partnumber description ean)};
+      transfer_stock_get_partunit();
+      transfer_warehouse_selection();
+
+    } else {
+      select_part('transfer_stock_part_selected', @{ $parts });
+    }
+
+  } else {
+    transfer_stock_get_partunit();
+    transfer_warehouse_selection();
+  }
+
+  $main::lxdebug->leave_sub();
+}
+
+# --------------------------------------------------------------------
+# Transfer: assemblies
+# Dies ist die Auswahlmaske für ein assembly.
+# Die ist einfach von transfer_assembly_update_part kopiert und nur um den trans_type (assembly) korrigiert worden
+# Es wäre schön, hier nochmal check_assembly_max_create auf, um die max. Fertigungszahl herauszufinden.
+# Ich lass das mal als auskommentierte Idee bestehen jb 18.3.09
+# --------------------------------------------------------------------
+
+sub transfer_assembly_update_part {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $form->{trans_type} = 'assembly';
+  $form->{qty}        = $form->parse_amount(\%myconfig, $form->{qty});
+
+  if (!$form->{partnumber} && !$form->{description}) {
+    delete @{$form}{qw(parts_id partunit)};
+    transfer_warehouse_selection();
+
+  } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description}) {
+    $form->{assemblies} = 1;
+    $form->{no_assemblies} = 0;
+    my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);
     if (scalar @{ $parts } == 1) {
       @{$form}{qw(parts_id partnumber description)} = @{$parts->[0]}{qw(id partnumber description)};
       transfer_stock_get_partunit();
       transfer_warehouse_selection();
-
     } else {
       select_part('transfer_stock_part_selected', @{ $parts });
     }
@@ -302,35 +376,111 @@ sub transfer_stock_update_part {
     transfer_warehouse_selection();
   }
 
-  $lxdebug->leave_sub();
+# hier die oben benannte idee
+#    my $maxcreate = Common->check_assembly_max_create(assembly_id => $form->{parts_id}, dbh => $my_dbh);
+  $main::lxdebug->leave_sub();
 }
 
 sub transfer_stock_part_selected {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my $part = shift;
 
-  @{$form}{qw(parts_id partnumber description)} = @{$part}{qw(id partnumber description)};
+  my $form     = $main::form;
+
+  @{$form}{qw(parts_id partnumber description ean)} = @{$part}{qw(id partnumber description ean)};
 
   transfer_stock_get_partunit();
   transfer_warehouse_selection();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub transfer_stock_get_partunit {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
   if ($form->{parts_id}) {
     my $part_info     = IC->get_basic_part_info('id' => $form->{parts_id});
     $form->{partunit} = $part_info->{unit};
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
+}
+
+# vorüberlegung jb 22.2.2009
+# wir benötigen für diese funktion, die anzahl die vom erzeugnis hergestellt werden soll. vielleicht direkt per js fehleingaben verhindern?
+# ferner dann nochmal mit check_asssembly_max_create gegenprüfen und dann transaktionssicher wegbuchen.
+# wir brauchen eine hilfsfunktion, die nee. brauchen wir nicht. der algorithmus läuft genau wie bei check max_create, nur dass hier auch eine lagerbewegung (verbraucht) stattfindet
+# Manko ist derzeit noch, dass unterschiedliche Lagerplätze, bzw. das Quelllager an sich nicht ausgewählt werden können.
+# Laut Absprache in KW11 09 übernimmt mb hier den rest im April ... jb 18.3.09
+
+sub create_assembly {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $form->{qty} = $form->parse_amount(\%myconfig, $form->{qty});
+  if ($form->{qty} <= 0) {
+    $form->show_generic_error($locale->text('Invalid quantity.'), 'back_button' => 1);
+  }
+  # TODO Es wäre schön, hier schon die maximale Anzahl der zu fertigenden Erzeugnisse zu haben
+  #else { if ($form->{qty} > $maxcreate) { #s.o.
+  #     $form->show_generic_error($locale->text('Can not create that quantity with current stock'), 'back_button' => 1);
+  #     $form->show_generic_error('Maximale Stückzahl' . $maxcreate , 'back_button' => 1);
+  #   }
+  #  }
+
+  if (!$form->{warehouse_id} || !$form->{bin_id}) {
+    $form->error($locale->text('The warehouse or the bin is missing.'));
+  }
+
+  if (!$::lx_office_conf{system}->{show_best_before}) {
+      $form->{bestbefore} = '';
+  }
+
+  # WIESO war das nicht vorher schon ein %HASH?? ein hash ist ein hash! das hat mich mehr als eine Stunde gekostet herauszufinden. grr. jb 3.3.2009
+  # Anm. jb 18.3. vielleicht auch nur meine unwissenheit in perl-datenstrukturen
+  my %TRANSFER = (
+    'transfer_type'    => 'assembly',
+    'login'            => $form->{login},
+    'dst_warehouse_id' => $form->{warehouse_id},
+    'dst_bin_id'       => $form->{bin_id},
+    'chargenumber'     => $form->{chargenumber},
+    'bestbefore'       => $form->{bestbefore},
+    'assembly_id'      => $form->{parts_id},
+    'qty'              => $form->{qty},
+    'unit'             => $form->{unit},
+    'comment'          => $form->{comment}
+  );
+
+  my $ret = WH->transfer_assembly (%TRANSFER);
+  # Frage: Ich pack in den return-wert auch gleich die Fehlermeldung. Irgendwelche Nummern als Fehlerkonstanten definieren find ich auch nicht besonders schick...
+  # Ideen? jb 18.3.09
+  if ($ret ne "1"){
+    # Die locale-Funktion kann keine Double-Quotes escapen, deswegen hier erstmal so (ein wahrscheinlich immerwährender Hotfix) s.a. Frage davor jb 25.4.09
+    $form->show_generic_error($ret, 'back_button' => 1);
+  }
+
+  delete @{$form}{qw(parts_id partnumber description qty unit chargenumber bestbefore comment)};
+
+  $form->{saved_message} = $locale->text('The assembly has been created.');
+  $form->{trans_type}    = 'assembly';
+
+  transfer_warehouse_selection();
+
+  $main::lxdebug->leave_sub();
 }
 
 sub transfer_stock {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->{qty} = $form->parse_amount(\%myconfig, $form->{qty});
 
@@ -347,6 +497,7 @@ sub transfer_stock {
     'dst_warehouse_id' => $form->{warehouse_id},
     'dst_bin_id'       => $form->{bin_id},
     'chargenumber'     => $form->{chargenumber},
+    'bestbefore'       => $form->{bestbefore},
     'parts_id'         => $form->{parts_id},
     'qty'              => $form->{qty},
     'unit'             => $form->{unit},
@@ -355,14 +506,14 @@ sub transfer_stock {
 
   WH->transfer($transfer);
 
-  delete @{$form}{qw(parts_id partnumber description qty unit chargenumber comment)};
+  delete @{$form}{qw(parts_id partnumber description qty unit chargenumber bestbefore comment ean)};
 
   $form->{saved_message} = $locale->text('The parts have been stocked.');
   $form->{trans_type}    = 'stock';
 
   transfer_warehouse_selection();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # --------------------------------------------------------------------
@@ -370,9 +521,13 @@ sub transfer_stock {
 # --------------------------------------------------------------------
 
 sub removal_parts_selection {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('warehouse_management');
 
-  $auth->assert('warehouse_management');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   transfer_or_removal_prepare_contents('direction' => 'out');
 
@@ -380,13 +535,17 @@ sub removal_parts_selection {
   $form->header();
   print $form->parse_html_template("wh/removal_parts_selection");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub remove_parts {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('warehouse_management');
+  $main::auth->assert('warehouse_management');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->get_lists('warehouses' => { 'key'    => 'WAREHOUSES',
                                      'bins'   => 'BINS', });
@@ -398,7 +557,7 @@ sub remove_parts {
 
   $form->show_generic_error($locale->text("The 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 bestbefore partunit);
 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id});
@@ -422,12 +581,12 @@ sub remove_parts {
       'transfer_type_id' => $form->{transfer_type_id},
     };
 
-    map { $transfer->{$_} = $form->{"${_}_${row}"} } qw(src_bin_id chargenumber parts_id qty);
+    map { $transfer->{$_} = $form->{"${_}_${row}"} } qw(src_bin_id chargenumber bestbefore parts_id qty);
 
     my $entry;
 
     foreach (@contents) {
-      if (($_->{binid} == $transfer->{src_bin_id}) && ($_->{parts_id} == $transfer->{parts_id}) && ($_->{chargenumber} eq $transfer->{chargenumber})) {
+      if (($_->{binid} == $transfer->{src_bin_id}) && ($_->{parts_id} == $transfer->{parts_id}) && ($_->{chargenumber} eq $transfer->{chargenumber}) && ($_->{bestbefore} eq $transfer->{bestbefore})) {
         $entry = $_;
         last;
       }
@@ -455,7 +614,7 @@ sub remove_parts {
 
   if (!scalar @transfers) {
     $form->show_generic_information($locale->text('Nothing has been selected for removal.'));
-    exit 0;
+    ::end_of_request();
   }
 
   WH->transfer(@transfers);
@@ -465,7 +624,7 @@ sub remove_parts {
 
   transfer_warehouse_selection();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # --------------------------------------------------------------------
@@ -473,10 +632,15 @@ sub remove_parts {
 # --------------------------------------------------------------------
 
 sub journal {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('warehouse_management');
 
-  $auth->assert('warehouse_management');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
+  $form->{title} = $locale->text('Report about warehouse transactions');
   $form->get_lists('warehouses' => { 'key'  => 'WAREHOUSES',
                                      'bins' => 'BINS', });
 
@@ -487,27 +651,31 @@ sub journal {
   $form->header();
   print $form->parse_html_template("wh/journal_filter", { "UNITS" => AM->unit_select_data(AM->retrieve_units(\%myconfig, $form)) });
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub generate_journal {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('warehouse_management');
+  $main::auth->assert('warehouse_management');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->{title}   = $locale->text("WHJournal");
   $form->{sort}  ||= 'date';
 
   my %filter;
-  my @columns = qw(trans_id date warehouse_from bin_from warehouse_to bin_to partnumber partdescription chargenumber trans_type comment qty employee projectnumber);
+  my @columns = qw(trans_id date warehouse_from bin_from warehouse_to bin_to partnumber partdescription chargenumber bestbefore trans_type comment qty employee oe_id projectnumber);
 
   # filter stuff
-  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber);
+  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore);
 
   $filter{qty_op} = WH->convert_qty_op($form->{qty_op});
   if ($filter{qty_op}) {
-    $form->isblank(qty,      $locale->text('Quantity missing.'));
-    $form->isblank(qty_unit, $locale->text('Unit missing.'));
+    $form->isblank("qty",      $locale->text('Quantity missing.'));
+    $form->isblank("qty_unit", $locale->text('Unit missing.'));
 
     $filter{qty}      = $form->{qty};
     $filter{qty_unit} = $form->{qty_unit};
@@ -517,7 +685,7 @@ sub generate_journal {
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   my @hidden_variables = map { "l_${_}" } @columns;
-  push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber qty_op qty qty_unit fromdate todate);
+  push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber bestbefore qty_op qty qty_unit fromdate todate);
 
   my %column_defs = (
     'date'            => { 'text' => $locale->text('Date'), },
@@ -529,11 +697,13 @@ sub generate_journal {
     'bin_from'        => { 'text' => $locale->text('Bin From'), },
     'bin_to'          => { 'text' => $locale->text('Bin To'), },
     'partnumber'      => { 'text' => $locale->text('Part Number'), },
-    'partdescription' => { 'text' => $locale->text('Description'), },
+    'partdescription' => { 'text' => $locale->text('Part Description'), },
     'chargenumber'    => { 'text' => $locale->text('Charge Number'), },
+    'bestbefore'      => { 'text' => $locale->text('Best Before'), },
     'qty'             => { 'text' => $locale->text('Qty'), },
     'employee'        => { 'text' => $locale->text('Employee'), },
     'projectnumber'   => { 'text' => $locale->text('Project Number'), },
+    'oe_id'           => { 'text' => $locale->text('Document'), },
   );
 
   my $href = build_std_url('action=generate_journal', grep { $form->{$_} } @hidden_variables);
@@ -546,19 +716,30 @@ sub generate_journal {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('generate_journal', @hidden_variables);
+  $report->set_export_options('generate_journal', @hidden_variables, qw(sort order));
 
   $report->set_sort_indicator($form->{sort}, $form->{order});
 
   $report->set_options('output_format'        => 'HTML',
                        'title'                => $form->{title},
-                       'attachment_basename'  => strftime('warehouse_journal_%Y%m%d', localtime time));
+                       'attachment_basename'  => strftime($locale->text('warehouse_journal_list') . '_%Y%m%d', localtime time));
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   my $all_units = AM->retrieve_units(\%myconfig, $form);
   my @contents  = WH->get_warehouse_journal(%filter);
 
-  foreach $entry (@contents) {
+  my %doc_types = ( 'sales_quotation'         => { script => 'oe', title => $locale->text('Sales quotation') },
+                    'sales_order'             => { script => 'oe', title => $locale->text('Sales Order') },
+                    'request_quotation'       => { script => 'oe', title => $locale->text('Request quotation') },
+                    'purchase_order'          => { script => 'oe', title => $locale->text('Purchase Order') },
+                    'sales_delivery_order'    => { script => 'do', title => $locale->text('Sales delivery order') },
+                    'purchase_delivery_order' => { script => 'do', title => $locale->text('Purchase delivery order') },
+                    'sales_invoice'           => { script => 'is', title => $locale->text('Sales Invoice') },
+                    'purchase_invoice'        => { script => 'ir', title => $locale->text('Purchase Invoice') },
+                  );
+
+  foreach my $entry (@contents) {
     $entry->{qty}        = $form->format_amount_units('amount'     => $entry->{qty},
                                                       'part_unit'  => $entry->{partunit},
                                                       'conv_units' => 'convertible');
@@ -567,25 +748,30 @@ sub generate_journal {
     my $row = { };
 
     foreach my $column (@columns) {
-      next if ($column eq 'trans_type');
-
       $row->{$column} = {
         'data'  => $entry->{$column},
         'align' => $column_alignment{$column},
       };
     }
 
-    $row->{trans_type} = {
-      'raw_data' => $entry->{trans_type},
-      'align'    => $column_alignment{trans_type},
-    };
+    $row->{trans_type}->{raw_data} = $entry->{trans_type};
+
+    if ($form->{l_oe_id}) {
+      $row->{oe_id}->{data} = '';
+      my $info              = $entry->{oe_id_info};
+
+      if ($info && $info->{id} && $info->{type} && $doc_types{$info->{type}}) {
+        $row->{oe_id} = { data => $doc_types{ $info->{type} }->{title} . ' ' . $info->{number},
+                          link => build_std_url('script=' . $doc_types{ $info->{type} }->{script} . '.pl', 'action=edit', 'id=' . $info->{id}, 'type=' . $info->{type}) };
+      }
+    }
 
     $report->add_data($row);
   }
 
   $report->generate_with_headers();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # --------------------------------------------------------------------
@@ -593,18 +779,24 @@ sub generate_journal {
 # --------------------------------------------------------------------
 
 sub report {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('warehouse_contents | warehouse_management');
 
-  $auth->assert('warehouse_content | warehouse_management');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->get_lists('warehouses' => { 'key'    => 'WAREHOUSES',
                                      'bins'   => 'BINS', });
 
   show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} });
 
-  $form->{fokus}   = "partnumber";
-  $form->{onload} .= "focus();";
-  $form->{title}   = $locale->text("Report about wareouse contents");
+  $form->{jsscript} = 1;
+
+#  $form->{fokus}   = "partnumber";
+#  $form->{onload} .= "focus();";
+  $form->{title}   = $locale->text("Report about warehouse contents");
 
   $form->header();
   print $form->parse_html_template("wh/report_filter",
@@ -612,28 +804,32 @@ sub report {
                                      "WAREHOUSES" => $form->{WAREHOUSES},
                                      "UNITS"      => AM->unit_select_data(AM->retrieve_units(\%myconfig, $form)) });
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub generate_report {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('warehouse_content | warehouse_management');
+  $main::auth->assert('warehouse_contents | warehouse_management');
 
-  $form->{title}   = $locale->text("Report about wareouse contents");
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $form->{title}   = $locale->text("Report about warehouse contents");
   $form->{sort}  ||= 'partnumber';
   my $sort_col     = $form->{sort};
 
   my %filter;
-  my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber qty);
+  my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber bestbefore qty stock_value);
 
   # filter stuff
-  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber);
+  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore);
 
   $filter{qty_op} = WH->convert_qty_op($form->{qty_op});
   if ($filter{qty_op}) {
-    $form->isblank(qty,      $locale->text('Quantity missing.'));
-    $form->isblank(qty_unit, $locale->text('Unit missing.'));
+    $form->isblank("qty",      $locale->text('Quantity missing.'));
+    $form->isblank("qty_unit", $locale->text('Unit missing.'));
 
     $filter{qty}      = $form->{qty};
     $filter{qty_unit} = $form->{qty_unit};
@@ -645,60 +841,72 @@ sub generate_report {
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   my @hidden_variables = map { "l_${_}" } @columns;
-  push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber qty_op qty qty_unit l_warehousedescription l_bindescription);
+  push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber bestbefore qty_op qty qty_unit l_warehousedescription l_bindescription);
   push @hidden_variables, qw(include_empty_bins subtotal);
 
   my %column_defs = (
     'warehousedescription' => { 'text' => $locale->text('Warehouse'), },
     'bindescription'       => { 'text' => $locale->text('Bin'), },
     'partnumber'           => { 'text' => $locale->text('Part Number'), },
-    'partdescription'      => { 'text' => $locale->text('Description'), },
+    'partdescription'      => { 'text' => $locale->text('Part Description'), },
     'chargenumber'         => { 'text' => $locale->text('Charge Number'), },
+    'bestbefore'           => { 'text' => $locale->text('Best Before'), },
     'qty'                  => { 'text' => $locale->text('Qty'), },
+    'stock_value'          => { 'text' => $locale->text('Stock value'), },
   );
 
   my $href = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
   map { $column_defs{$_}->{link} = $href . "&sort=${_}&order=" . Q($_ eq $sort_col ? 1 - $form->{order} : $form->{order}) } @columns;
 
-  my %column_alignment = map { $_ => 'right' } qw(qty);
+  my %column_alignment = map { $_ => 'right' } qw(qty stock_value);
 
   map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('generate_report', @hidden_variables);
+  $report->set_export_options('generate_report', @hidden_variables, qw(sort order));
 
   $report->set_sort_indicator($sort_col, $form->{order});
 
   $report->set_options('output_format'        => 'HTML',
                        'title'                => $form->{title},
-                       'attachment_basename'  => strftime('warehouse_report_%Y%m%d', localtime time));
+                       'attachment_basename'  => strftime($locale->text('warehouse_report_list') . '_%Y%m%d', localtime time));
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   my $all_units = AM->retrieve_units(\%myconfig, $form);
   my @contents  = WH->get_warehouse_report(%filter);
 
-  my $subtotal  = 0;
   my $idx       = 0;
 
-  foreach $entry (@contents) {
-    $subtotal     += $entry->{qty};
-    $entry->{qty}  = $form->format_amount_units('amount'     => $entry->{qty},
-                                                'part_unit'  => $entry->{partunit},
-                                                'conv_units' => 'convertible');
+  my @subtotals_columns = qw(qty stock_value);
+  my %subtotals         = map { $_ => 0 } @subtotals_columns;
 
-    $row_set = [ { map { $_ => { 'data' => $entry->{$_}, 'align' => $column_alignment{$_} } } @columns } ];
+  my $total_stock_value = 0;
+
+  foreach my $entry (@contents) {
+    map { $subtotals{$_} += $entry->{$_} } @subtotals_columns;
+    $total_stock_value   += $entry->{stock_value} * 1;
+
+    $entry->{qty}         = $form->format_amount_units('amount'     => $entry->{qty},
+                                                       'part_unit'  => $entry->{partunit},
+                                                       'conv_units' => 'convertible');
+    $entry->{stock_value} = $form->format_amount(\%myconfig, $entry->{stock_value} * 1, 2);
+
+    my $row_set = [ { map { $_ => { 'data' => $entry->{$_}, 'align' => $column_alignment{$_} } } @columns } ];
 
     if (($form->{subtotal} eq 'Y')
         && (($idx == (scalar @contents - 1))
             || ($entry->{$sort_col} ne $contents[$idx + 1]->{$sort_col}))) {
 
       my $row = { map { $_ => { 'data' => '', 'class' => 'listsubtotal', 'align' => $column_alignment{$_}, } } @columns };
-      $row->{qty}->{data} = $form->format_amount_units('amount'     => $subtotal,
-                                                       'part_unit'  => $entry->{partunit},
-                                                       'conv_units' => 'convertible');
-      $subtotal = 0;
+      $row->{qty}->{data}         = $form->format_amount_units('amount'     => $subtotals{qty} * 1,
+                                                               'part_unit'  => $entry->{partunit},
+                                                               'conv_units' => 'convertible');
+      $row->{stock_value}->{data} = $form->format_amount(\%myconfig, $subtotals{stock_value} * 1, 2);
+
+      %subtotals                  = map { $_ => 0 } @subtotals_columns;
 
       push @{ $row_set }, $row;
     }
@@ -708,9 +916,23 @@ sub generate_report {
     $idx++;
   }
 
+  if ($column_defs{stock_value}->{visible}) {
+    $report->add_separator();
+
+    my $row                      = { map { $_ => { 'data' => '', 'class' => 'listsubtotal', } } @columns };
+
+    my $left_col                 = first { $column_defs{$_}->{visible} } @columns;
+
+    $row->{$left_col}->{data}    = $locale->text('Total stock value');
+    $row->{stock_value}->{data}  = $form->format_amount(\%myconfig, $total_stock_value, 2);
+    $row->{stock_value}->{align} = 'right';
+
+    $report->add_data($row);
+  }
+
   $report->generate_with_headers();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # --------------------------------------------------------------------
@@ -718,11 +940,15 @@ sub generate_report {
 # --------------------------------------------------------------------
 
 sub show_no_warehouses_error {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  my $msg = $locale->text('No warehouse has been created yet.') . ' ';
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  if ($auth->check_right($form->{login}, 'config')) {
+  my $msg = $locale->text('No warehouse has been created yet or the quantity of the bins is not configured yet.') . ' ';
+
+  if ($main::auth->check_right($form->{login}, 'config')) {
     $msg .= $locale->text('You can create warehouses and bins via the menu "System -> Warehouses".');
   } else {
     $msg .= $locale->text('Please ask your administrator to create warehouses and bins.');
@@ -730,12 +956,14 @@ sub show_no_warehouses_error {
 
   $form->show_generic_error($msg);
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub get_warehouse_idx {
   my ($warehouse_id) = @_;
 
+  my $form     = $main::form;
+
   for (my $i = 0; $i < scalar @{$form->{WAREHOUSES}}; $i++) {
     return $i if ($form->{WAREHOUSES}->[$i]->{id} == $warehouse_id);
   }
@@ -746,6 +974,8 @@ sub get_warehouse_idx {
 sub get_bin_idx {
   my ($warehouse_index, $bin_id) = @_;
 
+  my $form     = $main::form;
+
   my $warehouse = $form->{WAREHOUSES}->[$warehouse_index];
 
   return -1 if (!$warehouse);
@@ -757,16 +987,65 @@ sub get_bin_idx {
   return -1;
 }
 
+sub new_item {
+  $main::lxdebug->enter_sub();
+  my %params = @_;
+
+  my $form     = $main::form;
+
+  # change callback
+  $form->{old_callback} = $form->escape($form->{callback}, 1);
+  $form->{callback}     = $form->escape("$form->{script}?action=$params{action}", 1);
+
+  # save all form variables except action in a previousform variable
+  my $previousform = join '&', map { my $value = $form->{$_}; $value =~ s/&/%26/; "$_=$value" } grep { !/action/ } keys %$form;
+  my @HIDDENS = ();
+
+#  push @HIDDENS,      { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) };
+  push @HIDDENS, map +{ 'name' => $_,             'value' => $form->{$_} }, qw(partnumber description unit vc sellprice ean);
+  push @HIDDENS,      { 'name' => 'taxaccount2',  'value' => $form->{taxaccounts} };
+  push @HIDDENS,      { 'name' => 'notes',        'value' => $form->{longdescription} };
+
+  $form->header();
+  print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } );
+
+  $main::lxdebug->leave_sub();
+}
+
 sub update {
+  my $form     = $main::form;
   call_sub($form->{update_nextsub} || $form->{nextsub});
 }
 
 sub continue {
+  my $form     = $main::form;
   call_sub($form->{continue_nextsub} || $form->{nextsub});
 }
 
 sub stock {
+  my $form     = $main::form;
   call_sub($form->{stock_nextsub} || $form->{nextsub});
 }
 
 1;
+
+__END__
+
+=head1 NAME
+
+bin/mozilla/wh.pl - Warehouse frontend.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item new_item
+
+call new item dialogue from warehouse masks.
+
+PARAMS:
+  action  => name of sub to be called when new item is done
+
+=back
+
+=cut