X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=731a060fd0ed837d87dbe80bf66a3c8116a00ce4;hb=eeb07c164e0c3398f14372308b404fb07e2102cf;hp=c06e79b4d34c16f85f5fdf989bb83192033caeb3;hpb=3da2dca2e601b311b6e464ffff02bfe98a7024d1;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index c06e79b4d..731a060fd 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -39,7 +39,6 @@ use POSIX qw(strftime); use SL::PE; use SL::RP; -use SL::USTVA; use SL::Iconv; use SL::ReportGenerator; @@ -92,9 +91,32 @@ require "bin/mozilla/reportgenerator.pl"; # $locale->text('Non-taxable Sales') # $locale->text('Non-taxable Purchases') +# $form->parse_html_template('rp/html_report_susa') + +my $rp_access_map = { + 'projects' => 'report', + 'ar_aging' => 'general_ledger', + 'ap_aging' => 'general_ledger', + 'receipts' => 'cash', + 'payments' => 'cash', + 'trial_balance' => 'report', + 'income_statement' => 'report', + 'bwa' => 'report', + 'balance_sheet' => 'report', +}; + +sub check_rp_access { + my $right = $rp_access_map->{$form->{report}}; + $right ||= 'DOES_NOT_EXIST'; + + $auth->assert($right); +} + sub report { $lxdebug->enter_sub(); + check_rp_access(); + %title = ('balance_sheet' => 'Balance Sheet', 'income_statement' => 'Income Statement', 'trial_balance' => 'Trial Balance', @@ -107,8 +129,7 @@ sub report { 'receipts' => 'Receipts', 'payments' => 'Payments', 'projects' => 'Project Transactions', - 'bwa' => 'Betriebswirtschaftliche Auswertung', - 'ustva' => 'Umsatzsteuervoranmeldung',); + 'bwa' => 'Betriebswirtschaftliche Auswertung',); $form->{title} = $locale->text($title{ $form->{report} }); @@ -153,49 +174,43 @@ sub report { # use JavaScript Calendar or not $form->{jsscript} = 1; $jsscript = ""; - if ($form->{report} eq "ustva") { - $department = ""; + if ($form->{report} eq "balance_sheet") { + $name_1 = "asofdate"; + $id_1 = "asofdate"; + $value_1 = "$form->{asofdate}"; + $trigger_1 = "trigger1"; + $name_2 = "compareasofdate"; + $id_2 = "compareasofdate"; + $value_2 = "$form->{compareasofdate}"; + $trigger_2 = "trigger2"; + } elsif ($form->{report} =~ /(receipts|payments)$/) { + $name_1 = "fromdate"; + $id_1 = "fromdate"; + $value_1 = "$form->{fromdate}"; + $trigger_1 = "trigger1"; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; + } elsif (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) { + $name_1 = ""; + $id_1 = ""; + $value_1 = ""; + $trigger_1 = ""; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; + } else { - if ($form->{report} eq "balance_sheet") { - $name_1 = "asofdate"; - $id_1 = "asofdate"; - $value_1 = "$form->{asofdate}"; - $trigger_1 = "trigger1"; - $name_2 = "compareasofdate"; - $id_2 = "compareasofdate"; - $value_2 = "$form->{compareasofdate}"; - $trigger_2 = "trigger2"; - } elsif ($form->{report} =~ /(receipts|payments)$/) { - $name_1 = "fromdate"; - $id_1 = "fromdate"; - $value_1 = "$form->{fromdate}"; - $trigger_1 = "trigger1"; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; - $trigger_2 = "trigger2"; - } else { - if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) { - $name_1 = ""; - $id_1 = ""; - $value_1 = ""; - $trigger_1 = ""; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; - $trigger_2 = "trigger2"; - - } else { - $name_1 = "fromdate"; - $id_1 = "fromdate"; - $value_1 = "$form->{fromdate}"; - $trigger_1 = "trigger1"; - $name_2 = "todate"; - $id_2 = "todate"; - $value_2 = ""; - $trigger_2 = "trigger2"; - } - } + $name_1 = "fromdate"; + $id_1 = "fromdate"; + $value_1 = "$form->{fromdate}"; + $trigger_1 = "trigger1"; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; } # with JavaScript Calendar @@ -524,17 +539,65 @@ $jsscript |; } - if ($form->{report} eq "ustva") { - + if ($form->{report} eq "balance_sheet") { print qq| + + + | . $locale->text('as at') . qq| + + $button1 + $button1_2 + + | . $locale->text('Compare to') . qq| + + $button2 + $button2_2 + + + + | . $locale->text('Decimalplaces') . qq| + + + + + + + + + + + + + + + + + -
- +$jsscript +|; + } + + if ($form->{report} eq "trial_balance") { + print qq| + + + + +
| . $locale->text('Method') . qq|| + . $locale->text('Accrual') . qq| +  | + . $locale->text('EUR') . qq|
| . $locale->text('Include in Report') . qq| | + . $locale->text('Heading') . qq| +  | + . $locale->text('Subtotal') . qq| +  | + . $locale->text('Account Number') . qq|
| . $locale->text('Project') . qq|$projectnumber
+ . $locale->text('Customized Report') . qq| @@ -608,102 +671,39 @@ $checked> - - - - - - -|; - } - - if ($form->{report} eq "balance_sheet") { - print qq| - - - - - - + - + - - + -
| - . $locale->text('Zeitraum') . qq|
| . $locale->text('Year') . qq|
| . $locale->text('Method') . qq|| - . $locale->text('Accrual') . qq| -  | - . $locale->text('EUR') . qq|
|; -########## - - &print_options(); - print qq| -
| . $locale->text('as at') . qq| - $button1 - $button1_2 - | . $locale->text('Compare to') . qq| - $button2 - $button2_2 + | + . $locale->text('Free report period') . qq|| . $locale->text('From') . qq|  + $button1 + $button1_2  + | . $locale->text('Bis') . qq|  + $button2 + $button2_2
| . $locale->text('Decimalplaces') . qq|
- - - - - - + - - - - - - -$jsscript -|; - } - - if ($form->{report} eq "trial_balance") { - print qq| - - - - - - - -
| . $locale->text('Method') . qq|| . $locale->text('Method') . qq| | . $locale->text('Accrual') . qq|  | . $locale->text('EUR') . qq|
| . $locale->text('Include in Report') . qq| | - . $locale->text('Heading') . qq| -  | - . $locale->text('Subtotal') . qq| -  | - . $locale->text('Account Number') . qq|
| . $locale->text('From') . qq| - $button1 - $button1_2 - | . $locale->text('Bis') . qq| - $button2 - $button2_2 -
- - - - - - - - - - + + + + + + + + $jsscript |; } @@ -981,32 +981,9 @@ $jsscript
| . $locale->text('Include in Report') . qq| | - . $locale->text('Heading') . qq| -  | - . $locale->text('Subtotal') . qq| -  | - . $locale->text('All Accounts') . qq|
| + . $locale->text('All Accounts') + . qq|
| + . $locale->text('Decimalplaces') + . qq|

