projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
print_html_template auch mit scalarrefs als file aufrufbar gemacht
[kivitendo-erp.git]
/
SL
/
AM.pm
diff --git
a/SL/AM.pm
b/SL/AM.pm
index
ed896e1
..
30b1d93
100644
(file)
--- 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});
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 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;
# 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 => {
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(),
});
map { ($_ => $form->{$_}) } SL::DB::AuthUser::CONFIG_VARS(),
});