X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=db1473ed58b20a614f40e641a0804a540392848d;hb=2e7983737542b36d9962073a7d04f2edcf6b8bb0;hp=0106afdaaaebe15eababc796b86c48a04ff97075;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 0106afdaa..db1473ed5 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -32,16 +32,25 @@
 #======================================================================
 #
 # module for preparing Income Statement and Balance Sheet
-# 
+#
 #======================================================================
 
-require "$form->{path}/arap.pl";
+use POSIX qw(strftime);
 
 use SL::PE;
 use SL::RP;
+use SL::Iconv;
+use SL::ReportGenerator;
+use Data::Dumper;
 
-1;
-# end of main
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/reportgenerator.pl";
+
+# note: this file was particularly hard to strictify.
+# alot of the vars are passed carelessly between invocations
+# should there be any missing vars, declare them globally
+use strict;
 
 # this is for our long dates
 # $locale->text('January')
@@ -84,150 +93,174 @@ 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',
+};
+
+# subs use these pretty freely, so declare them here
+our (%column_data, @column_index);
+our ($subtotalnetamount, $subtotaltax, $subtotal);
+
+sub check_rp_access {
+  my $form     = $main::form;
+
+  my $right   = $rp_access_map->{$form->{report}};
+  $right    ||= 'DOES_NOT_EXIST';
+
+  $main::auth->assert($right);
+}
+
 sub report {
-  $lxdebug->enter_sub();
-
-  %title = ( 'balance_sheet'	=> 'Balance Sheet',
-             'income_statement'	=> 'Income Statement',
-             'trial_balance'	=> 'Trial Balance',
-	     'ar_aging'		=> 'AR Aging',
-	     'ap_aging'		=> 'Offene Verbindlichkeiten',
-	     'tax_collected'	=> 'Tax collected',
-	     'tax_paid'		=> 'Tax paid',
-	     'nontaxable_sales'	=> 'Non-taxable Sales',
-	     'nontaxable_purchases' => 'Non-taxable Purchases',
-	     'receipts'		=> 'Receipts',
-	     'payments'		=> 'Payments',
-	     'projects'		=> 'Project Transactions',
-	     'bwa'		=> 'Betriebswirtschaftliche Auswertung',
-	     'ustva'		=> 'Umsatzsteuervoranmeldung',
-	   );
-  
-  $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;
-  
+  $main::lxdebug->enter_sub();
+
+  check_rp_access();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my %title = (
+            'balance_sheet'        => 'Balance Sheet',
+            'income_statement'     => 'Income Statement',
+            'trial_balance'        => 'Trial Balance',
+            'ar_aging'             => 'AR Aging',
+            'ap_aging'             => 'Offene Verbindlichkeiten',
+            'tax_collected'        => 'Tax collected',
+            'tax_paid'             => 'Tax paid',
+            'nontaxable_sales'     => 'Non-taxable Sales',
+            'nontaxable_purchases' => 'Non-taxable Purchases',
+            'receipts'             => 'Receipts',
+            'payments'             => 'Payments',
+            'projects'             => 'Project Transactions',
+            'bwa'                  => 'Betriebswirtschaftliche Auswertung',
+  );
+
+  $form->{title} = $locale->text($title{ $form->{report} });
+
+  my $accrual = ($main::eur) ? ""        : "checked";
+  my $cash    = ($main::eur) ? "checked" : "";
+
+  my $year = (localtime)[5] + 1900;
+
   # get departments
   $form->all_departments(\%myconfig);
   if (@{ $form->{all_departments} }) {
     $form->{selectdepartment} = "<option>\n";
-
-    map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+    map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } @{ $form->{all_departments} };
   }
- 
-  $department = qq|
+
+  my $department = qq|
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Department').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
 	  <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
 	</tr>
 | if $form->{selectdepartment};
 
-  # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";  
-  if ($form->{report} eq "ustva") {
-  	$department = "";
+  $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"};
   }
-  else 
-  {
-    if ($form->{report} eq "balance_sheet") 
-    {
-    $name_1 = "compareasofdate";
-    $id_1 = "compareasofdate";
-    $value_1 = "";
+
+  my $projectnumber =
+    NTI($main::cgi->popup_menu('-name' => "project_id",
+                               '-values' => \@project_values,
+                               '-labels' => \%project_labels));
+
+  # use JavaScript Calendar or not
+  $form->{jsscript} = 1;
+  my $jsscript = "";
+  my ( $name_1, $id_1, $value_1, $trigger_1, $name_2, $id_2, $value_2, $trigger_2, );
+  if ($form->{report} eq "balance_sheet") {
+    $name_1    = "asofdate";
+    $id_1      = "asofdate";
+    $value_1   = "$form->{asofdate}";
     $trigger_1 = "trigger1";
-    $name_2 = "asofdate";
-    $id_2 = "asofdate";
-    $value_2 = "$form->{asofdate}";
+    $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}";
+  } 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 = "";
+    $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}";
+  } elsif (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
+    $name_1    = "fromdate";
+    $id_1      = "fromdate";
+    $value_1   = "$form->{fromdate}";
     $trigger_1 = "trigger1";
-    $name_2 = "todate";
-    $id_2 = "todate";
-    $value_2 = "";
+    $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";
   }
-  }
-  }
-    
+
+  my ($button1, $button1_2, $button2, $button2_2);
+  my $checked;
+
   # with JavaScript Calendar