-{login}> -{password}> - -|; - - # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten - USTVA->get_config($userspath, 'finanzamt.ini'); - - $disabled = qq|disabled="disabled"|; - $disabled = '' if ($form->{elster} eq '1'); - if ($form->{report} eq 'ustva') { - print qq| - - - |; - print qq| - - |; - } - print qq| @@ -1020,6 +997,9 @@ sub continue { call_sub($form->{"nextsub"}); } sub get_project { $lxdebug->enter_sub(); + + $auth->assert('report'); + my $nextsub = shift; $form->{project_id} = $form->{project_id_1}; @@ -1043,6 +1023,8 @@ sub get_project { sub generate_income_statement { $lxdebug->enter_sub(); + $auth->assert('report'); + $form->{padding} = "  "; $form->{bold} = ""; $form->{endbold} = ""; @@ -1204,80 +1186,396 @@ sub generate_income_statement { $form->parse_template; - $lxdebug->leave_sub(); -} + $lxdebug->leave_sub(); +} + +sub generate_balance_sheet { + $lxdebug->enter_sub(); + + $auth->assert('report'); + + RP->balance_sheet(\%myconfig, \%$form); + + $form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate}; + $form->{period} = + $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); + + ($form->{department}) = split /--/, $form->{department}; + + # define Current Earnings account + $padding = ($form->{l_heading}) ? $form->{padding} : ""; + push(@{ $form->{equity_account} }, + $padding . $locale->text('Current Earnings')); + + $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0); + $form->{last_period} = + $locale->date(\%myconfig, $form->{compareasofdate}, 0); + + my $attachment_basename; + + my $report = SL::ReportGenerator->new(\%myconfig, $form); + + my @hidden_variables = (); + push @hidden_variables, qw(fromdate todate year cash ); + + my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); + + my %column_defs = ( + 'accno' => { 'text' => $locale->text('Account Number'), }, + 'description' => { 'text' => $locale->text('Description'), }, + 'last_transaction' => { 'text' => $locale->text('Last Transaction'), }, + 'soll_eb' => { 'text' => $locale->text('Debit Starting Balance'), }, + 'haben_eb' => { 'text' => $locale->text('Credit Starting Balance'), }, + 'soll' => { 'text' => $locale->text('Debit'), }, + 'haben' => { 'text' => $locale->text('Credit'), }, + 'soll_kumuliert' => { 'text' => $locale->text('Sum Debit'), }, + 'haben_kumuliert' => { 'text' => $locale->text('Sum Credit'), }, + 'soll_saldo' => { 'text' => $locale->text('Saldo Debit'), }, + 'haben_saldo' => { 'text' => $locale->text('Saldo Credit'), } + ); + + + + my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); + + map { $column_defs{$_}->{visible} = 1 } @columns; + + $report->set_columns(%column_defs); + $report->set_column_order(@columns); + + $report->set_export_options('trial_balance', @hidden_variables); + + $report->set_sort_indicator($form->{sort}, 1); + + my @options; + + + $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . "  -  " . $locale->date(\%myconfig, $form->{todate}, 0); + $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0); + + $report->set_options('output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), + ); + $report->set_options_from_form(); + # $form->parse_html_template('report_generator/html_report_bilanz', $variables)); + $form->{report_template} = 'report_generator/html_report_bilanz'; + # add sort and escape callback, this one we use for the add sub + $form->{callback} = $href .= "&sort=$form->{sort}"; + + # escape callback for href + $callback = $form->escape($href); + + my @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); + + my %totals = map { $_ => 0 } @subtotal_columns; + + my $edit_url = build_std_url('action=edit', 'type', 'vc'); + +# foreach $accno (@{ $form->{TB} }) { +# +# $accno->{soll} = $accno->{debit}; +# $accno->{haben} = $accno->{credit}; +# map { $totals{$_} += $accno->{$_} } @subtotal_columns; +# +# map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); +# +# map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); +# +# my $row = { }; +# +# foreach my $column (@columns) { +# $row->{$column} = { +# 'data' => $accno->{$column}, +# 'align' => $column_alignment{$column}, +# }; +# } +# +# +# $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}"; +# +# my $row_set = [ $row ]; +# +# +# $report->add_data($row_set); +# +# $idx++; +# } +# +# $report->add_separator(); +# +# $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal')); + + $report->generate_with_headers(); + + + $lxdebug->leave_sub(); +} + +sub generate_projects { + $lxdebug->enter_sub(); + + $auth->assert('report'); + + &get_project(generate_projects); + $form->{projectnumber} = $form->{projectnumber_1}; + + $form->{nextsub} = "generate_projects"; + $form->{title} = $locale->text('Project Transactions'); + RP->trial_balance(\%myconfig, \%$form); + + list_accounts('generate_projects'); + + $lxdebug->leave_sub(); +} + +# Antonio Gallardo +# +# D.S. Feb 16, 2001 +# included links to display transactions for period entered +# added headers and subtotals +# +sub generate_trial_balance { + $lxdebug->enter_sub(); + + $auth->assert('report'); + + if ($form->{reporttype} eq "custom") { + + #forgotten the year --> thisyear + if ($form->{year} !~ m/^\d\d\d\d$/) { + $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~ + /(\d\d\d\d)/; + $form->{year} = $1; + } + + #yearly report + if ($form->{duetyp} eq "13") { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; + } + + #Quater reports + if ($form->{duetyp} eq "A") { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.3.$form->{year}"; + } + if ($form->{duetyp} eq "B") { + $form->{fromdate} = "1.4.$form->{year}"; + $form->{todate} = "30.6.$form->{year}"; + } + if ($form->{duetyp} eq "C") { + $form->{fromdate} = "1.7.$form->{year}"; + $form->{todate} = "30.9.$form->{year}"; + } + if ($form->{duetyp} eq "D") { + $form->{fromdate} = "1.10.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; + } + + #Monthly reports + SWITCH: { + $form->{duetyp} eq "1" && do { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.1.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "2" && do { + $form->{fromdate} = "1.2.$form->{year}"; + + #this works from 1901 to 2099, 1900 and 2100 fail. + $leap = ($form->{year} % 4 == 0) ? "29" : "28"; + $form->{todate} = "$leap.2.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "3" && do { + $form->{fromdate} = "1.3.$form->{year}"; + $form->{todate} = "31.3.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "4" && do { + $form->{fromdate} = "1.4.$form->{year}"; + $form->{todate} = "30.4.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "5" && do { + $form->{fromdate} = "1.5.$form->{year}"; + $form->{todate} = "31.5.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "6" && do { + $form->{fromdate} = "1.6.$form->{year}"; + $form->{todate} = "30.6.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "7" && do { + $form->{fromdate} = "1.7.$form->{year}"; + $form->{todate} = "31.7.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "8" && do { + $form->{fromdate} = "1.8.$form->{year}"; + $form->{todate} = "31.8.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "9" && do { + $form->{fromdate} = "1.9.$form->{year}"; + $form->{todate} = "30.9.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "10" && do { + $form->{fromdate} = "1.10.$form->{year}"; + $form->{todate} = "31.10.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "11" && do { + $form->{fromdate} = "1.11.$form->{year}"; + $form->{todate} = "30.11.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "12" && do { + $form->{fromdate} = "1.12.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; + last SWITCH; + }; + } + } + + + # get for each account initial balance, debits and credits + RP->trial_balance(\%myconfig, \%$form); + + + $form->{rowcount} = scalar @{ $form->{TB} }; + + my @columns = ( + "accno", "description", + "last_transaction", "soll_eb", + "haben_eb", + "soll", "haben", + "soll_kumuliert", "haben_kumuliert", + "soll_saldo", "haben_saldo" + ); + + + my $attachment_basename; + + my $report = SL::ReportGenerator->new(\%myconfig, $form); + + my @hidden_variables = (); + push @hidden_variables, qw(fromdate todate year cash ); + + my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); + + my %column_defs = ( + 'accno' => { 'text' => $locale->text('Account Number'), }, + 'description' => { 'text' => $locale->text('Description'), }, + 'last_transaction' => { 'text' => $locale->text('Last Transaction'), }, + 'soll_eb' => { 'text' => $locale->text('Debit Starting Balance'), }, + 'haben_eb' => { 'text' => $locale->text('Credit Starting Balance'), }, + 'soll' => { 'text' => $locale->text('Debit'), }, + 'haben' => { 'text' => $locale->text('Credit'), }, + 'soll_kumuliert' => { 'text' => $locale->text('Sum Debit'), }, + 'haben_kumuliert' => { 'text' => $locale->text('Sum Credit'), }, + 'soll_saldo' => { 'text' => $locale->text('Saldo Debit'), }, + 'haben_saldo' => { 'text' => $locale->text('Saldo Credit'), } + ); + + + + my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); + + map { $column_defs{$_}->{visible} = 1 } @columns; + + $report->set_columns(%column_defs); + $report->set_column_order(@columns); + + $report->set_export_options('trial_balance', @hidden_variables); + + $report->set_sort_indicator($form->{sort}, 1); + + my @options; + + + $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . "  -  " . $locale->date(\%myconfig, $form->{todate}, 0); + $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0); + + $report->set_options('output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), + 'html_template' => 'rp/html_report_susa', + 'pdf_template' => 'rp/html_report_susa', + ); + $report->set_options_from_form(); + + # add sort and escape callback, this one we use for the add sub + $form->{callback} = $href .= "&sort=$form->{sort}"; + + # escape callback for href + $callback = $form->escape($href); + + my @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); + + my %totals = map { $_ => 0 } @subtotal_columns; -sub generate_balance_sheet { - $lxdebug->enter_sub(); + my $edit_url = build_std_url('action=edit', 'type', 'vc'); - $form->{padding} = "  "; - $form->{bold} = ""; - $form->{endbold} = ""; - $form->{br} = "
"; + foreach $accno (@{ $form->{TB} }) { - RP->balance_sheet(\%myconfig, \%$form); + $accno->{soll} = $accno->{debit}; + $accno->{haben} = $accno->{credit}; + map { $totals{$_} += $accno->{$_} } @subtotal_columns; - $form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate}; - $form->{period} = - $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); + map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); - ($form->{department}) = split /--/, $form->{department}; + map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); - # define Current Earnings account - $padding = ($form->{l_heading}) ? $form->{padding} : ""; - push(@{ $form->{equity_account} }, - $padding . $locale->text('Current Earnings')); + my $row = { }; - $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0); - $form->{last_period} = - $locale->date(\%myconfig, $form->{compareasofdate}, 0); + foreach my $column (@columns) { + $row->{$column} = { + 'data' => $accno->{$column}, + 'align' => $column_alignment{$column}, + }; + } - $form->{IN} = "balance_sheet.html"; - # setup company variables for the form - map { $form->{$_} = $myconfig{$_}; - $form->{$_} =~ s/\\n/\n/g; } - (qw(company address businessnumber nativecurr)); + $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}"; - $form->{templates} = $myconfig{templates}; + my $row_set = [ $row ]; - $form->parse_template; - $lxdebug->leave_sub(); -} + $report->add_data($row_set); -sub generate_projects { - $lxdebug->enter_sub(); + $idx++; + } - &get_project(generate_projects); - $form->{projectnumber} = $form->{projectnumber_1}; + $report->add_separator(); - $form->{nextsub} = "generate_projects"; - $form->{title} = $locale->text('Project Transactions'); - RP->trial_balance(\%myconfig, \%$form); + $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal')); - list_accounts('generate_projects'); + $report->generate_with_headers(); $lxdebug->leave_sub(); + } -# Antonio Gallardo -# -# D.S. Feb 16, 2001 -# included links to display transactions for period entered -# added headers and subtotals -# -sub generate_trial_balance { +sub create_subtotal_row { $lxdebug->enter_sub(); - # get for each account initial balance, debits and credits - RP->trial_balance(\%myconfig, \%$form); + my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_; + + my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } }; + + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns }; - $form->{nextsub} = "generate_trial_balance"; - $form->{title} = $locale->text('Trial Balance'); - list_accounts('generate_trial_balance'); + $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2); + + map { $totals->{$_} = 0 } @{ $subtotal_columns }; $lxdebug->leave_sub(); + + return $row; } sub create_list_accounts_subtotal_row { @@ -1419,6 +1717,8 @@ sub list_accounts { sub generate_ar_aging { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + # split customer ($form->{customer}) = split(/--/, $form->{customer}); @@ -1436,6 +1736,8 @@ sub generate_ar_aging { sub generate_ap_aging { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + # split vendor ($form->{vendor}) = split(/--/, $form->{vendor}); @@ -1458,7 +1760,7 @@ sub create_aging_subtotal_row { my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } }; foreach (@{ $periods }) { - $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : ''; + $row->{"$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : ''; $subtotals->{$_} = 0; } @@ -1470,9 +1772,11 @@ sub create_aging_subtotal_row { sub aging { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + my $report = SL::ReportGenerator->new(\%myconfig, $form); - my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90); + my @columns = qw(statement ct invnumber transdate duedate amount open); my %column_defs = ( 'statement' => { 'text' => '', 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, }, @@ -1480,14 +1784,12 @@ sub aging { 'invnumber' => { 'text' => $locale->text('Invoice'), }, 'transdate' => { 'text' => $locale->text('Date'), }, 'duedate' => { 'text' => $locale->text('Due'), }, - 'c0' => { 'text' => $locale->text('Current'), }, - 'c30' => { 'text' => '30', }, - 'c60' => { 'text' => '60', }, - 'c90' => { 'text' => '90', }, + 'amount' => { 'text' => $locale->text('Amount'), }, + 'open' => { 'text' => $locale->text('Open'), }, ); my %column_alignment = ('statement' => 'center', - map { $_ => 'right' } qw(c0 c30 c60 c90)); + map { $_ => 'right' } qw(open amount)); $report->set_options('std_column_visibility' => 1); $report->set_columns(%column_defs); @@ -1524,7 +1826,7 @@ sub aging { my $previous_ctid = 0; my $row_idx = 0; - my @periods = qw(0 30 60 90); + my @periods = qw(open amount); my %subtotals = map { $_ => 0 } @periods; my %totals = map { $_ => 0 } @periods; @@ -1534,9 +1836,9 @@ sub aging { } foreach my $key (@periods) { - $subtotals{$key} += $ref->{"c${key}"}; - $totals{$key} += $ref->{"c${key}"}; - $ref->{"c${key}"} = $ref->{"c${key}"} != 0 ? $form->format_amount(\%myconfig, $ref->{"c${key}"}, 2) : ''; + $subtotals{$key} += $ref->{"$key"}; + $totals{$key} += $ref->{"$key"}; + $ref->{"$key"} = $ref->{"$key"} != 0 ? $form->format_amount(\%myconfig, $ref->{"$key"}, 2) : ''; } my $row = { }; @@ -1572,7 +1874,7 @@ sub aging { if ($form->{arap} eq 'ar') { $raw_top_info_text = $form->parse_html_template('rp/aging_ar_top'); $raw_bottom_info_text = $form->parse_html_template('rp/aging_ar_bottom', { 'row_idx' => $row_idx, - 'PRINT_OPTIONS' => print_options(1), }); + 'PRINT_OPTIONS' => print_options(inline => 1), }); $report->set_options('raw_top_info_text' => $raw_top_info_text, 'raw_bottom_info_text' => $raw_bottom_info_text); } @@ -1599,6 +1901,8 @@ sub select_all { sub e_mail { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + # get name and email addresses for $i (1 .. $form->{rowcount}) { if ($form->{"statement_$i"}) { @@ -1674,6 +1978,7 @@ sub e_mail { # save all other variables foreach $key (keys %$form) { + next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); $form->{$key} =~ s/\"/"/g; print qq|\n|; } @@ -1703,6 +2008,8 @@ sub e_mail { sub send_email { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + $form->{subject} = $locale->text('Statement') . qq| - $form->{todate}| unless $form->{subject}; @@ -1721,6 +2028,8 @@ sub send_email { sub print { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + if ($form->{media} eq 'printer') { $form->error($locale->text('Select postscript or PDF!')) if ($form->{format} !~ /(postscript|pdf)/); @@ -1755,18 +2064,7 @@ sub print { sub print_form { $lxdebug->enter_sub(); - my %replacements = - ( - "ä" => "ae", "ö" => "oe", "ü" => "ue", - "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", - "ß" => "ss", - " " => "_" - ); - - foreach my $key (keys %replacements) { - my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key); - $replacements{$new_key} = $replacements{$key} if $new_key ne $key; - } + $auth->assert('general_ledger'); $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1); @@ -1785,9 +2083,7 @@ sub print_form { } $form->{IN} = "$form->{type}.$suffix"; - $form->{OUT} = - $form->{media} eq 'email' ? $sendmail : - $form->{media} eq 'printer' ? "| $myconfig{printer}" : ""; + $form->{OUT} = $form->{media} eq 'printer' ? "| $myconfig{printer}" : ""; # Save $form->{email} because it will be overwritten. $form->{EMAIL_RECIPIENT} = $form->{email}; @@ -1848,8 +2144,8 @@ sub print_form { $form->format_amount(\%myconfig, $form->{"${_}total"}, 2) } (c0, c30, c60, c90, ""); - $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix"; - map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements)); + $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, $userspath); @@ -1869,6 +2165,9 @@ sub print_form { sub statement_details { $lxdebug->enter_sub(); + + $auth->assert('general_ledger'); + my ($ref) = @_; push @{ $form->{invnumber} }, $ref->{invnumber}; @@ -1892,6 +2191,8 @@ sub statement_details { sub generate_tax_report { $lxdebug->enter_sub(); + $auth->assert('report'); + RP->tax_report(\%myconfig, \%$form); $descvar = "$form->{accno}_description"; @@ -1902,13 +2203,13 @@ sub generate_tax_report { # construct href $href = - "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; + "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; # construct callback $description = $form->escape($form->{$descvar}, 1); $department = $form->escape($form->{department}, 1); $callback = - "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; + "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; $title = $form->escape($form->{title}); $href .= "&title=$title"; @@ -2047,7 +2348,7 @@ sub generate_tax_report { $column_data{id} = qq|$ref->{id}|; $column_data{invnumber} = - qq|{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}|; + qq|{id}&callback=$callback>$ref->{invnumber}|; $column_data{transdate} = qq|$ref->{transdate}|; $column_data{name} = qq|$ref->{name} |; @@ -2144,6 +2445,8 @@ sub tax_subtotal { sub list_payments { $lxdebug->enter_sub(); + $auth->assert('cash'); + if ($form->{account}) { ($form->{paymentaccounts}) = split /--/, $form->{account}; } @@ -2259,30 +2562,6 @@ sub list_payments { $lxdebug->leave_sub(); } -sub config { - $lxdebug->enter_sub(); - edit(); - - #$form->header; - #print qq|Hallo|; - $lxdebug->leave_sub(); -} - -sub debug { - - $form->debug(); - -} - -sub winston_export { - $lxdebug->enter_sub(); - - #create_winston(); - $form->{winston} = 1; - &generate_ustva(); - $lxdebug->leave_sub(); -} - sub print_options { $lxdebug->enter_sub(); @@ -2305,14 +2584,9 @@ sub print_options { $form->{OP}{ $form->{media} } = "selected"; $form->{SM}{ $form->{sendmode} } = "selected"; - if ($form->{report} eq 'ustva') { - $type = qq| -