X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/be4e11d36f40d90622fdf35eb07ab207422b5455..18da4a96827fd65559a6f64334c3d8a313884f84:/bin/mozilla/rp.pl

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index e365c3304..67ad8a5e3 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -35,12 +35,17 @@
 #
 #======================================================================
 
-require "$form->{path}/arap.pl";
-require "bin/mozilla/common.pl";
+use POSIX qw(strftime);
 
 use SL::PE;
 use SL::RP;
 use SL::USTVA;
+use SL::Iconv;
+use SL::ReportGenerator;
+
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/reportgenerator.pl";
 
 1;
 
@@ -110,9 +115,7 @@ sub report {
   $accrual = ($eur) ? ""        : "checked";
   $cash    = ($eur) ? "checked" : "";
 
-  ($null, $null, $null, $null, $null, $year, $null, $null, $null) =
-    localtime();
-  $year += 1900;
+  $year = (localtime)[5] + 1900;
 
   # get departments
   $form->all_departments(\%myconfig);
@@ -148,7 +151,7 @@ sub report {
                          '-labels' => \%project_labels));
 
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $jsscript = "";
   if ($form->{report} eq "ustva") {
     $department = "";
@@ -978,7 +981,6 @@ $jsscript
 </table>
 
 <br>
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -1356,7 +1358,7 @@ sub list_accounts {
     $description = $form->escape($ref->{description});
 
     $href =
-      qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|;
+      qq|ca.pl?action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|;
 
     $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
 
@@ -1517,17 +1519,14 @@ sub generate_ar_aging {
 
   # split customer
   ($form->{customer}) = split(/--/, $form->{customer});
-  $customer = $form->escape($form->{customer}, 1);
-  $title    = $form->escape($form->{title},    1);
 
   $form->{ct}   = "customer";
   $form->{arap} = "ar";
 
-  $form->{callback} =
-    qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|;
+  $form->{callback} = build_std_url('action=generate_ar_aging', qw(todate customer title));
 
   RP->aging(\%myconfig, \%$form);
-  &aging;
+  aging();
 
   $lxdebug->leave_sub();
 }
@@ -1537,296 +1536,148 @@ sub generate_ap_aging {
 
   # split vendor
   ($form->{vendor}) = split(/--/, $form->{vendor});
-  $vendor = $form->escape($form->{vendor}, 1);
-  $title  = $form->escape($form->{title},  1);
 
   $form->{ct}   = "vendor";
   $form->{arap} = "ap";
 
-  $form->{callback} =
-    qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|;
+  $form->{callback} = build_std_url('action=generate_ap_aging', qw(todate vendor title));
 
   RP->aging(\%myconfig, \%$form);
-  &aging;
+  aging();
 
   $lxdebug->leave_sub();
 }
 
-sub aging {
+sub create_aging_subtotal_row {
   $lxdebug->enter_sub();
 
-  $form->header;
+  my ($subtotals, $columns, $periods, $class) = @_;
 
-  $column_header{statement} = qq|<th>&nbsp;</th>|;
-  $column_header{ct}        =
-      qq|<th class=listheading>|
-    . $locale->text(ucfirst $form->{ct})
-    . qq|</th>|;
-  $column_header{invnumber} =
-    qq|<th class=listheading>| . $locale->text('Invoice') . qq|</th>|;
-  $column_header{transdate} =
-    qq|<th class=listheading>| . $locale->text('Date') . qq|</th>|;
-  $column_header{duedate} =
-    qq|<th class=listheading>| . $locale->text('Due') . qq|</th>|;
-  $column_header{c0} =
-    qq|<th class=listheading>| . $locale->text('Current') . qq|</th>|;
-  $column_header{c30} = qq|<th class=listheading>30</th>|;
-  $column_header{c60} = qq|<th class=listheading>60</th>|;
-  $column_header{c90} = qq|<th class=listheading>90</th>|;
-
-  @column_index =
-    (qw(statement ct invnumber transdate duedate c0 c30 c60 c90));
-
-  if ($form->{department}) {
-    $option .= "\n<br>" if $option;
-    ($department) = split /--/, $form->{department};
-    $option .= $locale->text('Department') . " : $department";
-    $department = $form->escape($form->{department}, 1);
-    $form->{callback} .= "&department=$department";
-  }
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
 
-  if ($form->{arap} eq 'ar') {
-    if ($form->{customer}) {
-      $option .= "\n<br>" if $option;
-      $option .= $form->{customer};
-    }
-  }
-  if ($form->{arap} eq 'ap') {
-    shift @column_index;
-    if ($form->{vendor}) {
-      $option .= "\n<br>" if $option;
-      $option .= $form->{vendor};
-    }
+  foreach (@{ $periods }) {
+    $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
+    $subtotals->{$_}      = 0;
   }
 
-  $todate = $locale->date(\%myconfig, $form->{todate}, 1);
-  $option .= "\n<br>" if $option;
-  $option .=
-    $locale->text('for Period') . " " . $locale->text('Bis') . " $todate";
+  $lxdebug->leave_sub();
 
-  print qq|
-<body>
+  return $row;
+}
 
-<form method=post action=$form->{script}>
+sub aging {
+  $lxdebug->enter_sub();
 
-<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>
-|;
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  map { print "$column_header{$_}\n" } @column_index;
+  my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90);
 
-  print qq|
-	</tr>
-|;
+  my %column_defs = (
+    'statement' => { 'text' => '', 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, },
+    'ct'        => { 'text' => $form->{ct} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
+    'invnumber' => { 'text' => $locale->text('Invoice'), },
+    'transdate' => { 'text' => $locale->text('Date'), },
+    'duedate'   => { 'text' => $locale->text('Due'), },
+    'c0'        => { 'text' => $locale->text('Current'), },
+    'c30'       => { 'text' => '30', },
+    'c60'       => { 'text' => '60', },
+    'c90'       => { 'text' => '90', },
+  );
 
-  $ctid     = 0;
-  $subtotal = 0;
-  $i        = 0;
+  my %column_alignment = ('statement' => 'center',
+                          map { $_ => 'right' } qw(c0 c30 c60 c90));
 
-  foreach $ref (@{ $form->{AG} }) {
+  $report->set_options('std_column_visibility' => 1);
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-    if ($ctid != $ref->{ctid}) {
+  my @hidden_variables = qw(todate customer vendor arap title ct);
+  $report->set_export_options('generate_' . ($form->{arap} eq 'ar' ? 'ar' : 'ap') . '_aging', @hidden_variables);
 
-      $i++;
+  my @options;
 
-      if ($subtotal) {
-        $c0subtotal = ($c0subtotal != 0) ? 
-          $form->format_amount(\%myconfig, $c0subtotal, 2, "&nbsp") : "";
-        $c30subtotal = ($c30subtotal != 0) ?
-          $form->format_amount(\%myconfig, $c30subtotal, 2, "&nbsp") : "";
-        $c60subtotal = ($c60subtotal != 0) ?
-          $form->format_amount(\%myconfig, $c60subtotal, 2, "&nbsp") : "";
-        $c90subtotal = ($c90subtotal != 0) ?
-          $form->format_amount(\%myconfig, $c90subtotal, 2, "&nbsp") : "";
-      }
+  if ($form->{department}) {
+    my ($department) = split /--/, $form->{department};
+    push @options, $locale->text('Department') . " : $department";
+    $form->{callback} .= "&department=" . E($department);
+  }
 
-      $column_data{ct}        = qq|<th>&nbsp;</th>|;
-      $column_data{invnumber} = qq|<th>&nbsp;</th>|;
-      $column_data{transdate} = qq|<th>&nbsp;</th>|;
-      $column_data{duedate}   = qq|<th>&nbsp;</th>|;
-      $column_data{c0}        =
-        qq|<th align=right class=listsubtotal>$c0subtotal</th>|;
-      $column_data{c30} =
-        qq|<th align=right class=listsubtotal>$c30subtotal</th>|;
-      $column_data{c60} =
-        qq|<th align=right class=listsubtotal>$c60subtotal</th>|;
-      $column_data{c90} =
-        qq|<th align=right class=listsubtotal>$c90subtotal</th>|;
-
-      if ($subtotal) {
-
-        # print subtotals
-        print qq|
-	<tr class=listsubtotal>
-|;
+  if (($form->{arap} eq 'ar') && $form->{customer}) {
+    push @options, $form->{customer};
+  }
 
-        map { print "$column_data{$_}\n" } @column_index;
+  if (($form->{arap} eq 'ap') && $form->{vendor}) {
+    push @options, $form->{vendor};
+  }
 
-        $column_data{statement} = qq|<td>&nbsp;</td>|;
+  push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
 
-        print qq|
-        </tr>
-|;
-      }
+  my $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list');
 
-      $subtotal = 1;
+  $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),
+    );
 
-      $c0subtotal  = 0;
-      $c30subtotal = 0;
-      $c60subtotal = 0;
-      $c90subtotal = 0;
+  my $previous_ctid = 0;
+  my $row_idx       = 0;
+  my @periods       = qw(0 30 60 90);
+  my %subtotals     = map { $_ => 0 } @periods;
+  my %totals        = map { $_ => 0 } @periods;
 
-      $column_data{ct}        = qq|<td>$ref->{name}</td>|;
-      $column_data{statement} =
-        qq|<td><input name="statement_$i" type=checkbox class=checkbox value=1 $ref->{checked}>
-      <input type=hidden name="$form->{ct}_id_$i" value=$ref->{ctid}>
-      </td>|;
+  foreach $ref (@{ $form->{AG} }) {
+    if ($row_idx && ($previous_ctid != $ref->{ctid})) {
+      $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal'));
     }
 
-    $c0subtotal  += $ref->{c0};
-    $c30subtotal += $ref->{c30};
-    $c60subtotal += $ref->{c60};
-    $c90subtotal += $ref->{c90};
-
-    $c0total  += $ref->{c0};
-    $c30total += $ref->{c30};
-    $c60total += $ref->{c60};
-    $c90total += $ref->{c90};
-
-    $ref->{c0}  = ($ref->{c0} != 0) ? $form->format_amount(\%myconfig, $ref->{c0},  2, "&nbsp;") : "";
-    $ref->{c30} = ($ref->{c30} != 0) ? $form->format_amount(\%myconfig, $ref->{c30}, 2, "&nbsp;") : "";
-    $ref->{c60} = ($ref->{c60} != 0) ?  $form->format_amount(\%myconfig, $ref->{c60}, 2, "&nbsp;") : "";
-    $ref->{c90} = ($ref->{c90} != 0) ?  $form->format_amount(\%myconfig, $ref->{c90}, 2, "&nbsp;") : "";
+    foreach my $key (@periods) {
+      $subtotals{$key}  += $ref->{"c${key}"};
+      $totals{$key}     += $ref->{"c${key}"};
+      $ref->{"c${key}"}  = $ref->{"c${key}"} != 0 ? $form->format_amount(\%myconfig, $ref->{"c${key}"}, 2) : '';
+    }
 
-    $href =
-      qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|
-      . $form->escape($form->{callback});
+    my $row = { };
 
-    $column_data{invnumber} = qq|<td><a href=$href>$ref->{invnumber}</a></td>|;
-    $column_data{transdate} = qq|<td>$ref->{transdate}</td>|;
-    $column_data{duedate}   = qq|<td>$ref->{duedate}&nbsp;</td>|;
-    $column_data{c0}        = qq|<td align=right>$ref->{c0}</td>|;
-    $column_data{c30}       = qq|<td align=right>$ref->{c30}</td>|;
-    $column_data{c60}       = qq|<td align=right>$ref->{c60}</td>|;
-    $column_data{c90}       = qq|<td align=right>$ref->{c90}</td>|;
-
-    $j++;
-    $j %= 2;
-    print qq|
-	<tr class=listrow$j>
-|;
+    foreach my $column (@columns) {
+      $row->{$column} = {
+        'data'   => (($column eq 'ct') || ($column eq 'statement')) ? '' : $ref->{$column},
+        'align'  => $column_alignment{$column},
+        'valign' => $column eq 'statement' ? 'center' : '',
+      };
+    }
 
-    map { print "$column_data{$_}\n" } @column_index;
+    $row->{invnumber}->{link} =  build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id}));
 
-    print qq|
-        </tr>
-|;
+    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});
+      $row->{ct}->{data} = $ref->{name};
 
-    $column_data{ct}        = qq|<td>&nbsp;</td>|;
-    $column_data{statement} = qq|<td>&nbsp;</td>|;
+      $row_idx++;
+    }
 
