my %totals = ('debit' => 0, 'credit' => 0);
foreach my $ca (@{ $form->{CA} }) {
+ next unless defined $ca->{amount};
my $row = { };
foreach (qw(debit credit)) {
| if $form->{selectdepartment};
$accrual = ($eur) ? "" : "checked";
$cash = ($eur) ? "checked" : "";
-
+
$name_1 = "fromdate";
$id_1 = "fromdate";
$value_1 = "$form->{fromdate}";
<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>
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}) {
push @options, $period;
- my @columns = qw(transdate reference description gegenkonto debit credit ustkonto ustrate);
+ $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'), },
'credit' => { 'text' => $locale->text('Credit'), },
'gegenkonto' => { 'text' => $locale->text('Gegenkonto'), },
'ustkonto' => { 'text' => $locale->text('USt-Konto'), },
- 'ustrate' => { 'text' => $locale->text('Satz %'), },
+ '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);
{ 'text' => $locale->text('Credit'), },
{ 'text' => $locale->text('USt-Konto'), },
{ 'text' => $locale->text('Satz %'), },
+ { 'text' => $locale->text('Balance'), },
];
$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;
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->{description} .= " \n " . $ca->{memo};
}
-
+
foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) {
if ($ca->{gegenkonto} eq "") {
};
}
+ $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR');
+
if ($ca->{index} ne $previous_index) {
# $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);