X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/3c005fa1ac7b96ed002ecf7dc84852e79b4a2638..48c71a4b51f5359a7ab7e9bc51280baf9bc9b9b2:/bin/mozilla/wh.pl?ds=inline diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl index 214a26a64..78b05760c 100644 --- a/bin/mozilla/wh.pl +++ b/bin/mozilla/wh.pl @@ -45,6 +45,7 @@ use SL::WH; use SL::OE; use SL::Locale::String qw(t8); use SL::ReportGenerator; +use SL::Presenter::Part; use SL::DB::Part; @@ -70,6 +71,7 @@ use strict; # $locale->text('return_material') # $locale->text('release_material') # $locale->text('assembled') +# $locale->text('stocktaking') # -------------------------------------------------------------------- # Transfer @@ -700,8 +702,8 @@ sub generate_journal { my $idx = 0; foreach my $entry (@contents) { - $entry->{type_and_classific} = $::request->presenter->type_abbreviation($entry->{part_type}). - $::request->presenter->classification_abbreviation($entry->{classification_id}); + $entry->{type_and_classific} = SL::Presenter::Part::type_abbreviation($entry->{part_type}) . + SL::Presenter::Part::classification_abbreviation($entry->{classification_id}); $entry->{qty} = $form->format_amount(\%myconfig, $entry->{qty}); $entry->{trans_type} = $locale->text($entry->{trans_type}); @@ -740,7 +742,7 @@ sub generate_journal { $report->set_options('raw_bottom_info_text' => $form->parse_html_template('common/paginate', { 'pages' => $pages , 'base_url' => $href.'&sort='.$form->{sort}.'&order='.$form->{order}}) ); } - $report->generate_with_headers(action_bar => 1); + $report->generate_with_headers(); $main::lxdebug->leave_sub(); } @@ -915,8 +917,8 @@ sub generate_report { foreach my $entry (@contents) { - $entry->{type_and_classific} = $::request->presenter->type_abbreviation($entry->{part_type}). - $::request->presenter->classification_abbreviation($entry->{classification_id}); + $entry->{type_and_classific} = SL::Presenter::Part::type_abbreviation($entry->{part_type}). + SL::Presenter::Part::classification_abbreviation($entry->{classification_id}); map { $subtotals{$_} += $entry->{$_} } @subtotals_columns; $total_stock_value += $entry->{stock_value} * 1; $entry->{qty} = $form->format_amount(\%myconfig, $entry->{qty}); @@ -973,7 +975,7 @@ sub generate_report { {'pages' => $pages , 'base_url' => $href}) ); } - $report->generate_with_headers(action_bar => 1); + $report->generate_with_headers(); $main::lxdebug->leave_sub(); }