Benutzereinstellungen: Neue Optionen für den Standardausgabekanal und den Standarddru...

diff --git a/SL/User.pm b/SL/User.pm
index 5217ef8..9fd9e5e 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -1092,7 +1092,7 @@ sub config_vars {
     dbname dbuser dbpasswd email fax name numberformat in_numberformat password
     printer role sid signature stylesheet tel templates vclimit angebote bestellungen rechnungen
     anfragen lieferantenbestellungen einkaufsrechnungen taxnumber co_ustid duns menustyle
-    template_format copies show_form_details);
+    template_format default_media default_printer_id copies show_form_details);
 
   $main::lxdebug->leave_sub();
 

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 4e327fd..7084aa3 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -2858,7 +2858,7 @@ sub config {
   if (!$myconfig{"template_format"}) {
     $myconfig{"template_format"} = "pdf";
   }
-  $template_format = "";
+  my $template_format = "";
   foreach $item (@formats) {
     $template_format .=
       "<option value=\"$item->{value}\"" .
@@ -2867,6 +2867,27 @@ sub config {
        ">" . H($item->{"name"}) . "</option>";
   }
 
+  if (!$myconfig{"default_media"}) {
+    $myconfig{"default_media"} = "screen";
+  }
+  my %selected = ($myconfig{"default_media"} => "selected");
+  my $default_media = qq|
+  <option value="screen" $selected{'screen'}>| . $locale->text("Screen") . qq|</option>
+  <option value="printer" $selected{'printer'}>| . $locale->text("Printer") . qq|</option>
+  <option value="queue" $selected{'queue'}>| . $locale->text("Queue") . qq|</option>
+|;
+
+  %selected = ();
+  $selected{$myconfig{"default_printer_id"}} = "selected"
+    if ($myconfig{"default_printer_id"});
+  my $default_printer = qq|<option></option>|;
+  AM->printer(\%myconfig, $form);
+  foreach my $printer (@{$form->{"ALL"}}) {
+    $default_printer .= qq|<option value="| . Q($printer->{"id"}) .
+      qq|" $selected{$printer->{'id'}}>| .
+      H($printer->{"printer_description"}) . qq|</option>|;
+  }
+
   %countrycodes = User->country_codes;
   $countrycodes = '';
   foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
@@ -3027,6 +3048,14 @@ sub config {
          <th align=right>| . $locale->text('Default template format') . qq|</th>
          <td><select name="template_format">$template_format</select></td>
        </tr>
+       <tr>
+         <th align=right>| . $locale->text('Default output medium') . qq|</th>
+         <td><select name="default_media">$default_media</select></td>
+       </tr>
+       <tr>
+         <th align=right>| . $locale->text('Default printer') . qq|</th>
+         <td><select name="default_printer_id">$default_printer</select></td>
+       </tr>
        <tr>
          <th align=right>| . $locale->text('Number of copies') . qq|</th>
          <td><input name="copies" size="10" value="| .

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index afcdb66..820ad48 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1469,6 +1469,18 @@ sub print_options {
     $myconfig{"copies"} ? $myconfig{"copies"} :
     3;
 
+  $form->{"media"} =
+    $form->{"media"} ? $form->{"media"} :
+    $myconfig{"default_media"} ? $myconfig{"default_media"} :
+    "screen";
+
+  $lxdebug->message(0, "fm $form->{media}");
+
+  $form->{"printer_id"} =
+    defined($form->{"printer_id"}) ? $form->{"printer_id"} :
+    $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} :
+    "";
+
   $form->{PD}{ $form->{formname} } = "selected";
   $form->{DF}{ $form->{format} }   = "selected";
   $form->{OP}{ $form->{media} }    = "selected";

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 6b94e2c..89b375b 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -244,11 +244,9 @@ sub prepare_invoice {
   if ($form->{type} eq "credit_note") {
     $form->{type}     = "credit_note";
     $form->{formname} = "credit_note";
-    $form->{media}    = "screen";
   } else {
     $form->{type}     = "invoice";
     $form->{formname} = "invoice";
-    $form->{media}    = "screen";
   }
 
   if ($form->{id}) {

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index aabb659..10e71ac 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -284,7 +284,6 @@ sub order_links {
 
 sub prepare_order {
   $lxdebug->enter_sub();
-  $form->{media}    = "screen";
   $form->{formname} = $form->{type} unless $form->{formname};
 
   my $i = 0;

diff --git a/locale/de/all b/locale/de/all
index 8d7e7bd..8686370 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -313,6 +313,8 @@ aktualisieren wollen?',
   'December'                    => 'Dezember',
   'Decimalplaces'               => 'Dezimalstellen',
   'Decrease'                    => 'Verringern',
+  'Default output medium'       => 'Standardausgabekanal',
+  'Default printer'             => 'Standarddrucker',
   'Default template format'     => 'Standardvorlagenformat',
   'Delete'                      => 'Löschen',
   'Delete Account'              => 'Konto löschen',

diff --git a/locale/de/am b/locale/de/am
index d083ac8..ef6bf66 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -66,6 +66,8 @@ $self->{texts} = {
   'Dataset upgrade'             => 'Datenbankaktualisierung',
   'Date Format'                 => 'Datumsformat',
   'Debit'                       => 'Soll',
+  'Default output medium'       => 'Standardausgabekanal',
+  'Default printer'             => 'Standarddrucker',
   'Default template format'     => 'Standardvorlagenformat',
   'Delete'                      => 'Löschen',
   'Delete Account'              => 'Konto löschen',
@@ -186,6 +188,7 @@ $self->{texts} = {
   'Profit Center'               => 'Erfolgsbereich',
   'Project Number'              => 'Projektnummer',
   'Project description'         => 'Projektbeschreibung',
+  'Queue'                       => 'Warteschlange',
   'Rate'                        => 'Rate',
   'Receipt'                     => 'Zahlungseingang',
   'Receivables'                 => 'Forderungen',
@@ -195,6 +198,7 @@ $self->{texts} = {
   'SIC saved!'                  => 'SIC gespeichert',
   'Salesman'                    => 'Vertreter',
   'Save'                        => 'Speichern',
+  'Screen'                      => 'Bildschirm',
   'Select a Customer'           => 'Endkunde auswählen',
   'Select a part'               => 'Artikel auswählen',
   'Select a project'            => 'Projekt auswählen',