X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=1d8446966b1a55089e9debca34a08f9857a01847;hb=1e0d413084100ccd892e8c5be95703be5d965de7;hp=e3c64b0c6aa747d5f70f372acde329cefd9930ea;hpb=02978267f7e1b8d91e8d2d4e1010c80e292f2841;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index e3c64b0c6..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; @@ -1066,7 +1066,7 @@ sub generate_income_statement { } hotfix_reformat_date(); } # Ende Bericht für vorgewählten Zeitraum (warum auch immer die Prüfung (custom eq true) ist ... - + RP->income_statement(\%myconfig, \%$form); ($form->{department}) = split /--/, $form->{department}; @@ -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}> @@ -2794,13 +2794,13 @@ sub generate_bwa { # Hotfix, um das Datumsformat, die unten hart auf deutsches Datumsformat eingestellt # sind, entsprechend mit anderem Formaten (z.B. iso-kodiert) zum Laufen zu bringen (S.a.: Bug 1388) sub hotfix_reformat_date { - + $main::lxdebug->enter_sub(); - + my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - + if ($myconfig{dateformat} ne 'dd.mm.yyyy'){ my $current_dateformat = $myconfig{dateformat}; $myconfig{dateformat} = 'dd.mm.yyyy';