X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fca.pl;h=a4de2310ed68fb8c52947c7a168585bb2a917b41;hb=6f2050063ffa5417ab4495af84625385c766bc2d;hp=56ae60813eb00aa44f7a87947ebfef68d33b7788;hpb=ee072e4f077213bf6f8792ca8f0a1afebbb6282f;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 56ae60813..a4de2310e 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -32,7 +32,12 @@ # #====================================================================== +use POSIX qw(strftime); + use SL::CA; +use SL::ReportGenerator; + +require "bin/mozilla/reportgenerator.pl"; 1; @@ -69,106 +74,63 @@ use SL::CA; sub chart_of_accounts { $lxdebug->enter_sub(); - CA->all_accounts(\%myconfig, \%$form); - - @column_index = qw(accno gifi_accno description debit credit); - - $column_header{accno} = - qq|| . $locale->text('Account') . qq|\n|; - $column_header{gifi_accno} = - qq|| . $locale->text('GIFI') . qq|\n|; - $column_header{description} = - qq|| . $locale->text('Description') . qq|\n|; - $column_header{debit} = - qq|| . $locale->text('Debit') . qq|\n|; - $column_header{credit} = - qq|| . $locale->text('Credit') . qq|\n|; + $auth->assert('report'); $form->{title} = $locale->text('Chart of Accounts'); - $colspan = $#column_index + 1; + CA->all_accounts(\%myconfig, \%$form); - $form->header; + my @columns = qw(accno description debit credit); + my %column_defs = ( + 'accno' => { 'text' => $locale->text('Account'), }, + 'description' => { 'text' => $locale->text('Description'), }, + 'debit' => { 'text' => $locale->text('Debit'), }, + 'credit' => { 'text' => $locale->text('Credit'), }, + ); - print qq| - + my $report = SL::ReportGenerator->new(\%myconfig, $form); - - - - |; + $report->set_options('output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $locale->text('chart_of_accounts') . strftime('_%Y%m%d', localtime time), + 'std_column_visibility' => 1, + ); + $report->set_options_from_form(); - map { print $column_header{$_} } @column_index; + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - print qq| - -|; + $report->set_export_options('chart_of_accounts'); - foreach $ca (@{ $form->{CA} }) { + $report->set_sort_indicator($form->{sort}, 1); - $description = $form->escape($ca->{description}); - $gifi_description = $form->escape($ca->{gifi_description}); + my %totals = ('debit' => 0, 'credit' => 0); - $href = - qq|$form->{script}?path=$form->{path}&action=list&accno=$ca->{accno}&login=$form->{login}&password=$form->{password}&description=$description&gifi_accno=$ca->{gifi_accno}&gifi_description=$gifi_description|; + foreach my $ca (@{ $form->{CA} }) { + my $row = { }; - if ($ca->{charttype} eq "H") { - print qq||; - map { $column_data{$_} = ""; } qw(accno description); - $column_data{gifi_accno} = ""; - } else { - $i++; - $i %= 2; - print qq||; - $column_data{accno} = ""; - $column_data{gifi_accno} = - ""; - $column_data{description} = ""; + foreach (qw(debit credit)) { + $totals{$_} += $ca->{$_} * 1; + $ca->{$_} = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_}); } - $column_data{debit} = - "\n"; - $column_data{credit} = - "\n"; + map { $row->{$_} = { 'data' => $ca->{$_} } } @columns; - $totaldebit += $ca->{debit}; - $totalcredit += $ca->{credit}; + map { $row->{$_}->{align} = 'right' } qw(debit credit); + map { $row->{$_}->{class} = 'listheading' } @columns if ($ca->{charttype} eq "H"); - map { print $column_data{$_} } @column_index; + $row->{accno}->{link} = build_std_url('action=list', 'accno=' . E($ca->{accno}), 'description=' . E($ca->{description})); - print qq| - -|; + $report->add_data($row); } - map { $column_data{$_} = ""; } - qw(accno gifi_accno description); - - $column_data{debit} = - ""; - $column_data{credit} = - ""; + my $row = { map { $_ => { 'class' => 'listtotal', 'align' => 'right' } } @columns }; + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals{$_}, 2) } qw(debit credit); - print ""; + $report->add_separator(); + $report->add_data($row); - map { print $column_data{$_} } @column_index; - - print qq| - - - - -
$form->{title}
$ca->{$_}$ca->{gifi_accno} 
$ca->{accno}$ca->{gifi_accno} $ca->{description}" - . $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") - . "" - . $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") - . "
 " - . $form->format_amount(\%myconfig, $totaldebit, 2, 0) . "" - . $form->format_amount(\%myconfig, $totalcredit, 2, 0) . "
- - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } @@ -176,12 +138,10 @@ sub chart_of_accounts { sub list { $lxdebug->enter_sub(); + $auth->assert('report'); + $form->{title} = $locale->text('List Transactions'); - if ($form->{accounttype} eq 'gifi') { - $form->{title} .= " - " . $locale->text('GIFI') . " $form->{gifi_accno}"; - } else { - $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}"; - } + $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}"; # get departments $form->all_departments(\%myconfig); @@ -203,7 +163,7 @@ sub list { $form->header; - map { $form->{$_} =~ s/\"/"/g; } qw(description gifi_description); + $form->{description} =~ s/\"/"/g; print qq| @@ -215,8 +175,6 @@ sub list { {accounttype}> -{gifi_accno}> - @@ -235,8 +193,7 @@ sub list { + . $locale->text('Subtotal') . qq|
$form->{title}
| . $locale->text('Include in Report') . qq|  | - . $locale->text('Subtotal') - . qq|
@@ -244,10 +201,6 @@ sub list {
-{login}> -{path}> -{password}> -
@@ -262,72 +215,25 @@ sub list { sub list_transactions { $lxdebug->enter_sub(); - CA->all_transactions(\%myconfig, \%$form); - - $description = $form->escape($form->{description}); - $gifi_description = $form->escape($form->{gifi_description}); - $department = $form->escape($form->{department}); - $projectnumber = $form->escape($form->{projectnumber}); - $title = $form->escape($form->{title}); - - # construct href - $href = - "$form->{script}?path=$form->{path}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&gifi_accno=$form->{gifi_accno}&gifi_description=$gifi_description&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; - - $description = $form->escape($form->{description}, 1); - $gifi_description = $form->escape($form->{gifi_description}, 1); - $department = $form->escape($form->{department}, 1); - $projectnumber = $form->escape($form->{projectnumber}, 1); - $title = $form->escape($form->{title}, 1); - - # construct callback - $callback = - "$form->{script}?path=$form->{path}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&gifi_accno=$form->{gifi_accno}&gifi_description=$gifi_description&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; - - # figure out which column comes first - $column_header{transdate} = - qq|| - . $locale->text('Date') - . qq||; - $column_header{reference} = - qq|| - . $locale->text('Reference') - . 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{balance} = qq|| . $locale->text('Balance') . qq||; - - @column_index = - $form->sort_columns(qw(transdate reference description debit credit)); - - if ($form->{accounttype} eq 'gifi') { - map { $form->{$_} = $form->{"gifi_$_"} } qw(accno description); - } - if ($form->{accno}) { - push @column_index, "balance"; - } + $auth->assert('report'); - $form->{title} = - ($form->{accounttype} eq 'gifi') - ? $locale->text('GIFI') - : $locale->text('Account'); + $form->{title} = $locale->text('Account') . " $form->{accno} - $form->{description}"; - $form->{title} .= " $form->{accno} - $form->{description}"; + CA->all_transactions(\%myconfig, \%$form); + my @options; if ($form->{department}) { - ($department) = split /--/, $form->{department}; - $options = $locale->text('Department') . " : $department
"; + my ($department) = split /--/, $form->{department}; + push @options, $locale->text('Department') . " : $department"; } if ($form->{projectnumber}) { - $options .= $locale->text('Project Number'); - $options .= " : $form->{projectnumber}
"; + push @options, $locale->text('Project Number') . " : $form->{projectnumber}
"; } + my $period; if ($form->{fromdate} || $form->{todate}) { + my ($fromdate, $todate); + if ($form->{fromdate}) { $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1); } @@ -335,181 +241,138 @@ sub list_transactions { $todate = $locale->date(\%myconfig, $form->{todate}, 1); } - $form->{period} = "$fromdate - $todate"; + $period = "$fromdate - $todate"; + } else { - $form->{period} = - $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); + $period = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1); } - $options .= $form->{period}; + push @options, $period; - $form->header; + my @columns = qw(transdate reference description debit credit balance); + my %column_defs = ( + 'transdate' => { 'text' => $locale->text('Date'), }, + 'reference' => { 'text' => $locale->text('Reference'), }, + 'description' => { 'text' => $locale->text('Description'), }, + 'debit' => { 'text' => $locale->text('Debit'), }, + 'credit' => { 'text' => $locale->text('Credit'), }, + 'balance' => { 'text' => $locale->text('Balance'), }, + ); + my %column_alignment = map { $_ => 'right' } qw(debit credit balance); - print qq| - + my @hidden_variables = qw(accno fromdate todate description accounttype l_heading l_subtotal department projectnumber project_id sort); - - - - - - - - - - - - - - -
$form->{title}
$options
- - -|; + my $link = build_std_url('action=list_transactions', grep { $form->{$_} } @hidden_variables); + map { $column_defs{$_}->{link} = $link . "&sort=$_" } qw(transdate reference description); - map { print "$column_header{$_}\n" } @column_index; + $form->{callback} = $link . '&sort=' . E($form->{sort}); - print qq| - -|; + my $report = SL::ReportGenerator->new(\%myconfig, $form); - # add sort to callback - $callback = $form->escape($callback . "&sort=$form->{sort}"); + $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(); - if (@{ $form->{CA} }) { - $sameitem = $form->{CA}->[0]->{ $form->{sort} }; - } + $report->set_columns(%column_defs); + $report->set_column_order(@columns); - $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1; - if ($form->{accno} && $form->{balance}) { + $report->set_export_options('list_transactions', @hidden_variables); - map { $column_data{$_} = "" } @column_index; + $report->set_sort_indicator($form->{sort}, 1); - $column_data{balance} = - ""; + $column_defs->{balance}->{visible} = $form->{accno} ? 1 : 0; - $i++; - $i %= 2; - print qq| - -|; - map { print $column_data{$_} } @column_index; - print qq| - -|; + my $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1; + + if ($form->{accno} && $form->{balance}) { + my $row = { + 'balance' => { + 'data' => $form->format_amount(\%myconfig, $form->{balance} * $ml, 2), + 'align' => 'right', + }, + }; + + $report->add_data($row); } - foreach $ca (@{ $form->{CA} }) { + my $idx = 0; + my %totals = ( 'debit' => 0, 'credit' => 0 ); + my %subtotals = ( 'debit' => 0, 'credit' => 0 ); + my ($previous_index, $row_set); - if ($form->{l_subtotal} eq 'Y') { - if ($sameitem ne $ca->{ $form->{sort} }) { - &ca_subtotal; - } + foreach my $ca (@{ $form->{CA} }) { + $form->{balance} += $ca->{amount}; + + foreach (qw(debit credit)) { + $subtotals{$_} += $ca->{$_}; + $totals{$_} += $ca->{$_}; + $ca->{$_} = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_} != 0); } - # construct link to source - $href = - "{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}"; + $ca->{balance} = $form->format_amount(\%myconfig, $form->{balance} * $ml, 2); - $column_data{debit} = - ""; - $column_data{credit} = - ""; + my $row = { }; - $form->{balance} += $ca->{amount}; - $column_data{balance} = - ""; - - $subtotaldebit += $ca->{debit}; - $subtotalcredit += $ca->{credit}; + foreach (@columns) { + $row->{$_} = { + 'data' => $ca->{$_}, + 'align' => $column_alignment{$_}, + }; + } - $totaldebit += $ca->{debit}; - $totalcredit += $ca->{credit}; + if ($ca->{index} ne $previous_index) { + $report->add_data($row_set) if ($row_set); - $column_data{transdate} = qq||; - $column_data{reference} = qq||; - $column_data{description} = qq||; + $row_set = [ ]; + $previous_index = $ca->{index}; - $i++; - $i %= 2; - print qq| - -|; + $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback'); - map { print $column_data{$_} } @column_index; + } else { + map { $row->{$_}->{data} = '' } qw(reference description); + $row->{transdate}->{data} = '' if ($form->{sort} eq 'transdate'); + } - print qq| - -|; + push @{ $row_set }, $row; - } + if (($form->{l_subtotal} eq 'Y') + && (($idx == scalar @{ $form->{CA} } - 1) + || ($ca->{$form->{sort}} ne $form->{CA}->[$idx + 1]->{$form->{sort}}))) { + $report->add_data(create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal')); + } - if ($form->{l_subtotal} eq 'Y') { - &ca_subtotal; + $idx++; } - map { $column_data{$_} = "" } @column_index; + $report->add_data($row_set) if ($row_set); - $column_data{debit} = - ""; - $column_data{credit} = - ""; - $column_data{balance} = - ""; + $report->add_separator(); - print qq| - -|; + my $row = create_subtotal_row(\%totals, \@columns, \%column_alignment, 'listtotal'); + $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance} * $ml, 2); + $report->add_data($row); - map { print $column_data{$_} } @column_index; - - print qq| - -
 " - . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) - . "
" - . $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") . "" - . $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") . "" - . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) - . "$ca->{transdate}$href$ca->{description}
 " - . $form->format_amount(\%myconfig, $totaldebit, 2, " ") . "" - . $form->format_amount(\%myconfig, $totalcredit, 2, " ") . "" - . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) . "
-
- - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } -sub ca_subtotal { +sub create_subtotal_row { $lxdebug->enter_sub(); - map { $column_data{$_} = " " } @column_index; - - $column_data{debit} = - "" - . $form->format_amount(\%myconfig, $subtotaldebit, 2, " ") . ""; - $column_data{credit} = - "" - . $form->format_amount(\%myconfig, $subtotalcredit, 2, " ") . ""; - - $subtotaldebit = 0; - $subtotalcredit = 0; - - $sameitem = $ca->{ $form->{sort} }; + my ($totals, $columns, $column_alignment, $class) = @_; - print qq| - -|; + my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } }; - map { print "$column_data{$_}\n" } @column_index; + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } qw(credit debit); - print qq| - -|; + map { $totals->{$_} = 0 } qw(debit credit); $lxdebug->leave_sub(); + + return $row; }