Sortierfunktion und Zwischensummen bei Kontenuebersichten eingebaut

diff --git a/SL/CA.pm b/SL/CA.pm
index a208e2e3e9b18e58f8006cce890626c31c99a548..4604f13e3a6009485a83e0ebcb3984cd4a8ac7d1 100644 (file)
--- a/SL/CA.pm
+++ b/SL/CA.pm
@@ -405,7 +405,7 @@ sub all_transactions {
     }
 
     $ca->{index} = join "--", map { $ca->{$_} } qw(id reference description transdate);
     }
 
     $ca->{index} = join "--", map { $ca->{$_} } qw(id reference description transdate);

-
+#     $ca->{index} = $ca->{$form->{sort}};

     push(@{ $form->{CA} }, $ca);
 
   }
     push(@{ $form->{CA} }, $ca);
 
   }

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index 08856b9ca712b9673d7ffbfb8bad61f34f8e76a2..372004e1b6ee0a579b3085fcae5627028d1818de 100644 (file)
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -349,6 +349,9 @@ $checked></td>
       . qq|</th>
              <td><input name=decimalplaces size=3 value="2"></td>
          </tr>
       . qq|</th>
              <td><input name=decimalplaces size=3 value="2"></td>
          </tr>

+         <tr>
+            <td><input name="subtotal" class=checkbox type=checkbox value=1> | . $locale->text('Subtotal') . qq|</td>
+         </tr>

                                     
 $jsscript
   <tr><td colspan=5 ><hr size=3 noshade></td></tr>
                                     
 $jsscript
   <tr><td colspan=5 ><hr size=3 noshade></td></tr>


@@ -519,6 +522,13 @@ sub list_transactions {
     'ustkonto'     => { 'text' => $locale->text('USt-Konto'), },
      'ustrate'     => { 'text' => $locale->text('Satz %'), },
  );
     'ustkonto'     => { 'text' => $locale->text('USt-Konto'), },
      'ustrate'     => { 'text' => $locale->text('Satz %'), },
  );

+
+  my @hidden_variables = qw(accno fromdate todate description accounttype l_heading subtotal department projectnumber project_id sort);
+
+  my $link = build_std_url('action=list_transactions', grep { $form->{$_} } @hidden_variables);
+
+  $form->{callback} = $link . '&sort=' . E($form->{sort});
+

   my %column_alignment = map { $_ => 'right' } qw(debit credit);
 
   @custom_headers = ();
   my %column_alignment = map { $_ => 'right' } qw(debit credit);
 
   @custom_headers = ();


@@ -540,9 +550,9 @@ sub list_transactions {
  ];
  # Zeile 2:
  push @custom_headers, [
  ];
  # Zeile 2:
  push @custom_headers, [

-   { 'text' => $locale->text('Date'), },
-   { 'text' => $locale->text('Reference'), },
-   { 'text' => $locale->text('Description'), },
+   { 'text' => $locale->text('Date'), 'link' => $link . "&sort=transdate", },
+   { 'text' => $locale->text('Reference'), 'link' => $link . "&sort=reference",  },
+   { 'text' => $locale->text('Description'), 'link' => $link . "&sort=description",  },

    { 'text' => $locale->text('Gegenkonto'), },
    { 'text' => $locale->text('Debit'), },
    { 'text' => $locale->text('Credit'), },
    { 'text' => $locale->text('Gegenkonto'), },
    { 'text' => $locale->text('Debit'), },
    { 'text' => $locale->text('Credit'), },


@@ -552,12 +562,7 @@ sub list_transactions {
 
 
 
 
 
 

-  my @hidden_variables = qw(accno fromdate todate description accounttype l_heading l_subtotal department projectnumber project_id sort);

 
 

-  my $link = build_std_url('action=list_transactions', grep { $form->{$_} } @hidden_variables);
-  map { $column_defs{$_}->{link} = $link . "&sort=$_" } qw(transdate reference description);
-
-  $form->{callback} = $link . '&sort=' . E($form->{sort});

 
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
   $report->set_custom_headers(@custom_headers);
 
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
   $report->set_custom_headers(@custom_headers);


@@ -595,6 +600,12 @@ sub list_transactions {
       $ca->{$_}       = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_} != 0);
     }
 
       $ca->{$_}       = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_} != 0);
     }
 

+    my $do_subtotal = 0;
+    if (($form->{subtotal})
+        && (($idx == scalar @{ $form->{CA} } - 1)
+            || ($ca->{$form->{sort}} ne $form->{CA}->[$idx + 1]->{$form->{sort}}))) {
+      $do_subtotal = 1;
+    }

 
     my $row = { };
 
 
     my $row = { };
 


@@ -622,27 +633,28 @@ sub list_transactions {
     }
 
     if ($ca->{index} ne $previous_index) {
     }
 
     if ($ca->{index} ne $previous_index) {

-      $report->add_data($row_set) if ($row_set);
+#       $report->add_data($row_set) if ($row_set);

 
 

-      $row_set         = [ ];
+#       $row_set         = [ ];

       $previous_index  = $ca->{index};
 
       $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback');
 
       $previous_index  = $ca->{index};
 
       $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback');
 

-    } else {
+    } elsif ($ca->{index} eq $previous_index) {

       map { $row->{$_}->{data} = '' } qw(reference description);
       $row->{transdate}->{data} = '' if ($form->{sort} eq 'transdate');
     }
 
       map { $row->{$_}->{data} = '' } qw(reference description);
       $row->{transdate}->{data} = '' if ($form->{sort} eq 'transdate');
     }
 

+    my $row_set = [];
+

     push @{ $row_set }, $row;
 
     push @{ $row_set }, $row;
 

-    if (($form->{l_subtotal} eq 'Y')
-        && (($idx == scalar @{ $form->{CA} } - 1)
-            || ($ca->{$form->{sort}} ne $form->{CA}->[$idx + 1]->{$form->{sort}}))) {
-      $report->add_data(create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal'));
-    }
+    push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal') if ($do_subtotal);
+

 
     $idx++;
 
     $idx++;

+    $report->add_data($row_set);
+

   }
 
   $report->add_data($row_set) if ($row_set);
   }
 
   $report->add_data($row_set) if ($row_set);

diff --git a/locale/de/ca b/locale/de/ca
index e2c3773cf477d30ac66cb9d4f6ce34aac6e7b060..462950484ab289c7873ebf17d18e3e826f1021b9 100644 (file)
--- a/locale/de/ca
+++ b/locale/de/ca
@@ -123,6 +123,7 @@ $self->{texts} = {
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',
   'Subject'                     => 'Betreff',
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',
   'Subject'                     => 'Betreff',

+  'Subtotal'                    => 'Zwischensumme',

   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
   'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => 'Der LDAP-Server "#1:#2" ist nicht erreichbar. Bitte überprüfen Sie die Angaben in config/authentication.pl.',
   'The config file "config/authentication.pl" contained invalid Perl code:' => 'Die Konfigurationsdatei "config/authentication.pl" enthielt ungütigen Perl-Code:',
   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
   'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => 'Der LDAP-Server "#1:#2" ist nicht erreichbar. Bitte überprüfen Sie die Angaben in config/authentication.pl.',
   'The config file "config/authentication.pl" contained invalid Perl code:' => 'Die Konfigurationsdatei "config/authentication.pl" enthielt ungütigen Perl-Code:',