X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fbp.pl;h=2269ab4f1877e65faa47ca2ac1d38ec27e5c01aa;hb=1b3fe156b5ddfd588c1e55af5e21a36e84d9caf8;hp=653577f6352b0bb9e17b6c57318cd0d3c17c086b;hpb=bd8dfbe188caad43b1a2d40e3befbceec10fa1ef;p=kivitendo-erp.git
diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 653577f63..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 {
{password}>
|;
- if ($myconfig{printer}) {
+# if ($myconfig{printer}) {
print qq|
{transdateto}>
{transdatefrom}>
@@ -564,17 +569,18 @@ sub list_spool {
{vendor}>
-
+
|;
- }
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+$form->get_lists(printers=>"ALL_PRINTERS");
+print qq||;
+
+# }
print qq|
@@ -583,7 +589,7 @@ sub list_spool {