X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=eae6131792445126a5755e72d76f3db318c6704c;hb=b29783a3f0cff568b5d344d4fd34fe65840bea46;hp=de360495c1ec91319e9ee261b8b6ea9bff912338;hpb=72539cb39a3d19f930a8e0e41e46bf41afe9a8f1;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index de360495c..eae613179 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); + my $row = { map { $_ => { 'class' => 'listtotal', 'align' => 'right' } } @columns }; + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals{$_}, 2) } qw(debit credit); - $column_data{debit} = - ""; - $column_data{credit} = - ""; - - print ""; - - 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->add_separator(); + $report->add_data($row); - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } @@ -176,12 +138,11 @@ 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}"; + $year = (localtime)[5] + 1900; # get departments $form->all_departments(\%myconfig); @@ -200,13 +161,76 @@ sub list { | if $form->{selectdepartment}; + $accrual = ($eur) ? "" : "checked"; + $cash = ($eur) ? "checked" : ""; + + $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 + if ($form->{jsscript}) { + if ($name_1 eq "") { + + $button1 = qq| + |; + $button1_2 = qq| + text('button') . qq|>|; + + #write Trigger + $jsscript = + 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|> + |; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "2", "$name_1", "BR", "$trigger_1", + "$name_2", "BL", "$trigger_2"); + } + } else { + + # without JavaScript Calendar + if ($name_1 eq "") { + $button1 = + qq||; + } else { + $button1 = + qq||; + $button2 = + 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|')|; + $form->header; - map { $form->{$_} =~ s/\"/"/g; } qw(description gifi_description); + $form->{description} =~ s/\"/"/g; print qq| - +
{script}> @@ -215,37 +239,123 @@ sub list { {accounttype}> -{gifi_accno}> - - - - - - -
$form->{title}
- - $department + + + + +
$form->{title}
+ - - - - + - - + + -
| . $locale->text('From') . qq|| . $locale->text('To') . qq| | + . $locale->text('Customized Report') . qq|
| . $locale->text('Include in Report') . qq| -  | - . $locale->text('Subtotal') . qq|| . $locale->text('Year') . qq|
-
+|; + + print qq| + + + | . $locale->text('Yearly') . qq| + | . $locale->text('Quarterly') . qq| + | . $locale->text('Monthly') . qq| + + +   +  1. | + . $locale->text('Quarter') . qq| +|; + $checked = "checked"; + print qq| +  | + . $locale->text('January') . qq| +|; + $checked = ""; + print 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| -{login}> -{path}> -{password}> + + +   +  4. | + . $locale->text('Quarter') . qq|  +  | + . $locale->text('April') . qq| +  | + . $locale->text('August') . qq| +  | + . $locale->text('December') . qq| + + + +
+ + + | + . $locale->text('Free report period') . qq| + | . $locale->text('From') . qq|  + $button1 + $button1_2  + | . $locale->text('Bis') . qq|  + $button2 + $button2_2 + + + +
+ + + | . $locale->text('Method') . qq| + | + . $locale->text('Accrual') . qq| +  | + . $locale->text('EUR') . qq| + + + | + . $locale->text('Decimalplaces') + . qq| + + + + | . $locale->text('Subtotal') . qq| + + +$jsscript +
+
@@ -258,75 +368,149 @@ sub list { $lxdebug->leave_sub(); } +sub format_debit_credit { + $lxdebug->enter_sub(); + + my $dc = shift; + + my $formatted_dc = $form->format_amount(\%myconfig, abs($dc), 2) . ' '; + $formatted_dc .= ($dc > 0) ? $locale->text('Credit (one letter abbreviation)') : $locale->text('Debit (one letter abbreviation)'); + + $lxdebug->leave_sub(); + + return $formatted_dc; +} + + sub list_transactions { $lxdebug->enter_sub(); - CA->all_transactions(\%myconfig, \%$form); + $auth->assert('report'); - $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"; + $form->{title} = $locale->text('Account') . " $form->{accno} - $form->{description}"; + + 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; + }; + } } - $form->{title} = - ($form->{accounttype} eq 'gifi') - ? $locale->text('GIFI') - : $locale->text('Account'); + CA->all_transactions(\%myconfig, \%$form); - $form->{title} .= " $form->{accno} - $form->{description}"; + $form->{saldo_old} += $form->{beginning_balance}; + $form->{saldo_new} += $form->{beginning_balance}; + my $saldo_old = format_debit_credit($form->{saldo_old}); + my $eb_string = format_debit_credit($form->{beginning_balance}); + $form->{balance} = $form->{saldo_old}; + 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); } @@ -334,181 +518,267 @@ 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}; - - $form->header; - - print qq| - - - - - - - - - - - - - - - - -
$form->{title}
$options
- - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - - # add sort to callback - $callback = $form->escape($callback . "&sort=$form->{sort}"); - - if (@{ $form->{CA} }) { - $sameitem = $form->{CA}->[0]->{ $form->{sort} }; - } + push @options, $period; + + $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0); + push (@options, $form->{print_date}); + + $form->{company} = $locale->text('Company') . " " . $myconfig{company}; + push (@options, $form->{company}); + + my @columns = qw(transdate reference description gegenkonto debit credit ustkonto ustrate 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'), }, + 'gegenkonto' => { 'text' => $locale->text('Gegenkonto'), }, + 'ustkonto' => { 'text' => $locale->text('USt-Konto'), }, + 'balance' => { 'text' => $locale->text('Balance'), }, + 'ustrate' => { 'text' => $locale->text('Satz %'), }, + ); + + my @hidden_variables = qw(accno fromdate todate description accounttype l_heading subtotal department projectnumber project_id sort); + + my $link = build_std_url('action=list_transactions', grep { $form->{$_} } @hidden_variables); + + $form->{callback} = $link . '&sort=' . E($form->{sort}); + + my %column_alignment = map { $_ => 'right' } qw(debit credit); + + @custom_headers = (); + # Zeile 1: + push @custom_headers, [ + { 'text' => 'Letzte Buchung', }, + { 'text' => 'EB-Wert', }, + { 'text' => 'Saldo alt', 'colspan' => 2, }, + { 'text' => 'Jahresverkehrszahlen alt', 'colspan' => 2, }, + { 'text' => '', 'colspan' => 2, }, + ]; + push @custom_headers, [ + { 'text' => $form->{last_transaction}, }, + { 'text' => $eb_string, }, + { 'text' => $saldo_old, 'colspan' => 2, }, + { 'text' => $form->format_amount(\%myconfig, abs($form->{old_balance_debit}), 2) . " S", }, + { 'text' => $form->format_amount(\%myconfig, $form->{old_balance_credit}, 2) . " H", }, + { 'text' => '', 'colspan' => 2, }, + ]; + # Zeile 2: + push @custom_headers, [ + { 'text' => $locale->text('Date'), 'link' => $link . "&sort=transdate", }, + { 'text' => $locale->text('Reference'), 'link' => $link . "&sort=reference", }, + { 'text' => $locale->text('Description'), 'link' => $link . "&sort=description", }, + { 'text' => $locale->text('Gegenkonto'), }, + { 'text' => $locale->text('Debit'), }, + { 'text' => $locale->text('Credit'), }, + { 'text' => $locale->text('USt-Konto'), }, + { 'text' => $locale->text('Satz %'), }, + { 'text' => $locale->text('Balance'), }, + ]; + + + + + + my $report = SL::ReportGenerator->new(\%myconfig, $form); + $report->set_custom_headers(@custom_headers); + + $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(); + + $report->set_columns(%column_defs); + $report->set_column_order(@columns); + + $report->set_export_options('list_transactions', @hidden_variables); + + $report->set_sort_indicator($form->{sort}, 1); + + $column_defs->{balance}->{visible} = 1; + + my $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1; + + + my $idx = 0; + my %totals = ( 'debit' => 0, 'credit' => 0 ); + my %subtotals = ( 'debit' => 0, 'credit' => 0 ); + my ($previous_index, $row_set); + + foreach my $ca (@{ $form->{CA} }) { + + foreach (qw(debit credit)) { + $subtotals{$_} += $ca->{$_}; + $totals{$_} += $ca->{$_}; + if ($_ =~ /debit.*/) { + $ml = -1; + } else { + $ml = 1; + } + $form->{balance}= $form->{balance} + $ca->{$_} * $ml; + $ca->{$_} = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_} != 0); + } - $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1; - if ($form->{accno} && $form->{balance}) { + my $do_subtotal = 0; + if (($form->{subtotal}) + && (($idx == scalar @{ $form->{CA} } - 1) + || ($ca->{$form->{sort}} ne $form->{CA}->[$idx + 1]->{$form->{sort}}))) { + $do_subtotal = 1; + } - map { $column_data{$_} = "" } @column_index; + my $row = { }; - $column_data{balance} = - ""; + $ca->{ustrate} = $form->format_amount(\%myconfig, $ca->{ustrate} * 100, 2) if ($ca->{ustrate} != 0); - $i++; - $i %= 2; - print qq| - -|; - map { print $column_data{$_} } @column_index; - print qq| - -|; - } + if ($ca->{memo} ne "") { + $ca->{description} .= " \n " . $ca->{memo}; + } - foreach $ca (@{ $form->{CA} }) { + - if ($form->{l_subtotal} eq 'Y') { - if ($sameitem ne $ca->{ $form->{sort} }) { - &ca_subtotal; + foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) { + if ($ca->{gegenkonto} eq "") { + $ca->{gegenkonto} = $gegenkonto->{accno}; + } else { + $ca->{gegenkonto} .= ", " . $gegenkonto->{accno}; } } - # 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}"; - - $column_data{debit} = - ""; - $column_data{credit} = - ""; - - $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}; + $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR'); - $column_data{transdate} = qq||; - $column_data{reference} = qq||; - $column_data{description} = qq||; + if ($ca->{index} ne $previous_index) { +# $report->add_data($row_set) if ($row_set); - $i++; - $i %= 2; - print qq| - -|; +# $row_set = [ ]; + $previous_index = $ca->{index}; - map { print $column_data{$_} } @column_index; + $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback'); - print qq| - -|; + } elsif ($ca->{index} eq $previous_index) { + map { $row->{$_}->{data} = '' } qw(reference description); + $row->{transdate}->{data} = '' if ($form->{sort} eq 'transdate'); + } - } + my $row_set = []; - if ($form->{l_subtotal} eq 'Y') { - &ca_subtotal; - } + push @{ $row_set }, $row; - map { $column_data{$_} = "" } @column_index; + push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal') if ($do_subtotal); - $column_data{debit} = - ""; - $column_data{credit} = - ""; - $column_data{balance} = - ""; - print qq| - -|; + $idx++; + $report->add_data($row_set); - 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->add_data($row_set) if ($row_set); + + $report->add_separator(); + + my $row = create_subtotal_row(\%totals, \@columns, \%column_alignment, 'listtotal'); + + + $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR'); + + $report->add_data($row); + + + $report->add_separator(); + my $row = { + 'transdate' => { + 'data' => "", + 'class' => 'listtotal', + }, + 'reference' => { + 'data' => $locale->text('EB-Wert'), + 'class' => 'listtotal', + }, + 'description' => { + 'data' => $locale->text('Saldo neu'), + 'colspan' => 2, + 'class' => 'listtotal', + }, + 'debit' => { + 'data' => $locale->text('Jahresverkehrszahlen neu'), + 'colspan' => 2, + 'align' => 'left', + 'class' => 'listtotal', + }, + 'ustkonto' => { + 'data' => '', + 'colspan' => 2, + 'align' => 'left', + 'class' => 'listtotal', + }, + }; + + $report->add_data($row); + my $saldo_new = format_debit_credit($form->{saldo_new}); + my $row = { + 'transdate' => { + 'data' => "", + 'class' => 'listtotal', + }, + 'reference' => { + 'data' => $eb_string, + 'class' => 'listtotal', + }, + 'description' => { + 'data' => $saldo_new, + 'colspan' => 2, + 'class' => 'listtotal', + }, + 'debit' => { + 'data' => $form->format_amount(\%myconfig, abs($form->{current_balance_debit}) , 2) . " S", + 'class' => 'listtotal', + }, + 'credit' => { + 'data' => $form->format_amount(\%myconfig, $form->{current_balance_credit}, 2) . " H", + 'class' => 'listtotal', + }, + 'ustkonto' => { + 'data' => "", + 'colspan' => 2, + 'class' => 'listtotal', + }, + }; + + $report->add_data($row); + + $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; + my ($totals, $columns, $column_alignment, $class) = @_; - $sameitem = $ca->{ $form->{sort} }; + my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } }; - print qq| - -|; + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } qw(credit debit); - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; + map { $totals->{$_} = 0 } qw(debit credit); $lxdebug->leave_sub(); + + return $row; }