X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fca.pl;h=27070bb3f4cfdcfd7efe7b787679f4ff983b9d76;hb=64ec422b1db624af0f606fb485f7f5b0262006b3;hp=8aeabdce5ecea2297568b40a1d8143e2853672af;hpb=831f10968e839d686e9d10881211ecdc578de613;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 8aeabdce5..27070bb3f 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -84,7 +84,8 @@ sub chart_of_accounts { $form->{title} = $locale->text('Chart of Accounts'); - if ($main::eur) { + if ( $::instance_conf->get_accounting_method eq 'cash' ) { + # $form->{method} can probably be made redundant now that we have get_accounting_method $form->{method} = "cash"; } @@ -106,6 +107,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 +178,8 @@ sub list { | if $form->{selectdepartment}; - my $accrual = ($main::eur) ? "" : "checked"; - my $cash = ($main::eur) ? "checked" : ""; + my $accrual = $::instance_conf->get_accounting_method eq 'cash' ? "" : "checked"; + my $cash = $::instance_conf->get_accounting_method eq 'cash' ? "checked" : ""; my $name_1 = "fromdate"; my $id_1 = "fromdate"; @@ -245,6 +247,8 @@ sub list { $form->{description} =~ s/\"/"/g; + my $eur = $::instance_conf->get_accounting_method eq 'cash' ? 1 : 0; + print qq| @@ -253,7 +257,7 @@ sub list { {accno}> - + {accounttype}> @@ -274,7 +278,6 @@ sub list { |; - our $checked; print qq| - - -|; - $checked = "checked"; - print qq| - -|; - $checked = ""; - print qq| - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - +
@@ -283,48 +286,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  @@ -549,7 +545,7 @@ sub list_transactions { '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 +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);