-    $ctid = $ref->{ctid};
+    $previous_ctid = $ref->{ctid};
 
+    $report->add_data($row);
   }
 
-  # print subtotals
-  $c0subtotal  = $form->format_amount(\%myconfig, $c0subtotal,  2, "&nbsp;");
-  $c30subtotal = $form->format_amount(\%myconfig, $c30subtotal, 2, "&nbsp;");
-  $c60subtotal = $form->format_amount(\%myconfig, $c60subtotal, 2, "&nbsp;");
-  $c90subtotal = $form->format_amount(\%myconfig, $c90subtotal, 2, "&nbsp;");
-
-  print qq|
-        <tr class=listsubtotal>
-|;
-
-  map { $column_data{$_} = qq|<th>&nbsp;</th>| } @column_index;
-
-  $column_data{c0}  = qq|<th align=right class=listsubtotal>$c0subtotal</th>|;
-  $column_data{c30} = qq|<th align=right class=listsubtotal>$c30subtotal</th>|;
-  $column_data{c60} = qq|<th align=right class=listsubtotal>$c60subtotal</th>|;
-  $column_data{c90} = qq|<th align=right class=listsubtotal>$c90subtotal</th>|;
-
-  map { print "$column_data{$_}\n" } @column_index;
-
-  print qq|
-        </tr>
-        <tr class=listtotal>
-|;
-
-  $c0total  = $form->format_amount(\%myconfig, $c0total,  2, "&nbsp;");
-  $c30total = $form->format_amount(\%myconfig, $c30total, 2, "&nbsp;");
-  $c60total = $form->format_amount(\%myconfig, $c60total, 2, "&nbsp;");
-  $c90total = $form->format_amount(\%myconfig, $c90total, 2, "&nbsp;");
-
-  $column_data{c0}  = qq|<th align=right class=listtotal>$c0total</th>|;
-  $column_data{c30} = qq|<th align=right class=listtotal>$c30total</th>|;
-  $column_data{c60} = qq|<th align=right class=listtotal>$c60total</th>|;
-  $column_data{c90} = qq|<th align=right class=listtotal>$c90total</th>|;
-
-  map { print "$column_data{$_}\n" } @column_index;
-
-  print qq|
-          <input type=hidden name=rowcount value=$i>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-|;
+  $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal')) if ($row_idx);
 
