From: Sven Donath <lxo@dexo.de>
Date: Wed, 6 Oct 2010 21:55:00 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~104^2^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=98f1ede02f2100af3b113e824a8c992ae826b87c;hp=2a153abf478d94d05b5fe1c3113cffe4886fa2d8;p=kivitendo-erp.git

Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp
---

diff --git a/SL/DB/MetaSetup/Assembly.pm b/SL/DB/MetaSetup/Assembly.pm
index 408eea7af..038795183 100644
--- a/SL/DB/MetaSetup/Assembly.pm
+++ b/SL/DB/MetaSetup/Assembly.pm
@@ -16,14 +16,10 @@ __PACKAGE__->meta->setup(
     bom         => { type => 'boolean' },
     itime       => { type => 'timestamp', default => 'now()' },
     mtime       => { type => 'timestamp' },
-    variable    => { type => 'boolean', default => 'false', not_null => 1, remarks => 'true if this part of the assembly is variable, and can be modified' },
-    item_id     => { type => 'integer', remarks => 'used to group parts in an assembly for exclusive options' },
     assembly_id => { type => 'serial', not_null => 1 },
   ],
 
   primary_key_columns => [ 'assembly_id' ],
-
-  allow_inline_column_values => 1,
 );
 
 1;
diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index b119d7a59..ae2d6b746 100644
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -118,8 +118,7 @@ sub section_menu {
   my $form      = $main::form;
   my %myconfig  = %main::myconfig;
   my $locale    = $main::locale;
-  my $is_links_browser = 1;
-  if ( _calc_framesize() eq 240) { $is_links_browser = 0; }
+  my $is_not_links_browser = $ENV{HTTP_USER_AGENT} =~ /links/i ? 0 : 1;
 
   my $zeige;
 
@@ -204,13 +203,13 @@ sub section_menu {
                 qq|<tr><td class="hover" height="16" >$spacer|
                 . $menu->menuitem(\%myconfig, \%$form, $item, $level) ;
 
-            if (-f "image/icons/16x16/$label_icon" && ($is_links_browser))
+            if (-f "image/icons/16x16/$label_icon" && ($is_not_links_browser))
              { print
                 qq|<img src="image/icons/16x16/$label_icon" border="0" style="vertical-align:text-top" title="|
                 . $label
                 . qq|">&nbsp;&nbsp;| }
             else {
-                   if ($is_links_browser) {
+                   if ($is_not_links_browser) {
                     print qq|<img src="image/unterpunkt.png" border="0" style="vertical-align:text-top">|;
                    }
                 }
@@ -237,7 +236,7 @@ sub section_menu {
         print
           qq|<tr><td class="bg" height="24" align="left" valign="middle">
           <a href="menu.pl?action=acc_menu&level=$ml_" class="nohover" title="$label">|;
-              if ($is_links_browser) {
+              if ($is_not_links_browser) {
                   print qq|<img src="image/icons/24x24/$item.png" border="0" style="vertical-align:middle" title="$label">|;
               }
           print qq|&nbsp;$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|;
diff --git a/locale/de_DE/all b/locale/de_DE/all
index 85789fca0..b4ff85d5e 100644
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -1157,7 +1157,7 @@ $self->{texts} = {
   'Page #1/#2'                  => 'Seite #1/#2',
   'Paid'                        => 'bezahlt',
   'Part'                        => 'Ware',
-  'Part Description'            => 'Artikelbezeichung',
+  'Part Description'            => 'Artikelbezeichnung',
   'Part Description missing!'   => 'Artikelbezeichnung fehlt!',
   'Part Notes'                  => 'Artikelbeschreibung (Langtext)',
   'Part Number'                 => 'Artikelnummer',