X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fca.pl;h=ecce874295f8e12d98091f02e7c80d72632b2e8d;hb=ba5d3542135b3408a011ce42d2311fa3aefa7f38;hp=e4185ab339908bd02a30ed0dcee039291924fc7a;hpb=b65a230d60e86d2c18a3ab7222379905aea5ecd7;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index e4185ab33..ecce87429 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -84,7 +84,7 @@ sub chart_of_accounts { $form->{title} = $locale->text('Chart of Accounts'); - if ($main::eur) { + if ($::lx_office_conf{system}->{eur}) { $form->{method} = "cash"; } @@ -106,6 +106,7 @@ sub chart_of_accounts { '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); @@ -176,8 +177,8 @@ sub list {
@@ -283,48 +285,41 @@ sub list { | | . $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| | ++ | 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| | +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| | +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| | +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('Free report period') . qq| | | . $locale->text('From') . qq| $button1 $button1_2 @@ -543,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); @@ -601,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); |