X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=8d0ec94f24463d98577c022a0774172b7b45f07e;hb=b02735f55360e5a4e02dca40458b48cf057ecd7b;hp=25e62594e0ebe2c9353efa972f148d9c4c3456f4;hpb=762f8a97338181a9ecb01c20eed52215b470212d;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 25e62594e..8d0ec94f2 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -146,8 +146,8 @@ sub report { $form->{title} = $locale->text($title{ $form->{report} }); - my $accrual = ($main::eur) ? "" : "checked"; - my $cash = ($main::eur) ? "checked" : ""; + my $accrual = $::instance_conf->get_accounting_method eq 'cash' ? "" : "checked"; + my $cash = $::instance_conf->get_accounting_method eq 'cash' ? "checked" : ""; my $year = (localtime)[5] + 1900; @@ -2071,7 +2071,7 @@ sub print_form { $form->{attachment_filename} = $locale->quote_special_chars('filenames', $locale->text("Statement") . "_$form->{todate}.$attachment_suffix"); $form->{attachment_filename} =~ s/\s+/_/g; - $form->parse_template(\%myconfig, $main::userspath); + $form->parse_template(\%myconfig); } } @@ -2542,14 +2542,14 @@ sub print_options { } else { $media = qq| {OP}{screen}>| . $locale->text('Screen'); - if ($myconfig{printer} && $main::latex_templates) { + if ($myconfig{printer} && $::lx_office_conf{print_templates}->{latex}) { $media .= qq| {OP}{printer}>| . $locale->text('Printer'); } } my $format; - if ($main::latex_templates) { + if ($::lx_office_conf{print_templates}->{latex}) { $format .= qq| {DF}{html}>| . $locale->text('HTML') . qq| {DF}{pdf}>| . $locale->text('PDF') @@ -2564,7 +2564,7 @@ sub print_options { $media |; - if ($myconfig{printer} && $main::latex_templates && $form->{media} ne 'email') { + if ($myconfig{printer} && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email') { $output .= qq| | . $locale->text('Copies') . qq| {copies}>