From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 8 Nov 2012 14:42:00 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~21
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/347fcb5f3bba19631110d80b9ec0df7525d89b6d?hp=9b8c33ac6fc9badf163a4fdca1cb82b50984c980

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

diff --git a/SL/AM.pm b/SL/AM.pm
index 6862eb773..0e64e5a66 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -244,11 +244,18 @@ sub save_account {
   }
 
   $query = '
-    SELECT
-    accno
+    SELECT accno
     FROM chart
     WHERE accno = ?';
-  my ($accno) = selectrow_query($form, $dbh, $query, $form->{accno});
+
+  my @values = ($form->{accno});
+
+  if ( $form->{id} ) {
+    $query .= ' AND NOT id = ?';
+    push(@values, $form->{id});
+  }
+
+  my ($accno) = selectrow_query($form, $dbh, $query, @values);
 
   if ($accno) {
     $form->error($::locale->text('Account number not unique!'));
diff --git a/css/kivitendo/menu.css b/css/kivitendo/menu.css
index 625abec85..b5819a6cc 100644
--- a/css/kivitendo/menu.css
+++ b/css/kivitendo/menu.css
@@ -29,12 +29,6 @@ body.menuv4 {
 	margin: 0;
 	padding: 0.3em 1em;
 }
-#menuv4 h2:before {
-	content: " ";
-}
-#menuv4 h2:after {
-	content: " ";
-}
 #menuv4 h2 {
 	background-color: #ffffff;
 	color: #000000;
diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index 807082ee4..469d9de1f 100644
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -115,13 +115,11 @@ position:absolute;
 z-index:500;
 top:auto;
 display:none;
-background:#000;
 }
 
 #menuv3 ul ul ul {
 top:0;
 left:100%;
-background:#000;
 }
 
 /* Begin non-anchor hover selectors */
@@ -176,12 +174,6 @@ margin:0;
 padding:1px 0 1px 3px;
 }
 
-#menuv4 h2:before {
-    content:" ";
-}
-#menuv4 h2:after {
-    content:" ";
-}
 #menuv4 h2 {
 color:#fff;
 padding:2px 10px;
@@ -223,11 +215,6 @@ float:none;
 border:0;
 }
 
-#menuv4 li.sub {
-left:-25px;
-top:-3px;
-}
-
 /* IE6 spacing bug fix, <li>s without a bottom border get spaced to far
  * correction: the bug will change the height of the parent element! this will also cause the whole menu to grow
  * so the only method to get this pile of crap going is to add a bottom border to the <li>s, where the enclosing <ul> already has
@@ -255,7 +242,7 @@ display:none;
 
 #menuv4 ul ul ul {
 top:0;
-left:100%;
+left:90%;
 }
 
 /* Begin non-anchor hover selectors */
@@ -286,7 +273,7 @@ div#menuv4 li:hover ul,
 div#menuv4 li li:hover ul,
 div#menuv4 li li li:hover ul,
 div#menuv4 li li li li:hover ul
-{display:block; left:10px;}
+{display:block;}
 
 /* End of non-anchor hover selectors */
 
diff --git a/templates/webpages/menu/header.html b/templates/webpages/menu/header.html
index 44f6c79cf..2c443f4b7 100644
--- a/templates/webpages/menu/header.html
+++ b/templates/webpages/menu/header.html
@@ -21,7 +21,7 @@
 [%- END %]
  <span class="frame-header-element frame-header-right">
   [% 'User' | $T8 %]:
-  [% MYCONFIG.login %]
+  [% MYCONFIG.login | html %]
   [<a href="controller.pl?action=LoginScreen/logout" target="_top" title="[% 'Logout now' | $T8 %]">[% 'Logout' | $T8 %]</a>]
   [% now.to_lxoffice %] -
   [% now.hms %]
diff --git a/templates/webpages/menu/menuv3.html b/templates/webpages/menu/menuv3.html
index eae64cce8..178bf246e 100644
--- a/templates/webpages/menu/menuv3.html
+++ b/templates/webpages/menu/menuv3.html
@@ -38,24 +38,18 @@ $(clockon);
 //-->
  </script>
 
- <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-  <tr>
-   <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    &nbsp;
+<div id="frame-header">
+ <span class="frame-header-element frame-header-left">
     [<a href="login.pl?action=company_logo" target="_blank">[% 'new Window' | $T8 %]</a>]
-    &nbsp;
     [<a href="JavaScript:top.print()">[% 'print' | $T8 %]</a>]
-    &nbsp;
     [[% 'Search contacts' | $T8 %] <input size="15" name="search_term" id="search_term" onkeydown="return on_keydown_quicksearch(event)">]
-   </td>
-   <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+ </span>
+ <span class="frame-header-element frame-header-right">
+    [[% 'User' | $T8 %]: [% MYCONFIG.login | html %] -
     <a href="controller.pl?action=LoginScreen/logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
-   </td>
-  </tr>
- </table>
-
+ </span>
+</div>
  <div id="menuv3">
 
   [% menu %]
diff --git a/templates/webpages/rc/step2.html b/templates/webpages/rc/step2.html
index 642442a45..255296463 100644
--- a/templates/webpages/rc/step2.html
+++ b/templates/webpages/rc/step2.html
@@ -17,8 +17,8 @@
    <th>[% 'Source' | $T8 %]</th>
    <th>[% 'Description' | $T8 %]</th>
 [%- IF is_asset %]
-   <th>[% 'Deposit' | $T8 %]</th>
    <th>[% 'Payment' | $T8 %]</th>
+   <th>[% 'Deposit' | $T8 %]</th>
 [%- ELSE %]
    <th>[% 'Decrease' | $T8 %]</th>
    <th>[% 'Increase' | $T8 %]</th>