projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
licenses.pl
diff --git
a/bin/mozilla/licenses.pl
b/bin/mozilla/licenses.pl
index
591608b
..
fb065f2
100644
(file)
--- a/
bin/mozilla/licenses.pl
+++ b/
bin/mozilla/licenses.pl
@@
-71,7
+71,7
@@
sub form_footer {
my $form = $main::form;
my @items = qw(old_callback previousform);
my $form = $main::form;
my @items = qw(old_callback previousform);
- push
(@items, @{ $form->{"hidden"} })
;
+ push
@items, @{ $form->{"hidden"} } if ref $form->{hidden} eq 'ARRAY'
;
map({
print("<input type=hidden name=$_ value=\"" . quot($form->{$_}) . "\">\n"
);
map({
print("<input type=hidden name=$_ value=\"" . quot($form->{$_}) . "\">\n"
);
@@
-323,10
+323,12
@@
sub add {
my $form = $main::form;
my $locale = $main::locale;
my $form = $main::form;
my $locale = $main::locale;
- if (!$main::lizenzen) {
+ $form->{title} = $locale->text('Add License');
+
+ if (!$::lx_office_conf{features}->{lizenzen}) {
$form->error(
$locale->text(
$form->error(
$locale->text(
- 'The licensing module has been deactivated in
lx-erp.conf
.')
+ 'The licensing module has been deactivated in
the configuration
.')
);
}
);
}
@@
-514,10
+516,12
@@
sub search {
my $form = $main::form;
my $locale = $main::locale;
my $form = $main::form;
my $locale = $main::locale;
- if (!$main::lizenzen) {
+ $form->{title} = $locale->text('Licenses');
+
+ if (!$::lx_office_conf{features}->{lizenzen}) {
$form->error(
$locale->text(
$form->error(
$locale->text(
- 'The licensing module has been deactivated in
lx-erp.conf
.')
+ 'The licensing module has been deactivated in
the configuration
.')
);
}
);
}
@@
-611,7
+615,7
@@
sub do_search {
. $locale->text(
"No licenses were found that match the search criteria.")
. qq|</body></html>|);
. $locale->text(
"No licenses were found that match the search criteria.")
. qq|</body></html>|);
-
exit(0
);
+
::end_of_request(
);
}
print(
}
print(