-
- |
+ |
+ |
. $locale->text('Customized Report') . qq| |
-
-
- | . $locale->text('Year') . qq| |
- text('YYYY') . qq|" value="$year"> |
-
+
|;
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| |
-
-
-
- |
- 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
+ | | . $locale->text('Quarterly') . qq| |
+ | . $locale->text('Monthly') . qq| |
+
+
+ |
+ 1. | . $locale->text('Quarter') . qq| |
+ | . $locale->text('January') . 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| |
+
+
+
+ |
+ 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
+ | . $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('Method') . qq| |
+ | . $locale->text('Accrual') . qq|
+ | . $locale->text('EUR') . qq| |
+
+
+ | . $locale->text('Decimalplaces') . qq| |
|
@@ -370,27 +356,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();
- $auth->assert('report');
+ 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}";
@@ -438,7 +432,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;
};
@@ -544,13 +538,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);
@@ -558,7 +552,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', },
@@ -602,6 +596,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);
@@ -610,7 +605,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;
@@ -706,7 +701,7 @@ sub list_transactions {
$report->add_separator();
- my $row = {
+ $row = {
'transdate' => {
'data' => "",
'class' => 'listtotal',
@@ -736,7 +731,7 @@ sub list_transactions {
$report->add_data($row);
my $saldo_new = format_debit_credit($form->{saldo_new});
- my $row = {
+ $row = {
'transdate' => {
'data' => "",
'class' => 'listtotal',
@@ -769,11 +764,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) = @_;
@@ -783,7 +781,7 @@ sub create_subtotal_row {
map { $totals->{$_} = 0 } qw(debit credit);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $row;
}