# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# module for Chart of Accounts, Income Statement and Balance Sheet
#
#======================================================================
+use POSIX qw(strftime);
+
use SL::CA;
+use SL::DB::Default;
+use SL::ReportGenerator;
+
+require "bin/mozilla/reportgenerator.pl";
+
+use strict;
1;
# $locale->text('Dec')
sub chart_of_accounts {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- CA->all_accounts(\%myconfig, \%$form);
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- @column_index = qw(accno gifi_accno description debit credit);
-
- $column_header{accno} =
- qq|<th class=listheading>| . $locale->text('Account') . qq|</th>\n|;
- $column_header{gifi_accno} =
- qq|<th class=listheading>| . $locale->text('GIFI') . qq|</th>\n|;
- $column_header{description} =
- qq|<th class=listheading>| . $locale->text('Description') . qq|</th>\n|;
- $column_header{debit} =
- qq|<th class=listheading>| . $locale->text('Debit') . qq|</th>\n|;
- $column_header{credit} =
- qq|<th class=listheading>| . $locale->text('Credit') . qq|</th>\n|;
+ $main::auth->assert('report');
$form->{title} = $locale->text('Chart of Accounts');
- $colspan = $#column_index + 1;
+ if ( $::instance_conf->get_accounting_method eq 'cash' ) {
+ # $form->{method} can probably be made redundant now that we have get_accounting_method
+ $form->{method} = "cash";
+ }
- $form->header;
+ CA->all_accounts(\%myconfig, \%$form);
- print qq|
-<body>
-
-<table border=0 width=100%>
- <tr><th class=listtop colspan=$colspan>$form->{title}</th></tr>
- <tr height="5"></tr>
- <tr class=listheading>|;
+ 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'), },
+ );
- map { print $column_header{$_} } @column_index;
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
- print qq|
- </tr>
-|;
+ $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();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
- foreach $ca (@{ $form->{CA} }) {
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
- $description = $form->escape($ca->{description});
- $gifi_description = $form->escape($ca->{gifi_description});
+ $report->set_export_options('chart_of_accounts');
- $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|;
+ $report->set_sort_indicator($form->{sort}, 1);
- if ($ca->{charttype} eq "H") {
- print qq|<tr class=listheading>|;
- map { $column_data{$_} = "<th>$ca->{$_}</th>"; } qw(accno description);
- $column_data{gifi_accno} = "<th>$ca->{gifi_accno} </th>";
- } else {
- $i++;
- $i %= 2;
- print qq|<tr class=listrow$i>|;
- $column_data{accno} = "<td><a href=$href>$ca->{accno}</a></td>";
- $column_data{gifi_accno} =
- "<td><a href=$href&accounttype=gifi>$ca->{gifi_accno}</a> </td>";
- $column_data{description} = "<td>$ca->{description}</td>";
+ my %totals = ('debit' => 0, 'credit' => 0);
+
+ foreach my $ca (@{ $form->{CA} }) {
+ next unless defined $ca->{amount};
+ my $row = { };
+
+ foreach (qw(debit credit)) {
+ $totals{$_} += $ca->{$_} * 1;
+ $ca->{$_} = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_});
}
- $column_data{debit} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ca->{debit}, 2, " ")
- . "</td>\n";
- $column_data{credit} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ca->{credit}, 2, " ")
- . "</td>\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|
-</tr>
-|;
+ $report->add_data($row);
}
- map { $column_data{$_} = "<td> </td>"; }
- 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);
+
+ $report->add_separator();
+ $report->add_data($row);
- $column_data{debit} =
- "<th align=right class=listtotal>"
- . $form->format_amount(\%myconfig, $totaldebit, 2, 0) . "</th>";
- $column_data{credit} =
- "<th align=right class=listtotal>"
- . $form->format_amount(\%myconfig, $totalcredit, 2, 0) . "</th>";
+ $report->generate_with_headers();
- print "<tr class=listtotal>";
+ $main::lxdebug->leave_sub();
+}
- map { print $column_data{$_} } @column_index;
+sub list {
+ $::lxdebug->enter_sub;
+ $::auth->assert('report');
- print qq|
-</tr>
-<tr>
- <td colspan=$colspan><hr size=3 noshade></td>
-</tr>
-</table>
+ $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}" . " - " . $::form->{description};
-</body>
-</html>
-|;
+ $::form->header;
+ print $::form->parse_html_template('ca/list', {
+ year => DateTime->today->year,
+ });
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
-sub list {
- $lxdebug->enter_sub();
+sub format_debit_credit {
+ $main::lxdebug->enter_sub();
- $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}";
- }
+ my $dc = shift;
- # get departments
- $form->all_departments(\%myconfig);
- if (@{ $form->{all_departments} }) {
- $form->{selectdepartment} = "<option>\n";
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- map {
- $form->{selectdepartment} .=
- "<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
- }
+ 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)');
+
+ $main::lxdebug->leave_sub();
- $department = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
- </tr>
-| if $form->{selectdepartment};
-
- $form->header;
-
- map { $form->{$_} =~ s/\"/"/g; } qw(description gifi_description);
-
- print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=accno value=$form->{accno}>
-<input type=hidden name=description value="$form->{description}">
-<input type=hidden name=sort value=transdate>
-<input type=hidden name=eur value=$eur>
-<input type=hidden name=accounttype value=$form->{accounttype}>
-<input type=hidden name=gifi_accno value=$form->{gifi_accno}>
-<input type=hidden name=gifi_description value="$form->{gifi_description}">
-
-<table border=0 width=100%>
- <tr><th class=listtop>$form->{title}</th></tr>
- <tr height="5"></tr
- <tr valign=top>
- <td>
- <table>
- $department
- <tr>
- <th align=right>| . $locale->text('From') . qq|</th>
- <td><input name=fromdate size=11 title="$myconfig{dateformat}"></td>
- <th align=right>| . $locale->text('To') . qq|</th>
- <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Include in Report') . qq|</th>
- <td colspan=3>
- <input name=l_subtotal class=checkbox type=checkbox value=Y> |
- . $locale->text('Subtotal')
- . qq|</td>
- </tr>
- </table>
- </td>
- </tr>
- <tr><td><hr size=3 noshade></td></tr>
-</table>
-
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=password value=$form->{password}>
-
-<br><input class=submit type=submit name=action value="|
- . $locale->text('List Transactions') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
- $lxdebug->leave_sub();
+ return $formatted_dc;
}
+
sub list_transactions {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- CA->all_transactions(\%myconfig, \%$form);
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $defaults = SL::DB::Default->get;
- $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|<th><a class=listheading href=$href&sort=transdate>|
- . $locale->text('Date')
- . qq|</a></th>|;
- $column_header{reference} =
- qq|<th><a class=listheading href=$href&sort=reference>|
- . $locale->text('Reference')
- . qq|</a></th>|;
- $column_header{description} =
- qq|<th><a class=listheading href=$href&sort=description>|
- . $locale->text('Description')
- . qq|</a></th>|;
- $column_header{debit} = qq|<th>| . $locale->text('Debit') . qq|</th>|;
- $column_header{credit} = qq|<th>| . $locale->text('Credit') . qq|</th>|;
- $column_header{balance} = qq|<th>| . $locale->text('Balance') . qq|</th>|;
-
- @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";
+ $main::auth->assert('report');
+
+ $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.
+ my $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<br>";
+ my ($department) = split /--/, $form->{department};
+ push @options, $locale->text('Department') . " : $department";
}
if ($form->{projectnumber}) {
- $options .= $locale->text('Project Number');
- $options .= " : $form->{projectnumber}<br>";
+ push @options, $locale->text('Project Number') . " : $form->{projectnumber}<br>";
}
+ my $period;
if ($form->{fromdate} || $form->{todate}) {
+ my ($fromdate, $todate);
+
if ($form->{fromdate}) {
$fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
}
$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|
-<body>
-
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>$options</td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr class=listheading>
-|;
+ 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') . " " . $defaults->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 method);
+
+ 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 balance);
+
+ my @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();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
+
+ $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);
+ }
- map { print "$column_header{$_}\n" } @column_index;
+ 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;
+ }
- print qq|
- </tr>
-|;
+ my $row = { };
- # add sort to callback
- $callback = $form->escape($callback . "&sort=$form->{sort}");
+ $ca->{ustrate} = $form->format_amount(\%myconfig, $ca->{ustrate} * 100, 2) if ($ca->{ustrate} != 0);
- if (@{ $form->{CA} }) {
- $sameitem = $form->{CA}->[0]->{ $form->{sort} };
- }
+ if ($ca->{memo} ne "") {
+ $ca->{description} .= " \n " . $ca->{memo};
+ }
- $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1;
- if ($form->{accno} && $form->{balance}) {
-
- map { $column_data{$_} = "<td> </td>" } @column_index;
-
- $column_data{balance} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)
- . "</td>";
-
- $i++;
- $i %= 2;
- print qq|
- <tr class=listrow$i>
-|;
- map { print $column_data{$_} } @column_index;
- print qq|
- </tr>
-|;
- }
- 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 =
- "<a href=$ca->{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}</a>";
+ foreach (@columns) {
+ $row->{$_} = {
+ 'data' => $ca->{$_},
+ 'align' => $column_alignment{$_},
+ };
+ }
- $column_data{debit} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") . "</td>";
- $column_data{credit} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") . "</td>";
+ $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR');
- $form->{balance} += $ca->{amount};
- $column_data{balance} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)
- . "</td>";
+ if ($ca->{index} ne $previous_index) {
+# $report->add_data($row_set) if ($row_set);
- $subtotaldebit += $ca->{debit};
- $subtotalcredit += $ca->{credit};
+# $row_set = [ ];
+ $previous_index = $ca->{index};
- $totaldebit += $ca->{debit};
- $totalcredit += $ca->{credit};
+ $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback');
- $column_data{transdate} = qq|<td>$ca->{transdate}</td>|;
- $column_data{reference} = qq|<td>$href</td>|;
- $column_data{description} = qq|<td>$ca->{description}</td>|;
+ } elsif ($ca->{index} eq $previous_index) {
+ map { $row->{$_}->{data} = '' } qw(reference description);
+ $row->{transdate}->{data} = '' if ($form->{sort} eq 'transdate');
+ }
- $i++;
- $i %= 2;
- print qq|
- <tr class=listrow$i>
-|;
+ my $row_set = [];
- map { print $column_data{$_} } @column_index;
+ push @{ $row_set }, $row;
- print qq|
- </tr>
-|;
+ push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal') if ($do_subtotal);
- }
- if ($form->{l_subtotal} eq 'Y') {
- &ca_subtotal;
+ $idx++;
+ $report->add_data($row_set);
+
}
- map { $column_data{$_} = "<td> </td>" } @column_index;
-
- $column_data{debit} =
- "<th align=right>"
- . $form->format_amount(\%myconfig, $totaldebit, 2, " ") . "</th>";
- $column_data{credit} =
- "<th align=right>"
- . $form->format_amount(\%myconfig, $totalcredit, 2, " ") . "</th>";
- $column_data{balance} =
- "<th align=right>"
- . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) . "</th>";
-
- print qq|
- <tr class=listtotal>
-|;
-
- map { print $column_data{$_} } @column_index;
-
- print qq|
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-</body>
-</html>
-|;
-
- $lxdebug->leave_sub();
+ $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();
+ $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});
+ $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();
+
+ $main::lxdebug->leave_sub();
}
-sub ca_subtotal {
- $lxdebug->enter_sub();
-
- map { $column_data{$_} = "<td> </td>" } @column_index;
+sub create_subtotal_row {
+ $main::lxdebug->enter_sub();
- $column_data{debit} =
- "<th align=right>"
- . $form->format_amount(\%myconfig, $subtotaldebit, 2, " ") . "</th>";
- $column_data{credit} =
- "<th align=right>"
- . $form->format_amount(\%myconfig, $subtotalcredit, 2, " ") . "</th>";
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- $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|
- <tr class=listsubtotal>
-|;
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } qw(credit debit);
- map { print "$column_data{$_}\n" } @column_index;
+ map { $totals->{$_} = 0 } qw(debit credit);
- print qq|
- </tr>
-|;
+ $main::lxdebug->leave_sub();
- $lxdebug->leave_sub();
+ return $row;
}
-
projects / kivitendo-erp.git / blobdiff