-  if ($form->{jsscript}) 
-  {
+  if ($form->{jsscript}) {
     if ($name_1 eq "") {
-    
-      $button1 = qq|
-         <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
-      $button1_2 = qq|
-        <input type=button name=$name_2 id="$trigger_2" value=|.$locale->text('button').qq|>|; 
+      $button1   = qq| <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","","","");
-    }
-    else 
-    {
-      $button1 = qq|
-         <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1>|;
-      $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}">|;
-       $button2_2 = qq|  
-         <input type=button name=$name_2 id="$trigger_2" value=|.$locale->text('button').qq|>
-       |;
+      $jsscript = 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" 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}" onBlur=\"check_right_date_format(this)\">|;
+      $button2_2 = qq| <input type=button name=$name_2 id="$trigger_2" value=| . $locale->text('button') . qq|> |;
+
       #write Trigger
-      $jsscript = Form->write_trigger(\%myconfig,"2","$name_1","BR","$trigger_1","$name_2","BL","$trigger_2");
-       } 
-    }   
-   else
-   {
-      # without JavaScript Calendar
-      if ($name_1 eq "") {
-      $button1 = qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
-      }
-      else 
-      {
-      $button1 = qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1>|;
-      $button2 = qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
-      }
+      $jsscript = Form->write_trigger(\%myconfig, "2", "$name_1", "BR", "$trigger_1", "$name_2", "BL", "$trigger_2");
+    }
+  } else {
+
+    # without JavaScript Calendar
+    if ($name_1 eq "") {
+      $button1 = 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 onBlur=\"check_right_date_format(this)\">|;
+      $button2 = 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;
- 
+  my $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}>
 
@@ -247,15 +280,15 @@ sub report {
   if ($form->{report} eq "projects") {
     print qq|
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Project').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Project') . qq|</th>
 	  <td colspan=5><input name=projectnumber size=25</td>
 	</tr>
         <input type=hidden name=nextsub value=generate_projects>
         <tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
           <td>$button1</td>
           <td>$button1_2</td>
-	  <th align=right>|.$locale->text('Bis').qq|</th>
+	  <th align=right>| . $locale->text('Bis') . qq|</th>
           <td>$button2</td>
           <td>$button2_2</td>
 	</tr>
@@ -266,9 +299,9 @@ sub report {
     <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|</td>
+	  <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|</td>
 	</tr>
 
 $jsscript
@@ -278,283 +311,200 @@ $jsscript
   if ($form->{report} eq "income_statement") {
     print qq|
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Project').qq|</th>
-	  <td colspan=3><input name=projectnumber size=25</td>
+	  <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+	  <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>
+	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $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>
+	  <th colspan=1>| . $locale->text('Year') . qq|</th>
+	  <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
 	</tr>
 |;
 
-
-print qq|
+    print qq|
 	<tr>
-		<td align=right>
-<b> |.$locale->text('Yearly').qq|</b> </td>
-		<th align=left>|.$locale->text('Quarterly').qq|</th>
-		<th align=left colspan=3>|.$locale->text('Monthly').qq|</th>
+		<td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+		<th align=left>| . $locale->text('Quarterly') . qq|</th>
+		<th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
 	</tr>
 	<tr>
-		<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>
+		<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>
 |;
-$checked = "";
-print qq|
-		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|.$locale->text('January').qq|</td>
+    $checked = "";
+    print qq|
+		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $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>
-		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|.$locale->text('September').qq|</td>
+    $checked = "";
+    print qq|
+		<td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $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>
-		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|.$locale->text('February').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|.$locale->text('June').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|.$locale->text('October').qq|</td>
+		<td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $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>
-		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|.$locale->text('March').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|.$locale->text('July').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|.$locale->text('November').qq|</td>
+		<td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $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>
-		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|.$locale->text('April').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|.$locale->text('August').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|.$locale->text('December').qq|</td>
+		<td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
+		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
 
 	</tr>
 	<tr>
    		<td colspan=5><hr size=3 noshade></td>
 	</tr>
 	<tr>
-          <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;
+          <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|
+	      | . $locale->text('Bis') . qq|
               $button2
               $button2_2&nbsp;
           </td>
         </tr>
 	<tr>
    		<td colspan=5><hr size=3 noshade></td>
-	</tr>	
+	</tr>
 	<tr>
-	  <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>
+	  <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>
 
 $jsscript
 |;
-}
+  }
 
   if ($form->{report} eq "bwa") {
     print qq|
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Project').qq|</th>
-	  <td colspan=3><input name=projectnumber size=25</td>
+	  <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+	  <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>
+	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $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>
+	  <th colspan=1>| . $locale->text('Year') . qq|</th>
+	  <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
 	</tr>
 |;
 
-
-print qq|
+    print qq|
 	<tr>
-		<td align=right>
-<b> |.$locale->text('Yearly').qq|</b> </td>
-		<th align=left>|.$locale->text('Quarterly').qq|</th>
-		<th align=left colspan=3>|.$locale->text('Monthly').qq|</th>
+		<td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+		<th align=left>| . $locale->text('Quarterly') . qq|</th>
+		<th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
 	</tr>
 	<tr>
 		<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>
+		<td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. | . $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>
+    $checked = "checked";
+    print qq|
+		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $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>
-		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|.$locale->text('September').qq|</td>
+    $checked = "";
+    print qq|
+		<td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $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>
-		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|.$locale->text('February').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|.$locale->text('June').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|.$locale->text('October').qq|</td>
+		<td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $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>
-		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|.$locale->text('March').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|.$locale->text('July').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|.$locale->text('November').qq|</td>
+		<td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $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>
-		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|.$locale->text('April').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|.$locale->text('August').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|.$locale->text('December').qq|</td>
+		<td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
+		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
 
 	</tr>
 	<tr>
    		<td colspan=5><hr size=3 noshade></td>
 	</tr>
 	<tr>
-          <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;
+          <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;
+	      | . $locale->text('Bis') . qq|&nbsp;
 	      $button2
               $button2_2
           </td>
         </tr>
 	<tr>
    		<td colspan=5><hr size=3 noshade></td>
-	</tr>	
-	<tr>
-	  <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>
-        
-$jsscript    
-|;
-}
-
-  if ($form->{report} eq "ustva") {
-    
-    print qq|
-    
-        <br>
-        <input type=hidden name=nextsub value=generate_ustva>
-</table>
-<table>
-	<tr>
-	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |.$locale->text('Zeitraum').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>
+	  <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 colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
+             <td><input name=decimalplaces size=3 value="2"></td>
+         </tr>
 
-print qq|
-	<tr>
-		<td align=right>
-<b> |.$locale->text('Yearly').qq|</b> </td>
-		<th align=left>|.$locale->text('Quarterly').qq|</th>
-		<th align=left colspan=3>|.$locale->text('Monthly').qq|</th>
-	</tr>
-	<tr>
-		<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>
-|;
-$checked = "checked";
-print qq|
-		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|.$locale->text('January').qq|</td>
+$jsscript
 |;
-$checked = ""; 
-print qq|
-		<td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|.$locale->text('May').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|.$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>
-		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|.$locale->text('February').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|.$locale->text('June').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|.$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>
-		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|.$locale->text('March').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|.$locale->text('July').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|.$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>
-		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|.$locale->text('April').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|.$locale->text('August').qq|</td>
-		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|.$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>
+	  <th align=right>| . $locale->text('as at') . qq|</th>
 	  <td>
             $button1
             $button1_2
           </td>
-	  <th align=right nowrap>|.$locale->text('Compare to').qq|</th>
+	  <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></td>
+	  <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
+	  <td><input name=decimalplaces size=3 value="2"></td>
 	</tr>
       </table>
     </td>
@@ -563,126 +513,158 @@ print qq|
     <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>
+	  <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>
+	  <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
 |;
   }
 
-
   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>
-        <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
+</table>
+<table>
+	<tr>
+	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $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>
+	</tr>
+|;
+
+    print qq|
+	<tr>
+		<td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+		<th align=left>| . $locale->text('Quarterly') . qq|</th>
+		<th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+	</tr>
+	<tr>
+		<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>
+|;
+    $checked = "checked";
+    print qq|
+		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $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>
+		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $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>
+		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $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>
+		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $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>
+		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
+		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
+
+	</tr>
+	<tr>
+   		<td colspan=5><hr size=3 noshade></td>
+	</tr>
+	<tr>
+          <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>
+   		<td colspan=5><hr size=3 noshade></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;|.$locale->text('All Accounts').qq|</td>
+	  <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 colspan=4>| . $locale->text('All Accounts') . 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);
 
     print qq|
         <input type=hidden name=nextsub value=generate_tax_report>
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('Bis').qq|</th>
+	  <th align=right>| . $locale->text('Bis') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	<tr>
-	  <th align=right>|.$locale->text('Report for').qq|</th>
+	  <th align=right>| . $locale->text('Report for') . qq|</th>
 	  <td colspan=3>
 |;
 
-  $checked = "checked";
-  foreach $ref (@{ $form->{taxaccounts} }) {
-    
-    print qq|<input name=accno class=radio type=radio value=$ref->{accno} $checked>&nbsp;$ref->{description}
+    $checked = "checked";
+    foreach my $ref (@{ $form->{taxaccounts} }) {
+
+      print
+        qq|<input name=accno class=radio type=radio value=$ref->{accno} $checked>&nbsp;$ref->{description}
 
     <input name="$ref->{accno}_description" type=hidden value="$ref->{description}">
     <input name="$ref->{accno}_rate" type=hidden value="$ref->{rate}">|;
 
-    $checked = "";
+      $checked = "";
 
-  }
+    }
 
-  print qq|
+    print qq|
   <input type=hidden name=db value=$form->{db}>
   <input type=hidden name=sort value=transdate>
 
 	  </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>
+	  <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>
       </table>
     </td>
@@ -691,39 +673,39 @@ print qq|
     <td>
       <table>
         <tr>
-	  <th align=right>|.$locale->text('Include in Report').qq|</th>
+	  <th align=right>| . $locale->text('Include in Report') . qq|</th>
 	  <td>
 	    <table>
 	      <tr>
 		<td><input name="l_id" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('ID').qq|</td>
+		<td>| . $locale->text('ID') . qq|</td>
 		<td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Invoice').qq|</td>
+		<td>| . $locale->text('Invoice') . qq|</td>
 		<td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Date').qq|</td>
+		<td>| . $locale->text('Date') . qq|</td>
 	      </tr>
 	      <tr>
 		<td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
 		<td>|;
-		
-  if ($form->{db} eq 'ar') {
-    print $locale->text('Customer');
-  }
-  if ($form->{db} eq 'ap') {
-    print $locale->text('Vendor');
-  }
-  
-  print qq|</td>
+
+    if ($form->{db} eq 'ar') {
+      print $locale->text('Customer');
+    }
+    if ($form->{db} eq 'ap') {
+      print $locale->text('Vendor');
+    }
+
+    print qq|</td>
                 <td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Amount').qq|</td>
+		<td>| . $locale->text('Amount') . qq|</td>
 		<td><input name="l_tax" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Tax').qq|</td>
+		<td>| . $locale->text('Tax') . qq|</td>
 		<td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('Total').qq|</td>
+		<td>| . $locale->text('Total') . qq|</td>
 	      </tr>
 	      <tr>
 	        <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('Subtotal').qq|</td>
+		<td>| . $locale->text('Subtotal') . qq|</td>
 	      </tr>
 	    </table>
 	  </td>
@@ -732,12 +714,9 @@ print qq|
 
   }
 
-  
   if ($form->{report} =~ /^nontaxable_/) {
-    $gifi = "";
-
     $form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap";
-    
+
     print qq|
         <input type=hidden name=nextsub value=generate_tax_report>
 
@@ -746,48 +725,50 @@ print qq|
         <input type=hidden name=report value=$form->{report}>
 
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('Bis').qq|</th>
+	  <th align=right>| . $locale->text('Bis') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	<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>
+	  <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>|.$locale->text('Include in Report').qq|</th>
+	  <th align=right>| . $locale->text('Include in Report') . qq|</th>
 	  <td colspan=3>
 	    <table>
 	      <tr>
 		<td><input name="l_id" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('ID').qq|</td>
+		<td>| . $locale->text('ID') . qq|</td>
 		<td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Invoice').qq|</td>
+		<td>| . $locale->text('Invoice') . qq|</td>
 		<td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Date').qq|</td>
+		<td>| . $locale->text('Date') . qq|</td>
 	      </tr>
 	      <tr>
 		<td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
 		<td>|;
-		
-  if ($form->{db} eq 'ar') {
-    print $locale->text('Customer');
-  }
-  if ($form->{db} eq 'ap') {
-    print $locale->text('Vendor');
-  }
-  
-  print qq|</td>
+
+    if ($form->{db} eq 'ar') {
+      print $locale->text('Customer');
+    }
+    if ($form->{db} eq 'ap') {
+      print $locale->text('Vendor');
+    }
+
+    print qq|</td>
                 <td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Amount').qq|</td>
+		<td>| . $locale->text('Amount') . qq|</td>
 		<td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('Total').qq|</td>
+		<td>| . $locale->text('Total') . qq|</td>
 	      </tr>
 	      <tr>
 	        <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('Subtotal').qq|</td>
+		<td>| . $locale->text('Subtotal') . qq|</td>
 	      </tr>
 	    </table>
 	  </td>
@@ -796,11 +777,8 @@ print qq|
 
   }
 
-
-
+  my ($label, $nextsub, $vc);
   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';
@@ -808,26 +786,33 @@ print qq|
       $label = $locale->text('Vendor');
       $form->{vc} = 'vendor';
     }
-      
+
     $nextsub = "generate_$form->{report}";
-    
+
     # setup vc selection
-    $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
+    $form->all_vc(\%myconfig, $form->{vc},
+                  ($form->{vc} eq 'customer') ? "AR" : "AP");
+
+    map { $vc .= "<option>$_->{name}--$_->{id}\n" }
+      @{ $form->{"all_$form->{vc}"} };
+
+    $vc =
+      ($vc)
+      ? qq|<select name=$form->{vc}><option>\n$vc</select>|
+      : qq|<input name=$form->{vc} size=35>|;
 
-    map { $vc .= "<option>$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} };
-    
-    $vc = ($vc) ? qq|<select name=$form->{vc}><option>\n$vc</select>| : qq|<input name=$form->{vc} size=35>|;
-    
     print qq|
 	<tr>
-	  <th align=right>|.$locale->text($label).qq|</th>
+	  <th align=right>| . $locale->text($label) . qq|</th>
 	  <td>$vc</td>
 	</tr>
 	<tr>
-	  <th align=right>|.$locale->text('Bis').qq|</th>
-	  <td>
-            $button1
-            $button1_2
+	  <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+	      $button1
+              $button1_2&nbsp;
+	      | . $locale->text('Bis') . qq|&nbsp;
+	      $button2
+              $button2_2
           </td>
 	</tr>
         <input type=hidden name=type value=statement>
@@ -836,56 +821,54 @@ print qq|
 
 	<input type=hidden name=nextsub value=$nextsub>
 	<input type=hidden name=action value=$nextsub>
-        
+
 $jsscript
 |;
   }
 
-# above action can be removed if there is more than one input field
-
+  # above action can be removed if there is more than one input field
 
