X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=88283d0d0b06a3ee88f2b4445d6aef060ad7539d;hb=8c7e44938a661e035f62840e1e177353240ace5d;hp=152db9572a278041d02d2d740bbea0502eacf6cb;hpb=d2e805cac9546036c5fe186b74ccecf3151b1e8b;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 152db9572..88283d0d0 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -35,12 +35,16 @@ # #====================================================================== -require "$form->{path}/arap.pl"; -require "bin/mozilla/common.pl"; +use POSIX qw(strftime); use SL::PE; use SL::RP; -use SL::USTVA; +use SL::Iconv; +use SL::ReportGenerator; + +require "bin/mozilla/arap.pl"; +require "bin/mozilla/common.pl"; +require "bin/mozilla/reportgenerator.pl"; 1; @@ -87,9 +91,30 @@ use SL::USTVA; # $locale->text('Non-taxable Sales') # $locale->text('Non-taxable Purchases') +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', @@ -102,17 +127,14 @@ sub report { 'receipts' => 'Receipts', 'payments' => 'Payments', 'projects' => 'Project Transactions', - 'bwa' => 'Betriebswirtschaftliche Auswertung', - 'ustva' => 'Umsatzsteuervoranmeldung',); + 'bwa' => 'Betriebswirtschaftliche Auswertung',); $form->{title} = $locale->text($title{ $form->{report} }); $accrual = ($eur) ? "" : "checked"; $cash = ($eur) ? "checked" : ""; - ($null, $null, $null, $null, $null, $year, $null, $null, $null) = - localtime(); - $year += 1900; + $year = (localtime)[5] + 1900; # get departments $form->all_departments(\%myconfig); @@ -148,51 +170,45 @@ sub report { '-labels' => \%project_labels)); # use JavaScript Calendar or not - $form->{jsscript} = $jscalendar; + $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 @@ -200,7 +216,7 @@ sub report { if ($name_1 eq "") { $button1 = qq| - |; + |; $button1_2 = qq| text('button') . qq|>|; @@ -210,12 +226,12 @@ sub report { Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2"); } else { $button1 = qq| - |; + |; $button1_2 = qq| text('button') . qq|>|; $button2 = qq| - |; + |; $button2_2 = qq| text('button') . qq|> @@ -231,19 +247,21 @@ sub report { # without JavaScript Calendar if ($name_1 eq "") { $button1 = - qq||; + qq||; } else { $button1 = - qq||; + qq||; $button2 = - qq||; + qq||; } } - + $form->{javascript} .= qq||; $form->header; - + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +
{script}> @@ -519,107 +537,6 @@ $jsscript |; } - if ($form->{report} eq "ustva") { - - print qq| - -
- - - - - - - - - - -|; - - print qq| - - - - - - - - -|; - $checked = "checked"; - print qq| - -|; - $checked = ""; - print qq| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -|; - } - if ($form->{report} eq "balance_sheet") { print qq| @@ -976,33 +893,9 @@ $jsscript
| - . $locale->text('Zeitraum') . qq|
| . $locale->text('Year') . qq|
- | . $locale->text('Yearly') . qq| | . $locale->text('Quarterly') . qq|| . $locale->text('Monthly') . qq|
   1. | - . $locale->text('Quarter') . qq| | - . $locale->text('January') . qq| | - . $locale->text('May') . qq| | - . $locale->text('September') . qq|
  2. | - . $locale->text('Quarter') . qq| | - . $locale->text('February') . qq| | - . $locale->text('June') . qq| | - . $locale->text('October') . qq|
  3. | - . $locale->text('Quarter') . qq| | - . $locale->text('March') . qq| | - . $locale->text('July') . qq| | - . $locale->text('November') . qq|
  4. | - . $locale->text('Quarter') . qq|  | - . $locale->text('April') . qq| | - . $locale->text('August') . qq| | - . $locale->text('December') . qq|
| . $locale->text('Method') . qq|| - . $locale->text('Accrual') . qq| -  | - . $locale->text('EUR') . qq|
|; -########## - - &print_options(); - print qq| -

-{path}> -{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|
@@ -1012,10 +905,13 @@ $jsscript $lxdebug->leave_sub(); } -sub continue { &{ $form->{nextsub} } } +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}; @@ -1039,6 +935,8 @@ sub get_project { sub generate_income_statement { $lxdebug->enter_sub(); + $auth->assert('report'); + $form->{padding} = "  "; $form->{bold} = ""; $form->{endbold} = ""; @@ -1206,6 +1104,8 @@ sub generate_income_statement { sub generate_balance_sheet { $lxdebug->enter_sub(); + $auth->assert('report'); + $form->{padding} = "  "; $form->{bold} = ""; $form->{endbold} = ""; @@ -1231,9 +1131,7 @@ sub generate_balance_sheet { $form->{IN} = "balance_sheet.html"; # setup company variables for the form - map { $form->{$_} = $myconfig{$_}; - $form->{$_} =~ s/\\n/\n/g; } - (qw(company address businessnumber nativecurr)); + map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr)); $form->{templates} = $myconfig{templates}; @@ -1245,6 +1143,8 @@ sub generate_balance_sheet { sub generate_projects { $lxdebug->enter_sub(); + $auth->assert('report'); + &get_project(generate_projects); $form->{projectnumber} = $form->{projectnumber_1}; @@ -1252,7 +1152,7 @@ sub generate_projects { $form->{title} = $locale->text('Project Transactions'); RP->trial_balance(\%myconfig, \%$form); - &list_accounts; + list_accounts('generate_projects'); $lxdebug->leave_sub(); } @@ -1266,34 +1166,50 @@ sub generate_projects { sub generate_trial_balance { $lxdebug->enter_sub(); + $auth->assert('report'); + # get for each account initial balance, debits and credits RP->trial_balance(\%myconfig, \%$form); $form->{nextsub} = "generate_trial_balance"; $form->{title} = $locale->text('Trial Balance'); - &list_accounts; + list_accounts('generate_trial_balance'); + + $lxdebug->leave_sub(); +} + +sub create_list_accounts_subtotal_row { + $lxdebug->enter_sub(); + + my ($subtotals, $columns, $fields, $class) = @_; + + my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } }; + + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $subtotals->{$_}, 2) } @{ $fields }; $lxdebug->leave_sub(); + + return $row; } sub list_accounts { $lxdebug->enter_sub(); - $title = $form->escape($form->{title}); + my ($action) = @_; + my @options; if ($form->{department}) { - ($department) = split /--/, $form->{department}; - $options = $locale->text('Department') . " : $department
"; - $department = $form->escape($form->{department}); + my ($department) = split /--/, $form->{department}; + push @options, $locale->text('Department') . " : $department"; } if ($form->{projectnumber}) { - $options .= - $locale->text('Project Number') . " : $form->{projectnumber}
"; - $projectnumber = $form->escape($form->{projectnumber}); + push @options, $locale->text('Project Number') . " : $form->{projectnumber}"; } # if there are any dates if ($form->{fromdate} || $form->{todate}) { + my ($fromdate, $todate); + if ($form->{fromdate}) { $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1); } @@ -1301,211 +1217,99 @@ sub list_accounts { $todate = $locale->date(\%myconfig, $form->{todate}, 1); } - $form->{period} = "$fromdate - $todate"; - } else { - $form->{period} = - $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); + push @options, "$fromdate - $todate"; + } else { + push @options, $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); } - $options .= $form->{period}; - - @column_index = qw(accno description begbalance debit credit endbalance); - - $column_header{accno} = - qq|| . $locale->text('Account') . qq||; - $column_header{description} = - qq|| . $locale->text('Description') . qq||; - $column_header{debit} = - qq|| . $locale->text('Debit') . qq||; - $column_header{credit} = - qq|| . $locale->text('Credit') . qq||; - $column_header{begbalance} = - qq|| . $locale->text('Balance') . qq||; - $column_header{endbalance} = - qq|| . $locale->text('Balance') . qq||; - $form->header; + my @columns = qw(accno description begbalance debit credit endbalance); + my %column_defs = ( + 'accno' => { 'text' => $locale->text('Account'), }, + 'description' => { 'text' => $locale->text('Description'), }, + 'debit' => { 'text' => $locale->text('Debit'), }, + 'credit' => { 'text' => $locale->text('Credit'), }, + 'begbalance' => { 'text' => $locale->text('Balance'), }, + 'endbalance' => { 'text' => $locale->text('Balance'), }, + ); + my %column_alignment = map { $_ => 'right' } qw(debit credit begbalance endbalance); - print qq| - + my @hidden_variables = qw(fromdate todate department l_heading l_subtotal all_accounts sort accounttype eur projectnumber project_id title nextsub); - - - - - - - - - - - - - - -
$form->{title}
$options
- - |; + $form->{callback} = build_std_url("action=$action", grep { $form->{$_} } @hidden_variables); - map { print "$column_header{$_}\n" } @column_index; + my $report = SL::ReportGenerator->new(\%myconfig, $form); - print qq| - -|; + $report->set_options('top_info_text' => join("\n", @options), + 'output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $locale->text('list_of_transactions') . strftime('_%Y%m%d', localtime time), + 'std_column_visibility' => 1, + ); + $report->set_options_from_form(); - # sort the whole thing by account numbers and display - foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }) { - - $description = $form->escape($ref->{description}); - - $href = - qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|; - - $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; - - $debit = ($ref->{debit} != 0) ? $form->format_amount(\%myconfig, $ref->{debit}, 2, " ") : " "; - $credit = ($ref->{credit} != 0) ? $form->format_amount(\%myconfig, $ref->{credit}, 2, " ") : " "; - $begbalance = - $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " "); - $endbalance = - $form->format_amount(\%myconfig, - ($ref->{balance} + $ref->{amount}) * $ml, - 2, " "); - - # next if ($ref->{debit} == 0 && $ref->{credit} == 0); - - if ($ref->{charttype} eq "H" && $subtotal && $form->{l_subtotal}) { - map { $column_data{$_} = "" } - qw(accno begbalance endbalance); - - $subtotalbegbalance = - $form->format_amount(\%myconfig, $subtotalbegbalance, 2, " "); - $subtotalendbalance = - $form->format_amount(\%myconfig, $subtotalendbalance, 2, " "); - $subtotaldebit = - $form->format_amount(\%myconfig, $subtotaldebit, 2, " "); - $subtotalcredit = - $form->format_amount(\%myconfig, $subtotalcredit, 2, " "); - - $column_data{description} = ""; - $column_data{begbalance} = ""; - $column_data{endbalance} = ""; - $column_data{debit} = ""; - $column_data{credit} = ""; - - print qq| - -|; - map { print "$column_data{$_}\n" } @column_index; + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - print qq| - -|; - } + $report->set_export_options($action, @hidden_variables); - if ($ref->{charttype} eq "H") { - $subtotal = 1; - $subtotaldescription = $ref->{description}; - $subtotaldebit = $ref->{debit}; - $subtotalcredit = $ref->{credit}; - $subtotalbegbalance = 0; - $subtotalendbalance = 0; + $report->set_sort_indicator('accno', 1); - next unless $form->{l_heading}; + my @totals_columns = qw(credit debit begbalance endbalance); + 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} }; - map { $column_data{$_} = "" } - qw(accno debit credit begbalance endbalance); - $column_data{description} = - ""; - } + # sort the whole thing by account numbers and display + foreach my $idx (0 .. scalar(@tb) - 1) { + my $ref = $tb[$idx]; + my $href = build_std_url('script=ca.pl', 'action=list_transactions', 'accno=' . E($ref->{accno}), 'description=' . E($ref->{description}), @hidden_variables); - if ($ref->{charttype} eq "A") { - $column_data{accno} = ""; - $column_data{description} = ""; - $column_data{debit} = ""; - $column_data{credit} = ""; - $column_data{begbalance} = ""; - $column_data{endbalance} = ""; + my $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; - $totaldebit += $ref->{debit}; - $totalcredit += $ref->{credit}; + my $row = { map { $_ => { 'align' => $column_alignment{$_} } } @columns }; - $subtotalbegbalance += $ref->{balance} * $ml; - $subtotalendbalance += ($ref->{balance} + $ref->{amount}) * $ml; + if ($ref->{charttype} eq 'H') { + next unless ($form->{l_heading}); - } + %subtotals = map { $_ => 0 } @totals_columns; + $found_heading = 1; + $row->{description}->{class} = 'listheading'; + $row->{description}->{data} = $ref->{description}; - if ($ref->{charttype} eq "H") { - print qq| - -|; + $report->add_data($row); + + next; } - if ($ref->{charttype} eq "A") { - $i++; - $i %= 2; - print qq| - -|; + + foreach (qw(debit credit)) { + $subtotals{$_} += $ref->{$_}; + $totals{$_} += $ref->{$_}; } - map { print "$column_data{$_}\n" } @column_index; + $subtotals{begbalance} += $ref->{balance} * $ml; + $subtotals{endbalance} += ($ref->{balance} + $ref->{amount}) * $ml; - print qq| - -|; - } + map { $row->{$_}->{data} = $ref->{$_} } qw(accno description); + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $ref->{$_}, 2) if ($ref->{$_} != 0) } qw(credit debit); - # print last subtotal - if ($subtotal && $form->{l_subtotal}) { - map { $column_data{$_} = "" } - qw(accno begbalance endbalance); - $subtotalbegbalance = - $form->format_amount(\%myconfig, $subtotalbegbalance, 2, " "); - $subtotalendbalance = - $form->format_amount(\%myconfig, $subtotalendbalance, 2, " "); - $subtotaldebit = - $form->format_amount(\%myconfig, $subtotaldebit, 2, " "); - $subtotalcredit = - $form->format_amount(\%myconfig, $subtotalcredit, 2, " "); - $column_data{description} = ""; - $column_data{begbalance} = ""; - $column_data{endbalance} = ""; - $column_data{debit} = ""; - $column_data{credit} = ""; + $row->{begbalance}->{data} = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2); + $row->{endbalance}->{data} = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2); - print qq| - -|; - map { print "$column_data{$_}\n" } @column_index; + $report->add_data($row); - print qq| - -|; + if ($form->{l_heading} && $found_heading && + (($idx == scalar(@tb) - 1) || ('H' eq $tb[$idx + 1]->{charttype}))) { + $report->add_data(create_list_accounts_subtotal_row(\%subtotals, \@columns, \@totals_columns, 'listsubtotal')); + } } - $totaldebit = $form->format_amount(\%myconfig, $totaldebit, 2, " "); - $totalcredit = $form->format_amount(\%myconfig, $totalcredit, 2, " "); - - map { $column_data{$_} = "" } - qw(accno description begbalance endbalance); - - $column_data{debit} = qq||; - $column_data{credit} = qq||; - - print qq| - -|; - - map { print "$column_data{$_}\n" } @column_index; + $report->add_separator(); - print qq| - -
 $subtotaldescription$subtotalbegbalance$subtotalendbalance$subtotaldebit$subtotalcredit
 $ref->{description}$ref->{accno}$ref->{description}$debit$credit$begbalance$endbalance
 $subdescription$subtotalbegbalance$subtotalendbalance$subtotaldebit$subtotalcredit
 $totaldebit$totalcredit
-
+ $report->add_data(create_list_accounts_subtotal_row(\%totals, \@columns, [ qw(debit credit) ], 'listtotal')); - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } @@ -1513,19 +1317,18 @@ sub list_accounts { sub generate_ar_aging { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + # split customer ($form->{customer}) = split(/--/, $form->{customer}); - $customer = $form->escape($form->{customer}, 1); - $title = $form->escape($form->{title}, 1); $form->{ct} = "customer"; $form->{arap} = "ar"; - $form->{callback} = - qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|; + $form->{callback} = build_std_url('action=generate_ar_aging', qw(todate customer title)); RP->aging(\%myconfig, \%$form); - &aging; + aging(); $lxdebug->leave_sub(); } @@ -1533,298 +1336,154 @@ sub generate_ar_aging { sub generate_ap_aging { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + # split vendor ($form->{vendor}) = split(/--/, $form->{vendor}); - $vendor = $form->escape($form->{vendor}, 1); - $title = $form->escape($form->{title}, 1); $form->{ct} = "vendor"; $form->{arap} = "ap"; - $form->{callback} = - qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|; + $form->{callback} = build_std_url('action=generate_ap_aging', qw(todate vendor title)); RP->aging(\%myconfig, \%$form); - &aging; + aging(); $lxdebug->leave_sub(); } -sub aging { +sub create_aging_subtotal_row { $lxdebug->enter_sub(); - $form->header; + my ($subtotals, $columns, $periods, $class) = @_; - $column_header{statement} = qq| |; - $column_header{ct} = - qq|| - . $locale->text(ucfirst $form->{ct}) - . qq||; - $column_header{invnumber} = - qq|| . $locale->text('Invoice') . qq||; - $column_header{transdate} = - qq|| . $locale->text('Date') . qq||; - $column_header{duedate} = - qq|| . $locale->text('Due') . qq||; - $column_header{c0} = - qq|| . $locale->text('Current') . qq||; - $column_header{c30} = qq|30|; - $column_header{c60} = qq|60|; - $column_header{c90} = qq|90|; - - @column_index = - (qw(statement ct invnumber transdate duedate c0 c30 c60 c90)); + my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } }; - if ($form->{department}) { - $option .= "\n
" if $option; - ($department) = split /--/, $form->{department}; - $option .= $locale->text('Department') . " : $department"; - $department = $form->escape($form->{department}, 1); - $form->{callback} .= "&department=$department"; + foreach (@{ $periods }) { + $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : ''; + $subtotals->{$_} = 0; } - if ($form->{arap} eq 'ar') { - if ($form->{customer}) { - $option .= "\n
" if $option; - $option .= $form->{customer}; - } - } - if ($form->{arap} eq 'ap') { - shift @column_index; - if ($form->{vendor}) { - $option .= "\n
" if $option; - $option .= $form->{vendor}; - } - } + $lxdebug->leave_sub(); - $todate = $locale->date(\%myconfig, $form->{todate}, 1); - $option .= "\n
" if $option; - $option .= - $locale->text('for Period') . " " . $locale->text('Bis') . " $todate"; + return $row; +} - print qq| - +sub aging { + $lxdebug->enter_sub(); -
{script}> + $auth->assert('general_ledger'); - - - - - - - - - - - - - - - - - -
$form->{title}
$option
- - -|; + my $report = SL::ReportGenerator->new(\%myconfig, $form); - map { print "$column_header{$_}\n" } @column_index; + my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90); - print qq| - -|; + my %column_defs = ( + 'statement' => { 'text' => '', 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, }, + 'ct' => { 'text' => $form->{ct} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), }, + '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', }, + ); - $ctid = 0; - $subtotal = 0; - $i = 0; + my %column_alignment = ('statement' => 'center', + map { $_ => 'right' } qw(c0 c30 c60 c90)); - foreach $ref (@{ $form->{AG} }) { + $report->set_options('std_column_visibility' => 1); + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - if ($ctid != $ref->{ctid}) { + my @hidden_variables = qw(todate customer vendor arap title ct); + $report->set_export_options('generate_' . ($form->{arap} eq 'ar' ? 'ar' : 'ap') . '_aging', @hidden_variables); - $i++; + my @options; - if ($subtotal) { - $c0subtotal = ($c0subtotal != 0) ? - $form->format_amount(\%myconfig, $c0subtotal, 2, " ") : ""; - $c30subtotal = ($c30subtotal != 0) ? - $form->format_amount(\%myconfig, $c30subtotal, 2, " ") : ""; - $c60subtotal = ($c60subtotal != 0) ? - $form->format_amount(\%myconfig, $c60subtotal, 2, " ") : ""; - $c90subtotal = ($c90subtotal != 0) ? - $form->format_amount(\%myconfig, $c90subtotal, 2, " ") : ""; - } + if ($form->{department}) { + my ($department) = split /--/, $form->{department}; + push @options, $locale->text('Department') . " : $department"; + $form->{callback} .= "&department=" . E($department); + } - $column_data{ct} = qq||; - $column_data{invnumber} = qq||; - $column_data{transdate} = qq||; - $column_data{duedate} = qq||; - $column_data{c0} = - qq||; - $column_data{c30} = - qq||; - $column_data{c60} = - qq||; - $column_data{c90} = - qq||; - - if ($subtotal) { - - # print subtotals - print qq| - -|; + if (($form->{arap} eq 'ar') && $form->{customer}) { + push @options, $form->{customer}; + } - map { print "$column_data{$_}\n" } @column_index; + if (($form->{arap} eq 'ap') && $form->{vendor}) { + push @options, $form->{vendor}; + } - $column_data{statement} = qq||; + push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1); - print qq| - -|; - } + my $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list'); - $subtotal = 1; + $report->set_options('top_info_text' => join("\n", @options), + 'output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), + ); - $c0subtotal = 0; - $c30subtotal = 0; - $c60subtotal = 0; - $c90subtotal = 0; + my $previous_ctid = 0; + my $row_idx = 0; + my @periods = qw(0 30 60 90); + my %subtotals = map { $_ => 0 } @periods; + my %totals = map { $_ => 0 } @periods; - $column_data{ct} = qq||; - $column_data{statement} = - qq||; + foreach $ref (@{ $form->{AG} }) { + if ($row_idx && ($previous_ctid != $ref->{ctid})) { + $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal')); } - $c0subtotal += $ref->{c0}; - $c30subtotal += $ref->{c30}; - $c60subtotal += $ref->{c60}; - $c90subtotal += $ref->{c90}; + 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) : ''; + } - $c0total += $ref->{c0}; - $c30total += $ref->{c30}; - $c60total += $ref->{c60}; - $c90total += $ref->{c90}; + my $row = { }; - $ref->{c0} = ($ref->{c0} != 0) ? $form->format_amount(\%myconfig, $ref->{c0}, 2, " ") : ""; - $ref->{c30} = ($ref->{c30} != 0) ? $form->format_amount(\%myconfig, $ref->{c30}, 2, " ") : ""; - $ref->{c60} = ($ref->{c60} != 0) ? $form->format_amount(\%myconfig, $ref->{c60}, 2, " ") : ""; - $ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, " ") : ""; + foreach my $column (@columns) { + $row->{$column} = { + 'data' => (($column eq 'ct') || ($column eq 'statement')) ? '' : $ref->{$column}, + 'align' => $column_alignment{$column}, + 'valign' => $column eq 'statement' ? 'center' : '', + }; + } - $href = - qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=| - . $form->escape($form->{callback}); + $row->{invnumber}->{link} = build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id})); - $column_data{invnumber} = qq||; - $column_data{transdate} = qq||; - $column_data{duedate} = qq||; - $column_data{c0} = qq||; - $column_data{c30} = qq||; - $column_data{c60} = qq||; - $column_data{c90} = qq||; - - $j++; - $j %= 2; - print qq| - -|; + if ($previous_ctid != $ref->{ctid}) { + $row->{statement}->{raw_data} = + $cgi->hidden('-name' => "customer_id_${row_idx}", '-value' => $ref->{ctid}) + . $cgi->checkbox('-name' => "statement_${row_idx}", '-value' => 1, '-label' => '', 'checked' => $ref->{checked}); + $row->{ct}->{data} = $ref->{name}; - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; - - $column_data{ct} = qq||; - $column_data{statement} = qq||; + $row_idx++; + } - $ctid = $ref->{ctid}; + $previous_ctid = $ref->{ctid}; + $report->add_data($row); } - # print subtotals - $c0subtotal = $form->format_amount(\%myconfig, $c0subtotal, 2, " "); - $c30subtotal = $form->format_amount(\%myconfig, $c30subtotal, 2, " "); - $c60subtotal = $form->format_amount(\%myconfig, $c60subtotal, 2, " "); - $c90subtotal = $form->format_amount(\%myconfig, $c90subtotal, 2, " "); - - print qq| - -|; - - map { $column_data{$_} = qq|| } @column_index; - - $column_data{c0} = qq||; - $column_data{c30} = qq||; - $column_data{c60} = qq||; - $column_data{c90} = qq||; - - map { print "$column_data{$_}\n" } @column_index; - - print qq| - - -|; - - $c0total = $form->format_amount(\%myconfig, $c0total, 2, " "); - $c30total = $form->format_amount(\%myconfig, $c30total, 2, " "); - $c60total = $form->format_amount(\%myconfig, $c60total, 2, " "); - $c90total = $form->format_amount(\%myconfig, $c90total, 2, " "); - - $column_data{c0} = qq||; - $column_data{c30} = qq||; - $column_data{c60} = qq||; - $column_data{c90} = qq||; + $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal')) if ($row_idx); - map { print "$column_data{$_}\n" } @column_index; - - print qq| - - -
    $c0subtotal$c30subtotal$c60subtotal$c90subtotal
 
$ref->{name}{checked}> - {ctid}> - $ref->{invnumber}$ref->{transdate}$ref->{duedate} $ref->{c0}$ref->{c30}$ref->{c60}$ref->{c90}
  
 $c0subtotal$c30subtotal$c60subtotal$c90subtotal
$c0total$c30total$c60total$c90total
-
-|; - - &print_options if ($form->{arap} eq 'ar'); - - print qq| -
-|; + $report->add_data(create_aging_subtotal_row(\%totals, \@columns, \@periods, 'listtotal')); if ($form->{arap} eq 'ar') { - print qq| -{todate}> - - - -{arap}> -{ct}> -{ct} value="$form->{$form->{ct}}"> - - - -{path}> -{login}> -{password}> - -
- - -|; -} + $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(inline => 1), }); + $report->set_options('raw_top_info_text' => $raw_top_info_text, + 'raw_bottom_info_text' => $raw_bottom_info_text); + } -print qq| -
+ $report->set_options_from_form(); - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } @@ -1844,6 +1503,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"}) { @@ -1919,6 +1580,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|; } @@ -1948,7 +1610,7 @@ sub e_mail { sub send_email { $lxdebug->enter_sub(); - $form->{OUT} = "$sendmail"; + $auth->assert('general_ledger'); $form->{subject} = $locale->text('Statement') . qq| - $form->{todate}| unless $form->{subject}; @@ -1957,10 +1619,10 @@ sub send_email { $form->{"statement_1"} = 1; - &print_form; + $form->{media} = 'email'; + print_form(); - $form->redirect( - $locale->text('Statement sent to') . " $form->{$form->{ct}}"); + $form->redirect($locale->text('Statement sent to') . " $form->{$form->{ct}}"); $lxdebug->leave_sub(); } @@ -1968,6 +1630,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)/); @@ -1984,7 +1648,6 @@ sub print { $form->error($locale->text('Nothing selected!')) unless $selected; if ($form->{media} eq 'printer') { - $form->{OUT} = "| $myconfig{printer}"; $form->{"$form->{ct}_id"} = ""; } else { $form->{"statement_1"} = 1; @@ -1992,7 +1655,7 @@ sub print { RP->aging(\%myconfig, \%$form); - &print_form; + print_form(); $form->redirect($locale->text('Statements sent to printer!')) if ($form->{media} eq 'printer'); @@ -2003,6 +1666,8 @@ sub print { sub print_form { $lxdebug->enter_sub(); + $auth->assert('general_ledger'); + my %replacements = ( "ä" => "ae", "ö" => "oe", "ü" => "ue", @@ -2011,6 +1676,11 @@ sub print_form { " " => "_" ); + 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; + } + $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1); $form->{templates} = "$myconfig{templates}"; @@ -2027,8 +1697,8 @@ sub print_form { $attachment_suffix = "pdf"; } - $form->{IN} = "$form->{type}.$suffix"; - + $form->{IN} = "$form->{type}.$suffix"; + $form->{OUT} = $form->{media} eq 'printer' ? "| $myconfig{printer}" : ""; # Save $form->{email} because it will be overwritten. $form->{EMAIL_RECIPIENT} = $form->{email}; @@ -2099,6 +1769,7 @@ sub print_form { } # saving the history if(!exists $form->{addition} && $form->{id} ne "") { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "PRINTED"; $form->{what_done} = $form->{type}; $form->save_history($form->dbconnect(\%myconfig)); @@ -2109,6 +1780,9 @@ sub print_form { sub statement_details { $lxdebug->enter_sub(); + + $auth->assert('general_ledger'); + my ($ref) = @_; push @{ $form->{invnumber} }, $ref->{invnumber}; @@ -2132,6 +1806,8 @@ sub statement_details { sub generate_tax_report { $lxdebug->enter_sub(); + $auth->assert('report'); + RP->tax_report(\%myconfig, \%$form); $descvar = "$form->{accno}_description"; @@ -2142,13 +1818,13 @@ sub generate_tax_report { # construct href $href = - "$form->{script}?path=$form->{path}&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}?path=$form->{path}&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"; @@ -2287,7 +1963,7 @@ sub generate_tax_report { $column_data{id} = qq|$ref->{id}|; $column_data{invnumber} = - qq|{path}&action=edit&id=$ref->{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} |; @@ -2384,6 +2060,8 @@ sub tax_subtotal { sub list_payments { $lxdebug->enter_sub(); + $auth->assert('cash'); + if ($form->{account}) { ($form->{paymentaccounts}) = split /--/, $form->{account}; } @@ -2394,223 +2072,116 @@ sub list_payments { RP->payments(\%myconfig, \%$form); - @columns = - $form->sort_columns(qw(transdate reference name paid source memo)); + my @hidden_variables = qw(account title department reference source memo fromdate todate + fx_transaction db prepayment paymentaccounts sort); - # construct href - $account = $form->escape($form->{account}); - $title = $form->escape($form->{title}); - $department = $form->escape($form->{department}); - $form->{paymentaccounts} =~ s/ /%20/g; - $reference = $form->escape($form->{reference}); - $source = $form->escape($form->{source}); - $memo = $form->escape($form->{memo}); + my $href = build_std_url('action=list_payments', grep { $form->{$_} } @hidden_variables); + $form->{callback} = $href; - $href = - "$form->{script}?path=$form->{path}&action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo"; - - # construct callback - $account = $form->escape($form->{account}, 1); - $title = $form->escape($form->{title}, 1); - $department = $form->escape($form->{department}, 1); - $reference = $form->escape($form->{reference}, 1); - $source = $form->escape($form->{source}, 1); - $memo = $form->escape($form->{memo}, 1); + my @columns = qw(transdate invnumber name paid source memo); + my %column_defs = ( + 'name' => { 'text' => $locale->text('Description'), }, + 'invnumber' => { 'text' => $locale->text('Reference'), }, + 'transdate' => { 'text' => $locale->text('Date'), }, + 'paid' => { 'text' => $locale->text('Amount'), }, + 'source' => { 'text' => $locale->text('Source'), }, + 'memo' => { 'text' => $locale->text('Memo'), }, + ); + my %column_alignment = ('paid' => 'right'); - $form->{callback} = - "$form->{script}?path=$form->{path}&action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo&sort=$form->{sort}"; - $callback = $form->escape($form->{callback}); - - $column_header{name} = - "" - . $locale->text('Description') - . ""; - $column_header{reference} = - "" - . $locale->text('Reference') - . ""; - $column_header{transdate} = - "" - . $locale->text('Date') - . ""; - $column_header{paid} = - "" . $locale->text('Amount') . ""; - $column_header{source} = - "" - . $locale->text('Source') - . ""; - $column_header{memo} = - "" - . $locale->text('Memo') - . ""; + map { $column_defs{$_}->{link} = $href . "&sort=$_" } grep { $_ ne 'paid' } @columns; + my @options; if ($form->{fromdate}) { - $option .= "\n
" if ($option); - $option .= - $locale->text('From') . " " - . $locale->date(\%myconfig, $form->{fromdate}, 1); + push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1); } if ($form->{todate}) { - $option .= "\n
" if ($option); - $option .= - $locale->text('bis') . " " - . $locale->date(\%myconfig, $form->{todate}, 1); + push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1); } - @column_index = @columns; - $colspan = $#column_index + 1; + my $report = SL::ReportGenerator->new(\%myconfig, $form); - $form->header; + my $attachment_basename = $form->{db} eq 'ar' ? $locale->text('list_of_receipts') : $locale->text('list_of_payments'); - print qq| - + $report->set_options('top_info_text' => join("\n", @options), + 'output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), + 'std_column_visibility' => 1, + ); + $report->set_options_from_form(); - - - - - - - - - - - - - - -
$form->{title}
$option
- - -|; + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - map { print "\n$column_header{$_}" } @column_index; + $report->set_export_options('list_payments', @hidden_variables); - print qq| - -|; + $report->set_sort_indicator($form->{sort}, 1); - foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) { + my $total_paid = 0; + foreach my $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) { next unless @{ $form->{ $ref->{id} } }; - print qq| - - - -|; + $report->add_control({ 'type' => 'colspan_data', 'data' => "$ref->{accno}--$ref->{description}" }); - foreach $payment (@{ $form->{ $ref->{id} } }) { + my $subtotal_paid = 0; - $module = $payment->{module}; + foreach my $payment (@{ $form->{ $ref->{id} } }) { + my $module = $payment->{module}; $module = 'is' if ($payment->{invoice} && $payment->{module} eq 'ar'); $module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap'); - $href = - qq|${module}.pl?path=$form->{path}&action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|; - - $column_data{name} = ""; - $column_data{reference} = - qq||; - $column_data{transdate} = ""; - $column_data{paid} = - ""; - $column_data{source} = ""; - $column_data{memo} = ""; + $subtotal_paid += $payment->{paid}; + $total_paid += $payment->{paid}; - $subtotalpaid += $payment->{paid}; - $totalpaid += $payment->{paid}; + $payment->{paid} = $form->format_amount(\%myconfig, $payment->{paid}, 2); - $i++; - $i %= 2; - print qq| - -|; + my $row = { }; - map { print "\n$column_data{$_}" } @column_index; + foreach my $column (@columns) { + $row->{$column} = { + 'data' => $payment->{$column}, + 'align' => $column_alignment{$column}, + }; + } - print qq| - -|; + $row->{invnumber}->{link} = build_std_url("script=${module}.pl", 'action=edit', 'id=' . E($payment->{id}), 'callback'); + $report->add_data($row); } - # print subtotals - map { $column_data{$_} = "" } @column_index; - - $column_data{paid} = - ""; - - print qq| - -|; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - - $subtotalpaid = 0; + my $row = { map { $_ => { 'class' => 'listsubtotal' } } @columns }; + $row->{paid} = { + 'data' => $form->format_amount(\%myconfig, $subtotal_paid, 2), + 'align' => 'right', + 'class' => 'listsubtotal', + }; + $report->add_data($row); } - # print total - map { $column_data{$_} = "" } @column_index; + $report->add_separator(); - $column_data{paid} = - ""; + my $row = { map { $_ => { 'class' => 'listtotal' } } @columns }; + $row->{paid} = { + 'data' => $form->format_amount(\%myconfig, $total_paid, 2), + 'align' => 'right', + 'class' => 'listtotal', + }; - print qq| - -|; + $report->add_data($row); - map { print "\n$column_data{$_}" } @column_index; + $report->generate_with_headers(); - print qq| - - -
$ref->{accno}--$ref->{description}
$payment->{name} $payment->{invnumber}$payment->{transdate} " - . $form->format_amount(\%myconfig, $payment->{paid}, 2, " ") - . "$payment->{source} $payment->{memo} 
 " - . $form->format_amount(\%myconfig, $subtotalpaid, 2, " ") . "
 " - . $form->format_amount(\%myconfig, $totalpaid, 2, " ") . "
-
- - - -|; - - $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(); + my ($dont_print) = @_; + $form->{sendmode} = "attachment"; $form->{"format"} = @@ -2628,14 +2199,9 @@ sub print_options { $form->{OP}{ $form->{media} } = "selected"; $form->{SM}{ $form->{sendmode} } = "selected"; - if ($form->{report} eq 'ustva') { - $type = qq| -