X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Frp.pl;h=c23abeb59abe7d258a2832a350647f7699637c92;hb=6f2050063ffa5417ab4495af84625385c766bc2d;hp=a66a629daf5c4857659053d4fd8ef18c0db7fff3;hpb=d0198c4241600ece0edbd4ae2efa3d71e8e148ec;p=kivitendo-erp.git

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index a66a629da..c23abeb59 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -35,10 +35,16 @@
 #
 #======================================================================
 
-require "$form->{path}/arap.pl";
+use POSIX qw(strftime);
 
 use SL::PE;
 use SL::RP;
+use SL::Iconv;
+use SL::ReportGenerator;
+
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/reportgenerator.pl";
 
 1;
 
@@ -85,9 +91,32 @@ use SL::RP;
 # $locale->text('Non-taxable Sales')
 # $locale->text('Non-taxable Purchases')
 
+# $form->parse_html_template('rp/html_report_susa')
+
+my $rp_access_map = {
+  'projects'         => 'report',
+  'ar_aging'         => 'general_ledger',
+  'ap_aging'         => 'general_ledger',
+  'receipts'         => 'cash',
+  'payments'         => 'cash',
+  'trial_balance'    => 'report',
+  'income_statement' => 'report',
+  'bwa'              => 'report',
+  'balance_sheet'    => 'report',
+};
+
+sub check_rp_access {
+  my $right   = $rp_access_map->{$form->{report}};
+  $right    ||= 'DOES_NOT_EXIST';
+
+  $auth->assert($right);
+}
+
 sub report {
   $lxdebug->enter_sub();
 
+  check_rp_access();
+
   %title = ('balance_sheet'        => 'Balance Sheet',
             'income_statement'     => 'Income Statement',
             'trial_balance'        => 'Trial Balance',
@@ -100,17 +129,14 @@ sub report {
             'receipts'             => 'Receipts',
             'payments'             => 'Payments',
             'projects'             => 'Project Transactions',
-            'bwa'                  => 'Betriebswirtschaftliche Auswertung',
-            'ustva'                => 'Umsatzsteuervoranmeldung',);
+            'bwa'                  => 'Betriebswirtschaftliche Auswertung',);
 
   $form->{title} = $locale->text($title{ $form->{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);
@@ -130,52 +156,61 @@ sub report {
 	</tr>
 | if $form->{selectdepartment};
 
+  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+                                   "all" => 1 });
+
+  my %project_labels = ();
+  my @project_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@project_values, $item->{"id"});
+    $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
+  my $projectnumber =
+    NTI($cgi->popup_menu('-name' => "project_id",
+                         '-values' => \@project_values,
+                         '-labels' => \%project_labels));
+
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $jsscript = "";
-  if ($form->{report} eq "ustva") {
-    $department = "";
+  if ($form->{report} eq "balance_sheet") {
+    $name_1    = "asofdate";
+    $id_1      = "asofdate";
+    $value_1   = "$form->{asofdate}";
+    $trigger_1 = "trigger1";
+    $name_2    = "compareasofdate";
+    $id_2      = "compareasofdate";
+    $value_2   = "$form->{compareasofdate}";
+    $trigger_2 = "trigger2";
+  } elsif ($form->{report} =~ /(receipts|payments)$/) {
+    $name_1    = "fromdate";
+    $id_1      = "fromdate";
+    $value_1   = "$form->{fromdate}";
+    $trigger_1 = "trigger1";
+    $name_2    = "todate";
+    $id_2      = "todate";
+    $value_2   = "";
+    $trigger_2 = "trigger2";
+  } elsif (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
+    $name_1    = "";
+    $id_1      = "";
+    $value_1   = "";
+    $trigger_1 = "";
+    $name_2    = "todate";
+    $id_2      = "todate";
+    $value_2   = "";
+    $trigger_2 = "trigger2";
+
   } else {
-    if ($form->{report} eq "balance_sheet") {
-      $name_1    = "compareasofdate";
-      $id_1      = "compareasofdate";
-      $value_1   = "";
-      $trigger_1 = "trigger1";
-      $name_2    = "asofdate";
-      $id_2      = "asofdate";
-      $value_2   = "$form->{asofdate}";
-      $trigger_2 = "trigger2";
-    } elsif ($form->{report} =~ /(receipts|payments)$/) {
-      $name_1    = "fromdate";
-      $id_1      = "fromdate";
-      $value_1   = "$form->{fromdate}";
-      $trigger_1 = "trigger1";
-      $name_2    = "todate";
-      $id_2      = "todate";
-      $value_2   = "";
-      $trigger_2 = "trigger2";
-    } else {
-      if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
-        $name_1    = "";
-        $id_1      = "";
-        $value_1   = "";
-        $trigger_1 = "";
-        $name_2    = "todate";
-        $id_2      = "todate";
-        $value_2   = "";
-        $trigger_2 = "trigger2";
-
-      } else {
-        $name_1    = "fromdate";
-        $id_1      = "fromdate";
-        $value_1   = "$form->{fromdate}";
-        $trigger_1 = "trigger1";
-        $name_2    = "todate";
-        $id_2      = "todate";
-        $value_2   = "";
-        $trigger_2 = "trigger2";
-      }
-    }
+    $name_1    = "fromdate";
+    $id_1      = "fromdate";
+    $value_1   = "$form->{fromdate}";
+    $trigger_1 = "trigger1";
+    $name_2    = "todate";
+    $id_2      = "todate";
+    $value_2   = "";
+    $trigger_2 = "trigger2";
   }
 
   # with JavaScript Calendar
@@ -183,23 +218,22 @@ sub report {
     if ($name_1 eq "") {
 
       $button1 = qq|
-         <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
+         <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
       $button1_2 = qq|
         <input type=button name=$name_2 id="$trigger_2" value=|
         . $locale->text('button') . qq|>|;
 
       #write Trigger
       $jsscript =
-        Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2", "",
-                            "", "");
+        Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
     } else {
       $button1 = qq|
-         <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1>|;
+         <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value="$value_1" onBlur=\"check_right_date_format(this)\">|;
       $button1_2 = qq|
         <input type=button name=$name_1 id="$trigger_1" value=|
         . $locale->text('button') . qq|>|;
       $button2 = qq|
-         <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
+         <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
       $button2_2 = qq|
          <input type=button name=$name_2 id="$trigger_2" value=|
         . $locale->text('button') . qq|>
@@ -215,19 +249,21 @@ sub report {
     # without JavaScript Calendar
     if ($name_1 eq "") {
       $button1 =
-        qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
+        qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
     } else {
       $button1 =
-        qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1>|;
+        qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1 onBlur=\"check_right_date_format(this)\">|;
       $button2 =
-        qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
+        qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
     }
   }
-
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
   $form->header;
-
+  $onload = qq|focus()|;
+  $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
+  $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
   print qq|
-<body>
+<body onLoad="$onload">
 
 <form method=post action=$form->{script}>
 
@@ -270,8 +306,7 @@ sub report {
 	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
       . $locale->text('Heading') . qq|
 	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Subtotal')
-      . qq|</td>
+      . $locale->text('Subtotal') . qq|</td>
 	</tr>
 
 $jsscript
@@ -282,21 +317,19 @@ $jsscript
     print qq|
 	<tr>
 	  <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-	  <td colspan=3><input name=projectnumber size=25</td>
+	  <td colspan=3>$projectnumber</td>
 	</tr>
         <input type=hidden name=nextsub value=generate_income_statement>
 </table>
 <table>
 	<tr>
 	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
-      . $locale->text('Customized Report')
-      . qq|</th>
+      . $locale->text('Customized Report') . qq|</th>
 	</tr>
 	<tr>
 	  <th colspan=1>| . $locale->text('Year') . qq|</th>
 	  <td><input name=year size=11 title="|
-      . $locale->text('YYYY')
-      . qq|" value="$year"></td>
+      . $locale->text('YYYY') . qq|" value="$year"></td>
 	</tr>
 |;
 
@@ -311,70 +344,54 @@ $jsscript
 		<td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
 "checked"></td>
 		<td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "";
     print qq|
 		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January')
-      . qq|</td>
+      . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
 		<td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|
-      . $locale->text('May')
-      . qq|</td>
+      . $locale->text('May') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|
-      . $locale->text('September')
-      . qq|</td>
+      . $locale->text('September') . qq|</td>
 
 	</tr>
 	<tr>
 		<td align= right>&nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|
-      . $locale->text('February')
-      . qq|</td>
+      . $locale->text('February') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|
-      . $locale->text('June')
-      . qq|</td>
+      . $locale->text('June') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|
-      . $locale->text('October')
-      . qq|</td>
+      . $locale->text('October') . qq|</td>
 	</tr>
 	<tr>
 		<td> &nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|
-      . $locale->text('March')
-      . qq|</td>
+      . $locale->text('March') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|
-      . $locale->text('July')
-      . qq|</td>
+      . $locale->text('July') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|
-      . $locale->text('November')
-      . qq|</td>
+      . $locale->text('November') . qq|</td>
 
 	</tr>
 	<tr>
 		<td> &nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. |
-      . $locale->text('Quarter')
-      . qq|&nbsp;</td>
+      . $locale->text('Quarter') . qq|&nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|
-      . $locale->text('April')
-      . qq|</td>
+      . $locale->text('April') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|
-      . $locale->text('August')
-      . qq|</td>
+      . $locale->text('August') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|
-      . $locale->text('December')
-      . qq|</td>
+      . $locale->text('December') . qq|</td>
 
 	</tr>
 	<tr>
@@ -382,8 +399,7 @@ $jsscript
 	</tr>
 	<tr>
           <th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
-      . $locale->text('Free report period')
-      . qq|</th>
+      . $locale->text('Free report period') . qq|</th>
 	  <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
 	      $button1
               $button1_2&nbsp;
@@ -400,8 +416,7 @@ $jsscript
 	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
 	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
 	</tr>
 
 $jsscript
@@ -412,21 +427,19 @@ $jsscript
     print qq|
 	<tr>
 	  <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-	  <td colspan=3><input name=projectnumber size=25</td>
+	  <td colspan=3>$projectnumber</td>
 	</tr>
         <input type=hidden name=nextsub value=generate_bwa>
 </table>
 <table>
 	<tr>
 	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
-      . $locale->text('Customized Report')
-      . qq|</th>
+      . $locale->text('Customized Report') . qq|</th>
 	</tr>
 	<tr>
 	  <th colspan=1>| . $locale->text('Year') . qq|</th>
 	  <td><input name=year size=11 title="|
-      . $locale->text('YYYY')
-      . qq|" value="$year"></td>
+      . $locale->text('YYYY') . qq|" value="$year"></td>
 	</tr>
 |;
 
@@ -441,70 +454,54 @@ $jsscript
 		<td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
 $checked></td>
 		<td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "checked";
     print qq|
 		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January')
-      . qq|</td>
+      . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
 		<td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|
-      . $locale->text('May')
-      . qq|</td>
+      . $locale->text('May') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|
-      . $locale->text('September')
-      . qq|</td>
+      . $locale->text('September') . qq|</td>
 
 	</tr>
 	<tr>
 		<td align= right>&nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|
-      . $locale->text('February')
-      . qq|</td>
+      . $locale->text('February') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|
-      . $locale->text('June')
-      . qq|</td>
+      . $locale->text('June') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|
-      . $locale->text('October')
-      . qq|</td>
+      . $locale->text('October') . qq|</td>
 	</tr>
 	<tr>
 		<td> &nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|
-      . $locale->text('March')
-      . qq|</td>
+      . $locale->text('March') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|
-      . $locale->text('July')
-      . qq|</td>
+      . $locale->text('July') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|
-      . $locale->text('November')
-      . qq|</td>
+      . $locale->text('November') . qq|</td>
 
 	</tr>
 	<tr>
 		<td> &nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. |
-      . $locale->text('Quarter')
-      . qq|&nbsp;</td>
+      . $locale->text('Quarter') . qq|&nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|
-      . $locale->text('April')
-      . qq|</td>
+      . $locale->text('April') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|
-      . $locale->text('August')
-      . qq|</td>
+      . $locale->text('August') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|
-      . $locale->text('December')
-      . qq|</td>
+      . $locale->text('December') . qq|</td>
 
 	</tr>
 	<tr>
@@ -512,8 +509,7 @@ $checked></td>
 	</tr>
 	<tr>
           <th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
-      . $locale->text('Free report period')
-      . qq|</th>
+      . $locale->text('Free report period') . qq|</th>
 	  <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
 	      $button1
               $button1_2&nbsp;
@@ -530,36 +526,83 @@ $checked></td>
 	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
 	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
 	</tr>
         <tr>
-         <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
-             <td><input name=decimalplaces size=3></td>
+         <th align=right colspan=4>|
+      . $locale->text('Decimalplaces')
+      . qq|</th>
+             <td><input name=decimalplaces size=3 value="2"></td>
          </tr>
                                     
 $jsscript
 |;
   }
 
-  if ($form->{report} eq "ustva") {
-
+  if ($form->{report} eq "balance_sheet") {
     print qq|
+        <input type=hidden name=nextsub value=generate_balance_sheet>
+	<tr>
+	  <th align=right>| . $locale->text('as at') . qq|</th>
+	  <td>
+            $button1
+            $button1_2
+          </td>
+	  <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
+	  <td>
+          $button2
+          $button2_2
+          </td>
+	</tr>
+	<tr>
+	  <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
+	  <td><input name=decimalplaces size=3 value="2"></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <table>
+	<tr>
+	  <th align=right>| . $locale->text('Method') . qq|</th>
+	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
+      . $locale->text('Accrual') . qq|
+	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
+      . $locale->text('EUR') . qq|</td>
+	</tr>
+
+	<tr>
+	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
+      . $locale->text('Heading') . qq|
+	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
+      . $locale->text('Subtotal') . qq|
+	  <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;|
+      . $locale->text('Account Number') . qq|</td>
+	</tr>
+
+$jsscript
+|;
+  }
 
-        <br>
-        <input type=hidden name=nextsub value=generate_ustva>
+  if ($form->{report} eq "trial_balance") {
+    print qq|
+	<tr>
+	  <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+	  <td colspan=3>$projectnumber</td>
+	</tr>
+        <input type=hidden name=nextsub value=generate_trial_balance>
 </table>
 <table>
 	<tr>
 	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
-      . $locale->text('Zeitraum')
-      . qq|</th>
+      . $locale->text('Customized Report') . qq|</th>
 	</tr>
 	<tr>
 	  <th colspan=1>| . $locale->text('Year') . qq|</th>
 	  <td><input name=year size=11 title="|
-      . $locale->text('YYYY')
-      . qq|" value="$year"></td>
+      . $locale->text('YYYY') . qq|" value="$year"></td>
 	</tr>
 |;
 
@@ -574,183 +617,98 @@ $jsscript
 		<td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
 $checked></td>
 		<td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "checked";
     print qq|
 		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January')
-      . qq|</td>
+      . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
 		<td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|
-      . $locale->text('May')
-      . qq|</td>
+      . $locale->text('May') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|
-      . $locale->text('September')
-      . qq|</td>
+      . $locale->text('September') . qq|</td>
 
 	</tr>
 	<tr>
 		<td align= right>&nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|
-      . $locale->text('February')
-      . qq|</td>
+      . $locale->text('February') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|
-      . $locale->text('June')
-      . qq|</td>
+      . $locale->text('June') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|
-      . $locale->text('October')
-      . qq|</td>
+      . $locale->text('October') . qq|</td>
 	</tr>
 	<tr>
 		<td> &nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|
-      . $locale->text('March')
-      . qq|</td>
+      . $locale->text('March') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|
-      . $locale->text('July')
-      . qq|</td>
+      . $locale->text('July') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|
-      . $locale->text('November')
-      . qq|</td>
+      . $locale->text('November') . qq|</td>
 
 	</tr>
 	<tr>
 		<td> &nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. |
-      . $locale->text('Quarter')
-      . qq|&nbsp;</td>
+      . $locale->text('Quarter') . qq|&nbsp;</td>
 		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|
-      . $locale->text('April')
-      . qq|</td>
+      . $locale->text('April') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|
-      . $locale->text('August')
-      . qq|</td>
+      . $locale->text('August') . qq|</td>
 		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|
-      . $locale->text('December')
-      . qq|</td>
+      . $locale->text('December') . qq|</td>
 
 	</tr>
 	<tr>
    		<td colspan=5><hr size=3 noshade></td>
 	</tr>
 	<tr>
-	  <th align=left>| . $locale->text('Method') . qq|</th>
-	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
-      . $locale->text('Accrual') . qq|
-	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
-	</tr>
-	<tr>
-	  <th colspan=4>|;
-##########
-
-    &print_options();
-    print qq|
-	  </th>
-	</tr>
-|;
-  }
-
-  if ($form->{report} eq "balance_sheet") {
-    print qq|
-        <input type=hidden name=nextsub value=generate_balance_sheet>
-	<tr>
-	  <th align=right>| . $locale->text('as at') . qq|</th>
-	  <td>
-            $button1
-            $button1_2
-          </td>
-	  <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
-	  <td>
-          $button2
-          $button2_2
+          <th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
+      . $locale->text('Free report period') . qq|</th>
+	  <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+	      $button1
+              $button1_2&nbsp;
+	      | . $locale->text('Bis') . qq|&nbsp;
+	      $button2
+              $button2_2
           </td>
-	</tr>
+        </tr>
 	<tr>
-	  <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
-	  <td><input name=decimalplaces size=3></td>
+   		<td colspan=5><hr size=3 noshade></td>
 	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <table>
 	<tr>
-	  <th align=right>| . $locale->text('Method') . qq|</th>
+	  <th align=leftt>| . $locale->text('Method') . qq|</th>
 	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
 	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
-	</tr>
-
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
-	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Heading') . qq|
-	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Subtotal') . qq|
-	  <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Account Number')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
 	</tr>
-
-$jsscript
-|;
-  }
-
-  if ($form->{report} eq "trial_balance") {
-    print qq|
-        <input type=hidden name=nextsub value=generate_trial_balance>
-        <input type=hidden name=eur value=$eur>
        <tr>
-	  <th align=right>| . $locale->text('From') . qq|</th>
-          <td>
-            $button1
-            $button1_2
-          </td>
-	  <th align=right>| . $locale->text('Bis') . qq|</th>
-	  <td>
-            $button2
-            $button2_2
-          </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
-	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Heading') . qq|
-	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Subtotal') . qq|
-	  <input name=all_accounts class=checkbox type=checkbox value=Y>&nbsp;|
+         <th align=right colspan=4>|
       . $locale->text('All Accounts')
-      . qq|</td>
-	</tr>
-
+      . qq|</th>
+             <td><input name=all_accounts type=checkbox value=1></td>
+         </tr>
+        <tr>
+         <th align=right colspan=4>|
+      . $locale->text('Decimalplaces')
+      . qq|</th>
+             <td><input name=decimalplaces size=3 value="2"></td>
+         </tr>
+                                    
 $jsscript
 |;
   }
 
   if ($form->{report} =~ /^tax_/) {
-    $gifi = "";
-
     $form->{db} = ($form->{report} =~ /_collected/) ? "ar" : "ap";
 
     RP->get_taxaccounts(\%myconfig, \%$form);
@@ -787,39 +745,12 @@ $jsscript
 
 	  </td>
 	</tr>
-|;
-
-    if (@{ $form->{gifi_taxaccounts} }) {
-      print qq|
-        <tr>
-	  <th align=right>| . $locale->text('GIFI') . qq|</th>
-	  <td colspan=3>
-|;
-
-      foreach $ref (@{ $form->{gifi_taxaccounts} }) {
-
-        print
-          qq|<input name=accno class=radio type=radio value="gifi_$ref->{accno}">&nbsp;$ref->{description}
-
-      <input name="gifi_$ref->{accno}_description" type=hidden value="$ref->{description}">
-      <input name="gifi_$ref->{accno}_rate" type=hidden value="$ref->{rate}">|;
-
-      }
-
-      print qq|
-	  </td>
-	</tr>
-|;
-    }
-
-    print qq|
 	<tr>
 	  <th align=right>| . $locale->text('Method') . qq|</th>
 	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
 	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
 	</tr>
       </table>
     </td>
@@ -870,8 +801,6 @@ $jsscript
   }
 
   if ($form->{report} =~ /^nontaxable_/) {
-    $gifi = "";
-
     $form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap";
 
     print qq|
@@ -892,8 +821,7 @@ $jsscript
 	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
 	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
 	</tr>
         <tr>
 	  <th align=right>| . $locale->text('Include in Report') . qq|</th>
@@ -936,8 +864,6 @@ $jsscript
   }
 
   if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
-    $gifi = "";
-
     if ($form->{report} eq 'ar_aging') {
       $label = $locale->text('Customer');
       $form->{vc} = 'customer';
@@ -986,8 +912,6 @@ $jsscript
   # above action can be removed if there is more than one input field
 
   if ($form->{report} =~ /(receipts|payments)$/) {
-    $gifi = "";
-
     $form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar";
 
     RP->paymentaccounts(\%myconfig, \%$form);
@@ -1035,8 +959,7 @@ $jsscript
         <tr>
 	  <td align=right><input type=checkbox style=checkbox name=fx_transaction value=1 checked></td>
 	  <th align=left colspan=3>|
-      . $locale->text('Include Exchangerate Difference')
-      . qq|</td>
+      . $locale->text('Include Exchangerate Difference') . qq|</td>
 	</tr>
 
 $jsscript
@@ -1058,34 +981,9 @@ $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}>
-
 <input type=submit class=submit name=action value="|
     . $locale->text('Continue') . qq|">
-|;
 
-  # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
-  # Einlesen der Finanzamtdaten
-  get_config($userspath, 'finanzamt.ini');
-
-  $disabled = qq|disabled="disabled"|;
-  $disabled = '' if ($form->{elster} eq '1');
-  if ($form->{report} eq 'ustva') {
-    print qq|
-  <input type=submit class=submit name=action value="|
-      . $locale->text('debug') . qq|">
-  <input type=submit class=submit name=action $disabled
-   value="| . $locale->text('winston_export') . qq|">
-  |;
-    print qq|
-   <input type=submit class=submit name=action value="|
-      . $locale->text('config') . qq|">
-  |;
-  }
-
-  print qq|
 </form>
 
 </body>
@@ -1095,10 +993,13 @@ $jsscript
   $lxdebug->leave_sub();
 }
 
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }
 
 sub get_project {
   $lxdebug->enter_sub();
+
+  $auth->assert('report');
+
   my $nextsub = shift;
 
   $form->{project_id} = $form->{project_id_1};
@@ -1122,15 +1023,13 @@ sub get_project {
 sub generate_income_statement {
   $lxdebug->enter_sub();
 
+  $auth->assert('report');
+
   $form->{padding} = "&nbsp;&nbsp;";
   $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
   $form->{br}      = "<br>";
 
-  &get_project(generate_income_statement);
-
-  $form->{projectnumber} = $form->{projectnumber_1};
-
   if ($form->{reporttype} eq "custom") {
 
     #forgotten the year --> thisyear
@@ -1253,10 +1152,10 @@ sub generate_income_statement {
     $longfromdate  = $locale->date(\%myconfig, $form->{fromdate}, 1);
     $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
 
-    $form->{this_period} = "$shortfromdate<br>\n$shorttodate";
+    $form->{this_period} = "$shortfromdate\n$shorttodate";
     $form->{period}      =
         $locale->text('for Period')
-      . qq|<br>\n$longfromdate |
+      . qq|\n$longfromdate |
       . $locale->text('Bis')
       . qq| $longtodate|;
   }
@@ -1270,9 +1169,9 @@ sub generate_income_statement {
     $longcomparetodate  = $locale->date(\%myconfig, $form->{comparetodate}, 1);
     $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
 
-    $form->{last_period} = "$shortcomparefromdate<br>\n$shortcomparetodate";
+    $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate";
     $form->{period} .=
-        "<br>\n$longcomparefromdate "
+        "\n$longcomparefromdate "
       . $locale->text('Bis')
       . qq| $longcomparetodate|;
   }
@@ -1280,7 +1179,6 @@ sub generate_income_statement {
   # setup variables for the form
   @a = qw(company address businessnumber);
   map { $form->{$_} = $myconfig{$_} } @a;
-  $form->{address} =~ s/\\n/<br>/g;
 
   $form->{templates} = $myconfig{templates};
 
@@ -1294,6 +1192,8 @@ sub generate_income_statement {
 sub generate_balance_sheet {
   $lxdebug->enter_sub();
 
+  $auth->assert('report');
+
   $form->{padding} = "&nbsp;&nbsp;";
   $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
@@ -1319,9 +1219,7 @@ sub generate_balance_sheet {
   $form->{IN} = "balance_sheet.html";
 
   # setup company variables for the form
-  map { $form->{$_} = $myconfig{$_} }
-    (qw(company address businessnumber nativecurr));
-  $form->{address} =~ s/\\n/<br>/g;
+  map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr));
 
   $form->{templates} = $myconfig{templates};
 
@@ -1333,6 +1231,8 @@ sub generate_balance_sheet {
 sub generate_projects {
   $lxdebug->enter_sub();
 
+  $auth->assert('report');
+
   &get_project(generate_projects);
   $form->{projectnumber} = $form->{projectnumber_1};
 
@@ -1340,7 +1240,7 @@ sub generate_projects {
   $form->{title}   = $locale->text('Project Transactions');
   RP->trial_balance(\%myconfig, \%$form);
 
-  &list_accounts;
+  list_accounts('generate_projects');
 
   $lxdebug->leave_sub();
 }
@@ -1354,656 +1254,564 @@ sub generate_projects {
 sub generate_trial_balance {
   $lxdebug->enter_sub();
 
-  # get for each account initial balance, debits and credits
-  RP->trial_balance(\%myconfig, \%$form);
-
-  $form->{nextsub} = "generate_trial_balance";
-  $form->{title}   = $locale->text('Trial Balance');
-  &list_accounts;
-
-  $lxdebug->leave_sub();
-}
+  $auth->assert('report');
 
-sub list_accounts {
-  $lxdebug->enter_sub();
+  if ($form->{reporttype} eq "custom") {
 
-  $title = $form->escape($form->{title});
+    #forgotten the year --> thisyear
+    if ($form->{year} !~ m/^\d\d\d\d$/) {
+      $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~
+        /(\d\d\d\d)/;
+      $form->{year} = $1;
+    }
 
-  if ($form->{department}) {
-    ($department) = split /--/, $form->{department};
-    $options    = $locale->text('Department') . " : $department<br>";
-    $department = $form->escape($form->{department});
-  }
-  if ($form->{projectnumber}) {
-    $options .=
-      $locale->text('Project Number') . " : $form->{projectnumber}<br>";
-    $projectnumber = $form->escape($form->{projectnumber});
-  }
+    #yearly report
+    if ($form->{duetyp} eq "13") {
+      $form->{fromdate} = "1.1.$form->{year}";
+      $form->{todate}   = "31.12.$form->{year}";
+    }
 
-  # if there are any dates
-  if ($form->{fromdate} || $form->{todate}) {
-    if ($form->{fromdate}) {
-      $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
+    #Quater reports
+    if ($form->{duetyp} eq "A") {
+      $form->{fromdate} = "1.1.$form->{year}";
+      $form->{todate}   = "31.3.$form->{year}";
     }
-    if ($form->{todate}) {
-      $todate = $locale->date(\%myconfig, $form->{todate}, 1);
+    if ($form->{duetyp} eq "B") {
+      $form->{fromdate} = "1.4.$form->{year}";
+      $form->{todate}   = "30.6.$form->{year}";
+    }
+    if ($form->{duetyp} eq "C") {
+      $form->{fromdate} = "1.7.$form->{year}";
+      $form->{todate}   = "30.9.$form->{year}";
+    }
+    if ($form->{duetyp} eq "D") {
+      $form->{fromdate} = "1.10.$form->{year}";
+      $form->{todate}   = "31.12.$form->{year}";
     }
 
-    $form->{period} = "$fromdate - $todate";
-  } else {
-    $form->{period} =
-      $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
-
-  }
-  $options .= $form->{period};
-
-  @column_index = qw(accno description begbalance debit credit endbalance);
-
-  $column_header{accno} =
-    qq|<th class=listheading>| . $locale->text('Account') . qq|</th>|;
-  $column_header{description} =
-    qq|<th class=listheading>| . $locale->text('Description') . qq|</th>|;
-  $column_header{debit} =
-    qq|<th class=listheading>| . $locale->text('Debit') . qq|</th>|;
-  $column_header{credit} =
-    qq|<th class=listheading>| . $locale->text('Credit') . qq|</th>|;
-  $column_header{begbalance} =
-    qq|<th class=listheading>| . $locale->text('Balance') . qq|</th>|;
-  $column_header{endbalance} =
-    qq|<th class=listheading>| . $locale->text('Balance') . qq|</th>|;
-
-  if ($form->{accounttype} eq 'gifi') {
-    $column_header{accno} =
-      qq|<th class=listheading>| . $locale->text('GIFI') . qq|</th>|;
-  }
-
-  $form->header;
-
-  print qq|
-<body>
+    #Monthly reports
+  SWITCH: {
+      $form->{duetyp} eq "1" && do {
+        $form->{fromdate} = "1.1.$form->{year}";
+        $form->{todate}   = "31.1.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "2" && do {
+        $form->{fromdate} = "1.2.$form->{year}";
 
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$options</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr>|;
+        #this works from 1901 to 2099, 1900 and 2100 fail.
+        $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+        $form->{todate} = "$leap.2.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "3" && do {
+        $form->{fromdate} = "1.3.$form->{year}";
+        $form->{todate}   = "31.3.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "4" && do {
+        $form->{fromdate} = "1.4.$form->{year}";
+        $form->{todate}   = "30.4.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "5" && do {
+        $form->{fromdate} = "1.5.$form->{year}";
+        $form->{todate}   = "31.5.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "6" && do {
+        $form->{fromdate} = "1.6.$form->{year}";
+        $form->{todate}   = "30.6.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "7" && do {
+        $form->{fromdate} = "1.7.$form->{year}";
+        $form->{todate}   = "31.7.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "8" && do {
+        $form->{fromdate} = "1.8.$form->{year}";
+        $form->{todate}   = "31.8.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "9" && do {
+        $form->{fromdate} = "1.9.$form->{year}";
+        $form->{todate}   = "30.9.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "10" && do {
+        $form->{fromdate} = "1.10.$form->{year}";
+        $form->{todate}   = "31.10.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "11" && do {
+        $form->{fromdate} = "1.11.$form->{year}";
+        $form->{todate}   = "30.11.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "12" && do {
+        $form->{fromdate} = "1.12.$form->{year}";
+        $form->{todate}   = "31.12.$form->{year}";
+        last SWITCH;
+      };
+    }
+  }
 
-  map { print "$column_header{$_}\n" } @column_index;
 
-  print qq|
-        </tr>
-|;
+  # get for each account initial balance, debits and credits
+  RP->trial_balance(\%myconfig, \%$form);
 
-  # sort the whole thing by account numbers and display
-  foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }) {
 
-    $description = $form->escape($ref->{description});
+  $form->{rowcount} = scalar @{ $form->{TB} };
 
-    $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}|;
+  my @columns = (
+    "accno",               "description",
+    "last_transaction",    "soll_eb",
+    "haben_eb",
+    "soll",                 "haben",
+    "soll_kumuliert", "haben_kumuliert",
+    "soll_saldo", "haben_saldo"
+  );
 
-    if ($form->{accounttype} eq 'gifi') {
-      $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description";
-      $na = $locale->text('N/A');
-      map { $ref->{$_} = $na } qw(accno description) unless $ref->{accno};
-    } else {
-      $href .= "&accno=$ref->{accno}&description=$description";
-    }
 
-    $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
-
-    $debit  = $form->format_amount(\%myconfig, $ref->{debit},  2, "&nbsp;");
-    $credit = $form->format_amount(\%myconfig, $ref->{credit}, 2, "&nbsp;");
-    $begbalance =
-      $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, "&nbsp;");
-    $endbalance =
-      $form->format_amount(\%myconfig,
-                           ($ref->{balance} + $ref->{amount}) * $ml,
-                           2, "&nbsp;");
-
-    #    next if ($ref->{debit} == 0 && $ref->{credit} == 0);
-
-    if ($ref->{charttype} eq "H" && $subtotal && $form->{l_subtotal}) {
-      map { $column_data{$_} = "<th>&nbsp;</th>" }
-        qw(accno begbalance endbalance);
-
-      $subtotalbegbalance =
-        $form->format_amount(\%myconfig, $subtotalbegbalance, 2, "&nbsp;");
-      $subtotalendbalance =
-        $form->format_amount(\%myconfig, $subtotalendbalance, 2, "&nbsp;");
-      $subtotaldebit =
-        $form->format_amount(\%myconfig, $subtotaldebit, 2, "&nbsp;");
-      $subtotalcredit =
-        $form->format_amount(\%myconfig, $subtotalcredit, 2, "&nbsp;");
-
-      $column_data{description} = "<th>$subtotaldescription</th>";
-      $column_data{begbalance}  = "<th align=right>$subtotalbegbalance</th>";
-      $column_data{endbalance}  = "<th align=right>$subtotalendbalance</th>";
-      $column_data{debit}       = "<th align=right>$subtotaldebit</th>";
-      $column_data{credit}      = "<th align=right>$subtotalcredit</th>";
-
-      print qq|
-	<tr class=listsubtotal>
-|;
-      map { print "$column_data{$_}\n" } @column_index;
+  my $attachment_basename;
 
-      print qq|
-        </tr>
-|;
-    }
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-    if ($ref->{charttype} eq "H") {
-      $subtotal            = 1;
-      $subtotaldescription = $ref->{description};
-      $subtotaldebit       = $ref->{debit};
-      $subtotalcredit      = $ref->{credit};
-      $subtotalbegbalance  = 0;
-      $subtotalendbalance  = 0;
+  my @hidden_variables = ();
+  push @hidden_variables, qw(fromdate todate year cash );
 
-      next unless $form->{l_heading};
+  my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
 
-      map { $column_data{$_} = "<th>&nbsp;</th>" }
-        qw(accno debit credit begbalance endbalance);
-      $column_data{description} =
-        "<th class=listheading>$ref->{description}</th>";
-    }
+  my %column_defs = (
+    'accno'                   => { 'text' => $locale->text('Account Number'), },
+    'description'             => { 'text' => $locale->text('Description'), },
+    'last_transaction'        => { 'text' => $locale->text('Last Transaction'), },
+    'soll_eb'                 => { 'text' => $locale->text('Debit Starting Balance'), },
+    'haben_eb'                => { 'text' => $locale->text('Credit Starting Balance'), },
+    'soll'                    => { 'text' => $locale->text('Debit'), },
+    'haben'                   => { 'text' => $locale->text('Credit'), },
+    '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'), }
+  );
 
-    if ($ref->{charttype} eq "A") {
-      $column_data{accno}       = "<td><a href=$href>$ref->{accno}</a></td>";
-      $column_data{description} = "<td>$ref->{description}</td>";
-      $column_data{debit}       = "<td align=right>$debit</td>";
-      $column_data{credit}      = "<td align=right>$credit</td>";
-      $column_data{begbalance}  = "<td align=right>$begbalance</td>";
-      $column_data{endbalance}  = "<td align=right>$endbalance</td>";
 
-      $totaldebit  += $ref->{debit};
-      $totalcredit += $ref->{credit};
 
-      $subtotalbegbalance += $ref->{balance} * $ml;
-      $subtotalendbalance += ($ref->{balance} + $ref->{amount}) * $ml;
+  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;
 
-    if ($ref->{charttype} eq "H") {
-      print qq|
-      <tr class=listheading>
-|;
-    }
-    if ($ref->{charttype} eq "A") {
-      $i++;
-      $i %= 2;
-      print qq|
-      <tr class=listrow$i>
-|;
-    }
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-    map { print "$column_data{$_}\n" } @column_index;
+  $report->set_export_options('trial_balance', @hidden_variables);
 
-    print qq|
-      </tr>
-|;
-  }
+  $report->set_sort_indicator($form->{sort}, 1);
 
-  # print last subtotal
-  if ($subtotal && $form->{l_subtotal}) {
-    map { $column_data{$_} = "<th>&nbsp;</th>" }
-      qw(accno begbalance endbalance);
-    $subtotalbegbalance =
-      $form->format_amount(\%myconfig, $subtotalbegbalance, 2, "&nbsp;");
-    $subtotalendbalance =
-      $form->format_amount(\%myconfig, $subtotalendbalance, 2, "&nbsp;");
-    $subtotaldebit =
-      $form->format_amount(\%myconfig, $subtotaldebit, 2, "&nbsp;");
-    $subtotalcredit =
-      $form->format_amount(\%myconfig, $subtotalcredit, 2, "&nbsp;");
-    $column_data{description} = "<th>$subdescription</th>";
-    $column_data{begbalance}  = "<th align=right>$subtotalbegbalance</th>";
-    $column_data{endbalance}  = "<th align=right>$subtotalendbalance</th>";
-    $column_data{debit}       = "<th align=right>$subtotaldebit</th>";
-    $column_data{credit}      = "<th align=right>$subtotalcredit</th>";
+  my @options;
 
-    print qq|
-      <tr class=listsubtotal>
-|;
-    map { print "$column_data{$_}\n" } @column_index;
 
-    print qq|
-      </tr>
-|;
-  }
+  $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . "&nbsp; - &nbsp;" . $locale->date(\%myconfig, $form->{todate}, 0);
+  $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
 
-  $totaldebit  = $form->format_amount(\%myconfig, $totaldebit,  2, "&nbsp;");
-  $totalcredit = $form->format_amount(\%myconfig, $totalcredit, 2, "&nbsp;");
+  $report->set_options('output_format'        => 'HTML',
+                       'title'                => $form->{title},
+                       'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
+                       'html_template'        => 'report_generator/html_report_susa',
+                       'pdf_template'         => 'report_generator/html_report_susa',
+    );
+  $report->set_options_from_form();
 
-  map { $column_data{$_} = "<th>&nbsp;</th>" }
-    qw(accno description begbalance endbalance);
+  # add sort and escape callback, this one we use for the add sub
+  $form->{callback} = $href .= "&sort=$form->{sort}";
 
-  $column_data{debit}  = qq|<th align=right class=listtotal>$totaldebit</th>|;
-  $column_data{credit} = qq|<th align=right class=listtotal>$totalcredit</th>|;
+  # escape callback for href
+  $callback = $form->escape($href);
 
-  print qq|
-        <tr class=listtotal>
-|;
+  my @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
 
-  map { print "$column_data{$_}\n" } @column_index;
+  my %totals    = map { $_ => 0 } @subtotal_columns;
 
-  print qq|
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+  my $edit_url = build_std_url('action=edit', 'type', 'vc');
 
-</body>
-</html>
-|;
+  foreach $accno (@{ $form->{TB} }) {
+
+    $accno->{soll} = $accno->{debit};
+    $accno->{haben} = $accno->{credit};
+    map { $totals{$_}    += $accno->{$_} } @subtotal_columns;
+
+    map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+    map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+    my $row = { };
+
+    foreach my $column (@columns) {
+      $row->{$column} = {
+        'data'  => $accno->{$column},
+        'align' => $column_alignment{$column},
+      };
+    }
+
+
+    $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
+
+    my $row_set = [ $row ];
+
+
+    $report->add_data($row_set);
+
+    $idx++;
+  }
+
+  $report->add_separator();
+
+  $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
+
+  $report->generate_with_headers();
 
   $lxdebug->leave_sub();
+
 }
 
-sub generate_ar_aging {
+sub create_subtotal_row {
   $lxdebug->enter_sub();
 
-  # split customer
-  ($form->{customer}) = split(/--/, $form->{customer});
-  $customer = $form->escape($form->{customer}, 1);
-  $title    = $form->escape($form->{title},    1);
+  my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
 
-  $form->{ct}   = "customer";
-  $form->{arap} = "ar";
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
 
-  $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|;
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
 
-  RP->aging(\%myconfig, \%$form);
-  &aging;
+  $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
+
+  map { $totals->{$_} = 0 } @{ $subtotal_columns };
 
   $lxdebug->leave_sub();
+
+  return $row;
 }
 
-sub generate_ap_aging {
+sub create_list_accounts_subtotal_row {
   $lxdebug->enter_sub();
 
-  # split vendor
-  ($form->{vendor}) = split(/--/, $form->{vendor});
-  $vendor = $form->escape($form->{vendor}, 1);
-  $title  = $form->escape($form->{title},  1);
+  my ($subtotals, $columns, $fields, $class) = @_;
 
-  $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|;
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
 
-  RP->aging(\%myconfig, \%$form);
-  &aging;
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $subtotals->{$_}, 2) } @{ $fields };
 
   $lxdebug->leave_sub();
+
+  return $row;
 }
 
-sub aging {
+sub list_accounts {
   $lxdebug->enter_sub();
 
-  $form->header;
-
-  $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));
+  my ($action) = @_;
 
+  my @options;
   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 ($department) = split /--/, $form->{department};
+    push @options, $locale->text('Department') . " : $department";
+  }
+  if ($form->{projectnumber}) {
+    push @options, $locale->text('Project Number') . " : $form->{projectnumber}";
   }
 
-  if ($form->{arap} eq 'ar') {
-    if ($form->{customer}) {
-      $option .= "\n<br>" if $option;
-      $option .= $form->{customer};
+  # if there are any dates
+  if ($form->{fromdate} || $form->{todate}) {
+    my ($fromdate, $todate);
+
+    if ($form->{fromdate}) {
+      $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
     }
-  }
-  if ($form->{arap} eq 'ap') {
-    shift @column_index;
-    if ($form->{vendor}) {
-      $option .= "\n<br>" if $option;
-      $option .= $form->{vendor};
+    if ($form->{todate}) {
+      $todate = $locale->date(\%myconfig, $form->{todate}, 1);
     }
-  }
 
-  $todate = $locale->date(\%myconfig, $form->{todate}, 1);
-  $option .= "\n<br>" if $option;
-  $option .=
-    $locale->text('for Period') . " " . $locale->text('Bis') . " $todate";
+    push @options, "$fromdate - $todate";
 
-  print qq|
-<body>
+  } else {
+    push @options, $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+  }
 
-<form method=post action=$form->{script}>
+  my @columns     = qw(accno description begbalance debit credit endbalance);
+  my %column_defs = (
+    'accno'       => { 'text' => $locale->text('Account'), },
+    'description' => { 'text' => $locale->text('Description'), },
+    'debit'       => { 'text' => $locale->text('Debit'), },
+    'credit'      => { 'text' => $locale->text('Credit'), },
+    'begbalance'  => { 'text' => $locale->text('Balance'), },
+    'endbalance'  => { 'text' => $locale->text('Balance'), },
+  );
+  my %column_alignment = map { $_ => 'right' } qw(debit credit begbalance endbalance);
 
-<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 @hidden_variables = qw(fromdate todate department l_heading l_subtotal all_accounts sort accounttype eur projectnumber project_id title nextsub);
 
-  map { print "$column_header{$_}\n" } @column_index;
+  $form->{callback} = build_std_url("action=$action", grep { $form->{$_} } @hidden_variables);
 
-  print qq|
-	</tr>
-|;
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  $ctid     = 0;
-  $subtotal = 0;
-  $i        = 0;
+  $report->set_options('top_info_text'         => join("\n", @options),
+                       'output_format'         => 'HTML',
+                       'title'                 => $form->{title},
+                       'attachment_basename'   => $locale->text('list_of_transactions') . strftime('_%Y%m%d', localtime time),
+                       'std_column_visibility' => 1,
+    );
+  $report->set_options_from_form();
 
-  foreach $ref (@{ $form->{AG} }) {
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-    if ($ctid != $ref->{ctid}) {
+  $report->set_export_options($action, @hidden_variables);
 
-      $i++;
+  $report->set_sort_indicator('accno', 1);
 
-      if ($subtotal) {
-        $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");
-      }
+  my @totals_columns = qw(credit debit begbalance endbalance);
+  my %subtotals      = map { $_ => 0 } @totals_columns;
+  my %totals         = map { $_ => 0 } @totals_columns;
+  my $found_heading  = 0;
+  my @tb             = sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} };
 
-      $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>
-|;
+  # sort the whole thing by account numbers and display
+  foreach my $idx (0 .. scalar(@tb) - 1) {
+    my $ref  = $tb[$idx];
+    my $href = build_std_url('script=ca.pl', 'action=list_transactions', 'accno=' . E($ref->{accno}), 'description=' . E($ref->{description}), @hidden_variables);
 
-        map { print "$column_data{$_}\n" } @column_index;
+    my $ml   = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
 
-        $column_data{statement} = qq|<td>&nbsp;</td>|;
+    my $row  = { map { $_ => { 'align' => $column_alignment{$_} } } @columns };
 
-        print qq|
-        </tr>
-|;
-      }
+    if ($ref->{charttype} eq 'H') {
+      next unless ($form->{l_heading});
 
-      $subtotal = 1;
+      %subtotals                   = map { $_ => 0 } @totals_columns;
+      $found_heading               = 1;
+      $row->{description}->{class} = 'listheading';
+      $row->{description}->{data}  = $ref->{description};
 
-      $c0subtotal  = 0;
-      $c30subtotal = 0;
-      $c60subtotal = 0;
-      $c90subtotal = 0;
+      $report->add_data($row);
 
-      $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>|;
+      next;
     }
 
-    $c0subtotal  += $ref->{c0};
-    $c30subtotal += $ref->{c30};
-    $c60subtotal += $ref->{c60};
-    $c90subtotal += $ref->{c90};
+    foreach (qw(debit credit)) {
+      $subtotals{$_} += $ref->{$_};
+      $totals{$_}    += $ref->{$_};
+    }
 
-    $c0total  += $ref->{c0};
-    $c30total += $ref->{c30};
-    $c60total += $ref->{c60};
-    $c90total += $ref->{c90};
+    $subtotals{begbalance} += $ref->{balance} * $ml;
+    $subtotals{endbalance} += ($ref->{balance} + $ref->{amount}) * $ml;
 
-    $ref->{c0}  = $form->format_amount(\%myconfig, $ref->{c0},  2, "&nbsp;");
-    $ref->{c30} = $form->format_amount(\%myconfig, $ref->{c30}, 2, "&nbsp;");
-    $ref->{c60} = $form->format_amount(\%myconfig, $ref->{c60}, 2, "&nbsp;");
-    $ref->{c90} = $form->format_amount(\%myconfig, $ref->{c90}, 2, "&nbsp;");
+    map { $row->{$_}->{data} = $ref->{$_} } qw(accno description);
+    map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $ref->{$_}, 2) if ($ref->{$_} != 0) } qw(credit debit);
 
-    $href =
-      qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|
-      . $form->escape($form->{callback});
+    $row->{begbalance}->{data} = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2);
+    $row->{endbalance}->{data} = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2);
 
-    $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>
-|;
+    $report->add_data($row);
 
-    map { print "$column_data{$_}\n" } @column_index;
+    if ($form->{l_heading} && $found_heading &&
+        (($idx == scalar(@tb) - 1) || ('H' eq $tb[$idx + 1]->{charttype}))) {
+      $report->add_data(create_list_accounts_subtotal_row(\%subtotals, \@columns, \@totals_columns, 'listsubtotal'));
+    }
+  }
 
-    print qq|
-        </tr>
-|;
+  $report->add_separator();
 
-    $column_data{ct}        = qq|<td>&nbsp;</td>|;
-    $column_data{statement} = qq|<td>&nbsp;</td>|;
+  $report->add_data(create_list_accounts_subtotal_row(\%totals, \@columns, [ qw(debit credit) ], 'listtotal'));
 
-    $ctid = $ref->{ctid};
+  $report->generate_with_headers();
 
-  }
+  $lxdebug->leave_sub();
+}
 
-  # 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;");
+sub generate_ar_aging {
+  $lxdebug->enter_sub();
 
-  print qq|
-        <tr class=listsubtotal>
-|;
+  $auth->assert('general_ledger');
 
-  map { $column_data{$_} = qq|<th>&nbsp;</th>| } @column_index;
+  # split customer
+  ($form->{customer}) = split(/--/, $form->{customer});
 
-  $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>|;
+  $form->{ct}   = "customer";
+  $form->{arap} = "ar";
 
-  map { print "$column_data{$_}\n" } @column_index;
+  $form->{callback} = build_std_url('action=generate_ar_aging', qw(todate customer title));
 
-  print qq|
-        </tr>
-        <tr class=listtotal>
-|;
+  RP->aging(\%myconfig, \%$form);
+  aging();
 
-  $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;");
+  $lxdebug->leave_sub();
+}
 
-  $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>|;
+sub generate_ap_aging {
+  $lxdebug->enter_sub();
 
-  map { print "$column_data{$_}\n" } @column_index;
+  $auth->assert('general_ledger');
 
-  print qq|
-          <input type=hidden name=rowcount value=$i>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-|;
+  # split vendor
+  ($form->{vendor}) = split(/--/, $form->{vendor});
 
-  &print_options if ($form->{arap} eq 'ar');
+  $form->{ct}   = "vendor";
+  $form->{arap} = "ap";
 
-  print qq|
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+  $form->{callback} = build_std_url('action=generate_ap_aging', qw(todate vendor title));
 
-  if ($form->{arap} eq 'ar') {
-    print qq|
-<input type=hidden name=todate value=$form->{todate}>
+  RP->aging(\%myconfig, \%$form);
+  aging();
 
-<input type=hidden name=title value="$form->{title}">
+  $lxdebug->leave_sub();
+}
 
-<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}}">
+sub create_aging_subtotal_row {
+  $lxdebug->enter_sub();
 
-<input type=hidden name=department value="$form->{department}">
+  my ($subtotals, $columns, $periods, $class) = @_;
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
 
-<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|">
-|;
+  foreach (@{ $periods }) {
+    $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
+    $subtotals->{$_}      = 0;
   }
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+  $lxdebug->leave_sub();
+
+  return $row;
+}
+
+sub aging {
+  $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+  my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90);
+
+  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', },
+  );
+
+  my %column_alignment = ('statement' => 'center',
+                          map { $_ => 'right' } qw(c0 c30 c60 c90));
+
+  $report->set_options('std_column_visibility' => 1);
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
+
+  my @hidden_variables = qw(todate customer vendor arap title ct);
+  $report->set_export_options('generate_' . ($form->{arap} eq 'ar' ? 'ar' : 'ap') . '_aging', @hidden_variables);
+
+  my @options;
+
+  if ($form->{department}) {
+    my ($department) = split /--/, $form->{department};
+    push @options, $locale->text('Department') . " : $department";
+    $form->{callback} .= "&department=" . E($department);
   }
 