+  my ($selection, $paymentaccounts);
   if ($form->{report} =~ /(receipts|payments)$/) {
-    $gifi = "";
-
     $form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar";
 
     RP->paymentaccounts(\%myconfig, \%$form);
 
     $selection = "<option>\n";
-    foreach $ref (@{ $form->{PR} }) {
+    foreach my $ref (@{ $form->{PR} }) {
       $paymentaccounts .= "$ref->{accno} ";
-      $selection .= "<option>$ref->{accno}--$ref->{description}\n";
+      $selection       .= "<option>$ref->{accno}--$ref->{description}\n";
     }
-    
+
     chop $paymentaccounts;
 
     print qq|
         <input type=hidden name=nextsub value=list_payments>
         <tr>
-	  <th align=right nowrap>|.$locale->text('Account').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Account') . qq|</th>
           <td colspan=3><select name=account>$selection</select>
 	    <input type=hidden name=paymentaccounts value="$paymentaccounts">
 	  </td>
 	</tr>
         <tr>
-	  <th align=right>|.$locale->text('Reference').qq|</th>
+	  <th align=right>| . $locale->text('Reference') . qq|</th>
           <td colspan=3><input name=reference></td>
 	</tr>
         <tr>
-	  <th align=right nowrap>|.$locale->text('Source').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Source') . qq|</th>
           <td colspan=3><input name=source></td>
 	</tr>
         <tr>
-	  <th align=right nowrap>|.$locale->text('Memo').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Memo') . qq|</th>
           <td colspan=3><input name=memo size=30></td>
 	</tr>
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td>
             $button1
             $button1_2
           </td>
-	  <th align=right>|.$locale->text('Bis').qq|</th>
+	  <th align=right>| . $locale->text('Bis') . qq|</th>
 	  <td>
             $button2
             $button2_2
@@ -893,11 +876,11 @@ $jsscript
 	</tr>
         <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>
+	  <th align=left colspan=3>| . $locale->text('Include Exchangerate Difference') . qq|</td>
 	</tr>
 
-$jsscript 
-        
+$jsscript
+
 	  <input type=hidden name=db value=$form->{db}>
 	  <input type=hidden name=sort value=transdate>
 |;
@@ -915,244 +898,244 @@ $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|">
-|;
+<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>
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
+sub continue { call_sub($main::form->{"nextsub"}); }
+
+sub get_project {
+  $main::lxdebug->enter_sub();
 
-sub continue { &{$form->{nextsub}} };
+  $main::auth->assert('report');
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-sub get_project {
-  $lxdebug->enter_sub();
   my $nextsub = shift;
-  
+
   $form->{project_id} = $form->{project_id_1};
   if ($form->{projectnumber} && !$form->{project_id}) {
     $form->{rowcount} = 1;
 
     # call this instead of update
-    $form->{update} = $nextsub;
+    $form->{update}          = $nextsub;
     $form->{projectnumber_1} = $form->{projectnumber};
-    
+
     delete $form->{sort};
-    &check_project;
+    check_project('generate_projects');
 
     # if there is one only, assign id
     $form->{project_id} = $form->{project_id_1};
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-
 sub generate_income_statement {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('report');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->{padding} = "&nbsp;&nbsp;";
-  $form->{bold} = "<b>";
+  $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
-  $form->{br} = "<br>";
-  
-  &get_project(generate_income_statement);
+  $form->{br}      = "<br>";
+
+  if ($form->{reporttype} eq "custom") {
 
-  $form->{projectnumber} = $form->{projectnumber_1};
-  
-    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;
+    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}";
+    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}";
+
+    #Quater reports
+    if ($form->{duetyp} eq "A") {
+      $form->{fromdate} = "1.1.$form->{year}";
+      $form->{todate}   = "31.3.$form->{year}";
     }
-    if ($form->{duetyp} eq "B"   ){
-      $form->{fromdate}="1.4.$form->{year}";
-      $form->{todate}="30.6.$form->{year}";
+    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 "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}";
+    if ($form->{duetyp} eq "D") {
+      $form->{fromdate} = "1.10.$form->{year}";
+      $form->{todate}   = "31.12.$form->{year}";
     }
- 
+
     #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}";
-					#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;
-    					};
-        }
-   }
-  
+  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}";
+
+        #this works from 1901 to 2099, 1900 and 2100 fail.
+        my $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;
+      };
+    }
+  }
+
   RP->income_statement(\%myconfig, \%$form);
 
   ($form->{department}) = split /--/, $form->{department};
-  
-  $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+
+  $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|;
-  }
+    my $longtodate  = $locale->date(\%myconfig, $form->{todate}, 1);
+    my $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0);
+
+    my $longfromdate  = $locale->date(\%myconfig, $form->{fromdate}, 1);
+    my $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
+
+    $form->{this_period} = "$shortfromdate\n$shorttodate";
+    $form->{period}      =
+        $locale->text('for Period')
+      . qq|\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|;
+    my $longcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 1);
+    my $shortcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 0);
+
+    my $longcomparetodate  = $locale->date(\%myconfig, $form->{comparetodate}, 1);
+    my $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
+
+    $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate";
+    $form->{period} .=
+        "\n$longcomparefromdate "
+      . $locale->text('Bis')
+      . qq| $longcomparetodate|;
   }
 
   # setup variables for the form
-  @a = qw(company address businessnumber);
+  my @a = qw(company address businessnumber);
   map { $form->{$_} = $myconfig{$_} } @a;
-  $form->{address} =~ s/\\n/<br>/g;
 
   $form->{templates} = $myconfig{templates};
 
   $form->{IN} = "income_statement.html";
-  
+
   $form->parse_template;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-
 sub generate_balance_sheet {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('report');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
+  $form->{decimalplaces} = $form->{decimalplaces} * 1 || 2;
   $form->{padding} = "&nbsp;&nbsp;";
-  $form->{bold} = "<b>";
+  $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
-  $form->{br} = "<br>";
-  
-  RP->balance_sheet(\%myconfig, \%$form);
+  $form->{br}      = "<br>";
+
+  my $data = RP->balance_sheet(\%myconfig, \%$form);
 
   $form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate};
   $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
-  
+
   ($form->{department}) = split /--/, $form->{department};
-  
+
   # define Current Earnings account
-  $padding = ($form->{l_heading}) ? $form->{padding} : "";
-  push(@{$form->{equity_account}}, $padding.$locale->text('Current Earnings'));
+  my $padding = ($form->{l_heading}) ? $form->{padding} : "";
+  push(@{ $form->{equity_account} }, $padding . $locale->text('Current Earnings'));
 
   $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0);
   $form->{last_period} = $locale->date(\%myconfig, $form->{compareasofdate}, 0);
@@ -1160,32 +1143,37 @@ 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};
-	  
-  $form->parse_template;
 
-  $lxdebug->leave_sub();
-}
+  $form->header();
+  print $form->parse_html_template('rp/balance_sheet', $data);
+#  $form->parse_template();
 
+  $main::lxdebug->leave_sub();
+}
 
 sub generate_projects {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('report');
 
-  &get_project(generate_projects);
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  &get_project("generate_projects");
   $form->{projectnumber} = $form->{projectnumber_1};
 
   $form->{nextsub} = "generate_projects";
-  $form->{title} = $locale->text('Project Transactions');
+  $form->{title}   = $locale->text('Project Transactions');
   RP->trial_balance(\%myconfig, \%$form);
-  
-  &list_accounts;
 
-  $lxdebug->leave_sub();
-}
+  list_accounts('generate_projects');
 
+  $main::lxdebug->leave_sub();
+}
 
 # Antonio Gallardo
 #
@@ -1194,625 +1182,629 @@ sub generate_projects {
 # added headers and subtotals
 #
 sub generate_trial_balance {
-  $lxdebug->enter_sub();
-  
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('report');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  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}";
+    }
+    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}";
+    }
+
+    #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}";
+
+        #this works from 1901 to 2099, 1900 and 2100 fail.
+        my $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;
+      };
+    }
+  }
+
+
   # get for each account initial balance, debits and credits
-  RP->trial_balance(\%myconfig, \%$form);
+  RP->trial_balance(\%myconfig, \%$form, 'beginning_balances' => 1);
+
+
+  $form->{rowcount} = scalar @{ $form->{TB} };
+  $form->{title} = sprintf($locale->text('Trial balance between %s and %s'), $form->{fromdate}, $form->{todate});
+
+  my @columns = (
+    "accno",               "description",
+    "last_transaction",    "soll_eb",
+    "haben_eb",
+    "soll",                "haben",
+    "soll_kumuliert",      "haben_kumuliert",
+    "soll_saldo",          "haben_saldo"
+  );
+
+
+  my $attachment_basename = $locale->text('trial_balance');
+  my $report              = SL::ReportGenerator->new(\%myconfig, $form);
+
+  my @hidden_variables    = qw(fromdate todate year cash);
+
+  my $href                = build_std_url('action=generate_trial_balance', grep { $form->{$_} } @hidden_variables);
+
+  my %column_defs         = (
+    'accno'               => { 'text' => $locale->text('Account'), },
+    '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'), }
+  );
+
+
+
+  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;
+
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
+
+  $report->set_export_options('generate_trial_balance', @hidden_variables);
 
-  $form->{nextsub} = "generate_trial_balance";
-  $form->{title} = $locale->text('Trial Balance');
-  &list_accounts;
+  my @options;
+
+
+  $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . "&nbsp; - &nbsp;" . $locale->date(\%myconfig, $form->{todate}, 0);
+
+  $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0);
+  push (@options, $form->{print_date});
+
+  $form->{company} = $locale->text('Company') . " " . $myconfig{company};
+  push (@options, $form->{company});
+
+
+  $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
+
+  $report->set_options('output_format'        => 'HTML',
+                       'top_info_text'        => join("\n", @options),
+                       'title'                => $form->{title},
+                       'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
+                       'html_template'        => 'rp/html_report_susa',
+                       'pdf_template'         => 'rp/html_report_susa',
+    );
+  $report->set_options_from_form();
+
+  # add sort and escape callback, this one we use for the add sub
+  $form->{callback} = $href .= "&sort=$form->{sort}";
+
+  # escape callback for href
+  my $callback = $form->escape($href);
+
+  my @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+  my %totals    = map { $_ => 0 } @subtotal_columns;
+
+  my $edit_url = build_std_url('action=edit', 'type', 'vc');
+
+  my $idx;
+  foreach my $accno (@{ $form->{TB} }) {
+
+    $accno->{soll} = $accno->{debit};
+    $accno->{haben} = $accno->{credit};
+    map { $totals{$_}    += $accno->{$_} } @subtotal_columns;
+
+    map { $accno->{$_} = $accno->{$_} == 0 ? '' : $form->format_amount(\%myconfig, $accno->{$_}, 2) }
+      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},
+      };
+    }
 
-  $lxdebug->leave_sub();
+    $row->{accno}->{link} = build_std_url('script=ca.pl', 'action=list_transactions', 'accno=' . E($accno->{accno}), 'description=' . E($accno->{description}), 'fromdate=' . E($form->{fromdate}), 'todate=' . E($form->{todate}), 'method=' . E($form->{method}));
+
+    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();
+
+  $main::lxdebug->leave_sub();
+
+}
+
+sub create_subtotal_row {
+  $main::lxdebug->enter_sub();
+
+  my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
+
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
+
+  $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
+
+  map { $totals->{$_} = 0 } @{ $subtotal_columns };
+
+  $main::lxdebug->leave_sub();
+
+  return $row;
 }
 
+sub create_list_accounts_subtotal_row {
+  $main::lxdebug->enter_sub();
+
+  my ($subtotals, $columns, $fields, $class) = @_;
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
+
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $subtotals->{$_}, 2) } @{ $fields };
+
+  $main::lxdebug->leave_sub();
+
+  return $row;
+}
 
 sub list_accounts {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $title = $form->escape($form->{title});
-  
+  my ($action) = @_;
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my @options;
   if ($form->{department}) {
-    ($department) = split /--/, $form->{department};
-    $options = $locale->text('Department')." : $department<br>";
-    $department = $form->escape($form->{department});
+    my ($department) = split /--/, $form->{department};
+    push @options, $locale->text('Department') . " : $department";
   }
   if ($form->{projectnumber}) {
-    $options .= $locale->text('Project Number')." : $form->{projectnumber}<br>";
-    $projectnumber = $form->escape($form->{projectnumber});
+    push @options, $locale->text('Project Number') . " : $form->{projectnumber}";
   }
 
   # 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->{todate}) {
       $todate = $locale->date(\%myconfig, $form->{todate}, 1);
     }
