projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"path" wird nicht mehr benötigt.
[kivitendo-erp.git]
/
bin
/
mozilla
/
bp.pl
diff --git
a/bin/mozilla/bp.pl
b/bin/mozilla/bp.pl
index
653577f
..
457a35e
100644
(file)
--- a/
bin/mozilla/bp.pl
+++ b/
bin/mozilla/bp.pl
@@
-32,9
+32,12
@@
#======================================================================
use SL::BP;
#======================================================================
use SL::BP;
+use Data::Dumper;
1;
1;
+require "bin/mozilla/common.pl";
+
# end of main
sub search {
# end of main
sub search {
@@
-158,12
+161,12
@@
sub search {
# with JavaScript Calendar
$button1 = qq|
# with JavaScript Calendar
$button1 = qq|
- <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
+ <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
>
<input type=button name=transdatefrom id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
$button2 = qq|
<input type=button name=transdatefrom id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
$button2 = qq|
- <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
+ <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
>
<input type=button name=transdateto name=transdateto id="trigger2" value=|
. $locale->text('button') . qq|></td>
|;
<input type=button name=transdateto name=transdateto id="trigger2" value=|
. $locale->text('button') . qq|></td>
|;
@@
-176,15
+179,16
@@
sub search {
# without JavaScript Calendar
$button1 = qq|
# without JavaScript Calendar
$button1 = qq|
- <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
+ <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
></td>|;
$button2 = qq|
$button2 = qq|
- <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
+ <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"
onBlur=\"check_right_date_format(this)\"
></td>|;
}
}
-
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
$form->header;
$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|
print qq|
-<body>
+<body
onLoad="$onload"
>
<form method=post action=$form->{script}>
<form method=post action=$form->{script}>
@@
-225,7
+229,6
@@
sub search {
<input type=hidden name=nextsub value=list_spool>
<input type=hidden name=nextsub value=list_spool>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-310,6
+313,10
@@
sub yes {
sub print {
$lxdebug->enter_sub();
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});
if ($form->{callback}) {
map { $form->{callback} .= "&checked_$_=1" if $form->{"checked_$_"} }
(1 .. $form->{rowcount});
@@
-318,7
+325,7
@@
sub print {
for $i (1 .. $form->{rowcount}) {
if ($form->{"checked_$i"}) {
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)) {
$form->info($locale->text('Printing ... '));
if (BP->print_spool(\%myconfig, \%$form, $spool)) {
@@
-345,11
+352,11
@@
sub list_spool {
$title = $form->escape($form->{title});
$href =
$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 =
$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);
if ($form->{ $form->{vc} }) {
$callback .= "&$form->{vc}=" . $form->escape($form->{ $form->{vc} }, 1);
@@
-499,11
+506,11
@@
sub list_spool {
}
$column_data{invnumber} =
}
$column_data{invnumber} =
- "<td><a href=$module?action=edit&id=$ref->{id}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}</a></td>";
+ "<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}</a></td>";
$column_data{ordnumber} =
$column_data{ordnumber} =
- "<td><a href=$module?action=edit&id=$ref->{id}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}</a></td>";
+ "<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}</a></td>";
$column_data{quonumber} =
$column_data{quonumber} =
- "<td><a href=$module?action=edit&id=$ref->{id}&
path=$form->{path}&
login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}</a></td>";
+ "<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}</a></td>";
$column_data{name} = "<td>$ref->{name}</td>";
$column_data{spoolfile} =
qq|<td><a href=$spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>
$column_data{name} = "<td>$ref->{name}</td>";
$column_data{spoolfile} =
qq|<td><a href=$spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>
@@
-548,12
+555,11
@@
sub list_spool {
<input type=hidden name=account value="$form->{account}">
<input type=hidden name=account value="$form->{account}">
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
|;
<input type=hidden name=login value=$form->{login}>
<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}>
print qq|
<input type=hidden name=transdateto value=$form->{transdateto}>
<input type=hidden name=transdatefrom value=$form->{transdatefrom}>
@@
-564,17
+570,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 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('Remove') . qq|">
+<input class=submit type=submit name=action value="|
+ . $locale->text('Print') . qq|">
|;
|;
- }
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+$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>
print qq|
</form>
@@
-583,7
+590,7
@@
sub list_spool {
</html>
|;
</html>
|;
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub select_all {
}
sub select_all {
@@
-595,5
+602,5
@@
sub select_all {
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
-sub continue {
&{ $form->{nextsub} }
}
+sub continue {
call_sub($form->{"nextsub"});
}