-  &print_options if ($form->{arap} eq 'ar');
-
-  print qq|
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+  $report->add_data(create_aging_subtotal_row(\%totals, \@columns, \@periods, 'listtotal'));
 
   if ($form->{arap} eq 'ar') {
-    print qq|
-<input type=hidden name=todate value=$form->{todate}>
-
-<input type=hidden name=title value="$form->{title}">
-
-<input type=hidden name=arap value=$form->{arap}>
-<input type=hidden name=ct value=$form->{ct}>
-<input type=hidden name=$form->{ct} value="$form->{$form->{ct}}">
-
-<input type=hidden name=department value="$form->{department}">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<br>
-<input class=submit type=submit name=action value="|
-      . $locale->text('Select all') . qq|">
-<input class=submit type=submit name=action value="|
-      . $locale->text('Print') . qq|">
-<input class=submit type=submit name=action value="|
-      . $locale->text('E-mail') . qq|">|;
-}
+    $raw_top_info_text    = $form->parse_html_template('rp/aging_ar_top');
+    $raw_bottom_info_text = $form->parse_html_template('rp/aging_ar_bottom', { 'row_idx' => $row_idx,
+                                                                               'PRINT_OPTIONS' => print_options(1), });
+    $report->set_options('raw_top_info_text'    => $raw_top_info_text,
+                         'raw_bottom_info_text' => $raw_bottom_info_text);
+  }
 