-  print qq|
-</form>
+  if (($form->{arap} eq 'ar') && $form->{customer}) {
+    push @options, $form->{customer};
+  }
 
-</body>
-</html>
-|;
+  if (($form->{arap} eq 'ap') && $form->{vendor}) {
+    push @options, $form->{vendor};
+  }
 
-  $lxdebug->leave_sub();
-}
+  push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
 
-sub select_all {
-  $lxdebug->enter_sub();
+  my $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list');
 
-  RP->aging(\%myconfig, \%$form);
+  $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),
+    );
 
-  map { $_->{checked} = "checked" } @{ $form->{AG} };
+  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;
 
-  &aging;
+  foreach $ref (@{ $form->{AG} }) {
+    if ($row_idx && ($previous_ctid != $ref->{ctid})) {
+      $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal'));
+    }
 
-  $lxdebug->leave_sub();
-}
+    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) : '';
+    }
 
-sub print_options {
-  $lxdebug->enter_sub();
+    my $row = { };
 
-  $form->{sendmode} = "attachment";
-  $form->{copies}   = 2 unless $form->{copies};
+    foreach my $column (@columns) {
+      $row->{$column} = {
+        'data'   => (($column eq 'ct') || ($column eq 'statement')) ? '' : $ref->{$column},
+        'align'  => $column_alignment{$column},
+        'valign' => $column eq 'statement' ? 'center' : '',
+      };
+    }
 
-  $form->{PD}{ $form->{type} }     = "selected";
-  $form->{DF}{ $form->{format} }   = "selected";
-  $form->{OP}{ $form->{media} }    = "selected";
-  $form->{SM}{ $form->{sendmode} } = "selected";
+    $row->{invnumber}->{link} =  build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id}));
 
