X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=2a6321422b824873f0ae946d312f9b171ea0047b;hb=796b3881fae7c5f5feacfc5914a2d47cb85e18e6;hp=966df6e025f5132cf60b4d44561dd9d5a5892475;hpb=2b89ec9756dc1d3525b6163fe4cf4f38af83f9d8;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 966df6e02..2a6321422 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -35,11 +35,17 @@ # #====================================================================== -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/report_generator.pl"; 1; @@ -109,9 +115,7 @@ sub 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); @@ -147,7 +151,7 @@ sub report { '-labels' => \%project_labels)); # use JavaScript Calendar or not - $form->{jsscript} = $jscalendar; + $form->{jsscript} = 1; $jsscript = ""; if ($form->{report} eq "ustva") { $department = ""; @@ -199,7 +203,7 @@ sub report { if ($name_1 eq "") { $button1 = qq| - |; + |; $button1_2 = qq| text('button') . qq|>|; @@ -209,12 +213,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|> @@ -230,19 +234,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}> @@ -703,8 +709,6 @@ $jsscript } if ($form->{report} =~ /^tax_/) { - $gifi = ""; - $form->{db} = ($form->{report} =~ /_collected/) ? "ar" : "ap"; RP->get_taxaccounts(\%myconfig, \%$form); @@ -741,32 +745,6 @@ $jsscript -|; - - if (@{ $form->{gifi_taxaccounts} }) { - print qq| - - | . $locale->text('GIFI') . qq| - -|; - - foreach $ref (@{ $form->{gifi_taxaccounts} }) { - - print - qq| $ref->{description} - - - |; - - } - - print qq| - - -|; - } - - print qq| | . $locale->text('Method') . qq| | @@ -823,8 +801,6 @@ $jsscript } if ($form->{report} =~ /^nontaxable_/) { - $gifi = ""; - $form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap"; print qq| @@ -888,8 +864,6 @@ $jsscript } if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) { - $gifi = ""; - if ($form->{report} eq 'ar_aging') { $label = $locale->text('Customer'); $form->{vc} = 'customer'; @@ -938,8 +912,6 @@ $jsscript # above action can be removed if there is more than one input field if ($form->{report} =~ /(receipts|payments)$/) { - $gifi = ""; - $form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar"; RP->paymentaccounts(\%myconfig, \%$form); @@ -1009,7 +981,6 @@ $jsscript
-{path}> {login}> {password}> @@ -1017,9 +988,8 @@ $jsscript . $locale->text('Continue') . qq|"> |; - # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum - # Einlesen der Finanzamtdaten - get_config($userspath, 'finanzamt.ini'); + # 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'); @@ -1046,7 +1016,7 @@ $jsscript $lxdebug->leave_sub(); } -sub continue { &{ $form->{nextsub} } } +sub continue { call_sub($form->{"nextsub"}); } sub get_project { $lxdebug->enter_sub(); @@ -1358,11 +1328,6 @@ sub list_accounts { $column_header{endbalance} = qq|| . $locale->text('Balance') . qq||; - if ($form->{accounttype} eq 'gifi') { - $column_header{accno} = - qq|| . $locale->text('GIFI') . qq||; - } - $form->header; print qq| @@ -1393,15 +1358,7 @@ sub list_accounts { $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}|; - - if ($form->{accounttype} eq 'gifi') { - $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description"; - $na = $locale->text('N/A'); - map { $ref->{$_} = $na } qw(accno description) unless $ref->{accno}; - } else { - $href .= "&accno=$ref->{accno}&description=$description"; - } + qq|ca.pl?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; @@ -1562,17 +1519,14 @@ sub generate_ar_aging { # 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(); } @@ -1582,296 +1536,148 @@ sub generate_ap_aging { # 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"; - } - - 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}; - } + foreach (@{ $periods }) { + $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : ''; + $subtotals->{$_} = 0; } - $todate = $locale->date(\%myconfig, $form->{todate}, 1); - $option .= "\n
" if $option; - $option .= - $locale->text('for Period') . " " . $locale->text('Bis') . " $todate"; + $lxdebug->leave_sub(); - print qq| - + return $row; +} -{script}> +sub aging { + $lxdebug->enter_sub(); - - - - - - - - - - - - - - - - - -
$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}; - - $c0total += $ref->{c0}; - $c30total += $ref->{c30}; - $c60total += $ref->{c60}; - $c90total += $ref->{c90}; - - $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 $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) : ''; + } - $href = - qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=| - . $form->escape($form->{callback}); + my $row = { }; - $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| - -|; + foreach my $column (@columns) { + $row->{$column} = { + 'data' => (($column eq 'ct') || ($column eq 'statement')) ? '' : $ref->{$column}, + 'align' => $column_alignment{$column}, + 'valign' => $column eq 'statement' ? 'center' : '', + }; + } - map { print "$column_data{$_}\n" } @column_index; + $row->{invnumber}->{link} = build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id})); - 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}; - $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||; - - 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'); + $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal')) if ($row_idx); - 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(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(); } @@ -1995,8 +1801,6 @@ sub e_mail { sub send_email { $lxdebug->enter_sub(); - $form->{OUT} = "$sendmail"; - $form->{subject} = $locale->text('Statement') . qq| - $form->{todate}| unless $form->{subject}; @@ -2004,10 +1808,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(); } @@ -2031,7 +1835,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; @@ -2039,7 +1842,7 @@ sub print { RP->aging(\%myconfig, \%$form); - &print_form; + print_form(); $form->redirect($locale->text('Statements sent to printer!')) if ($form->{media} eq 'printer'); @@ -2050,21 +1853,43 @@ 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; + } + $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1); $form->{templates} = "$myconfig{templates}"; - $form->{IN} = "$form->{type}.html"; - + my $suffix = "html"; + my $attachment_suffix = "html"; if ($form->{format} eq 'postscript') { $form->{postscript} = 1; - $form->{IN} =~ s/html$/tex/; - } - if ($form->{format} eq 'pdf') { + $suffix = "tex"; + $attachment_suffix = "ps"; + } elsif ($form->{format} eq 'pdf') { $form->{pdf} = 1; - $form->{IN} =~ s/html$/tex/; + $suffix = "tex"; + $attachment_suffix = "pdf"; } + $form->{IN} = "$form->{type}.$suffix"; + $form->{OUT} = + $form->{media} eq 'email' ? $sendmail : + $form->{media} eq 'printer' ? "| $myconfig{printer}" : ""; + + # Save $form->{email} because it will be overwritten. + $form->{EMAIL_RECIPIENT} = $form->{email}; + $i = 0; while (@{ $form->{AG} }) { @@ -2121,6 +1946,9 @@ 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->parse_template(\%myconfig, $userspath); } @@ -2128,6 +1956,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)); @@ -2167,26 +1996,17 @@ sub generate_tax_report { $description = $form->escape($form->{$descvar}); $ratevar = "$form->{accno}_rate"; - if ($form->{accno} =~ /^gifi_/) { - $descvar = "gifi_$form->{accno}_description"; - $description = $form->escape($form->{$descvar}); - $ratevar = "gifi_$form->{accno}_rate"; - } - $department = $form->escape($form->{department}); # 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&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}"; # 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->{title} = $locale->text('GIFI') . " - " - if ($form->{accno} =~ /^gifi_/); + "$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}"; $title = $form->escape($form->{title}); $href .= "&title=$title"; @@ -2325,7 +2145,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}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}|; $column_data{transdate} = qq|$ref->{transdate}|; $column_data{name} = qq|$ref->{name} |; @@ -2432,192 +2252,107 @@ sub list_payments { RP->payments(\%myconfig, \%$form); - @columns = - $form->sort_columns(qw(transdate reference name paid source memo)); - - # 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}); - - $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"; + my @hidden_variables = qw(account title department reference source memo fromdate todate + fx_transaction db prepayment paymentaccounts sort); - # 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 $href = build_std_url('action=list_payments', grep { $form->{$_} } @hidden_variables); + $form->{callback} = $href; - $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}); + 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'); - $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|; + $subtotal_paid += $payment->{paid}; + $total_paid += $payment->{paid}; - $column_data{name} = ""; - $column_data{reference} = - qq||; - $column_data{transdate} = ""; - $column_data{paid} = - ""; - $column_data{source} = ""; - $column_data{memo} = ""; + $payment->{paid} = $form->format_amount(\%myconfig, $payment->{paid}, 2); - $subtotalpaid += $payment->{paid}; - $totalpaid += $payment->{paid}; + my $row = { }; - $i++; - $i %= 2; - print qq| - -|; - - 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| - -|; - - map { print "\n$column_data{$_}" } @column_index; - - 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, " ") . "
-
+ $report->add_data($row); - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } @@ -2649,6 +2384,8 @@ sub winston_export { sub print_options { $lxdebug->enter_sub(); + my ($dont_print) = @_; + $form->{sendmode} = "attachment"; $form->{"format"} = @@ -2702,7 +2439,7 @@ sub print_options { } } - print qq| + my $output = qq| @@ -2711,18 +2448,22 @@ sub print_options { |; if ($myconfig{printer} && $latex_templates && $form->{media} ne 'email') { - print qq| + $output .= qq| |; } - print qq| + $output .= qq|
| . $locale->text('Copies') . qq| {copies}>
|; + print $output unless $dont_print; + $lxdebug->leave_sub(); + + return $output; } sub generate_bwa { @@ -2920,9 +2661,8 @@ sub generate_bwa { sub generate_ustva { $lxdebug->enter_sub(); - # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum - # Einlesen der Finanzamtdaten - get_config($userspath, 'finanzamt.ini'); + # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten + USTVA->get_config($userspath, 'finanzamt.ini'); # &get_project(generate_bwa); @anmeldungszeitraum =