X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=9780078f514bee6876c7138ad0cce70722e31e74;hb=332e327b6613bf762b34d841442378de255d946b;hp=6302c24810cd820804b9c49658b4794432b1cec7;hpb=b30eacc6bbc6f76fcd4f1342070d5796fc97b896;p=kivitendo-erp.git diff --git a/SL/AM.pm b/SL/AM.pm index 6302c2481..9780078f5 100644 --- a/SL/AM.pm +++ b/SL/AM.pm @@ -54,6 +54,8 @@ use SL::DB; use SL::GenericTranslations; use SL::Helper::UserPreferences::PositionsScrollbar; use SL::Helper::UserPreferences::PartPickerSearch; +use SL::Helper::UserPreferences::TimeRecording; +use SL::Helper::UserPreferences::UpdatePositions; use strict; @@ -105,7 +107,7 @@ sub get_account { # get the taxkeys of the account $form->{ACCOUNT_TAXKEYS} = []; - foreach my $taxkey ( @{ $chart_obj->taxkeys } ) { + foreach my $taxkey ( sort { $b->startdate <=> $a->startdate } @{ $chart_obj->taxkeys } ) { push @{ $form->{ACCOUNT_TAXKEYS} }, { id => $taxkey->id, chart_id => $taxkey->chart_id, tax_id => $taxkey->tax_id, @@ -541,12 +543,20 @@ sub sales_search_customer_partnumber { SL::Helper::UserPreferences::PartPickerSearch->new()->get_sales_search_customer_partnumber(); } +sub positions_show_update_button { + SL::Helper::UserPreferences::UpdatePositions->new()->get_show_update_button(); +} + +sub time_recording_use_duration { + SL::Helper::UserPreferences::TimeRecording->new()->get_use_duration(); +} + sub save_preferences { $main::lxdebug->enter_sub(); my ($self, $form) = @_; - my $employee = SL::DB::Manager::Employee->find_by(login => $::myconfig{login}); + my $employee = SL::DB::Manager::Employee->current; $employee->update_attributes(name => $form->{name}); my $user = SL::DB::Manager::AuthUser->find_by(login => $::myconfig{login}); @@ -575,6 +585,12 @@ sub save_preferences { if (exists $form->{sales_search_customer_partnumber}) { SL::Helper::UserPreferences::PartPickerSearch->new()->store_sales_search_customer_partnumber($form->{sales_search_customer_partnumber}) } + if (exists $form->{positions_show_update_button}) { + SL::Helper::UserPreferences::UpdatePositions->new()->store_show_update_button($form->{positions_show_update_button}) + } + if (exists $form->{time_recording_use_duration}) { + SL::Helper::UserPreferences::TimeRecording->new()->store_use_duration($form->{time_recording_use_duration}) + } $main::lxdebug->leave_sub(); @@ -1199,7 +1215,7 @@ sub _save_tax { chart_categories, id ) - VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ?, ?, ?, ?)|; + VALUES (?, ?, ?, ?, ?, ?, ?, ?)|; } push(@values, $form->{id}); do_query($form, $dbh, $query, @values);