Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / SL / Form.pm
diff --git a/SL/Form.pm b/SL/Form.pm

index 46b1905..c14024f 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -56,6 +56,7 @@ use SL::DBUtils;
  use SL::DO;
  use SL::IC;
  use SL::IS;
+use SL::Layout::Dispatcher;
  use SL::Locale;
  use SL::Mailer;
  use SL::Menu;
@@ -454,11 +455,16 @@ sub header {
    my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
    my @header;
  
-  my $layout = $::request->{layout};
-
    $::lxdebug->leave_sub and return if !$ENV{HTTP_USER_AGENT} || $self->{header}++;
  
+  if ($params{no_layout}) {
+    $::request->{layout} = SL::Layout::Dispatcher->new(style => 'none');
+  }
+
+  my $layout = $::request->{layout};
+
    # standard css for all
+  # this should gradually move to the layouts that need it
    $layout->use_stylesheet("$_.css") for qw(
      main menu tabcontent list_accounts jquery.autocomplete
      jquery.multiselect2side frame_header/header
@@ -488,7 +494,6 @@ sub header {
    push @header, map { qq|<script type="text/javascript" src="$_"></script>| }                    $layout->javascripts;
    push @header, $self->{javascript} if $self->{javascript};
    push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
-  push @header, "<script type='text/javascript'>function fokus(){ document.$self->{fokus}.focus(); }</script>" if $self->{fokus};
  
    my  %doctypes = (
      strict       => qq|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|,
@@ -537,7 +542,7 @@ sub footer {
    print $::request->{layout}->post_content;
  
    if (my @inline_scripts = $::request->{layout}->javascripts_inline) {
-    print "<script type='text/javascript'>$_</script>\n" for @inline_scripts;
+    print "<script type='text/javascript'>@inline_scripts</script>\n";
    }
  
    print <<EOL
@@ -1092,6 +1097,7 @@ sub parse_template {
      UNLINK => ($::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files})? 0 : 1,
    );
    close $temp_fh;
+  (undef, undef, $self->{template_meta}{tmpfile}) = File::Spec->splitpath( $self->{tmpfile} );
  
    if ($template->uses_temp_file() || $self->{media} eq 'email') {
      $out              = $self->{OUT};
@@ -1736,10 +1742,9 @@ sub set_payment_options {
      $amounts{invtotal} = $self->{invtotal};
      $amounts{total}    = $self->{total};
    }
-  $amounts{skonto_in_percent} = 100.0 * $self->{percent_skonto};
-
    map { $amounts{$_} = $self->parse_amount($myconfig, $amounts{$_}) } keys %amounts;
  
+  $amounts{skonto_in_percent}  = 100.0 * $self->{percent_skonto};
    $amounts{skonto_amount}      = $amounts{invtotal} * $self->{percent_skonto};
    $amounts{invtotal_wo_skonto} = $amounts{invtotal} * (1 - $self->{percent_skonto});
    $amounts{total_wo_skonto}    = $amounts{total}    * (1 - $self->{percent_skonto});