From: Moritz Bunkus Date: Fri, 26 Aug 2011 08:52:15 +0000 (+0200) Subject: Ermöglichen, keinen Drucker als Standarddrucker auszuwählen X-Git-Tag: release-2.7.0beta1~320 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bd1ece25ff151772844eb6318f02ade2470602db;p=kivitendo-erp.git Ermöglichen, keinen Drucker als Standarddrucker auszuwählen --- diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index ff0af8b10..368a62716 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -1552,7 +1552,7 @@ sub edit_defaults { # default language my $all_languages = SL::DB::Manager::Language->get_all; -# EÜR = cash, Bilanzierung = accrual +# EÜR = cash, Bilanzierung = accrual foreach my $key (keys %{ $form->{IC} }) { foreach my $accno (sort keys %{ $form->{IC}->{$key} }) { @@ -1660,14 +1660,7 @@ sub config { { 'name' => $locale->text('Queue'), 'value' => 'queue', 'selected' => $selected{queue}, }, ]; - $form->{PRINTERS} = []; - foreach my $printer (SL::Printer->all_printers(%::myconfig)) { - push @{ $form->{PRINTERS} }, { - 'name' => $printer->{printer_description}, - 'value' => $printer->{id}, - 'selected' => $printer->{id} == $myconfig{default_printer_id}, - }; - } + $form->{PRINTERS} = [ SL::Printer->all_printers(%::myconfig) ]; my %countrycodes = User->country_codes; diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html index 31cd43264..9c22678a2 100644 --- a/templates/webpages/am/config.html +++ b/templates/webpages/am/config.html @@ -1,6 +1,6 @@ [%- USE T8 %] [%- USE LxERP %] -[% USE HTML %] +[% USE HTML %][% USE L %]

[% title %]
@@ -200,11 +200,7 @@ [% 'Default printer' | $T8 %] - + [% L.select_tag('default_printer_id', L.options_for_select(PRINTERS, default => myconfig_default_printer_id, title => 'printer_description', with_empty => 1)) %]