Menüvariante "Oben (mit CSS, neu)" bei Stilvorlage "lx-office" nicht verdeckt lassen

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 591e02df3e61108a6debb8da5bde601b298d4a5e..8915ca20f1cff28bc5e2a5f988f3b25731d31054 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::DO;
 use SL::IC;
 use SL::IS;

+use SL::Layout::Dispatcher;

 use SL::Locale;
 use SL::Mailer;
 use SL::Menu;
 use SL::Locale;
 use SL::Mailer;
 use SL::Menu;


@@ -457,12 +458,13 @@ sub header {
   $::lxdebug->leave_sub and return if !$ENV{HTTP_USER_AGENT} || $self->{header}++;
 
   if ($params{no_layout}) {
   $::lxdebug->leave_sub and return if !$ENV{HTTP_USER_AGENT} || $self->{header}++;
 
   if ($params{no_layout}) {

-    $::request->{layout} = SL::Controller::Layout->new(style => 'none');
+    $::request->{layout} = SL::Layout::Dispatcher->new(style => 'none');

   }
 
   my $layout = $::request->{layout};
 
   # standard css for all
   }
 
   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
   $layout->use_stylesheet("$_.css") for qw(
     main menu tabcontent list_accounts jquery.autocomplete
     jquery.multiselect2side frame_header/header


@@ -1739,10 +1741,9 @@ sub set_payment_options {
     $amounts{invtotal} = $self->{invtotal};
     $amounts{total}    = $self->{total};
   }
     $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;
 
   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});
   $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});