Umstellung der Liste der Zahlungsein- und -ausgänge auf die Verwendung von ReportGene...

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index a5f9a72bc7c8bcb025c11222ddbfd053a958a5e7..4cb742d0b500501af27a206dcf0980b39f9c13bb 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -2252,192 +2252,107 @@ sub list_payments {
 
   RP->payments(\%myconfig, \%$form);
 
 
   RP->payments(\%myconfig, \%$form);
 

-  @columns =
-    $form->sort_columns(qw(transdate reference name paid source memo));
-
-  # construct href
-  $account    = $form->escape($form->{account});
-  $title      = $form->escape($form->{title});
-  $department = $form->escape($form->{department});
-  $form->{paymentaccounts} =~ s/ /%20/g;
-  $reference = $form->escape($form->{reference});
-  $source    = $form->escape($form->{source});
-  $memo      = $form->escape($form->{memo});
+  my @hidden_variables = qw(account title department reference source memo fromdate todate
+                            fx_transaction db prepayment paymentaccounts sort);

 
 

-  $href =
-    "$form->{script}?action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo";
+  my $href = build_std_url('action=list_payments', grep { $form->{$_} } @hidden_variables);
+  $form->{callback} = $href;

 
 

-  # construct callback
-  $account    = $form->escape($form->{account},    1);
-  $title      = $form->escape($form->{title},      1);
-  $department = $form->escape($form->{department}, 1);
-  $reference  = $form->escape($form->{reference},  1);
-  $source     = $form->escape($form->{source},     1);
-  $memo       = $form->escape($form->{memo},       1);
-
-  $form->{callback} =
-    "$form->{script}?action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo&sort=$form->{sort}";
-  $callback = $form->escape($form->{callback});
+  my @columns     = qw(transdate invnumber name paid source memo);
+  my %column_defs = (
+    'name'      => { 'text' => $locale->text('Description'), },
+    'invnumber' => { 'text' => $locale->text('Reference'), },
+    'transdate' => { 'text' => $locale->text('Date'), },
+    'paid'      => { 'text' => $locale->text('Amount'), },
+    'source'    => { 'text' => $locale->text('Source'), },
+    'memo'      => { 'text' => $locale->text('Memo'), },
+  );
+  my %column_alignment = ('paid' => 'right');

 
 

-  $column_header{name} =
-      "<th><a class=listheading href=$href&sort=name>"
-    . $locale->text('Description')
-    . "</a></th>";
-  $column_header{reference} =
-      "<th><a class=listheading href=$href&sort=invnumber>"
-    . $locale->text('Reference')
-    . "</a></th>";
-  $column_header{transdate} =
-      "<th><a class=listheading href=$href&sort=transdate>"
-    . $locale->text('Date')
-    . "</a></th>";
-  $column_header{paid} =
-    "<th class=listheading>" . $locale->text('Amount') . "</a></th>";
-  $column_header{source} =
-      "<th><a class=listheading href=$href&sort=source>"
-    . $locale->text('Source')
-    . "</a></th>";
-  $column_header{memo} =
-      "<th><a class=listheading href=$href&sort=memo>"
-    . $locale->text('Memo')
-    . "</a></th>";
+  map { $column_defs{$_}->{link} = $href . "&sort=$_" } grep { $_ ne 'paid' } @columns;

 
 

+  my @options;

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

-    $option .= "\n<br>" if ($option);
-    $option .=
-        $locale->text('From') . "&nbsp;"
-      . $locale->date(\%myconfig, $form->{fromdate}, 1);
+    push @options, $locale->text('From') . "&nbsp;" . $locale->date(\%myconfig, $form->{fromdate}, 1);

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

-    $option .= "\n<br>" if ($option);
-    $option .=
-        $locale->text('bis') . "&nbsp;"
-      . $locale->date(\%myconfig, $form->{todate}, 1);
+    push @options, $locale->text('bis') . "&nbsp;" . $locale->date(\%myconfig, $form->{todate}, 1);

   }
 
   }
 

-  @column_index = @columns;
-  $colspan      = $#column_index + 1;
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);

 
 

-  $form->header;
+  my $attachment_basename = $form->{db} eq 'ar' ? $locale->text('list_of_receipts') : $locale->text('list_of_payments');

 
 

-  print qq|
-<body>
+  $report->set_options('top_info_text'         => join("\n", @options),
+                       'output_format'         => 'HTML',
+                       'title'                 => $form->{title},
+                       'attachment_basename'   => $attachment_basename . strftime('_%Y%m%d', localtime time),
+                       'std_column_visibility' => 1,
+    );
+  $report->set_options_from_form();

 
 

-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$option</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-       <tr class=listheading>
-|;
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);

 
 

-  map { print "\n$column_header{$_}" } @column_index;
+  $report->set_export_options('list_payments', @hidden_variables);

 
 

-  print qq|
-        </tr>
-|;
+  $report->set_sort_indicator($form->{sort}, 1);

 
 