-print qq|
-</form>
+  $report->set_options_from_form();
 
-</body>
-</html>
-|;
+  $report->generate_with_headers();
 
   $lxdebug->leave_sub();
 }
@@ -1950,8 +1801,6 @@ sub e_mail {
 sub send_email {
   $lxdebug->enter_sub();
 
-  $form->{OUT} = "$sendmail";
-
   $form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
     unless $form->{subject};
 
@@ -1959,10 +1808,10 @@ sub send_email {
 
   $form->{"statement_1"} = 1;
 
-  &print_form;
+  $form->{media} = 'email';
+  print_form();
 
-  $form->redirect(
-                 $locale->text('Statement sent to') . " $form->{$form->{ct}}");
+  $form->redirect($locale->text('Statement sent to') . " $form->{$form->{ct}}");
 
   $lxdebug->leave_sub();
 }
@@ -1986,7 +1835,6 @@ sub print {
   $form->error($locale->text('Nothing selected!')) unless $selected;
 
   if ($form->{media} eq 'printer') {
-    $form->{OUT} = "| $myconfig{printer}";
     $form->{"$form->{ct}_id"} = "";
   } else {
     $form->{"statement_1"} = 1;
@@ -1994,7 +1842,7 @@ sub print {
 
   RP->aging(\%myconfig, \%$form);
 
-  &print_form;
+  print_form();
 
   $form->redirect($locale->text('Statements sent to printer!'))
     if ($form->{media} eq 'printer');
@@ -2013,6 +1861,11 @@ sub print_form {
      " " => "_"
     );
 
+  foreach my $key (keys %replacements) {
+    my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key);
+    $replacements{$new_key} = $replacements{$key} if $new_key ne $key;
+  }
+
   $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
 
   $form->{templates} = "$myconfig{templates}";
@@ -2029,8 +1882,10 @@ sub print_form {
     $attachment_suffix = "pdf";
   }
 
-  $form->{IN} = "$form->{type}.$suffix";
-
+  $form->{IN}  = "$form->{type}.$suffix";
+  $form->{OUT} =
+    $form->{media} eq 'email'   ? $sendmail              :
+    $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
 
   # Save $form->{email} because it will be overwritten.
   $form->{EMAIL_RECIPIENT} = $form->{email};
@@ -2101,6 +1956,7 @@ sub print_form {
   }
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
   	$form->{addition} = "PRINTED";
   	$form->{what_done} = $form->{type};
   	$form->save_history($form->dbconnect(\%myconfig));
@@ -2144,13 +2000,13 @@ sub generate_tax_report {
 
   # construct href
   $href =
-    "$form->{script}?path=$form->{path}&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+    "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
 
   # construct callback
   $description = $form->escape($form->{$descvar},   1);
   $department  = $form->escape($form->{department}, 1);
   $callback    =
-    "$form->{script}?path=$form->{path}&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+    "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
 
   $title = $form->escape($form->{title});
   $href .= "&title=$title";
@@ -2289,7 +2145,7 @@ sub generate_tax_report {
 
     $column_data{id}        = qq|<td>$ref->{id}</td>|;
     $column_data{invnumber} =
-      qq|<td><a href=$module?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>|;
+      qq|<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>|;
     $column_data{transdate} = qq|<td>$ref->{transdate}</td>|;
     $column_data{name}      = qq|<td>$ref->{name}&nbsp;</td>|;
 
@@ -2396,192 +2252,107 @@ sub list_payments {
 
   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});
-
-  $href =
-    "$form->{script}?path=$form->{path}&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 @hidden_variables = qw(account title department reference source memo fromdate todate
+                            fx_transaction db prepayment paymentaccounts sort);
 
-  # 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);
+  my $href = build_std_url('action=list_payments', grep { $form->{$_} } @hidden_variables);
+  $form->{callback} = $href;
 
-  $form->{callback} =
-    "$form->{script}?path=$form->{path}&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}) {
-    $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}) {
-    $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} } };
 