-  $type = qq|
-	    <option value=statement $form->{PD}{statement}>|
-    . $locale->text('Statement');
+    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};
 
-  if ($form->{media} eq 'email') {
-    $media = qq|
-	    <option value=attachment $form->{SM}{attachment}>|
-      . $locale->text('Attachment') . qq|
-	    <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
-  } else {
-    $media = qq|
-	    <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-    if ($myconfig{printer} && $latex) {
-      $media .= qq|
-            <option value=printer $form->{OP}{printer}>|
-        . $locale->text('Printer');
+      $row_idx++;
     }
-  }
 
-  if ($latex) {
-    $format .= qq|
-            <option value=postscript $form->{DF}{postscript}>|
-      . $locale->text('Postscript') . qq|
-	    <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
+    $previous_ctid = $ref->{ctid};
+
+    $report->add_data($row);
   }
 
-  print qq|
-<table>
-  <tr>
-    <td><select name=type>$type</select></td>
-    <td><select name=format>$format</select></td>
-    <td><select name=media>$media</select></td>
-|;
+  $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal')) if ($row_idx);
 
-  if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
-    print qq|
-      <td>| . $locale->text('Copies') . qq|
-      <input name=copies size=2 value=$form->{copies}></td>
-|;
+  $report->add_data(create_aging_subtotal_row(\%totals, \@columns, \@periods, 'listtotal'));
+
+  if ($form->{arap} eq 'ar') {
+    $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(inline => 1), });
+    $report->set_options('raw_top_info_text'    => $raw_top_info_text,
+                         'raw_bottom_info_text' => $raw_bottom_info_text);
   }
 
