X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Frp.pl;h=1d8446966b1a55089e9debca34a08f9857a01847;hb=9f522077cdc739cbb17564f76e31e9b7ce7ab4f1;hp=c7e37fce6cc532090800d28e81ca3b2f9c17e09f;hpb=00c4c9942abab84066a35f7e57bb69765a626948;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index c7e37fce6..1d8446966 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 = $::lx_office_conf{system}->{eur} ? "" : "checked"; + my $cash = $::lx_office_conf{system}->{eur} ? "checked" : ""; my $year = (localtime)[5] + 1900; @@ -1385,7 +1385,7 @@ sub generate_trial_balance { my $edit_url = build_std_url('action=edit', 'type', 'vc'); my $idx; - foreach my $accno (@{ $form->{TB} }) { + foreach my $accno (@{ $form->{TB} || [] }) { $accno->{soll} = $accno->{debit}; $accno->{haben} = $accno->{credit}; @@ -1533,7 +1533,7 @@ sub list_accounts { my %subtotals = map { $_ => 0 } @totals_columns; my %totals = map { $_ => 0 } @totals_columns; my $found_heading = 0; - my @tb = sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }; + my @tb = sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} || [] }; # sort the whole thing by account numbers and display foreach my $idx (0 .. scalar(@tb) - 1) { @@ -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}>