DATEV-Schnittstelle: Auslagerung von KNE-Schreibfunktionen in eigenes Modul. Kosmetik...

[mfinanz.git] / bin / mozilla / rp.pl

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 7f5aa0d6969a382be88fd68d4c587c354ec9ff04..6c8562b46cbca7ad992b8d722ee675373812f885 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1127,11 +1127,9 @@ sub generate_balance_sheet {
     'soll_kumuliert'          => { 'text' => $locale->text('Sum Debit'), },
     'haben_kumuliert'         => { 'text' => $locale->text('Sum Credit'), },
     'soll_saldo'              => { 'text' => $locale->text('Saldo Debit'), },
     'soll_kumuliert'          => { 'text' => $locale->text('Sum Debit'), },
     'haben_kumuliert'         => { 'text' => $locale->text('Sum Credit'), },
     'soll_saldo'              => { 'text' => $locale->text('Saldo Debit'), },

-    'haben_saldo'                => { 'text' => $locale->text('Saldo Credit'), }
+    'haben_saldo'             => { 'text' => $locale->text('Saldo Credit'), }

   );
 
   );
 

-
-

   my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
 
   map { $column_defs{$_}->{visible} =  1 } @columns;
   my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
 
   map { $column_defs{$_}->{visible} =  1 } @columns;


@@ -1761,8 +1759,8 @@ sub aging {
 
     if ($previous_ctid != $ref->{ctid}) {
       $row->{statement}->{raw_data} =
 
     if ($previous_ctid != $ref->{ctid}) {
       $row->{statement}->{raw_data} =

-          $cgi->hidden('-name' => "customer_id_${row_idx}", '-value' => $ref->{ctid})
-        . $cgi->checkbox('-name' => "statement_${row_idx}", '-value' => 1, '-label' => '', 'checked' => $ref->{checked});
+          $cgi->hidden('-name' => "customer_id_" . ($row_idx + 1), '-value' => $ref->{ctid})
+        . $cgi->checkbox('-name' => "statement_" . ($row_idx + 1), '-value' => 1, '-label' => '', 'checked' => $ref->{checked});

       $row->{ct}->{data} = $ref->{name};
 
       $row_idx++;
       $row->{ct}->{data} = $ref->{name};
 
       $row_idx++;


@@ -2348,6 +2346,8 @@ sub list_payments {
     $option = $locale->text('Department') . " : $department";
   }
 
     $option = $locale->text('Department') . " : $department";
   }
 

+  report_generator_set_default_sort('transdate', 1);
+

   RP->payments(\%myconfig, \%$form);
 
   my @hidden_variables = qw(account title department reference source memo fromdate todate
   RP->payments(\%myconfig, \%$form);
 
   my @hidden_variables = qw(account title department reference source memo fromdate todate


@@ -2367,14 +2367,17 @@ sub list_payments {
   );
   my %column_alignment = ('paid' => 'right');
 
   );
   my %column_alignment = ('paid' => 'right');
 

-  map { $column_defs{$_}->{link} = $href . "&sort=$_" } grep { $_ ne 'paid' } @columns;
+  foreach my $name (grep { $_ ne 'paid' } @columns) {
+    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$name}->{link} = $href . "&sort=${name}&sortdir=$sortdir";
+  }

 
   my @options;
   if ($form->{fromdate}) {
 
   my @options;
   if ($form->{fromdate}) {

-    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1);
+    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1);

   }
   if ($form->{todate}) {
   }
   if ($form->{todate}) {

-    push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+    push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);

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


@@ -2394,7 +2397,7 @@ sub list_payments {
 
   $report->set_export_options('list_payments', @hidden_variables);
 
 
   $report->set_export_options('list_payments', @hidden_variables);
 

-  $report->set_sort_indicator($form->{sort}, 1);
+  $report->set_sort_indicator($form->{sort}, $form->{sortdir});

 
   my $total_paid    = 0;
 
 
   my $total_paid    = 0;