X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fca.pl;h=774da855a9c37c3449e74d35dbe2cfa4719e968e;hb=ee56f1b20ab915671ded297f593c0e2e245bad70;hp=66a6a6a3d241cffcef13a6fa9faf502680491ddb;hpb=57bf9c89a037036fcf433de39643778854defe51;p=kivitendo-erp.git
diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index 66a6a6a3d..774da855a 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -24,7 +24,8 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# module for Chart of Accounts, Income Statement and Balance Sheet
@@ -35,6 +36,7 @@
use POSIX qw(strftime);
use SL::CA;
+use SL::DB::Default;
use SL::ReportGenerator;
require "bin/mozilla/reportgenerator.pl";
@@ -84,7 +86,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 +109,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);
@@ -147,242 +151,17 @@ sub chart_of_accounts {
}
sub list {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('report');
-
- $form->{title} = $locale->text('List Transactions');
- $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}";
- my $year = (localtime)[5] + 1900;
+ $::lxdebug->enter_sub;
+ $::auth->assert('report');
- # get departments
- $form->all_departments(\%myconfig);
- if (@{ $form->{all_departments} }) {
- $form->{selectdepartment} = "