X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fbp.pl;h=846aba18159aae4eee94aa2721cfc1d17a7b4093;hb=f559ec45ea2fc09c361ef7e4a40a59b1f2133737;hp=653577f6352b0bb9e17b6c57318cd0d3c17c086b;hpb=9659649d435c0436ce14048e56b03879ac641429;p=kivitendo-erp.git diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl index 653577f63..846aba181 100644 --- a/bin/mozilla/bp.pl +++ b/bin/mozilla/bp.pl @@ -32,9 +32,12 @@ #====================================================================== use SL::BP; +use Data::Dumper; 1; +require "bin/mozilla/common.pl"; + # end of main sub search { @@ -152,18 +155,18 @@ sub search { } # use JavaScript Calendar or not - $form->{jsscript} = $jscalendar; + $form->{jsscript} = 1; $jsscript = ""; if ($form->{jsscript}) { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; $button2 = qq| - + text('button') . qq|> |; @@ -176,15 +179,16 @@ sub search { # without JavaScript Calendar $button1 = qq| - |; + |; $button2 = qq| - |; + |; } - + $form->{javascript} .= qq||; $form->header; - + $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +
{script}> @@ -225,7 +229,6 @@ sub search { -{path}> {login}> {password}> @@ -310,6 +313,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,10 +325,9 @@ sub print { for $i (1 .. $form->{rowcount}) { if ($form->{"checked_$i"}) { - $form->{OUT} = "| $myconfig{printer}"; $form->info($locale->text('Printing ... ')); - if (BP->print_spool(\%myconfig, \%$form, $spool)) { + if (BP->print_spool(\%myconfig, \%$form, $spool, "| $selected_printer")) { print $locale->text('done'); $form->redirect($locale->text('Marked entries printed!')); } @@ -345,11 +351,11 @@ sub list_spool { $title = $form->escape($form->{title}); $href = - "$form->{script}?action=list_spool&path=$form->{path}&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title"; + "$form->{script}?action=list_spool&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title"; $title = $form->escape($form->{title}, 1); $callback = - "$form->{script}?action=list_spool&path=$form->{path}&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title"; + "$form->{script}?action=list_spool&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title"; if ($form->{ $form->{vc} }) { $callback .= "&$form->{vc}=" . $form->escape($form->{ $form->{vc} }, 1); @@ -499,11 +505,11 @@ sub list_spool { } $column_data{invnumber} = - "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}"; + "{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}"; $column_data{ordnumber} = - "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}"; + "{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}"; $column_data{quonumber} = - "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}"; + "{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}"; $column_data{name} = "$ref->{name}"; $column_data{spoolfile} = qq|{spoolfile}>$ref->{spoolfile} @@ -548,12 +554,11 @@ sub list_spool { -{path}> {login}> {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 { |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub select_all { @@ -595,5 +601,5 @@ sub select_all { $lxdebug->leave_sub(); } -sub continue { &{ $form->{nextsub} } } +sub continue { call_sub($form->{"nextsub"}); }