-    
-    $form->{period} = "$fromdate - $todate";
-  } else {
-    $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
 
+    push @options, "$fromdate - $todate";
+
+  } else {
+    push @options, $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
   }
-  $options .= $form->{period};
 
-  @column_index = qw(accno description begbalance debit credit endbalance);
+  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);
 
-  $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>|;
+  my @hidden_variables = qw(fromdate todate department l_heading l_subtotal all_accounts sort accounttype eur projectnumber project_id title nextsub);
 
+  $form->{callback} = build_std_url("action=$action", grep { $form->{$_} } @hidden_variables);
 
-  if ($form->{accounttype} eq 'gifi') {
-    $column_header{accno} = qq|<th class=listheading>|.$locale->text('GIFI').qq|</th>|;
-  }
-  
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  $form->header;
+  $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();
 
-  print qq|
-<body>
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-<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>|;
+  $report->set_export_options($action, @hidden_variables);
 
-  map { print "$column_header{$_}\n" } @column_index;
+  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} };
 
-  print qq|
-        </tr>
-|;
+  # 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);
 
+    my $ml   = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
 
-  
-  # sort the whole thing by account numbers and display
-  foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }) {
-
-    $description = $form->escape($ref->{description});
-    
-    $href = qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|;
-    
-    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";
-    }
+    my $row  = { map { $_ => { 'align' => $column_alignment{$_} } } @columns };
 
-    $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;
-      
-      print qq|
-        </tr>
-|;
-    }
- 
-    if ($ref->{charttype} eq "H") {
-      $subtotal = 1;
-      $subtotaldescription = $ref->{description};
-      $subtotaldebit = $ref->{debit};
-      $subtotalcredit = $ref->{credit};
-      $subtotalbegbalance = 0;
-      $subtotalendbalance = 0;
-
-      next unless $form->{l_heading};
-      
-      map { $column_data{$_} = "<th>&nbsp;</th>" } qw(accno debit credit begbalance endbalance);
-      $column_data{description} = "<th class=listheading>$ref->{description}</th>";
-    }
+    if ($ref->{charttype} eq 'H') {
+      next unless ($form->{l_heading});
 
-    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};
+      %subtotals                   = map { $_ => 0 } @totals_columns;
+      $found_heading               = 1;
+      $row->{description}->{class} = 'listheading';
+      $row->{description}->{data}  = $ref->{description};
 
-      $subtotalbegbalance += $ref->{balance} * $ml;
-      $subtotalendbalance += ($ref->{balance} + $ref->{amount}) * $ml;
+      $report->add_data($row);
 
+      next;
     }
-    
-    if ($ref->{charttype} eq "H") {
-      print qq|
-      <tr class=listheading>
-|;
-    }
-    if ($ref->{charttype} eq "A") {
-      $i++; $i %= 2;
-      print qq|
-      <tr class=listrow$i>
-|;
+
+    foreach (qw(debit credit)) {
+      $subtotals{$_} += $ref->{$_};
+      $totals{$_}    += $ref->{$_};
     }
-    
-    map { print "$column_data{$_}\n" } @column_index;
-    
-    print qq|
-      </tr>
-|;
-  }
 
+    $subtotals{begbalance} += $ref->{balance} * $ml;
+    $subtotals{endbalance} += ($ref->{balance} + $ref->{amount}) * $ml;
 
-  # 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>";
-    
-    print qq|
-      <tr class=listsubtotal>
-|;
-    map { print "$column_data{$_}\n" } @column_index;
-    
-    print qq|
-      </tr>
-|;
+    map { $row->{$_}->{data} = $ref->{$_} } qw(accno description);
+    map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $ref->{$_}, 2) if ($ref->{$_} != 0) } qw(credit debit);
+
+    $row->{begbalance}->{data} = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2);
+    $row->{endbalance}->{data} = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2);
+
+    $report->add_data($row);
+
+    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'));
+    }
   }
-  
-  $totaldebit = $form->format_amount(\%myconfig, $totaldebit, 2, "&nbsp;");
-  $totalcredit = $form->format_amount(\%myconfig, $totalcredit, 2, "&nbsp;");
-
-  map { $column_data{$_} = "<th>&nbsp;</th>" } qw(accno description begbalance endbalance);
- 
-  $column_data{debit} = qq|<th align=right class=listtotal>$totaldebit</th>|;
-  $column_data{credit} = qq|<th align=right class=listtotal>$totalcredit</th>|;
-  
-  print qq|
-        <tr class=listtotal>
-|;
 
-  map { print "$column_data{$_}\n" } @column_index;
+  $report->add_separator();
 
-  print qq|
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+  $report->add_data(create_list_accounts_subtotal_row(\%totals, \@columns, [ qw(debit credit) ], 'listtotal'));
 
-</body>
-</html>
-|;
+  $report->generate_with_headers();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-
 sub generate_ar_aging {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   # split customer
   ($form->{customer}) = split(/--/, $form->{customer});
-  $customer = $form->escape($form->{customer},1);
-  $title = $form->escape($form->{title},1);
 
-  $form->{ct} = "customer";
+  $form->{ct}   = "customer";
   $form->{arap} = "ar";
 
-  $form->{callback} = qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|;
+  $form->{callback} = build_std_url('action=generate_ar_aging', qw(todate customer title));
 
   RP->aging(\%myconfig, \%$form);
-  &aging;
-  
-  $lxdebug->leave_sub();
-}
+  aging();
 
+  $main::lxdebug->leave_sub();
+}
 
 sub generate_ap_aging {
-  $lxdebug->enter_sub();
-  
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
   # split vendor
   ($form->{vendor}) = split(/--/, $form->{vendor});
-  $vendor = $form->escape($form->{vendor},1);
-  $title = $form->escape($form->{title},1);
 
-  $form->{ct} = "vendor";
+  $form->{ct}   = "vendor";
   $form->{arap} = "ap";
-  
-  $form->{callback} = qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|;
+
+  $form->{callback} = build_std_url('action=generate_ap_aging', qw(todate vendor title));
 
   RP->aging(\%myconfig, \%$form);
-  &aging;
-  
-  $lxdebug->leave_sub();
-}
+  aging();
 
+  $main::lxdebug->leave_sub();
+}
 
-sub aging {
-  $lxdebug->enter_sub();
+sub create_aging_subtotal_row {
+  $main::lxdebug->enter_sub();
 
+  my ($subtotals, $columns, $periods, $class) = @_;
 
-  $form->header;
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $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 $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
 
-  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";
-  }
-    
-  if ($form->{arap} eq 'ar') {
-    if ($form->{customer}) {
-      $option .= "\n<br>" if $option;
-      $option .= $form->{customer};
-    }
-  }
-  if ($form->{arap} eq 'ap') {
-    shift @column_index;
-    if ($form->{vendor}) {
-      $option .= "\n<br>" if $option;
-      $option .= $form->{vendor};
-    }
+  foreach (@{ $periods }) {
+    $row->{"$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
+    $subtotals->{$_}      = 0;
   }
-  
-  $todate = $locale->date(\%myconfig, $form->{todate}, 1);
-  $option .= "\n<br>" if $option;
-  $option .= $locale->text('for Period')." ".$locale->text('Bis')." $todate";
 
-  print qq|
-<body>
+  $main::lxdebug->leave_sub();
 
-<form method=post action=$form->{script}>
+  return $row;
+}
 
-<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>
-|;
+sub aging {
+  $main::lxdebug->enter_sub();
 
-  map { print "$column_header{$_}\n" } @column_index;
-  
-  print qq|
-	</tr>
-|;
+  $main::auth->assert('general_ledger');
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+  my $cgi      = $main::cgi;
 
-  $ctid = 0;
-  $subtotal = 0;
-  $i = 0;
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  foreach $ref (@{ $form->{AG} }) {
+  my @columns = qw(statement ct invnumber transdate duedate amount open);
 
-    if ($ctid != $ref->{ctid}) {
+  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'), },
+    'amount'        => { 'text' => $locale->text('Amount'), },
+    'open'       => { 'text' => $locale->text('Open'), },
+  );
 
-      $i++;
+  my %column_alignment = ('statement' => 'center',
+                          map { $_ => 'right' } qw(open amount));
 
-      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");
-      }
-      
-      $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>
-|;
+  $report->set_options('std_column_visibility' => 1);
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-	map { print "$column_data{$_}\n" } @column_index;
+  my @hidden_variables = qw(todate customer vendor arap title ct);
+  $report->set_export_options('generate_' . ($form->{arap} eq 'ar' ? 'ar' : 'ap') . '_aging', @hidden_variables);
 
-	$column_data{statement} = qq|<td>&nbsp;</td>|;
+  my @options;
+  my $attachment_basename;
 
-	print qq|
-        </tr>
-|;
-      }
-   
-      $subtotal = 1;
-
-      $c0subtotal = 0;
-      $c30subtotal = 0;
-      $c60subtotal = 0;
-      $c90subtotal = 0;
-
-      $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>|;
-    }
-
-    $c0subtotal += $ref->{c0};
-    $c30subtotal += $ref->{c30};
-    $c60subtotal += $ref->{c60};
-    $c90subtotal += $ref->{c90};
-
-    $c0total += $ref->{c0};
-    $c30total += $ref->{c30};
-    $c60total += $ref->{c60};
-    $c90total += $ref->{c90};
-
-    $ref->{c0} = $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;");
- 
-    $href = qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|.$form->escape($form->{callback});
-    
-    $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>
-|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-        </tr>
-|;
- 
-    $column_data{ct} = qq|<td>&nbsp;</td>|;
-    $column_data{statement} = qq|<td>&nbsp;</td>|;
+  if ($form->{department}) {
+    my ($department) = split /--/, $form->{department};
+    push @options, $locale->text('Department') . " : $department";
+    $form->{callback} .= "&department=" . E($department);
+  }
 
-    $ctid = $ref->{ctid};
+  if (($form->{arap} eq 'ar') && $form->{customer}) {
+    push @options, $form->{customer};
+    $attachment_basename = $locale->text('ar_aging_list');
+    $form->{title} = sprintf($locale->text('Ar aging on %s'), $form->{todate});
+  }
 
+  if (($form->{arap} eq 'ap') && $form->{vendor}) {
+    push @options, $form->{vendor};
+    $attachment_basename = $locale->text('ap_aging_list');
+    $form->{title} = sprintf($locale->text('Ap aging on %s'), $form->{todate});
   }
-  
-  # print subtotals
-  $c0subtotal = $form->format_amount(\%myconfig, $c0subtotal, 2, "&nbsp;");
-  $c30subtotal = $form->format_amount(\%myconfig, $c30subtotal, 2, "&nbsp;");
-  $c60subtotal = $form->format_amount(\%myconfig, $c60subtotal, 2, "&nbsp;");
-  $c90subtotal = $form->format_amount(\%myconfig, $c90subtotal, 2, "&nbsp;");
-  
-  print qq|
-        <tr class=listsubtotal>
-|;
 
-  map { $column_data{$_} = qq|<th>&nbsp;</th>| } @column_index;
+  if ($form->{fromdate}) {
+    push @options, $locale->text('for Period') . " " . $locale->text('From') . " " .$locale->date(\%myconfig, $form->{fromdate}, 1) . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+  } else {
+    push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+  }
 
-  $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>|;
+  $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list');
 
-  map { print "$column_data{$_}\n" } @column_index;
- 
-  
-  print qq|
-        </tr>
-        <tr class=listtotal>
-|;
+  $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),
+    );
 
