X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/09fe7f33a735ecc3f4a3112ad716f674983b00cc..43f9b1c512be9bc2199369c2f5accea32b8bd423:/bin/mozilla/ca.pl diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index b35b66495..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); @@ -172,12 +174,12 @@ sub list { my $department = qq| - | . $locale->text('Department') . qq| - - + | . $locale->text('Department') . qq| + + | 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}> @@ -263,107 +267,78 @@ sub list {
- - + - - - - - + |; - our $checked; print qq| - - + - - - - - - -|; - $checked = "checked"; - print qq| - -|; - $checked = ""; - print qq| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -564,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); @@ -622,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);
| +
| . $locale->text('Customized Report') . qq|
| . $locale->text('Year') . qq|text('YYYY') . qq|" value="$year">
+
| . $locale->text('Yearly') . qq| | . $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 + | . $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|