X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=30b1d9301936d3337fb8301e719fc103cf8552ed;hb=0152cc2e4e1e451cb51d4d3fd8a0e450eff5efcb;hp=ed896e1ad9951c909fbe95f4712d85201f3c00b5;hpb=8e97a740bfcebe977b27c800ba964daf04d40db3;p=kivitendo-erp.git

diff --git a/SL/AM.pm b/SL/AM.pm
index ed896e1ad..30b1d9301 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -482,16 +482,18 @@ sub delete_account {
               WHERE chart_id = ?|;
   do_query($form, $dbh, $query, $form->{id});
 
-  # delete chart of account record
-  $query = qq|DELETE FROM chart
-              WHERE id = ?|;
-  do_query($form, $dbh, $query, $form->{id});
-
   # delete account taxkeys
   $query = qq|DELETE FROM taxkeys
               WHERE chart_id = ?|;
   do_query($form, $dbh, $query, $form->{id});
 
+  # delete chart of account record
+  # last step delete chart, because we have a constraint
+  # to taxkeys
+  $query = qq|DELETE FROM chart
+              WHERE id = ?|;
+  do_query($form, $dbh, $query, $form->{id});
+
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -1063,6 +1065,7 @@ sub save_preferences {
   my $user = SL::DB::Manager::AuthUser->find_by(login => $form->{login});
   $user->update_attributes(
     config_values => {
+      %{ $user->config_values },
       map { ($_ => $form->{$_}) } SL::DB::AuthUser::CONFIG_VARS(),
     });