X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Flicenses.pl;h=fd8f01d9f514e8c24f914a8d26882a4978671315;hb=12c4c658bc579890462f96832d918337c2b2d484;hp=93397361b2e4c8a6b470a1e01820458c70941a45;hpb=0576299f2aa98125991c4ffcd2f75073ea583d7d;p=kivitendo-erp.git
diff --git a/bin/mozilla/licenses.pl b/bin/mozilla/licenses.pl
index 93397361b..fd8f01d9f 100644
--- a/bin/mozilla/licenses.pl
+++ b/bin/mozilla/licenses.pl
@@ -35,6 +35,8 @@ use SL::IC;
use SL::IS;
use SL::LICENSES;
+require "bin/mozilla/common.pl";
+
sub quot {
$lxdebug->enter_sub();
$_[0] =~ s/\"/\"/g;
@@ -44,6 +46,7 @@ sub quot {
sub form_header {
$lxdebug->enter_sub();
+ $form->{jsscript} = 1;
$form->header();
print(
@@ -55,7 +58,7 @@ sub form_header {
sub form_footer {
$lxdebug->enter_sub();
- my @items = ("path", "login", "password", "old_callback", "previousform");
+ my @items = qw(login password old_callback previousform);
push(@items, @{ $form->{"hidden"} });
map({
print("{$_}) . "\">\n"
@@ -87,8 +90,7 @@ sub print_part_selection {
| .
+ $form->write_trigger(\%myconfig, 1, "validuntil", "BL",
+ "trigger_validuntil"));
+
$lxdebug->leave_sub();
}
@@ -374,7 +366,7 @@ sub update {
sub continue {
$lxdebug->enter_sub();
- &{ $form->{nextsub} };
+ call_sub($form->{"nextsub"});
$lxdebug->leave_sub();
}
@@ -488,8 +480,7 @@ sub search {
. $locale->text('Expiring in x month(s)')
. qq|
|
- . $locale->text('Expired licenses')
- . qq|
+ . $locale->text('Expired licenses') . qq|
@@ -510,13 +501,8 @@ sub do_search {
LICENSES->search(\%myconfig, $form);
$callback = "";
- foreach (
- ("db", "path", "login", "password",
- "partnumber", "description", "customer_name", "all",
- "expiring_in", "show_expired")
- ) {
- $callback .= "\&${_}=" . $form->escape($form->{$_}, 1);
- }
+ map { $callback .= "\&${_}=" . $form->escape($form->{$_}, 1) }
+ qw(db login password partnumber description customer_name all expiring_in show_expired);
$details = $form->{"script"} . "?action=details" . $callback . "\&id=";
$invdetails = "is.pl?action=edit" . $callback . "\&id=";
$callback = $form->{"script"} . "?action=do_search" . $callback;
@@ -563,9 +549,7 @@ sub do_search {
. $locale->text('Description')
. qq|
"
- . $locale->text('Company Name')
- . qq| |
+ . $columns{"name"} . "\">" . $locale->text('Company Name') . qq|
"
. $locale->text('Valid until')
|