X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=27070bb3f4cfdcfd7efe7b787679f4ff983b9d76;hb=64ec422b1db624af0f606fb485f7f5b0262006b3;hp=66a6a6a3d241cffcef13a6fa9faf502680491ddb;hpb=57bf9c89a037036fcf433de39643778854defe51;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 66a6a6a3d..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); @@ -161,23 +163,23 @@ sub list { # get departments $form->all_departments(\%myconfig); - if (@{ $form->{all_departments} }) { + if (@{ $form->{all_departments} || [] }) { $form->{selectdepartment} = "

\| +
\| . $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\|