require "bin/mozilla/reportgenerator.pl";
+use strict;
+
1;
# end of main
# $locale->text('Dec')
sub chart_of_accounts {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $main::auth->assert('report');
$form->{title} = $locale->text('Chart of Accounts');
+ if ($::lx_office_conf{system}->{eur}) {
+ $form->{method} = "cash";
+ }
+
CA->all_accounts(\%myconfig, \%$form);
my @columns = qw(accno description debit credit);
'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);
my %totals = ('debit' => 0, 'credit' => 0);
foreach my $ca (@{ $form->{CA} }) {
+ next unless defined $ca->{amount};
my $row = { };
foreach (qw(debit credit)) {
$report->generate_with_headers();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub list {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $main::auth->assert('report');
$form->{title} = $locale->text('List Transactions');
$form->{title} .= " - " . $locale->text('Account') . " $form->{accno}";
+ my $year = (localtime)[5] + 1900;
# get departments
$form->all_departments(\%myconfig);
- if (@{ $form->{all_departments} }) {
+ if (@{ $form->{all_departments} || [] }) {
$form->{selectdepartment} = "<option>\n";
map {
$form->{selectdepartment} .=
"<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
+ } (@{ $form->{all_departments} || [] });
}
- $department = qq|
+ my $department = qq|
<tr>
- <th align=right nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
- </tr>
+ <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+ <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+ </tr>
| if $form->{selectdepartment};
+ my $accrual = $::lx_office_conf{system}->{eur} ? "" : "checked";
+ my $cash = $::lx_office_conf{system}->{eur} ? "checked" : "";
+
+ my $name_1 = "fromdate";
+ my $id_1 = "fromdate";
+ my $value_1 = "$form->{fromdate}";
+ my $trigger_1 = "trigger1";
+ my $name_2 = "todate";
+ my $id_2 = "todate";
+ my $value_2 = "";
+ my $trigger_2 = "trigger2";
+
+ my ($button1, $button1_2, $button2, $button2_2, $jsscript);
+
+ # with JavaScript Calendar
+ if ($form->{jsscript}) {
+ if ($name_1 eq "") {
+
+ $button1 = qq|
+ <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
+ $button1_2 = qq|
+ <input type=button name=$name_2 id="$trigger_2" value=|
+ . $locale->text('button') . qq|>|;
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
+ } else {
+ $button1 = qq|
+ <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\" value="$value_1">|;
+ $button1_2 = qq|
+ <input type=button name=$name_1 id="$trigger_1" value=|
+ . $locale->text('button') . qq|>|;
+ $button2 = qq|
+ <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
+ $button2_2 = qq|
+ <input type=button name=$name_2 id="$trigger_2" value=|
+ . $locale->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|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
+ } else {
+ $button1 =
+ qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value="$value_1" onBlur=\"check_right_date_format(this)\">|;
+ $button2 =
+ qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
+ }
+ }
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
+ $form->header;
+ my $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;
$form->{description} =~ s/\"/"/g;
+ my $eur = $::lx_office_conf{system}->{eur};
+
print qq|
-<body>
+<body onLoad="$onload">
<form method=post action=$form->{script}>
<input type=hidden name=accounttype value=$form->{accounttype}>
<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>
+ <th class=listtop>$form->{title}</th>
</tr>
- <tr><td><hr size=3 noshade></td></tr>
+
</table>
+<table>
+ <tr>
+ <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
+ . $locale->text('Customized Report') . qq|</th>
+ </tr>
+ <tr>
+ <th colspan=1>| . $locale->text('Year') . qq|</th>
+ <td><input name=year size=11 title="|
+ . $locale->text('YYYY') . qq|" value="$year"></td>
+ </tr>
+|;
+
+ print qq|
+ <tr>
+ <td align=right>
+<b> | . $locale->text('Yearly') . qq|</b> </td>
+ <th align=left>| . $locale->text('Quarterly') . qq|</th>
+ <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+ </tr>
+ <tr>
+ <td align=right> <input name=duetyp class=radio type=radio value="13"></td>
+ <td><input name=duetyp class=radio type=radio value="A"> 1. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="1" "checked"> | . $locale->text('January') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="5" > | . $locale->text('May') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="9" > | . $locale->text('September') . qq|</td>
+
+ </tr>
+ <tr>
+ <td align= right> </td>
+ <td><input name=duetyp class=radio type=radio value="B"> 2. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="2" > | . $locale->text('February') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="6" > | . $locale->text('June') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="10" > | . $locale->text('October') . qq|</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name=duetyp class=radio type=radio value="C"> 3. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="3" > | . $locale->text('March') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="7" > | . $locale->text('July') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="11" > | . $locale->text('November') . qq|</td>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name=duetyp class=radio type=radio value="D"> 4. | . $locale->text('Quarter') . qq| </td>
+ <td><input name=duetyp class=radio type=radio value="4" > | . $locale->text('April') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="8" > | . $locale->text('August') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="12" > | . $locale->text('December') . qq|</td>
+
+ </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
+ </tr>
+ <tr>
+ <th align=left><input name=reporttype class=radio type=radio value="free"> | . $locale->text('Free report period') . qq|</th>
+ <td align=left colspan=4>| . $locale->text('From') . qq|
+ $button1
+ $button1_2
+ | . $locale->text('Bis') . qq|
+ $button2
+ $button2_2
+ </td>
+ </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
+ </tr>
+ <tr>
+ <th align=leftt>| . $locale->text('Method') . qq|</th>
+ <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+ <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+ </tr>
+ <tr>
+ <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
+ <td><input name=decimalplaces size=3 value="2"></td>
+ </tr>
+ <tr>
+ <td><input name="subtotal" class=checkbox type=checkbox value=1> | . $locale->text('Subtotal') . qq|</td>
+ </tr>
+
+$jsscript
+ <tr><td colspan=5 ><hr size=3 noshade></td></tr>
+</table>
<br><input class=submit type=submit name=action value="|
. $locale->text('List Transactions') . qq|">
</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
+}
+
+sub format_debit_credit {
+ $main::lxdebug->enter_sub();
+
+ my $dc = shift;
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ 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();
+
+ return $formatted_dc;
}
+
sub list_transactions {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $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;
+ };
+ }
+ }
+
CA->all_transactions(\%myconfig, \%$form);
+ $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}) {
my ($department) = split /--/, $form->{department};
push @options, $period;
- my @columns = qw(transdate reference description debit credit balance);
+ $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'), },
- );
- my %column_alignment = map { $_ => 'right' } qw(debit credit balance);
+ 'ustrate' => { 'text' => $locale->text('Satz %'), },
+ );
- my @hidden_variables = qw(accno fromdate todate description accounttype l_heading l_subtotal department projectnumber project_id sort);
+ 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);
- map { $column_defs{$_}->{link} = $link . "&sort=$_" } qw(transdate reference description);
$form->{callback} = $link . '&sort=' . E($form->{sort});
+ my %column_alignment = map { $_ => 'right' } qw(debit credit);
+
+ 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',
'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_sort_indicator($form->{sort}, 1);
- $column_defs->{balance}->{visible} = $form->{accno} ? 1 : 0;
+ $column_defs{balance}->{visible} = 1;
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);
- }
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} }) {
- $form->{balance} += $ca->{amount};
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);
}
- $ca->{balance} = $form->format_amount(\%myconfig, $form->{balance} * $ml, 2);
+ 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;
+ }
my $row = { };
+ $ca->{ustrate} = $form->format_amount(\%myconfig, $ca->{ustrate} * 100, 2) if ($ca->{ustrate} != 0);
+
+ if ($ca->{memo} ne "") {
+ $ca->{description} .= " \n " . $ca->{memo};
+ }
+
+
+
+ foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) {
+ if ($ca->{gegenkonto} eq "") {
+ $ca->{gegenkonto} = $gegenkonto->{accno};
+ } else {
+ $ca->{gegenkonto} .= ", " . $gegenkonto->{accno};
+ }
+ }
+
foreach (@columns) {
$row->{$_} = {
'data' => $ca->{$_},
};
}
- $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback');
+ $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR');
- $report->add_data($row);
+ if ($ca->{index} ne $previous_index) {
+# $report->add_data($row_set) if ($row_set);
- 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'));
+# $row_set = [ ];
+ $previous_index = $ca->{index};
+
+ $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback');
+
+ } elsif ($ca->{index} eq $previous_index) {
+ map { $row->{$_}->{data} = '' } qw(reference description);
+ $row->{transdate}->{data} = '' if ($form->{sort} eq 'transdate');
}
+ my $row_set = [];
+
+ push @{ $row_set }, $row;
+
+ push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal') if ($do_subtotal);
+
+
$idx++;
+ $report->add_data($row_set);
+
}
$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} * $ml, 2);
+
+
+ $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();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub create_subtotal_row {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
my ($totals, $columns, $column_alignment, $class) = @_;
map { $totals->{$_} = 0 } qw(debit credit);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $row;
}
projects / kivitendo-erp.git / blobdiff