X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=248bbb1f83e5261cbde9a776cdb3e673acd24fcb;hb=72f018a6943ea8776f163e12f37bc0d91000b9aa;hp=071a7a4c246ad7246a03cbbe4929fcc12eec9f62;hpb=3c255f2892121da44822fd2c391a4ed5b333ff7e;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 071a7a4c2..248bbb1f8 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -305,7 +305,7 @@ sub form_header { # emulate click for resubmitting actions $dispatch_to_popup .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form; $dispatch_to_popup .= "document.do.submit();"; - $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup)"); + $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})"); } my $follow_up_vc = $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' }; @@ -313,6 +313,8 @@ sub form_header { $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')'; + $::request->layout->use_stylesheet('presenter/record/record_list.css'); + $form->header(); # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID' # und Erweiterung für Bug 1760: @@ -976,7 +978,7 @@ sub save_as_new { map { delete $form->{$_} } qw(printed emailed queued); delete @{ $form }{ grep { m/^stock_(?:in|out)_\d+/ } keys %{ $form } }; - # Let Lx-Office assign a new order number if the user hasn't changed the + # Let kivitendo assign a new order number if the user hasn't changed the # previous one. If it has been changed manually then use it as-is. $form->{donumber} =~ s/^\s*//g; $form->{donumber} =~ s/\s*$//g; @@ -1150,7 +1152,7 @@ sub display_stock_in_form { get_basic_bin_wh_info($stock_info); - $form->header(); + $form->header(no_layout => 1); print $form->parse_html_template('do/stock_in_form', { 'UNITS' => $units_data, 'STOCK_INFO' => $stock_info, 'PART_INFO' => $part_info, }); @@ -1244,7 +1246,7 @@ sub stock_out_form { } } - $form->header(); + $form->header(no_layout => 1); print $form->parse_html_template('do/stock_out_form', { 'UNITS' => $units_data, 'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents, 'PART_INFO' => $part_info, }); @@ -1444,7 +1446,7 @@ sub transfer_out { my $pinfo = $part_info_map{$request->{parts_id}}; my $binfo = $bin_info_map{$request->{bin_id}}; - if ($::lx_office_conf{features}->{show_best_before}) { + if ($::instance_conf->get_show_bestbefore) { push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, #5, for the transfer of #6.", $pinfo->{description}, $binfo->{warehouse_description},