@@ -365,27 +357,35 @@ $jsscript
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub format_debit_credit {
- $lxdebug->enter_sub();
+ $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)');
- $lxdebug->leave_sub();
+ $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;
- $auth->assert('report');
+ $main::auth->assert('report');
$form->{title} = $locale->text('Account') . " $form->{accno} - $form->{description}";
@@ -433,7 +433,7 @@ sub list_transactions {
$form->{fromdate} = "1.2.$form->{year}";
#this works from 1901 to 2099, 1900 and 2100 fail.
- $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+ my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
$form->{todate} = "$leap.2.$form->{year}";
last SWITCH;
};
@@ -539,13 +539,13 @@ sub list_transactions {
'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'), },
+ '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 @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);
@@ -553,7 +553,7 @@ sub list_transactions {
my %column_alignment = map { $_ => 'right' } qw(debit credit);
- @custom_headers = ();
+ my @custom_headers = ();
# Zeile 1:
push @custom_headers, [
{ 'text' => 'Letzte Buchung', },
@@ -597,6 +597,7 @@ sub list_transactions {
'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);
@@ -605,7 +606,7 @@ sub list_transactions {
$report->set_sort_indicator($form->{sort}, 1);
- $column_defs->{balance}->{visible} = 1;
+ $column_defs{balance}->{visible} = 1;
my $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1;
@@ -644,7 +645,7 @@ sub list_transactions {
$ca->{description} .= " \n " . $ca->{memo};
}
-
+
foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) {
if ($ca->{gegenkonto} eq "") {
@@ -701,7 +702,7 @@ sub list_transactions {
$report->add_separator();
- my $row = {
+ $row = {
'transdate' => {
'data' => "",
'class' => 'listtotal',
@@ -731,7 +732,7 @@ sub list_transactions {
$report->add_data($row);
my $saldo_new = format_debit_credit($form->{saldo_new});
- my $row = {
+ $row = {
'transdate' => {
'data' => "",
'class' => 'listtotal',
@@ -764,11 +765,14 @@ sub list_transactions {
$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) = @_;
@@ -778,7 +782,7 @@ sub create_subtotal_row {
map { $totals->{$_} = 0 } qw(debit credit);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $row;
}