-  print qq|
-  </tr>
-</table>
-|;
+  $report->set_options_from_form();
+
+  $report->generate_with_headers();
+
+  $lxdebug->leave_sub();
+}
+
+sub select_all {
+  $lxdebug->enter_sub();
+
+  RP->aging(\%myconfig, \%$form);
+
+  map { $_->{checked} = "checked" } @{ $form->{AG} };
+
+  &aging;
 
   $lxdebug->leave_sub();
 }
@@ -2011,6 +1819,8 @@ sub print_options {
 sub e_mail {
   $lxdebug->enter_sub();
 
+  $auth->assert('general_ledger');
+
   # get name and email addresses
   for $i (1 .. $form->{rowcount}) {
     if ($form->{"statement_$i"}) {
@@ -2086,6 +1896,7 @@ sub e_mail {
 
   # save all other variables
   foreach $key (keys %$form) {
+    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
     $form->{$key} =~ s/\"/&quot;/g;
     print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
   }
@@ -2115,7 +1926,7 @@ sub e_mail {
 sub send_email {
   $lxdebug->enter_sub();
 
-  $form->{OUT} = "$sendmail";
+  $auth->assert('general_ledger');
 
   $form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
     unless $form->{subject};
@@ -2124,10 +1935,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();
 }
@@ -2135,6 +1946,8 @@ sub send_email {
 sub print {
   $lxdebug->enter_sub();
 
+  $auth->assert('general_ledger');
+
   if ($form->{media} eq 'printer') {
     $form->error($locale->text('Select postscript or PDF!'))
       if ($form->{format} !~ /(postscript|pdf)/);
@@ -2151,7 +1964,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;
@@ -2159,7 +1971,7 @@ sub print {
 
   RP->aging(\%myconfig, \%$form);
 
-  &print_form;
+  print_form();
 
   $form->redirect($locale->text('Statements sent to printer!'))
     if ($form->{media} eq 'printer');
@@ -2170,26 +1982,43 @@ sub print {
 sub print_form {
   $lxdebug->enter_sub();
 
-  $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
+  $auth->assert('general_ledger');
 
-  $form->{templates} = "$myconfig{templates}";
+  my %replacements =
+    (
+     "ä" => "ae", "ö" => "oe", "ü" => "ue",
+     "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
+     "ß" => "ss",
+     " " => "_"
+    );
 
-  # setup variables for the form
-  @a = qw(company address businessnumber tel fax);
-  map { $form->{$_} = $myconfig{$_} } @a;
-  $form->format_string(@a);
+  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->{IN} = "$form->{type}.html";
+  $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
 
+  $form->{templates} = "$myconfig{templates}";
+
+  my $suffix = "html";
+  my $attachment_suffix = "html";
   if ($form->{format} eq 'postscript') {
     $form->{postscript} = 1;
-    $form->{IN} =~ s/html$/tex/;
-  }
-  if ($form->{format} eq 'pdf') {
+    $suffix = "tex";
+    $attachment_suffix = "ps";
+  } elsif ($form->{format} eq 'pdf') {
     $form->{pdf} = 1;
-    $form->{IN} =~ s/html$/tex/;
+    $suffix = "tex";
+    $attachment_suffix = "pdf";
   }
 
+  $form->{IN}  = "$form->{type}.$suffix";
+  $form->{OUT} = $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
+
+  # Save $form->{email} because it will be overwritten.
+  $form->{EMAIL_RECIPIENT} = $form->{email};
+
   $i = 0;
   while (@{ $form->{AG} }) {
 
@@ -2206,7 +2035,6 @@ sub print_form {
           (name, street, zipcode, city, country, contact, email,
            "$form->{ct}phone", "$form->{ct}fax");
         map { $form->{$_} = $ref->{$_} } @a;
-        $form->format_string(@a);
 
         $form->{ $form->{ct} } = $form->{name};
         $form->{"$form->{ct}_id"} = $ref->{ctid};
@@ -2247,17 +2075,30 @@ sub print_form {
             $form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
         } (c0, c30, c60, c90, "");
 
+        $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix";
+        map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements));
+
         $form->parse_template(\%myconfig, $userspath);
 
       }
     }
   }
-
+  # 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));
+  }
+  # /saving the history 
   $lxdebug->leave_sub();
 }
 
 sub statement_details {
   $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
   my ($ref) = @_;
 
   push @{ $form->{invnumber} }, $ref->{invnumber};
@@ -2265,10 +2106,10 @@ sub statement_details {
   push @{ $form->{duedate} },   $ref->{duedate};
 
   foreach $item (qw(c0 c30 c60 c90)) {
-    eval {
+    if ($ref->{exchangerate} * 1) {
       $ref->{$item} =
         $form->round_amount($ref->{$item} / $ref->{exchangerate}, 2);
-    };
+    }
     $form->{"${item}total"} += $ref->{$item};
     $form->{total}          += $ref->{$item};
     push @{ $form->{$item} },
@@ -2281,32 +2122,25 @@ sub statement_details {
 sub generate_tax_report {
   $lxdebug->enter_sub();
 
+  $auth->assert('report');
+
   RP->tax_report(\%myconfig, \%$form);
 
   $descvar     = "$form->{accno}_description";
   $description = $form->escape($form->{$descvar});
   $ratevar     = "$form->{accno}_rate";
 
-  if ($form->{accno} =~ /^gifi_/) {
-    $descvar     = "gifi_$form->{accno}_description";
-    $description = $form->escape($form->{$descvar});
-    $ratevar     = "gifi_$form->{accno}_rate";
-  }
-
   $department = $form->escape($form->{department});
 
   # 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&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->{title} = $locale->text('GIFI') . " - "
-    if ($form->{accno} =~ /^gifi_/);
+    "$form->{script}?&action=generate_tax_report&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";
@@ -2445,7 +2279,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}&callback=$callback>$ref->{invnumber}</a></td>|;
     $column_data{transdate} = qq|<td>$ref->{transdate}</td>|;
     $column_data{name}      = qq|<td>$ref->{name}&nbsp;</td>|;
 
@@ -2521,271 +2355,169 @@ sub tax_subtotal {
 
   $column_data{netamount} =
     "<th class=listsubtotal align=right>$subtotalnetamount</th>";
-  $column_data{tax} = "<th class=listsubtotal align=right>$subtotaltax</th>";
-  $column_data{amount} = "<th class=listsubtotal align=right>$subtotal</th>";
-
-  $subtotalnetamount = 0;
-  $subtotaltax       = 0;
-
-  print qq|
-	<tr class=listsubtotal>
-|;
-  map { print "\n$column_data{$_}" } @column_index;
-
-  print qq|
-        </tr>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub list_payments {
-  $lxdebug->enter_sub();
-
-  if ($form->{account}) {
-    ($form->{paymentaccounts}) = split /--/, $form->{account};
-  }
-  if ($form->{department}) {
-    ($department, $form->{department_id}) = split /--/, $form->{department};
-    $option = $locale->text('Department') . " : $department";
-  }
-
-  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";
-
-  # 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}?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});
-
-  $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>";
-
-  if ($form->{fromdate}) {
-    $option .= "\n<br>" if ($option);
-    $option .=
-        $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);
-  }
-
-  @column_index = @columns;
-  $colspan      = $#column_index + 1;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<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>
-|;
+  $column_data{tax} = "<th class=listsubtotal align=right>$subtotaltax</th>";
+  $column_data{amount} = "<th class=listsubtotal align=right>$subtotal</th>";
+
+  $subtotalnetamount = 0;
+  $subtotaltax       = 0;
 
-  map { print "\n$column_header{$_}" } @column_index;
+  print qq|
+	<tr class=listsubtotal>
+|;
+  map { print "\n$column_data{$_}" } @column_index;
 
   print qq|
         </tr>
 |;
 
-  foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {
+  $lxdebug->leave_sub();
+}
 
-    next unless @{ $form->{ $ref->{id} } };
+sub list_payments {
+  $lxdebug->enter_sub();
 
-    print qq|
-        <tr>
-	  <th colspan=$colspan align=left>$ref->{accno}--$ref->{description}</th>
-	</tr>
-|;
+  $auth->assert('cash');
 
-    foreach $payment (@{ $form->{ $ref->{id} } }) {
+  if ($form->{account}) {
+    ($form->{paymentaccounts}) = split /--/, $form->{account};
+  }
+  if ($form->{department}) {
+    ($department, $form->{department_id}) = split /--/, $form->{department};
+    $option = $locale->text('Department') . " : $department";
+  }
 
-      $module = $payment->{module};
-      $module = 'is' if ($payment->{invoice} && $payment->{module} eq 'ar');
-      $module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap');
+  RP->payments(\%myconfig, \%$form);
 
-      $href =
-        qq|${module}.pl?path=$form->{path}&action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|;
+  my @hidden_variables = qw(account title department reference source memo fromdate todate
+                            fx_transaction db prepayment paymentaccounts sort);
 
-      $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>";
+  my $href = build_std_url('action=list_payments', grep { $form->{$_} } @hidden_variables);
+  $form->{callback} = $href;
 
-      $subtotalpaid += $payment->{paid};
-      $totalpaid    += $payment->{paid};
+  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');
 
-      $i++;
-      $i %= 2;
-      print qq|
-	<tr class=listrow$i>
-|;
+  map { $column_defs{$_}->{link} = $href . "&sort=$_" } grep { $_ ne 'paid' } @columns;
 
-      map { print "\n$column_data{$_}" } @column_index;
+  my @options;
+  if ($form->{fromdate}) {
+    push @options, $locale->text('From') . "&nbsp;" . $locale->date(\%myconfig, $form->{fromdate}, 1);
+  }
+  if ($form->{todate}) {
+    push @options, $locale->text('bis') . "&nbsp;" . $locale->date(\%myconfig, $form->{todate}, 1);
+  }
 
-      print qq|
-        </tr>
-|;
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-    }
+  my $attachment_basename = $form->{db} eq 'ar' ? $locale->text('list_of_receipts') : $locale->text('list_of_payments');
 
-    # print subtotals
-    map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
+  $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();
 
-    $column_data{paid} =
-      "<th class=listsubtotal align=right>"
-      . $form->format_amount(\%myconfig, $subtotalpaid, 2, "&nbsp;") . "</th>";
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-    print qq|
-	<tr class=listsubtotal>
-|;
+  $report->set_export_options('list_payments', @hidden_variables);
 
-    map { print "\n$column_data{$_}" } @column_index;
+  $report->set_sort_indicator($form->{sort}, 1);
 
-    print qq|
-        </tr>
-|;
+  my $total_paid    = 0;
 
-    $subtotalpaid = 0;
+  foreach my $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {
+    next unless @{ $form->{ $ref->{id} } };
 
-  }
+    $report->add_control({ 'type' => 'colspan_data', 'data' => "$ref->{accno}--$ref->{description}" });
 
-  # print total
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
+    my $subtotal_paid = 0;
 
-  $column_data{paid} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalpaid, 2, "&nbsp;") . "</th>";
+    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');
 
-  print qq|
-        <tr class=listtotal>
-|;
+      $subtotal_paid += $payment->{paid};
+      $total_paid    += $payment->{paid};
 
-  map { print "\n$column_data{$_}" } @column_index;
+      $payment->{paid} = $form->format_amount(\%myconfig, $payment->{paid}, 2);
 
-  print qq|
-        </tr>
+      my $row = { };
 
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+      foreach my $column (@columns) {
+        $row->{$column} = {
+          'data'  => $payment->{$column},
+          'align' => $column_alignment{$column},
+        };
+      }
 
-</body>
-</html>
-|;
+      $row->{invnumber}->{link} = build_std_url("script=${module}.pl", 'action=edit', 'id=' . E($payment->{id}), 'callback');
 
-  $lxdebug->leave_sub();
-}
+      $report->add_data($row);
+    }
 
-sub config {
-  $lxdebug->enter_sub();
-  edit();
+    my $row = { map { $_ => { 'class' => 'listsubtotal' } } @columns };
+    $row->{paid} = {
+      'data'  => $form->format_amount(\%myconfig, $subtotal_paid, 2),
+      'align' => 'right',
+      'class' => 'listsubtotal',
+    };
 
-  #$form->header;
-  #print qq|Hallo|;
-  $lxdebug->leave_sub();
-}
+    $report->add_data($row);
+  }
 
-sub debug {
+  $report->add_separator();
 
-  $form->debug();
+  my $row = { map { $_ => { 'class' => 'listtotal' } } @columns };
+  $row->{paid} = {
+    'data'  => $form->format_amount(\%myconfig, $total_paid, 2),
+    'align' => 'right',
+    'class' => 'listtotal',
+  };
 
-}
+  $report->add_data($row);
 
-sub winston_export {
-  $lxdebug->enter_sub();
-  print(STDERR "Winston Export1\n");
+  $report->generate_with_headers();
 
-  #create_winston();
-  $form->{winston} = 1;
-  &generate_ustva();
   $lxdebug->leave_sub();
 }
 
 sub print_options {
   $lxdebug->enter_sub();
 
+  my ($dont_print) = @_;
+
   $form->{sendmode} = "attachment";
-  $form->{copies}   = 2 unless $form->{copies};
+
+  $form->{"format"} =
+    $form->{"format"} ? $form->{"format"} :
+    $myconfig{"template_format"} ? $myconfig{"template_format"} :
+    "pdf";
+
+  $form->{"copies"} =
+    $form->{"copies"} ? $form->{"copies"} :
+    $myconfig{"copies"} ? $myconfig{"copies"} :
+    2;
 
   $form->{PD}{ $form->{type} }     = "selected";
   $form->{DF}{ $form->{format} }   = "selected";
   $form->{OP}{ $form->{media} }    = "selected";
   $form->{SM}{ $form->{sendmode} } = "selected";
 
-  if ($form->{report} eq 'ustva') {
-    $type = qq|
-	    <option value=ustva $form->{PD}{ustva}>| . $locale->text('ustva');
-  } else {
-    $type = qq|
+  $type = qq|
 	    <option value=statement $form->{PD}{statement}>|
       . $locale->text('Statement');
-  }
 
   if ($form->{media} eq 'email') {
     $media = qq|
@@ -2795,26 +2527,21 @@ sub print_options {
   } else {
     $media = qq|
 	    <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-    if ($myconfig{printer} && $latex) {
+    if ($myconfig{printer} && $latex_templates) {
       $media .= qq|
             <option value=printer $form->{OP}{printer}>|
         . $locale->text('Printer');
     }
   }
 
-  if ($latex) {
+  if ($latex_templates) {
     $format .= qq|
-            <option value=html $form->{DF}{html}>|
-      . $locale->text('HTML') . qq|
-	    <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
-    if ($form->{report} ne 'ustva') {
-      $format . qq|
-            <option value=postscript $form->{DF}{postscript}>|
-        . $locale->text('Postscript');
-    }
+            <option value=html $form->{DF}{html}>| . $locale->text('HTML')
+      . qq| <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF')
+      . qq| <option value=postscript $form->{DF}{postscript}>| . $locale->text('Postscript');
   }
 
-  print qq|
+  my $output = qq|
 <table>
   <tr>
     <td><select name=type>$type</select></td>
@@ -2822,30 +2549,35 @@ sub print_options {
     <td><select name=media>$media</select></td>
 |;
 
-  if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
-    print qq|
+  if ($myconfig{printer} && $latex_templates && $form->{media} ne 'email') {
+    $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 {
   $lxdebug->enter_sub();
+
+  $auth->assert('report');
+
   $form->{padding} = "&nbsp;&nbsp;";
   $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
   $form->{br}      = "<br>";
 
-  #  &get_project(generate_bwa);
-
   if ($form->{reporttype} eq "custom") {
 
     #forgotten the year --> thisyear
@@ -3011,10 +2743,10 @@ sub generate_bwa {
     $longfromdate  = $locale->date(\%germandate, $form->{fromdate}, 1);
     $shortfromdate = $locale->date(\%germandate, $form->{fromdate}, 0);
 
-    $form->{this_period} = "$shortfromdate<br>\n$shorttodate";
+    $form->{this_period} = "$shortfromdate\n$shorttodate";
     $form->{period}      =
         $locale->text('for Period')
-      . qq|<br>\n$longfromdate |
+      . qq|\n$longfromdate |
       . $locale->text('bis')
       . qq| $longtodate|;
   }
@@ -3022,7 +2754,6 @@ sub generate_bwa {
   # setup variables for the form
   @a = qw(company address businessnumber);
   map { $form->{$_} = $myconfig{$_} } @a;
-  $form->{address} =~ s/\\n/<br>/g;
   $form->{templates} = $myconfig{templates};
 
   $form->{IN} = "bwa.html";
@@ -3032,236 +2763,3 @@ sub generate_bwa {
   $lxdebug->leave_sub();
 }
 
-sub generate_ustva {
-  $lxdebug->enter_sub();
-
-  # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
-  # Einlesen der Finanzamtdaten
-  print(STDERR "Winston4\n");
-  get_config($userspath, 'finanzamt.ini');
-
-  #  &get_project(generate_bwa);
-  @anmeldungszeitraum =
-    qw(0401, 0402, 0403, 0404, 0405, 0405, 0406, 0407, 0408, 0409, 0410, 0411, 0412, 0441, 0442, 0443, 0444);
-
-  foreach $item (@anmeldungszeitraum) {
-    $form->{$item} = "";
-  }
-  print(STDERR "Winston2\n");
-  if ($form->{reporttype} eq "custom") {
-
-    #forgotten the year --> thisyear
-    if ($form->{year} !~ m/^\d\d\d\d$/) {
-      $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~
-        /(\d\d\d\d)/;
-      $form->{year} = $1;
-    }
-
-    #yearly report
-    if ($form->{duetyp} eq "13") {
-      $form->{fromdate} = "1.1.$form->{year}";
-      $form->{todate}   = "31.12.$form->{year}";
-    }
-
-    #Quater reports
-    if ($form->{duetyp} eq "A") {
-      $form->{fromdate} = "1.1.$form->{year}";
-      $form->{todate}   = "31.3.$form->{year}";
-      $form->{"0441"}   = "X";
-    }
-    if ($form->{duetyp} eq "B") {
-      $form->{fromdate} = "1.4.$form->{year}";
-      $form->{todate}   = "30.6.$form->{year}";
-      $form->{"0442"}   = "X";
-    }
-    if ($form->{duetyp} eq "C") {
-      $form->{fromdate} = "1.7.$form->{year}";
-      $form->{todate}   = "30.9.$form->{year}";
-      $form->{"0443"}   = "X";
-    }
-    if ($form->{duetyp} eq "D") {
-      $form->{fromdate} = "1.10.$form->{year}";
-      $form->{todate}   = "31.12.$form->{year}";
-      $form->{"0444"}   = "X";
-    }
-
-    #Monthly reports
-  SWITCH: {
-      $form->{duetyp} eq "1" && do {
-        $form->{fromdate} = "1.1.$form->{year}";
-        $form->{todate}   = "31.1.$form->{year}";
-        $form->{"0401"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "2" && do {
-        $form->{fromdate} = "1.2.$form->{year}";
-
-        #this works from 1901 to 2099, 1900 and 2100 fail.
-        $leap = ($form->{year} % 4 == 0) ? "29" : "28";
-        $form->{todate} = "$leap.2.$form->{year}";
-        $form->{"0402"} = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "3" && do {
-        $form->{fromdate} = "1.3.$form->{year}";
-        $form->{todate}   = "31.3.$form->{year}";
-        $form->{"0403"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "4" && do {
-        $form->{fromdate} = "1.4.$form->{year}";
-        $form->{todate}   = "30.4.$form->{year}";
-        $form->{"0404"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "5" && do {
-        $form->{fromdate} = "1.5.$form->{year}";
-        $form->{todate}   = "31.5.$form->{year}";
-        $form->{"0405"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "6" && do {
-        $form->{fromdate} = "1.6.$form->{year}";
-        $form->{todate}   = "30.6.$form->{year}";
-        $form->{"0406"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "7" && do {
-        $form->{fromdate} = "1.7.$form->{year}";
-        $form->{todate}   = "31.7.$form->{year}";
-        $form->{"0407"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "8" && do {
-        $form->{fromdate} = "1.8.$form->{year}";
-        $form->{todate}   = "31.8.$form->{year}";
-        $form->{"0408"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "9" && do {
-        $form->{fromdate} = "1.9.$form->{year}";
-        $form->{todate}   = "30.9.$form->{year}";
-        $form->{"0409"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "10" && do {
-        $form->{fromdate} = "1.10.$form->{year}";
-        $form->{todate}   = "31.10.$form->{year}";
-        $form->{"0410"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "11" && do {
-        $form->{fromdate} = "1.11.$form->{year}";
-        $form->{todate}   = "30.11.$form->{year}";
-        $form->{"0411"}   = "X";
-        last SWITCH;
-      };
-      $form->{duetyp} eq "12" && do {
-        $form->{fromdate} = "1.12.$form->{year}";
-        $form->{todate}   = "31.12.$form->{year}";
-        $form->{"0412"}   = "X";
-        last SWITCH;
-      };
-    }
-  }
-
-  #    $locale->date(\%myconfig, $form->current_date(\%myconfig), 0)=~ /(\d\d\d\d)/;
-  #    $form->{year}= $1;
-  #    $form->{fromdate}="1.1.$form->{year}";
-  #    $form->{todate}="31.3.$form->{year}";
-  #    $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
-  #  }
-
-  RP->ustva(\%myconfig, \%$form);
-
-  ($form->{department}) = split /--/, $form->{department};
-
-  $form->{period} =
-    $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
-  $form->{todate} = $form->current_date(\%myconfig) unless $form->{todate};
-
-  # if there are any dates construct a where
-  if ($form->{fromdate} || $form->{todate}) {
-
-    unless ($form->{todate}) {
-      $form->{todate} = $form->current_date(\%myconfig);
-    }
-
-    $longtodate  = $locale->date(\%myconfig, $form->{todate}, 1);
-    $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0);
-
-    $longfromdate  = $locale->date(\%myconfig, $form->{fromdate}, 1);
-    $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
-
-    $form->{this_period} = "$shortfromdate<br>\n$shorttodate";
-    $form->{period}      =
-        $locale->text('for Period')
-      . qq|<br>\n$longfromdate |
-      . $locale->text('bis')
-      . qq| $longtodate|;
-  }
-
-  if ($form->{comparefromdate} || $form->{comparetodate}) {
-    $longcomparefromdate =
-      $locale->date(\%myconfig, $form->{comparefromdate}, 1);
-    $shortcomparefromdate =
-      $locale->date(\%myconfig, $form->{comparefromdate}, 0);
-
-    $longcomparetodate  = $locale->date(\%myconfig, $form->{comparetodate}, 1);
-    $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
-
-    $form->{last_period} = "$shortcomparefromdate<br>\n$shortcomparetodate";
-    $form->{period} .=
-        "<br>\n$longcomparefromdate "
-      . $locale->text('bis')
-      . qq| $longcomparetodate|;
-  }
-
-  $form->{Datum_heute} =
-    $locale->date(\%myconfig, $form->current_date(\%myconfig), 0);
-
-  if (   $form->{format} eq 'pdf'
-      or $form->{format} eq 'postscript') {
-    $form->{padding} = "~~";
-    $form->{bold}    = "\textbf{";
-    $form->{endbold} = "}";
-    $form->{br}      = '\\\\';
-
-    @numbers = qw(51r 86r 97r 93r 96 43 45
-      66 62 67);
-    foreach $number (@numbers) {
-      $form->{$number} =~ s/,/~~/g;
-    }
-
-      } elsif ($form->{format} eq 'html') {
-    $form->{padding} = "&nbsp;&nbsp;";
-    $form->{bold}    = "<b>";
-    $form->{endbold} = "</b>";
-    $form->{br}      = "<br>"
-
-  }
-
-  # setup variables for the form
-  @a = qw(company address businessnumber);
-  map { $form->{$_} = $myconfig{$_} } @a;
-
-  $form->{address} =~ s/\\n/$form->{br}/g;
-
-  if ($form->{winston} eq '1') {
-    print(STDERR "fast bei winston\n");
-    create_winston();
-
-  } else {
-    $form->{templates} = $myconfig{templates};
-    $form->{IN}        = "$form->{type}";
-    $form->{IN} .= '.tex'
-      if (   $form->{format} eq 'pdf'
-          or $form->{format} eq 'postscript');
-    $form->{IN} .= '.html' if ($form->{format} eq 'html');
-
-    $form->parse_template(\%myconfig, $userspath);
-
-    # $form->parse_template;
-  }
-  $lxdebug->leave_sub();
-}