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
/
am.pl
diff --git
a/bin/mozilla/am.pl
b/bin/mozilla/am.pl
index
66874c7
..
7fd49d0
100644
(file)
--- a/
bin/mozilla/am.pl
+++ b/
bin/mozilla/am.pl
@@
-1111,7
+1111,7
@@
sub list_business {
$form->{title} = $locale->text('Type of Business');
my @column_index = qw(description discount customernumberinit);
$form->{title} = $locale->text('Type of Business');
my @column_index = qw(description discount customernumberinit);
- push @column_index, 'salesman' if $::
vertreter
;
+ push @column_index, 'salesman' if $::
lx_office_conf{features}->{vertreter}
;
my %column_header;
$column_header{description} =
qq|<th class=listheading width=60%>|
my %column_header;
$column_header{description} =
qq|<th class=listheading width=60%>|
@@
-1224,7
+1224,7
@@
sub business_header {
$form->format_amount(\%myconfig, $form->{discount} * 100);
my $salesman_code;
$form->format_amount(\%myconfig, $form->{discount} * 100);
my $salesman_code;
- if ($::
vertreter
) {
+ if ($::
lx_office_conf{features}->{vertreter}
) {
$salesman_code = qq|
<tr>
<th align="right">| . $locale->text('Representative') . qq|</th>
$salesman_code = qq|
<tr>
<th align="right">| . $locale->text('Representative') . qq|</th>
@@
-1873,7
+1873,7
@@
sub buchungsgruppe_header {
}
my $linkaccounts;
}
my $linkaccounts;
- if (!$
main::eur
) {
+ if (!$
::lx_office_conf{system}->{eur}
) {
$linkaccounts = qq|
<tr>
<th align=right>| . $locale->text('Inventory') . qq|</th>
$linkaccounts = qq|
<tr>
<th align=right>| . $locale->text('Inventory') . qq|</th>
@@
-2457,20
+2457,21
@@
sub config {
_build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
my @formats = ();
_build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
my @formats = ();
- if ($main::opendocument_templates && $main::openofficeorg_writer_bin &&
- $main::xvfb_bin && (-x $main::openofficeorg_writer_bin) && (-x $main::xvfb_bin)) {
+ if ($::lx_office_conf{print_templates}->{opendocument}
+ && $::lx_office_conf{applications}->{openofficeorg_writer} && (-x $::lx_office_conf{applications}->{openofficeorg_writer})
+ && $::lx_office_conf{applications}->{xvfb} && (-x $::lx_office_conf{applications}->{xvfb})) {
push(@formats, { "name" => $locale->text("PDF (OpenDocument/OASIS)"),
"value" => "opendocument_pdf" });
}
push(@formats, { "name" => $locale->text("PDF (OpenDocument/OASIS)"),
"value" => "opendocument_pdf" });
}
- if ($
main::latex_templates
) {
+ if ($
::lx_office_conf{print_templates}->{latex}
) {
push(@formats, { "name" => $locale->text("PDF"), "value" => "pdf" });
}
push(@formats, { "name" => "HTML", "value" => "html" });
push(@formats, { "name" => $locale->text("PDF"), "value" => "pdf" });
}
push(@formats, { "name" => "HTML", "value" => "html" });
- if ($
main::latex_templates
) {
+ if ($
::lx_office_conf{print_templates}->{latex}
) {
push(@formats, { "name" => $locale->text("Postscript"),
"value" => "postscript" });
}
push(@formats, { "name" => $locale->text("Postscript"),
"value" => "postscript" });
}
- if ($
main::opendocument_templates
) {
+ if ($
::lx_office_conf{print_templates}->{opendocument}
) {
push(@formats, { "name" => $locale->text("OpenDocument/OASIS"),
"value" => "opendocument" });
}
push(@formats, { "name" => $locale->text("OpenDocument/OASIS"),
"value" => "opendocument" });
}