From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 22 Feb 2007 16:56:43 +0000 (+0000)
Subject: Erste Version Druckqueue.
X-Git-Tag: release-2.4.2~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1b3fe156b5ddfd588c1e55af5e21a36e84d9caf8;p=kivitendo-erp.git

Erste Version Druckqueue.
Es ist nun wieder moeglich aus der Warteschlange zu drucken, und zwar auf selektierte Drucker.
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 7636b1659..0e59786d9 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1520,6 +1520,18 @@ sub get_lists {
                         $params{"all_projects"} ? 1 : 0);
   }
 
+  if ($params{"printers"}) {
+    $query = qq|SELECT id, printer_description, printer_command FROM printers|;
+    $sth = $dbh->prepare($query);
+    $sth->execute() || $self->dberror($query);
+
+    $self->{$params{"printers"}} = [];
+    while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+      push(@{ $self->{$params{"printers"}} }, $ref);
+    }
+    $sth->finish;
+  }
+
   $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 3afd23a7c..2269ab4f1 100644
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -32,6 +32,7 @@
 #======================================================================
 
 use SL::BP;
+use Data::Dumper;
 
 1;
 
@@ -310,6 +311,10 @@ sub yes {
 sub print {
   $lxdebug->enter_sub();
 
+  $form->get_lists(printers => 'ALL_PRINTERS');
+  # use the command stored in the databse or fall back to $myconfig{printer}
+  my $selected_printer = (grep { $_->{id} eq $form->{printer} } @{ $form->{ALL_PRINTERS} })[0]->{'printer_command'} || $myconfig{printer};
+
   if ($form->{callback}) {
     map { $form->{callback} .= "&checked_$_=1" if $form->{"checked_$_"} }
       (1 .. $form->{rowcount});
@@ -318,7 +323,7 @@ sub print {
 
   for $i (1 .. $form->{rowcount}) {
     if ($form->{"checked_$i"}) {
-      $form->{OUT} = "| $myconfig{printer}";
+      $form->{OUT} = "| $selected_printer";
       $form->info($locale->text('Printing ... '));
 
       if (BP->print_spool(\%myconfig, \%$form, $spool)) {
@@ -553,7 +558,7 @@ sub list_spool {
 <input type=hidden name=password value=$form->{password}>
 |;
 
-  if ($myconfig{printer}) {
+#  if ($myconfig{printer}) {
     print qq|
 <input type=hidden name=transdateto value=$form->{transdateto}>
 <input type=hidden name=transdatefrom value=$form->{transdatefrom}>
@@ -564,12 +569,18 @@ sub list_spool {
 <input type=hidden name=vendor value=$form->{vendor}>
 <input class=submit type=submit name=action value="|
       . $locale->text('Select all') . qq|">
-<input class=submit type=submit name=action value="|
-      . $locale->text('Print') . qq|">
 <input class=submit type=submit name=action value="|
       . $locale->text('Remove') . qq|">
+<input class=submit type=submit name=action value="|
+      . $locale->text('Print') . qq|">
 |;
-  }
+
+$form->get_lists(printers=>"ALL_PRINTERS");
+print qq|<select name="printer">|;
+print map(qq|<option value="$_->{id}">| . $form->quote_html($_->{printer_description}) . qq|</option>|, @{ $form->{ALL_PRINTERS} });
+print qq|</select>|;
+
+#  }
 
   print qq|
 </form>
@@ -578,7 +589,7 @@ sub list_spool {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub select_all {