X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=62abf6683c450084475a97b519005aea3ca15f1e;hb=870e380d3248baa87148a6316977b69c8c4b17c4;hp=98a0aba59df785af62f71c19de569d69731049b3;hpb=19688fcacc86e86dd6ff5c5427e3b50893bb60f0;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 98a0aba59..62abf6683 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -47,6 +47,11 @@ require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; require "bin/mozilla/reportgenerator.pl"; +# note: this file was particularly hard to strictify. +# alot of the vars are passed carelessly between invocations +# should there be any missing vars, declare them globally +use strict; + 1; # end of main @@ -106,19 +111,30 @@ my $rp_access_map = { 'balance_sheet' => 'report', }; +# subs use these pretty freely, so declare them here +our (%column_data, @column_index); +our ($subtotalnetamount, $subtotaltax, $subtotal); + sub check_rp_access { + my $form = $main::form; + my $right = $rp_access_map->{$form->{report}}; $right ||= 'DOES_NOT_EXIST'; - $auth->assert($right); + $main::auth->assert($right); } sub report { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); check_rp_access(); - %title = ('balance_sheet' => 'Balance Sheet', + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + my %title = ( + 'balance_sheet' => 'Balance Sheet', 'income_statement' => 'Income Statement', 'trial_balance' => 'Trial Balance', 'ar_aging' => 'AR Aging', @@ -130,14 +146,15 @@ sub report { 'receipts' => 'Receipts', 'payments' => 'Payments', 'projects' => 'Project Transactions', - 'bwa' => 'Betriebswirtschaftliche Auswertung',); + 'bwa' => 'Betriebswirtschaftliche Auswertung', + ); $form->{title} = $locale->text($title{ $form->{report} }); - $accrual = ($eur) ? "" : "checked"; - $cash = ($eur) ? "checked" : ""; + my $accrual = ($main::eur) ? "" : "checked"; + my $cash = ($main::eur) ? "checked" : ""; - $year = (localtime)[5] + 1900; + my $year = (localtime)[5] + 1900; # get departments $form->all_departments(\%myconfig); @@ -146,7 +163,7 @@ sub report { map { $form->{selectdepartment} .= "