X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=c14024f95eeac18cb1c193893ae4c311bd5fc040;hb=8d771986641efbc83911b0ba007e6c240daea550;hp=4dc31182666c6190e2708a02a777e705be329a66;hpb=a8814e0ef7175fef00ba18195ba2d457095b96ad;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index 4dc311826..c14024f95 100644
--- 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|| } $layout->javascripts;
push @header, $self->{javascript} if $self->{javascript};
push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
- push @header, "" if $self->{fokus};
my %doctypes = (
strict => qq||,
@@ -531,15 +536,13 @@ EOT
}
sub footer {
- # TODO: fix abort conditions
-
return unless $::request->{layout}->need_footer;
print $::request->{layout}->end_content;
print $::request->{layout}->post_content;
if (my @inline_scripts = $::request->{layout}->javascripts_inline) {
- print "\n" for @inline_scripts;
+ print "\n";
}
print < ($::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};
@@ -1738,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});