-  $c0total = $form->format_amount(\%myconfig, $c0total, 2, "&nbsp;");
-  $c30total = $form->format_amount(\%myconfig, $c30total, 2, "&nbsp;");
-  $c60total = $form->format_amount(\%myconfig, $c60total, 2, "&nbsp;");
-  $c90total = $form->format_amount(\%myconfig, $c90total, 2, "&nbsp;");
-  
-  $column_data{c0} = qq|<th align=right class=listtotal>$c0total</th>|;
-  $column_data{c30} = qq|<th align=right class=listtotal>$c30total</th>|;
-  $column_data{c60} = qq|<th align=right class=listtotal>$c60total</th>|;
-  $column_data{c90} = qq|<th align=right class=listtotal>$c90total</th>|;
-
- 
-  map { print "$column_data{$_}\n" } @column_index;
+  my $previous_ctid = 0;
+  my $row_idx       = 0;
+  my @periods       = qw(open amount);
+  my %subtotals     = map { $_ => 0 } @periods;
+  my %totals        = map { $_ => 0 } @periods;
 
-  
-  print qq|
-          <input type=hidden name=rowcount value=$i>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-|;
+  foreach my $ref (@{ $form->{AG} }) {
+    if ($row_idx && ($previous_ctid != $ref->{ctid})) {
+      $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal'));
+    }
 
-  &print_options if ($form->{arap} eq 'ar');
+    foreach my $key (@periods) {
+      $subtotals{$key}  += $ref->{"$key"};
+      $totals{$key}     += $ref->{"$key"};
+      $ref->{"$key"}  = $ref->{"$key"} != 0 ? $form->format_amount(\%myconfig, $ref->{"$key"}, 2) : '';
+    }
 
-  print qq|
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+    my $row = { };
 
-  if ($form->{arap} eq 'ar') {
-    print qq|
-<input type=hidden name=todate value=$form->{todate}>
+    foreach my $column (@columns) {
+      $row->{$column} = {
+        'data'   => (($column eq 'ct') || ($column eq 'statement')) ? '' : $ref->{$column},
+        'align'  => $column_alignment{$column},
+        'valign' => $column eq 'statement' ? 'center' : '',
+      };
+    }
 
-<input type=hidden name=title value="$form->{title}">
+    $row->{invnumber}->{link} =  build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id}));
 
-<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}}">
+    if ($previous_ctid != $ref->{ctid}) {
+      $row->{statement}->{raw_data} =
+          $cgi->hidden('-name' => "customer_id_" . ($row_idx + 1), '-value' => $ref->{ctid})
+        . $cgi->checkbox('-name' => "statement_" . ($row_idx + 1), '-value' => 1, '-label' => '', 'checked' => $ref->{checked});
+      $row->{ct}->{data} = $ref->{name};
 
-<input type=hidden name=department value="$form->{department}">
+      $row_idx++;
+    }
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-  
-<br>
-<input class=submit type=submit name=action value="|.$locale->text('Select all').qq|">
-<input class=submit type=submit name=action value="|.$locale->text('Print').qq|">
-<input class=submit type=submit name=action value="|.$locale->text('E-mail').qq|">
-|;
-  }
+    $previous_ctid = $ref->{ctid};
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+    $report->add_data($row);
   }
 
-  print qq|
-</form>
+  $report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal')) if ($row_idx);
 
-</body>
-</html>
-|;
+  $report->add_data(create_aging_subtotal_row(\%totals, \@columns, \@periods, 'listtotal'));
 
-  $lxdebug->leave_sub();
-}
-
-
-sub select_all {
-  $lxdebug->enter_sub();
-
-  RP->aging(\%myconfig, \%$form);
-
-  map { $_->{checked} = "checked" } @{ $form->{AG} };
-
-  &aging;
+  if ($form->{arap} eq 'ar') {
+    my $raw_top_info_text    = $form->parse_html_template('rp/aging_ar_top');
+    my $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);
+  }
 
-  $lxdebug->leave_sub();
-}
+  $report->set_options_from_form();
 
+  $report->generate_with_headers();
 
-sub print_options {
-  $lxdebug->enter_sub();
+  $main::lxdebug->leave_sub();
+}
 
-  $form->{sendmode} = "attachment";
-  $form->{copies} = 2 unless $form->{copies};
-  
-  $form->{PD}{$form->{type}} = "selected";
-  $form->{DF}{$form->{format}} = "selected";
-  $form->{OP}{$form->{media}} = "selected";
-  $form->{SM}{$form->{sendmode}} = "selected";
-  
-  $type = qq|
-	    <option value=statement $form->{PD}{statement}>|.$locale->text('Statement');
+sub select_all {
+  $main::lxdebug->enter_sub();
 
-  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');
-    }
-  }
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  if ($latex) {
-    $format .= qq|
-            <option value=postscript $form->{DF}{postscript}>|.$locale->text('Postscript').qq|
-	    <option value=pdf $form->{DF}{pdf}>|.$locale->text('PDF');
-  }
+  RP->aging(\%myconfig, \%$form);
 
-  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>
-|;
+  map { $_->{checked} = "checked" } @{ $form->{AG} };
 