-    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');
 
-      $href =
-        qq|${module}.pl?path=$form->{path}&action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|;
+      $subtotal_paid += $payment->{paid};
+      $total_paid    += $payment->{paid};
 
-      $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>";
+      $payment->{paid} = $form->format_amount(\%myconfig, $payment->{paid}, 2);
 
-      $subtotalpaid += $payment->{paid};
-      $totalpaid    += $payment->{paid};
+      my $row = { };
 
-      $i++;
-      $i %= 2;
-      print qq|
-	<tr class=listrow$i>
-|;
-
-      map { print "\n$column_data{$_}" } @column_index;
+      foreach my $column (@columns) {
+        $row->{$column} = {
+          'data'  => $payment->{$column},
+          'align' => $column_alignment{$column},
+        };
+      }
 
-      print qq|
-        </tr>
-|;
+      $row->{invnumber}->{link} = build_std_url("script=${module}.pl", 'action=edit', 'id=' . E($payment->{id}), 'callback');
 
+      $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;
+  $report->add_separator();
 
-  $column_data{paid} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalpaid, 2, "&nbsp;") . "</th>";
+  my $row = { map { $_ => { 'class' => 'listtotal' } } @columns };
+  $row->{paid} = {
+    'data'  => $form->format_amount(\%myconfig, $total_paid, 2),
+    'align' => 'right',
+    'class' => 'listtotal',
+  };
 
-  print qq|
-        <tr class=listtotal>
-|;
+  $report->add_data($row);
 
-  map { print "\n$column_data{$_}" } @column_index;
-
-  print qq|
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-</body>
-</html>
-|;
+  $report->generate_with_headers();
 
   $lxdebug->leave_sub();
 }
@@ -2613,6 +2384,8 @@ sub winston_export {
 sub print_options {
   $lxdebug->enter_sub();
 
+  my ($dont_print) = @_;
+
   $form->{sendmode} = "attachment";
 
   $form->{"format"} =
@@ -2666,7 +2439,7 @@ sub print_options {
     }
   }
 
-  print qq|
+  my $output = qq|
 <table>
   <tr>
     <td><select name=type>$type</select></td>
@@ -2675,18 +2448,22 @@ sub print_options {
 |;
 
   if ($myconfig{printer} && $latex_templates && $form->{media} ne 'email') {
-    print qq|
+    $output .= qq|
       <td>| . $locale->text('Copies') . qq|
       <input name=copies size=2 value=$form->{copies}></td>
 |;
   }
 
-  print qq|
+  $output .= qq|
   </tr>
 </table>
 |;
 
+  print $output unless $dont_print;
+
   $lxdebug->leave_sub();
+
+  return $output;
 }
 
 sub generate_bwa {