-  foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {
+  my $total_paid    = 0;

 
 

+  foreach my $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {

     next unless @{ $form->{ $ref->{id} } };
 
     next unless @{ $form->{ $ref->{id} } };
 

-    print qq|
-        <tr>
-         <th colspan=$colspan align=left>$ref->{accno}--$ref->{description}</th>
-       </tr>
-|;
+    $report->add_control({ 'type' => 'colspan_data', 'data' => "$ref->{accno}--$ref->{description}" });

 
 

-    foreach $payment (@{ $form->{ $ref->{id} } }) {
+    my $subtotal_paid = 0;

 
 

-      $module = $payment->{module};
+    foreach my $payment (@{ $form->{ $ref->{id} } }) {
+      my $module = $payment->{module};

       $module = 'is' if ($payment->{invoice} && $payment->{module} eq 'ar');
       $module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap');
 
       $module = 'is' if ($payment->{invoice} && $payment->{module} eq 'ar');
       $module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap');
 

-      $href =
-        qq|${module}.pl?action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|;
+      my $link = build_std_url("module=${module}.pl", 'action=edit', 'id=' . E($payment->{id}), 'callback');

 
 

-      $column_data{name}      = "<td>$payment->{name}&nbsp;</td>";
-      $column_data{reference} =
-        qq|<td><a href=$href>$payment->{invnumber}</a></td>|;
-      $column_data{transdate} = "<td>$payment->{transdate}&nbsp;</td>";
-      $column_data{paid}      =
-          "<td align=right>"
-        . $form->format_amount(\%myconfig, $payment->{paid}, 2, "&nbsp;")
-        . "</td>";
-      $column_data{source} = "<td>$payment->{source}&nbsp;</td>";
-      $column_data{memo}   = "<td>$payment->{memo}&nbsp;</td>";
+      $subtotal_paid += $payment->{paid};
+      $total_paid    += $payment->{paid};

 
 

-      $subtotalpaid += $payment->{paid};
-      $totalpaid    += $payment->{paid};
+      $payment->{paid} = $form->format_amount(\%myconfig, $payment->{paid}, 2);

 
 

-      $i++;
-      $i %= 2;
-      print qq|
-       <tr class=listrow$i>
-|;
-
-      map { print "\n$column_data{$_}" } @column_index;
+      my $row = { };

 
 

-      print qq|
-        </tr>
-|;
+      foreach my $column (@columns) {
+        $row->{$column} = {
+          'data'  => $payment->{$column},
+          'align' => $column_alignment{$column},
+        };
+      }

 
 

+      $report->add_data($row);

     }
 
     }
 

-    # print subtotals
-    map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-
-    $column_data{paid} =
-      "<th class=listsubtotal align=right>"
-      . $form->format_amount(\%myconfig, $subtotalpaid, 2, "&nbsp;") . "</th>";
-
-    print qq|
-       <tr class=listsubtotal>
-|;
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-        </tr>
-|;
-
-    $subtotalpaid = 0;
+    my $row = { map { $_ => { 'class' => 'listsubtotal' } } @columns };
+    $row->{paid} = {
+      'data'  => $form->format_amount(\%myconfig, $subtotal_paid, 2),
+      'align' => 'right',
+      'class' => 'listsubtotal',
+    };

 
 

+    $report->add_data($row);

   }
 
   }
 

-  # print total
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-
-  $column_data{paid} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalpaid, 2, "&nbsp;") . "</th>";
+  $report->add_separator();

 
 

-  print qq|
-        <tr class=listtotal>
-|;
+  my $row = { map { $_ => { 'class' => 'listtotal' } } @columns };
+  $row->{paid} = {
+    'data'  => $form->format_amount(\%myconfig, $total_paid, 2),
+    'align' => 'right',
+    'class' => 'listtotal',
+  };

 
 

-  map { print "\n$column_data{$_}" } @column_index;
+  $report->add_data($row);

 
 

-  print qq|
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-</body>
-</html>
-|;
+  $report->generate_with_headers();

 
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }

diff --git a/locale/de/all b/locale/de/all
index 2826bf42e106d338b4a22fc5be2d7efa49156cdc..8450e454fdb116138a6fc401c7cd12576b829aab 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1296,6 +1296,8 @@ aktualisieren wollen?',
   'lead deleted!'               => 'Kundenquelle gelöscht',
   'lead saved!'                 => 'Kundenquelle geichert',
   'list'                        => 'auflisten',
   'lead deleted!'               => 'Kundenquelle gelöscht',
   'lead saved!'                 => 'Kundenquelle geichert',
   'list'                        => 'auflisten',

+  'list_of_payments'            => 'zahlungsausgaenge',
+  'list_of_receipts'            => 'zahlungseingaenge',

   'localhost'                   => 'lokaler Rechner',
   'logout'                      => 'abmelden',
   'mark as paid'                => 'als bezahlt markieren',
   'localhost'                   => 'lokaler Rechner',
   'logout'                      => 'abmelden',
   'mark as paid'                => 'als bezahlt markieren',

diff --git a/locale/de/rp b/locale/de/rp
index 776b38ab9bc1bbb85ba8e3c2ee7e704b1f2a6857..7e343e64fb9c570ed0e1fd124ab6eba75d549f1e 100644 (file)
--- a/locale/de/rp
+++ b/locale/de/rp
@@ -187,6 +187,8 @@ $self->{texts} = {
   'debug'                       => 'Debug',
   'for Period'                  => 'für den Zeitraum',
   'invoice'                     => 'Rechnung',
   'debug'                       => 'Debug',
   'for Period'                  => 'für den Zeitraum',
   'invoice'                     => 'Rechnung',

+  'list_of_payments'            => 'zahlungsausgaenge',
+  'list_of_receipts'            => 'zahlungseingaenge',

   'no'                          => 'nein',
   'packing_list'                => 'Versandliste',
   'pick_list'                   => 'Entnahmeliste',
   'no'                          => 'nein',
   'packing_list'                => 'Versandliste',
   'pick_list'                   => 'Entnahmeliste',