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

diff --git a/SL/AM.pm b/SL/AM.pm
index 6862eb7..0e64e5a 100644 (file)
--- 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/templates/webpages/rc/step2.html b/templates/webpages/rc/step2.html
index 642442a..2552964 100644 (file)
--- 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>