-  if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
-    print qq|
-      <td>|.$locale->text('Copies').qq|
-      <input name=copies size=2 value=$form->{copies}></td>
-|;
-  }
-  
-  print qq|
-  </tr>
-</table>
-|;
+  &aging;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-
 sub e_mail {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   # get name and email addresses
-  for $i (1 .. $form->{rowcount}) {
+  my $selected = 0;
+  for my $i (1 .. $form->{rowcount}) {
     if ($form->{"statement_$i"}) {
       $form->{"$form->{ct}_id"} = $form->{"$form->{ct}_id_$i"};
       RP->get_customer(\%myconfig, \%$form);
@@ -1823,17 +1815,18 @@ sub e_mail {
 
   $form->error($locale->text('Nothing selected!')) unless $selected;
 
+  my $bcc = '';
   if ($myconfig{role} eq 'admin') {
     $bcc = qq|
-          <th align=right nowrap=true>|.$locale->text('Bcc').qq|</th>
+          <th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
 	  <td><input name=bcc size=30 value="$form->{bcc}"></td>
 |;
   }
 
-  $title = $locale->text('E-mail Statement to')." $form->{$form->{ct}}";
+  my $title = $locale->text('E-mail Statement to') . " $form->{$form->{ct}}";
 
   $form->{media} = "email";
-  
+
   $form->header;
 
   print qq|
@@ -1850,13 +1843,13 @@ sub e_mail {
     <td>
       <table width=100%>
         <tr>
-	  <th align=right nowrap>|.$locale->text('E-mail').qq|</th>
+	  <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
 	  <td><input name=email size=30 value="$form->{email}"></td>
-	  <th align=right nowrap>|.$locale->text('Cc').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
 	  <td><input name=cc size=30 value="$form->{cc}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Subject').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
 	  <td><input name=subject size=30 value="$form->{subject}"></td>
 	  $bcc
 	</tr>
@@ -1867,7 +1860,7 @@ sub e_mail {
     <td>
       <table width=100%>
         <tr>
-	  <th align=left nowrap>|.$locale->text('Message').qq|</th>
+	  <th align=left nowrap>| . $locale->text('Message') . qq|</th>
 	</tr>
 	<tr>
 	  <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
@@ -1881,10 +1874,12 @@ sub e_mail {
 
   &print_options;
 
-  map { delete $form->{$_} } qw(action email cc bcc subject message type sendmode format header);
+  map { delete $form->{$_} }
+    qw(action email cc bcc subject message type sendmode format header);
 
   # save all other variables
-  foreach $key (keys %$form) {
+  foreach my $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|;
   }
@@ -1900,45 +1895,57 @@ sub e_mail {
 <input type=hidden name=nextsub value=send_email>
 
 <br>
-<input name=action class=submit type=submit value="|.$locale->text('Continue').qq|">
+<input name=action class=submit type=submit value="|
+    . $locale->text('Continue') . qq|">
 </form>
 
 </body>
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-
 sub send_email {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
 
-  $form->{OUT} = "$sendmail";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
+    unless $form->{subject};
 
-  $form->{subject} = $locale->text('Statement').qq| - $form->{todate}| unless $form->{subject};
-  
   RP->aging(\%myconfig, \%$form);
-  
+
   $form->{"statement_1"} = 1;
 
-  &print_form;
-  
-  $form->redirect($locale->text('Statement sent to')." $form->{$form->{ct}}");
+  $form->{media} = 'email';
+  print_form();
 
-  $lxdebug->leave_sub();
+  $form->redirect($locale->text('Statement sent to') . " $form->{$form->{ct}}");
+
+  $main::lxdebug->leave_sub();
 }
 
+sub print {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-sub print {
-  $lxdebug->enter_sub();
-  
   if ($form->{media} eq 'printer') {
-    $form->error($locale->text('Select postscript or PDF!')) if ($form->{format} !~ /(postscript|pdf)/);
+    $form->error($locale->text('Select postscript or PDF!'))
+      if ($form->{format} !~ /(postscript|pdf)/);
   }
-  
-  for $i (1 .. $form->{rowcount}) {
+
+  my $selected = 0;
+  for my $i (1 .. $form->{rowcount}) {
     if ($form->{"statement_$i"}) {
       $form->{"$form->{ct}_id"} = $form->{"$form->{ct}_id_$i"};
       $selected = 1;
@@ -1947,183 +1954,219 @@ 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;
   }
-  
+
   RP->aging(\%myconfig, \%$form);
- 
-  &print_form;
 
-  $form->redirect($locale->text('Statements sent to printer!')) if ($form->{media} eq 'printer');
+  print_form();
 
-  $lxdebug->leave_sub();
-}
+  $form->redirect($locale->text('Statements sent to printer!'))
+    if ($form->{media} eq 'printer');
 
+  $main::lxdebug->leave_sub();
+}
 
 sub print_form {
-  $lxdebug->enter_sub();
-  
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
   $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
 
   $form->{templates} = "$myconfig{templates}";
- 
-  # setup variables for the form
-  @a = qw(company address businessnumber tel fax);
-  map { $form->{$_} = $myconfig{$_} } @a;
-  $form->format_string(@a);
-  
-  $form->{IN} = "$form->{type}.html";
 
+  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";
   }
 
-  $i = 0;
+  $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};
+
+  my $i = 0;
+  my $ctid;
   while (@{ $form->{AG} }) {
 
-    $ref = shift @{ $form->{AG} };
-    
+    my $ref = shift @{ $form->{AG} };
+
     if ($ctid != $ref->{ctid}) {
-      
+
       $ctid = $ref->{ctid};
       $i++;
 
       if ($form->{"statement_$i"}) {
-	
-	@a = (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};
-	
-	map { $form->{$_} = () } qw(invnumber invdate duedate);
-	$form->{total} = 0;
-	foreach $item (qw(c0 c30 c60 c90)) {
-	  $form->{$item} = ();
-	  $form->{"${item}total"} = 0;
-	}
-
-	&statement_details($ref);
+
+        my @a =
+          ("name", "street", "zipcode", "city", "country", "contact", "email",
+           "$form->{ct}phone", "$form->{ct}fax");
+        map { $form->{$_} = $ref->{$_} } @a;
+
+        $form->{ $form->{ct} } = $form->{name};
+        $form->{"$form->{ct}_id"} = $ref->{ctid};
+
+        map { $form->{$_} = () } qw(invnumber invdate duedate);
+        $form->{total} = 0;
+        foreach my $item (qw(c0 c30 c60 c90)) {
+          $form->{$item} = ();
+          $form->{"${item}total"} = 0;
+        }
+
+        &statement_details($ref);
 
         while ($ref) {
 
-	  if (scalar (@{ $form->{AG} }) > 0) {
-	    # one or more left to go
-	    if ($ctid == $form->{AG}->[0]->{ctid}) {
-	      $ref = shift @{ $form->{AG} };
-	      &statement_details($ref);
-	      # any more?
-	      $ref = scalar (@{ $form->{AG} });
-	    } else {
-	      $ref = 0;
-	    }
-	  } else {
-	    # set initial ref to 0
-	    $ref = 0;
-	  }
-
-	}
-	
-	map { $form->{"${_}total"} = $form->format_amount(\%myconfig, $form->{"${_}total"}, 2) } (c0, c30, c60, c90, "");
-
-	$form->parse_template(\%myconfig, $userspath);
-	
+          if (scalar(@{ $form->{AG} }) > 0) {
+
+            # one or more left to go
+            if ($ctid == $form->{AG}->[0]->{ctid}) {
+              $ref = shift @{ $form->{AG} };
+              &statement_details($ref);
+
+              # any more?
+              $ref = scalar(@{ $form->{AG} });
+            } else {
+              $ref = 0;
+            }
+          } else {
+
+            # set initial ref to 0
+            $ref = 0;
+          }
+
+        }
+
+        map {
+          $form->{"${_}total"} =
+            $form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
+        } ('c0', 'c30', 'c60', 'c90', "");
+
+        $form->{attachment_filename} =  $locale->quote_special_chars('filenames', $locale->text("Statement") . "_$form->{todate}.$attachment_suffix");
+        $form->{attachment_filename} =~ s/\s+/_/g;
+
+        $form->parse_template(\%myconfig, $main::userspath);
+
       }
     }
   }
-
-  $lxdebug->leave_sub();
+  # 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
+  $main::lxdebug->leave_sub();
 }
 
-
 sub statement_details {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
   my ($ref) = @_;
 
   push @{ $form->{invnumber} }, $ref->{invnumber};
-  push @{ $form->{invdate} }, $ref->{transdate};
-  push @{ $form->{duedate} }, $ref->{duedate};
-  
-  foreach $item (qw(c0 c30 c60 c90)) {
-    eval { $ref->{$item} = $form->round_amount($ref->{$item} / $ref->{exchangerate}, 2) };
+  push @{ $form->{invdate} },   $ref->{transdate};
+  push @{ $form->{duedate} },   $ref->{duedate};
+
+  foreach my $item (qw(c0 c30 c60 c90)) {
+    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} }, $form->format_amount(\%myconfig, $ref->{$item}, 2);
+    $form->{total}          += $ref->{$item};
+    push @{ $form->{$item} },
+      $form->format_amount(\%myconfig, $ref->{$item}, 2);
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
- 
 
 sub generate_tax_report {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('report');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   RP->tax_report(\%myconfig, \%$form);
 
-  $descvar = "$form->{accno}_description";
-  $description = $form->escape($form->{$descvar});
-  $ratevar = "$form->{accno}_rate";
+  my $descvar     = "$form->{accno}_description";
+  my $description = $form->escape($form->{$descvar});
+  my $ratevar     = "$form->{accno}_rate";
+  our $taxrate; # most likely error
+
+  my $department = $form->escape($form->{department});
 
-  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}";
+  my $href =
+    "$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_/);
+  $description = $form->escape($form->{$descvar},   1);
+  $department  = $form->escape($form->{department}, 1);
+  my $callback    =
+    "$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});
+  my $title = $form->escape($form->{title});
   $href .= "&title=$title";
-  $title = $form->escape($form->{title},1);
+  $title = $form->escape($form->{title}, 1);
   $callback .= "&title=$title";
-  
+
   $form->{title} = qq|$form->{title} $form->{"$form->{accno}_description"} |;
 
-  @columns = $form->sort_columns(qw(id transdate invnumber name netamount tax amount));
+  my @columns =
+    $form->sort_columns(qw(id transdate invnumber name netamount tax amount));
 
-  foreach $item (@columns) {
+  foreach my $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {
       push @column_index, $item;
 
       # add column to href and callback
       $callback .= "&l_$item=Y";
-      $href .= "&l_$item=Y";
+      $href     .= "&l_$item=Y";
     }
   }
 
   if ($form->{l_subtotal} eq 'Y') {
     $callback .= "&l_subtotal=Y";
-    $href .= "&l_subtotal=Y";
+    $href     .= "&l_subtotal=Y";
   }
-  
-  
+
+  my $option;
   if ($form->{department}) {
     ($department) = split /--/, $form->{department};
-    $option = $locale->text('Department')." : $department";
+    $option = $locale->text('Department') . " : $department";
   }
-  
+
+  my ($fromdate, $todate);
   # if there are any dates
   if ($form->{fromdate} || $form->{todate}) {
     if ($form->{fromdate}) {
@@ -2132,38 +2175,38 @@ sub generate_tax_report {
     if ($form->{todate}) {
       $todate = $locale->date(\%myconfig, $form->{todate}, 1);
     }
-    
+
     $form->{period} = "$fromdate - $todate";
   } else {
-    $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+    $form->{period} =
+      $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
   }
 
-
+  my ($name, $invoice, $arap);
   if ($form->{db} eq 'ar') {
-    $name = $locale->text('Customer');
+    $name    = $locale->text('Customer');
     $invoice = 'is.pl';
-    $arap = 'ar.pl';
+    $arap    = 'ar.pl';
   }
   if ($form->{db} eq 'ap') {
-    $name = $locale->text('Vendor');
+    $name    = $locale->text('Vendor');
     $invoice = 'ir.pl';
-    $arap = 'ap.pl';
+    $arap    = 'ap.pl';
   }
 
   $option .= "<br>" if $option;
   $option .= "$form->{period}";
-  
- 
-  $column_header{id} = qq|<th><a class=listheading href=$href&sort=id>|.$locale->text('ID').qq|</th>|;
-  $column_header{invnumber} = qq|<th><a class=listheading href=$href&sort=invnumber>|.$locale->text('Invoice').qq|</th>|;
-  $column_header{transdate} = qq|<th><a class=listheading href=$href&sort=transdate>|.$locale->text('Date').qq|</th>|;
-  $column_header{netamount} = qq|<th class=listheading>|.$locale->text('Amount').qq|</th>|;
-  $column_header{tax} = qq|<th class=listheading>|.$locale->text('Tax').qq|</th>|;
-  $column_header{amount} = qq|<th class=listheading>|.$locale->text('Total').qq|</th>|;
-  
-  $column_header{name} = qq|<th><a class=listheading href=$href&sort=name>$name</th>|;
-
-  
+
+  my %column_header;
+  $column_header{id}        = qq|<th><a class=listheading href=$href&sort=id>| . $locale->text('ID') . qq|</th>|;
+  $column_header{invnumber} = qq|<th><a class=listheading href=$href&sort=invnumber>| . $locale->text('Invoice') . qq|</th>|;
+  $column_header{transdate} = qq|<th><a class=listheading href=$href&sort=transdate>| . $locale->text('Date') . qq|</th>|;
+  $column_header{netamount} = qq|<th class=listheading>| . $locale->text('Amount') . qq|</th>|;
+  $column_header{tax}       = qq|<th class=listheading>| . $locale->text('Tax') . qq|</th>|;
+  $column_header{amount}    = qq|<th class=listheading>| . $locale->text('Total') . qq|</th>|;
+
+  $column_header{name}      = qq|<th><a class=listheading href=$href&sort=name>$name</th>|;
+
   $form->header;
 
   print qq|
@@ -2171,7 +2214,7 @@ sub generate_tax_report {
 
 <table width=100%>
   <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
+    <th class=listtop>$form->{title}</th>
   </tr>
   <tr height="5"></tr>
   <tr>
@@ -2184,46 +2227,54 @@ sub generate_tax_report {
 |;
 
   map { print "$column_header{$_}\n" } @column_index;
-  
+
   print qq|
 	</tr>
 |;
 
   # add sort and escape callback
   $callback = $form->escape($callback . "&sort=$form->{sort}");
-    
+
+  my $sameitem;
   if (@{ $form->{TR} }) {
-    $sameitem = $form->{TR}->[0]->{$form->{sort}};
+    $sameitem = $form->{TR}->[0]->{ $form->{sort} };
   }
 
-  foreach $ref (@{ $form->{TR} }) {
+  my ($totalnetamount, $totaltax);
+  my ($i);
+  foreach my $ref (@{ $form->{TR} }) {
+
+    my $module = ($ref->{invoice}) ? $invoice : $arap;
 
-    $module = ($ref->{invoice}) ? $invoice : $arap;
-    
     if ($form->{l_subtotal} eq 'Y') {
-      if ($sameitem ne $ref->{$form->{sort}}) {
-	&tax_subtotal;
-	$sameitem = $ref->{$form->{sort}};
+      if ($sameitem ne $ref->{ $form->{sort} }) {
+        &tax_subtotal;
+        $sameitem = $ref->{ $form->{sort} };
       }
     }
 
     $totalnetamount += $ref->{netamount};
-    $totaltax += $ref->{tax};
+    $totaltax       += $ref->{tax};
     $ref->{amount} = $ref->{netamount} + $ref->{tax};
 
     $subtotalnetamount += $ref->{netamount};
-    $subtotaltax += $ref->{tax};
-    
-    map { $ref->{$_} = $form->format_amount(\%myconfig, $ref->{$_}, 2, "&nbsp;"); } qw(netamount tax amount);
-    
-    $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>|;
+    $subtotaltax       += $ref->{tax};
+
+    map {
+      $ref->{$_} = $form->format_amount(\%myconfig, $ref->{$_}, 2, "&nbsp;");
+    } qw(netamount tax amount);
+
+    $column_data{id}        = qq|<td>$ref->{id}</td>|;
+    $column_data{invnumber} =
+      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>|;
-    
-    map { $column_data{$_} = qq|<td align=right>$ref->{$_}</td>| } qw(netamount tax amount);
+    $column_data{name}      = qq|<td>$ref->{name}&nbsp;</td>|;
 
-    $i++; $i %= 2;
+    map { $column_data{$_} = qq|<td align=right>$ref->{$_}</td>| }
+      qw(netamount tax amount);
+
+    $i++;
+    $i %= 2;
     print qq|
 	<tr class=listrow$i>
 |;
@@ -2233,32 +2284,30 @@ sub generate_tax_report {
     print qq|
 	</tr>
 |;
- 
+
   }
- 
+
   if ($form->{l_subtotal} eq 'Y') {
     &tax_subtotal;
   }
 
-  
   map { $column_data{$_} = qq|<th>&nbsp;</th>| } @column_index;
-  
+
   print qq|
         </tr>
 	<tr class=listtotal>
 |;
 
-  $total = $form->format_amount(\%myconfig, $totalnetamount + $totaltax, 2, "&nbsp;");
+  my $total          = $form->format_amount(\%myconfig, $totalnetamount + $totaltax, 2, "&nbsp;");
   $totalnetamount = $form->format_amount(\%myconfig, $totalnetamount, 2, "&nbsp;");
-  $totaltax = $form->format_amount(\%myconfig, $totaltax, 2, "&nbsp;");
-  
+  $totaltax       = $form->format_amount(\%myconfig, $totaltax, 2, "&nbsp;");
+
   $column_data{netamount} = qq|<th class=listtotal align=right>$totalnetamount</th>|;
-  $column_data{tax} = qq|<th class=listtotal align=right>$totaltax</th>|;
+  $column_data{tax}    = qq|<th class=listtotal align=right>$totaltax</th>|;
   $column_data{amount} = qq|<th class=listtotal align=right>$total</th>|;
- 
+
   map { print "$column_data{$_}\n" } @column_index;
- 
-    
+
   print qq|
         </tr>
       </table>
@@ -2273,26 +2322,29 @@ sub generate_tax_report {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-
 sub tax_subtotal {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
 
   $subtotalnetamount = $form->format_amount(\%myconfig, $subtotalnetamount, 2, "&nbsp;");
-  $subtotaltax = $form->format_amount(\%myconfig, $subtotaltax, 2, "&nbsp;");
-  $subtotal = $form->format_amount(\%myconfig, $subtotalnetamount + $subtotaltax, 2, "&nbsp;");
-  
+  $subtotaltax       = $form->format_amount(\%myconfig, $subtotaltax, 2, "&nbsp;");
+  $subtotal          = $form->format_amount(\%myconfig, $subtotalnetamount + $subtotaltax, 2, "&nbsp;");
+
   $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>";
+  $column_data{tax}       = "<th class=listsubtotal align=right>$subtotaltax</th>";
+  $column_data{amount}    = "<th class=listsubtotal align=right>$subtotal</th>";
 
   $subtotalnetamount = 0;
-  $subtotaltax = 0;
-  
+  $subtotaltax       = 0;
+
   print qq|
 	<tr class=listsubtotal>
 |;
@@ -2301,256 +2353,196 @@ sub tax_subtotal {
   print qq|
         </tr>
 |;
-  
-  $lxdebug->leave_sub();
-}
-
 
+  $main::lxdebug->leave_sub();
+}
 
 sub list_payments {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
+  $main::auth->assert('cash');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   if ($form->{account}) {
     ($form->{paymentaccounts}) = split /--/, $form->{account};
   }
+
+  my $option;
   if ($form->{department}) {
-    ($department, $form->{department_id}) = split /--/, $form->{department};
-    $option = $locale->text('Department')." : $department";
+    (my $department, $form->{department_id}) = split /--/, $form->{department};
+    $option = $locale->text('Department') . " : $department";
   }
 
+  report_generator_set_default_sort('transdate', 1);
+
   RP->payments(\%myconfig, \%$form);
-  
-  @columns = $form->sort_columns(qw(transdate reference name paid source memo));
 
-  # construct href
-  $account = $form->escape($form->{account});
-  $title = $form->escape($form->{title});
-  $department = $form->escape($form->{department});
-  $form->{paymentaccounts} =~ s/ /%20/g;
-  $reference = $form->escape($form->{reference});
-  $source = $form->escape($form->{source});
-  $memo = $form->escape($form->{memo});
-  
-  $href = "$form->{script}?path=$form->{path}&action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo";
+  my @hidden_variables = qw(account title department reference source memo fromdate todate
+                            fx_transaction db prepayment paymentaccounts sort);
 
-  # construct callback
-  $account = $form->escape($form->{account},1);
-  $title = $form->escape($form->{title},1);
-  $department = $form->escape($form->{department},1);
-  $reference = $form->escape($form->{reference},1);
-  $source = $form->escape($form->{source},1);
-  $memo = $form->escape($form->{memo},1);
-  
-  $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>";
-  
+  my $href = build_std_url('action=list_payments', grep { $form->{$_} } @hidden_variables);
+  $form->{callback} = $href;
+
+  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');
 
+  foreach my $name (grep { $_ ne 'paid' } @columns) {
+    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$name}->{link} = $href . "&sort=${name}&sortdir=$sortdir";
+  }
+
+  my @options;
   if ($form->{fromdate}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('From')."&nbsp;".$locale->date(\%myconfig, $form->{fromdate}, 1);
+    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1);
   }
   if ($form->{todate}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('bis')."&nbsp;".$locale->date(\%myconfig, $form->{todate}, 1);
+    push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
   }
 
-  @column_index = @columns;
-  $colspan = $#column_index + 1;
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  $form->header;
+  my $attachment_basename = $form->{db} eq 'ar' ? $locale->text('list_of_receipts') : $locale->text('list_of_payments');
 
-  print qq|
-<body>
+  $report->set_options('top_info_text'         => join("\n", @options),
+                       'output_format'         => 'HTML',
+                       'title'                 => $form->{title},
+                       'attachment_basename'   => $attachment_basename . strftime('_%Y%m%d', localtime time),
+                       'std_column_visibility' => 1,
+    );
+  $report->set_options_from_form();
 
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$option</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>
-|;
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-  map { print "\n$column_header{$_}" } @column_index;
+  $report->set_export_options('list_payments', @hidden_variables, qw(sort sortdir));
 
-  print qq|
-        </tr>
-|;
+  $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 
-  
-  foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {
+  my $total_paid    = 0;
 
-    next unless @{ $form->{$ref->{id}} };
+  foreach my $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {
+    next unless @{ $form->{ $ref->{id} } };
 
-    print qq|
-        <tr>
-	  <th colspan=$colspan align=left>$ref->{accno}--$ref->{description}</th>
-	</tr>
-|;
-  
-    foreach $payment (@{ $form->{$ref->{id}} }) {
-      
-      $module = $payment->{module};
+    $report->add_control({ 'type' => 'colspan_data', 'data' => "$ref->{accno}--$ref->{description}" });
+
+    my $subtotal_paid = 0;
+
+    foreach my $payment (@{ $form->{ $ref->{id} } }) {
+      my $module = $payment->{module};
       $module = 'is' if ($payment->{invoice} && $payment->{module} eq 'ar');
       $module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap');
-      
-      $href = qq|${module}.pl?path=$form->{path}&action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|;
-    
-      
-      $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>";
-
-      $subtotalpaid += $payment->{paid};
-      $totalpaid += $payment->{paid};
-       
-      $i++; $i %= 2;
-      print qq|
-	<tr class=listrow$i>
-|;
 
-      map { print "\n$column_data{$_}" } @column_index;
+      $subtotal_paid += $payment->{paid};
+      $total_paid    += $payment->{paid};
 
-      print qq|
-        </tr>
-|;
+      $payment->{paid} = $form->format_amount(\%myconfig, $payment->{paid}, 2);
 
-    }
+      my $row = { };
 
-    # print subtotals
-    map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
+      foreach my $column (@columns) {
+        $row->{$column} = {
+          'data'  => $payment->{$column},
+          'align' => $column_alignment{$column},
+        };
+      }
 
-    $column_data{paid} = "<th class=listsubtotal align=right>".$form->format_amount(\%myconfig, $subtotalpaid, 2, "&nbsp;")."</th>";
-     
-    print qq|
-	<tr class=listsubtotal>
-|;
+      $row->{invnumber}->{link} = build_std_url("script=${module}.pl", 'action=edit', 'id=' . E($payment->{id}), 'callback');
 
-    map { print "\n$column_data{$_}" } @column_index;
+      $report->add_data($row);
+    }
 
-    print qq|
-        </tr>
-|;
+    my $row = { map { $_ => { 'class' => 'listsubtotal' } } @columns };
+    $row->{paid} = {
+      'data'  => $form->format_amount(\%myconfig, $subtotal_paid, 2),
+      'align' => 'right',
+      'class' => 'listsubtotal',
+    };
 
-    $subtotalpaid = 0;
-     
+    $report->add_data($row);
   }
 
+  $report->add_separator();
 
-  # print total
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
+  my $row = { map { $_ => { 'class' => 'listtotal' } } @columns };
+  $row->{paid} = {
+    'data'  => $form->format_amount(\%myconfig, $total_paid, 2),
+    'align' => 'right',
+    'class' => 'listtotal',
+  };
 
-  $column_data{paid} = "<th class=listtotal align=right>".$form->format_amount(\%myconfig, $totalpaid, 2, "&nbsp;")."</th>";
-     
-  print qq|
-        <tr class=listtotal>
-|;
+  $report->add_data($row);
 
-  map { print "\n$column_data{$_}" } @column_index;
+  $report->generate_with_headers();
 
-  print qq|
-        </tr>
+  $main::lxdebug->leave_sub();
+}
 
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+sub print_options {
+  $main::lxdebug->enter_sub();
 
-</body>
-</html>
-|;
+  my ($dont_print) = @_;
 
-  $lxdebug->leave_sub();
-}
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-sub config { 
-  $lxdebug->enter_sub();
-   edit();
-   #$form->header;
-   #print qq|Hallo|;
-  $lxdebug->leave_sub();
-}
+  $form->{sendmode} = "attachment";
 
-sub debug {
+  $form->{"format"} =
+    $form->{"format"} ? $form->{"format"} :
+    $myconfig{"template_format"} ? $myconfig{"template_format"} :
+    "pdf";
 
-    $form->debug();
-    
-}
-    
-
-sub winston_export {
-  $lxdebug->enter_sub();
-  print (STDERR "Winston Export1\n");
-  #create_winston();
-  $form->{winston} = 1;
-  &generate_ustva();
-  $lxdebug->leave_sub();
-}
+  $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";
 
-sub print_options {
-  $lxdebug->enter_sub();
+  my ($media);
+  my $type = qq|
+	    <option value=statement $form->{PD}{statement}>|
+      . $locale->text('Statement');
 
-  $form->{sendmode} = "attachment";
-  $form->{copies} = 2 unless $form->{copies};
-  
-  $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|
-	    <option value=statement $form->{PD}{statement}>|.$locale->text('Statement');
-  }
-  
   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');
+	    <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) {
+	    <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
+    if ($myconfig{printer} && $main::latex_templates) {
       $media .= qq|
-            <option value=printer $form->{OP}{printer}>|.$locale->text('Printer');
+            <option value=printer $form->{OP}{printer}>|
+        . $locale->text('Printer');
     }
   }
 
-  if ($latex) {
+  my $format;
+  if ($main::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>
@@ -2558,426 +2550,222 @@ sub print_options {
     <td><select name=media>$media</select></td>
 |;
 
-  if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
-    print qq|
-      <td>|.$locale->text('Copies').qq|
+  if ($myconfig{printer} && $main::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>
 |;
 
-  $lxdebug->leave_sub();
+  print $output unless $dont_print;
+
+  $main::lxdebug->leave_sub();
+
+  return $output;
 }
 
 sub generate_bwa {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('report');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
   $form->{padding} = "&nbsp;&nbsp;";
-  $form->{bold} = "<b>";
+  $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
-  $form->{br} = "<br>";
-  
-#  &get_project(generate_bwa);
+  $form->{br}      = "<br>";
+
+  if ($form->{reporttype} eq "custom") {
 
-  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;
+    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}";
-      $form->{comparefromdate}="1.01.$form->{year}";
-      $form->{comparetodate}="31.12.$form->{year}";
+    if ($form->{duetyp} eq "13") {
+      $form->{fromdate}        = "1.1.$form->{year}";
+      $form->{todate}          = "31.12.$form->{year}";
+      $form->{comparefromdate} = "1.01.$form->{year}";
+      $form->{comparetodate}   = "31.12.$form->{year}";
     }
-    #Quater reports    
-    if ($form->{duetyp} eq "A"   ){
-      $form->{fromdate}="1.1.$form->{year}";
-      $form->{todate}="31.3.$form->{year}";
-      $form->{comparefromdate}="1.01.$form->{year}";
-      $form->{comparetodate}="31.03.$form->{year}";
+
+    #Quater reports
+    if ($form->{duetyp} eq "A") {
+      $form->{fromdate}        = "1.1.$form->{year}";
+      $form->{todate}          = "31.3.$form->{year}";
+      $form->{comparefromdate} = "1.01.$form->{year}";
+      $form->{comparetodate}   = "31.03.$form->{year}";
     }
-    if ($form->{duetyp} eq "B"   ){
-      $form->{fromdate}="1.4.$form->{year}";
-      $form->{todate}="30.6.$form->{year}";
-      $form->{comparefromdate}="1.01.$form->{year}";
-      $form->{comparetodate}="30.06.$form->{year}";      
+    if ($form->{duetyp} eq "B") {
+      $form->{fromdate}        = "1.4.$form->{year}";
+      $form->{todate}          = "30.6.$form->{year}";
+      $form->{comparefromdate} = "1.01.$form->{year}";
+      $form->{comparetodate}   = "30.06.$form->{year}";
     }
-    if ($form->{duetyp} eq "C"   ){
-      $form->{fromdate}="1.7.$form->{year}";
-      $form->{todate}="30.9.$form->{year}";
-      $form->{comparefromdate}="1.01.$form->{year}";
-      $form->{comparetodate}="30.09.$form->{year}";     
+    if ($form->{duetyp} eq "C") {
+      $form->{fromdate}        = "1.7.$form->{year}";
+      $form->{todate}          = "30.9.$form->{year}";
+      $form->{comparefromdate} = "1.01.$form->{year}";
+      $form->{comparetodate}   = "30.09.$form->{year}";
     }
-    if ($form->{duetyp} eq "D"   ){
-      $form->{fromdate}="1.10.$form->{year}";
-      $form->{todate}="31.12.$form->{year}";
-      $form->{comparefromdate}="1.01.$form->{year}";
-      $form->{comparetodate}="31.12.$form->{year}";      
+    if ($form->{duetyp} eq "D") {
+      $form->{fromdate}        = "1.10.$form->{year}";
+      $form->{todate}          = "31.12.$form->{year}";
+      $form->{comparefromdate} = "1.01.$form->{year}";
+      $form->{comparetodate}   = "31.12.$form->{year}";
     }
- 
+
     #Monthly reports
-    SWITCH: {
-    	$form->{duetyp} eq "1" && do {
-      					$form->{fromdate}="1.1.$form->{year}";
-				      	$form->{todate}="31.1.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="31.01.$form->{year}";
-					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->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="$leap.02.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "3" && do {
-      					$form->{fromdate}="1.3.$form->{year}";
-				      	$form->{todate}="31.3.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="31.03.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "4" && do {
-      					$form->{fromdate}="1.4.$form->{year}";
-				      	$form->{todate}="30.4.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="30.04.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "5" && do {
-      					$form->{fromdate}="1.5.$form->{year}";
-				      	$form->{todate}="31.5.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="31.05.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "6" && do {
-      					$form->{fromdate}="1.6.$form->{year}";
-				      	$form->{todate}="30.6.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="30.06.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "7" && do {
-      					$form->{fromdate}="1.7.$form->{year}";
-				      	$form->{todate}="31.7.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="31.07.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "8" && do {
-      					$form->{fromdate}="1.8.$form->{year}";
-				      	$form->{todate}="31.8.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="31.08.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "9" && do {
-      					$form->{fromdate}="1.9.$form->{year}";
-				      	$form->{todate}="30.9.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="30.09.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "10" && do {
-      					$form->{fromdate}="1.10.$form->{year}";
-				      	$form->{todate}="31.10.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="31.10.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "11" && do {
-      					$form->{fromdate}="1.11.$form->{year}";
-				      	$form->{todate}="30.11.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="30.11.$form->{year}";
-					last SWITCH;
-    					};
-    	$form->{duetyp} eq "12" && do {
-      					$form->{fromdate}="1.12.$form->{year}";
-				      	$form->{todate}="31.12.$form->{year}";
-      					$form->{comparefromdate}="1.01.$form->{year}";
-				      	$form->{comparetodate}="31.12.$form->{year}";
-					last SWITCH;
-    					};
-        }
-   } else {
-     ($yy, $mm, $dd) = $locale->parse_date(\%myconfig, $form->{fromdate});
-     $form->{fromdate} = "${dd}.${mm}.${yy}";
-     ($yy, $mm, $dd) = $locale->parse_date(\%myconfig, $form->{todate});
-     $form->{todate} = "${dd}.${mm}.${yy}";
-     $form->{comparefromdate} = "01.01.$yy";
-     $form->{comparetodate} = $form->{todate};
-   }
+  SWITCH: {
+      $form->{duetyp} eq "1" && do {
+        $form->{fromdate}        = "1.1.$form->{year}";
+        $form->{todate}          = "31.1.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "31.01.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "2" && do {
+        $form->{fromdate} = "1.2.$form->{year}";
+
+        #this works from 1901 to 2099, 1900 and 2100 fail.
+        my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+        $form->{todate}          = "$leap.2.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "$leap.02.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "3" && do {
+        $form->{fromdate}        = "1.3.$form->{year}";
+        $form->{todate}          = "31.3.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "31.03.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "4" && do {
+        $form->{fromdate}        = "1.4.$form->{year}";
+        $form->{todate}          = "30.4.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "30.04.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "5" && do {
+        $form->{fromdate}        = "1.5.$form->{year}";
+        $form->{todate}          = "31.5.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "31.05.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "6" && do {
+        $form->{fromdate}        = "1.6.$form->{year}";
+        $form->{todate}          = "30.6.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "30.06.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "7" && do {
+        $form->{fromdate}        = "1.7.$form->{year}";
+        $form->{todate}          = "31.7.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "31.07.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "8" && do {
+        $form->{fromdate}        = "1.8.$form->{year}";
+        $form->{todate}          = "31.8.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "31.08.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "9" && do {
+        $form->{fromdate}        = "1.9.$form->{year}";
+        $form->{todate}          = "30.9.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "30.09.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "10" && do {
+        $form->{fromdate}        = "1.10.$form->{year}";
+        $form->{todate}          = "31.10.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "31.10.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "11" && do {
+        $form->{fromdate}        = "1.11.$form->{year}";
+        $form->{todate}          = "30.11.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "30.11.$form->{year}";
+        last SWITCH;
+      };
+      $form->{duetyp} eq "12" && do {
+        $form->{fromdate}        = "1.12.$form->{year}";
+        $form->{todate}          = "31.12.$form->{year}";
+        $form->{comparefromdate} = "1.01.$form->{year}";
+        $form->{comparetodate}   = "31.12.$form->{year}";
+        last SWITCH;
+      };
+    }
+  } else {
+    my ($yy, $mm, $dd) = $locale->parse_date(\%myconfig, $form->{fromdate});
+    $form->{fromdate} = "${dd}.${mm}.${yy}";
+    ($yy, $mm, $dd) = $locale->parse_date(\%myconfig, $form->{todate});
+    $form->{todate}          = "${dd}.${mm}.${yy}";
+    $form->{comparefromdate} = "01.01.$yy";
+    $form->{comparetodate}   = $form->{todate};
+  }
 
   RP->bwa(\%myconfig, \%$form);
 
   ($form->{department}) = split /--/, $form->{department};
-  
-  $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+
+  $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);
     }
 
     my %germandate = ("dateformat" => "dd.mm.yyyy");
 
-    $longtodate = $locale->date(\%germandate, $form->{todate}, 1);
-    $shorttodate = $locale->date(\%germandate, $form->{todate}, 0);
-    
-    $longfromdate = $locale->date(\%germandate, $form->{fromdate}, 1);
-    $shortfromdate = $locale->date(\%germandate, $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|;
-  }
+    my $longtodate  = $locale->date(\%germandate, $form->{todate}, 1);
+    my $shorttodate = $locale->date(\%germandate, $form->{todate}, 0);
+
+    my $longfromdate  = $locale->date(\%germandate, $form->{fromdate}, 1);
+    my $shortfromdate = $locale->date(\%germandate, $form->{fromdate}, 0);
 
+    $form->{this_period} = "$shortfromdate\n$shorttodate";
+    $form->{period}      =
+        $locale->text('for Period')
+      . qq|\n$longfromdate |
+      . $locale->text('bis')
+      . qq| $longtodate|;
+  }
 
   # setup variables for the form
-  @a = qw(company address businessnumber);
+  my @a = qw(company address businessnumber);
   map { $form->{$_} = $myconfig{$_} } @a;
-  $form->{address} =~ s/\\n/<br>/g;
   $form->{templates} = $myconfig{templates};
 
   $form->{IN} = "bwa.html";
-  
-  $form->parse_template;
-
-  $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->parse_template;
 
-  $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();
+  $main::lxdebug->leave_sub();
 }
 
-
+1;