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

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index f967c79..1aca213 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -336,7 +336,7 @@ sub account_header {
 
   # account where AR_tax or AP_tax is set are not orphaned if they are used as
   # tax-o-matic account
-  if ( $form->{id} && !$form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
+  if ( $form->{id} && $form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
     if (SL::DB::Manager::Tax->find_by(chart_id => $form->{id})) {
       $form->{orphaned} = 0;
     }

diff --git a/css/kivitendo/menu.css b/css/kivitendo/menu.css
index 0ae57a2..3523c74 100644 (file)
--- a/css/kivitendo/menu.css
+++ b/css/kivitendo/menu.css
@@ -19,7 +19,6 @@ body.menuv4 {
        /*border: 3px solid;*/
        background-color: #FFFFFF;
        color: #000000;
-       margin-top: 15px;
 }
 #menuv4 a, #menuv4 h2, #menuv4 div.x {
        font-size: 80%;
@@ -290,8 +289,6 @@ div#menuv3 li:hover ul, div#menuv3 li li:hover ul, div#menuv3 li li li:hover ul,
    and one mic (menu-item-chunk)
    indenting is done with the levels s0, s1, s2 */
 #content.html-menu, #html-menu {
-  position: relative;
-  top: 20px;
   transition:         margin-left 0.2s, width 0.2s;
   -moz-transition:    margin-left 0.2s, width 0.2s;
   -webkit-transition: margin-left 0.2s, width 0.2s;

diff --git a/css/lx-office-erp/frame_header/header.css b/css/lx-office-erp/frame_header/header.css
index 1e96c98..852a76c 100644 (file)
--- a/css/lx-office-erp/frame_header/header.css
+++ b/css/lx-office-erp/frame_header/header.css
@@ -8,9 +8,6 @@
 }
 
 #frame-header {
-  position: fixed; 
-  top: 0px;
-  z-index: 99;
   background: url('../../../image/bg_titel.gif') repeat-x;
   text-align: center;
   margin: 0;

diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index ac73a9e..19f98b2 100644 (file)
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -296,8 +296,6 @@ div#menuv4 li li li li:hover ul
    and one mic (menu-item-chunk)
    indenting is done with the levels s0, s1, s2 */
 #content.html-menu, #html-menu {
-  position: relative;
-  top: 20px;
   transition:         margin-left 0.2s, width 0.2s;
   -moz-transition:    margin-left 0.2s, width 0.2s;
   -webkit-transition: margin-left 0.2s, width 0.2s;