X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=a4de2310ed68fb8c52947c7a168585bb2a917b41;hb=4923839ef41fc8c2fec0d27b300d1fa2ea655777;hp=497ee6157483da95df7ec11567853eef6be8bd73;hpb=ec022a581e19d03e34ae31e7ba53ee4dde66ea73;p=kivitendo-erp.git
diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index 497ee6157..a4de2310e 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -37,7 +37,7 @@ use POSIX qw(strftime);
use SL::CA;
use SL::ReportGenerator;
-require "bin/mozilla/report_generator.pl";
+require "bin/mozilla/reportgenerator.pl";
1;
@@ -74,6 +74,8 @@ require "bin/mozilla/report_generator.pl";
sub chart_of_accounts {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
$form->{title} = $locale->text('Chart of Accounts');
CA->all_accounts(\%myconfig, \%$form);
@@ -136,6 +138,8 @@ sub chart_of_accounts {
sub list {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
$form->{title} = $locale->text('List Transactions');
$form->{title} .= " - " . $locale->text('Account') . " $form->{accno}";
@@ -197,9 +201,6 @@ sub list {
|
-{login}>
-{password}>
-
@@ -214,6 +215,8 @@ sub list {
sub list_transactions {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
$form->{title} = $locale->text('Account') . " $form->{accno} - $form->{description}";
CA->all_transactions(\%myconfig, \%$form);
@@ -299,6 +302,7 @@ sub list_transactions {
my $idx = 0;
my %totals = ( 'debit' => 0, 'credit' => 0 );
my %subtotals = ( 'debit' => 0, 'credit' => 0 );
+ my ($previous_index, $row_set);
foreach my $ca (@{ $form->{CA} }) {
$form->{balance} += $ca->{amount};
@@ -320,9 +324,20 @@ sub list_transactions {
};
}
- $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback');
+ if ($ca->{index} ne $previous_index) {
+ $report->add_data($row_set) if ($row_set);
- $report->add_data($row);
+ $row_set = [ ];
+ $previous_index = $ca->{index};
+
+ $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback');
+
+ } else {
+ map { $row->{$_}->{data} = '' } qw(reference description);
+ $row->{transdate}->{data} = '' if ($form->{sort} eq 'transdate');
+ }
+
+ push @{ $row_set }, $row;
if (($form->{l_subtotal} eq 'Y')
&& (($idx == scalar @{ $form->{CA} } - 1)