Vor Fremdschlüsselzuweisung trans_id verwaiste Einträge in orderitems löschen

[kivitendo-erp.git] / SL / Layout / Javascript.pm

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index 6e6d6553d9b1049941b432c81c669fe8afa569fe..f3a2f0f066b50a4eb1874214aeadad88a99a65a3 100644 (file)
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -10,6 +10,14 @@ sub init_sub_layouts {
   [ SL::Layout::None->new ]
 }
 
+sub use_javascript {
+  my $self = shift;
+  qw(
+    js/quicksearch_input.js
+  ),
+  $self->SUPER::use_javascript(@_);
+}
+
 sub pre_content {
   &display
 }
@@ -26,6 +34,7 @@ sub stylesheets {
   $_[0]->add_stylesheets(qw(
     dhtmlsuite/menu-item.css
     dhtmlsuite/menu-bar.css
+    menu.css
   ));
   $_[0]->SUPER::stylesheets;
 }
@@ -114,7 +123,7 @@ sub create_menu {
     my $item      = { 'title' => $::locale->text($name) };
     push @{ $all_items }, $item;
 
-    if ($menu_item->{submenu} || !defined($menu_item->{module})) {
+    if ($menu_item->{submenu} || (!defined($menu_item->{module}) && !defined($menu_item->{href}))) {
       $item->{subitems} = [];
       $item->{image} = _icon_path("$name.png");
       $self->create_menu($menu, $item->{subitems}, "${parent}${name}", $depth * 1 + 1);