X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=dd157e0a9626bf7a71b4b2d64e52a1a336f59d9b;hb=1db3214445fbc5144ebc62c314c11082a2d904c4;hp=e4185ab339908bd02a30ed0dcee039291924fc7a;hpb=9bd3030a376850c427c102c6e0c54f19bd19332e;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index e4185ab33..dd157e0a9 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 { | if $form->{selectdepartment}; - my $accrual = ($main::eur) ? "" : "checked"; - my $cash = ($main::eur) ? "checked" : ""; + my $accrual = $::lx_office_conf{system}->{eur} ? "" : "checked"; + my $cash = $::lx_office_conf{system}->{eur} ? "checked" : ""; my $name_1 = "fromdate"; my $id_1 = "fromdate"; @@ -245,6 +246,8 @@ sub list { $form->{description} =~ s/\"/"/g; + my $eur = $::lx_office_conf{system}->{eur}; + print qq| @@ -253,7 +256,7 @@ sub list { {accno}> - + {accounttype}> @@ -274,7 +277,6 @@ sub list { |; - our $checked; print qq| - - -|; - $checked = "checked"; - print qq| - -|; - $checked = ""; - print qq| - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - +
@@ -283,48 +285,41 @@ sub list { | . $locale->text('Monthly') . qq|
   1. | . $locale->text('Quarter') . qq| | . $locale->text('January') . 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,9 +538,9 @@ 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 %'), }, ); @@ -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);