X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=7f5aa0d6969a382be88fd68d4c587c354ec9ff04;hb=c66624d02068502ae8e7bc55f7ec2edbcd8a4702;hp=c06e79b4d34c16f85f5fdf989bb83192033caeb3;hpb=3da2dca2e601b311b6e464ffff02bfe98a7024d1;p=kivitendo-erp.git

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index c06e79b4d..7f5aa0d69 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -39,7 +39,6 @@ use POSIX qw(strftime);
 
 use SL::PE;
 use SL::RP;
-use SL::USTVA;
 use SL::Iconv;
 use SL::ReportGenerator;
 
@@ -92,9 +91,32 @@ require "bin/mozilla/reportgenerator.pl";
 # $locale->text('Non-taxable Sales')
 # $locale->text('Non-taxable Purchases')
 
+# $form->parse_html_template('rp/html_report_susa')
+
+my $rp_access_map = {
+  'projects'         => 'report',
+  'ar_aging'         => 'general_ledger',
+  'ap_aging'         => 'general_ledger',
+  'receipts'         => 'cash',
+  'payments'         => 'cash',
+  'trial_balance'    => 'report',
+  'income_statement' => 'report',
+  'bwa'              => 'report',
+  'balance_sheet'    => 'report',
+};
+
+sub check_rp_access {
+  my $right   = $rp_access_map->{$form->{report}};
+  $right    ||= 'DOES_NOT_EXIST';
+
+  $auth->assert($right);
+}
+
 sub report {
   $lxdebug->enter_sub();
 
+  check_rp_access();
+
   %title = ('balance_sheet'        => 'Balance Sheet',
             'income_statement'     => 'Income Statement',
             'trial_balance'        => 'Trial Balance',
@@ -107,8 +129,7 @@ sub report {
             'receipts'             => 'Receipts',
             'payments'             => 'Payments',
             'projects'             => 'Project Transactions',
-            'bwa'                  => 'Betriebswirtschaftliche Auswertung',
-            'ustva'                => 'Umsatzsteuervoranmeldung',);
+            'bwa'                  => 'Betriebswirtschaftliche Auswertung',);
 
   $form->{title} = $locale->text($title{ $form->{report} });
 
@@ -121,11 +142,7 @@ sub report {
   $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|
@@ -153,93 +170,70 @@ sub report {
   # use JavaScript Calendar or not
   $form->{jsscript} = 1;
   $jsscript = "";
-  if ($form->{report} eq "ustva") {
-    $department = "";
+  if ($form->{report} eq "balance_sheet") {
+    $name_1    = "asofdate";
+    $id_1      = "asofdate";
+    $value_1   = "$form->{asofdate}";
+    $trigger_1 = "trigger1";
+    $name_2    = "compareasofdate";
+    $id_2      = "compareasofdate";
+    $value_2   = "$form->{compareasofdate}";
+    $trigger_2 = "trigger2";
+  } elsif ($form->{report} =~ /(receipts|payments)$/) {
+    $name_1    = "fromdate";
+    $id_1      = "fromdate";
+    $value_1   = "$form->{fromdate}";
+    $trigger_1 = "trigger1";
+    $name_2    = "todate";
+    $id_2      = "todate";
+    $value_2   = "";
+    $trigger_2 = "trigger2";
+  } elsif (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
+    $name_1    = "fromdate";
+    $id_1      = "fromdate";
+    $value_1   = "$form->{fromdate}";
+    $trigger_1 = "trigger1";
+    $name_2    = "todate";
+    $id_2      = "todate";
+    $value_2   = "";
+    $trigger_2 = "trigger2";
+
   } else {
-    if ($form->{report} eq "balance_sheet") {
-      $name_1    = "asofdate";
-      $id_1      = "asofdate";
-      $value_1   = "$form->{asofdate}";
-      $trigger_1 = "trigger1";
-      $name_2    = "compareasofdate";
-      $id_2      = "compareasofdate";
-      $value_2   = "$form->{compareasofdate}";
-      $trigger_2 = "trigger2";
-    } elsif ($form->{report} =~ /(receipts|payments)$/) {
-      $name_1    = "fromdate";
-      $id_1      = "fromdate";
-      $value_1   = "$form->{fromdate}";
-      $trigger_1 = "trigger1";
-      $name_2    = "todate";
-      $id_2      = "todate";
-      $value_2   = "";
-      $trigger_2 = "trigger2";
-    } else {
-      if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
-        $name_1    = "";
-        $id_1      = "";
-        $value_1   = "";
-        $trigger_1 = "";
-        $name_2    = "todate";
-        $id_2      = "todate";
-        $value_2   = "";
-        $trigger_2 = "trigger2";
-
-      } else {
-        $name_1    = "fromdate";
-        $id_1      = "fromdate";
-        $value_1   = "$form->{fromdate}";
-        $trigger_1 = "trigger1";
-        $name_2    = "todate";
-        $id_2      = "todate";
-        $value_2   = "";
-        $trigger_2 = "trigger2";
-      }
-    }
+    $name_1    = "fromdate";
+    $id_1      = "fromdate";
+    $value_1   = "$form->{fromdate}";
+    $trigger_1 = "trigger1";
+    $name_2    = "todate";
+    $id_2      = "todate";
+    $value_2   = "";
+    $trigger_2 = "trigger2";
   }
 
   # with JavaScript Calendar
   if ($form->{jsscript}) {
     if ($name_1 eq "") {
-
-      $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|>|;
+      $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");
+      $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|>
-       |;
+      $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");
+      $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)\">|;
+      $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)\">|;
+      $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>|;
@@ -288,10 +282,8 @@ sub report {
       <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>
+	  <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
@@ -308,83 +300,62 @@ $jsscript
 </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>
+	  <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>
+		<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>
+		<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>
+		<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>
+          <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;
@@ -398,10 +369,8 @@ $jsscript
 	</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>
+	  <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
@@ -418,83 +387,63 @@ $jsscript
 </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>
+	  <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>
+		<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>
+		<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>
+		<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>
+          <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;
@@ -508,15 +457,11 @@ $checked></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>
+	  <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>
+         <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
              <td><input name=decimalplaces size=3 value="2"></td>
          </tr>
                                     
@@ -524,186 +469,139 @@ $jsscript
 |;
   }
 
-  if ($form->{report} eq "ustva") {
-
+  if ($form->{report} eq "balance_sheet") {
     print qq|
+        <input type=hidden name=nextsub value=generate_balance_sheet>
+	<tr>
+	  <th align=right>| . $locale->text('as at') . qq|</th>
+	  <td>
+            $button1
+            $button1_2
+          </td>
+	  <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
+	  <td>
+          $button2
+          $button2_2
+          </td>
+	</tr>
+	<tr>
+	  <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
+	  <td><input name=decimalplaces size=3 value="2"></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <table>
+	<tr>
+	  <th align=right>| . $locale->text('Method') . qq|</th>
+	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+	  &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+	</tr>
 
-        <br>
-        <input type=hidden name=nextsub value=generate_ustva>
+	<tr>
+	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Heading') . qq|
+	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Subtotal') . qq|
+	  <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Account Number') . qq|</td>
+	</tr>
+
+$jsscript
+|;
+  }
+
+  if ($form->{report} eq "trial_balance") {
+    print qq|
+	<tr>
+	  <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+	  <td colspan=3>$projectnumber</td>
+	</tr>
+        <input type=hidden name=nextsub value=generate_trial_balance>
 </table>
 <table>
 	<tr>
-	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
-      . $locale->text('Zeitraum') . qq|</th>
+	  <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>
+	  <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>
+		<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 = "checked";
     print qq|
-		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January') . qq|</td>
+		<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>
+		<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>| . $locale->text('Method') . qq|</th>
-	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
-      . $locale->text('Accrual') . qq|
-	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR') . qq|</td>
-	</tr>
-	<tr>
-	  <th colspan=4>|;
-##########
-
-    &print_options();
-    print qq|
-	  </th>
-	</tr>
-|;
-  }
-
-  if ($form->{report} eq "balance_sheet") {
-    print qq|
-        <input type=hidden name=nextsub value=generate_balance_sheet>
-	<tr>
-	  <th align=right>| . $locale->text('as at') . qq|</th>
-	  <td>
-            $button1
-            $button1_2
-          </td>
-	  <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
-	  <td>
-          $button2
-          $button2_2
+          <th align=left><input name=reporttype class=radio type=radio value="free" $checked> | . $locale->text('Free report period') . qq|</th>
+	  <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+	      $button1
+              $button1_2&nbsp;
+	      | . $locale->text('Bis') . qq|&nbsp;
+	      $button2
+              $button2_2
           </td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
-	  <td><input name=decimalplaces size=3 value="2"></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <table>
+        </tr>
 	<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>
+   		<td colspan=5><hr size=3 noshade></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=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 "trial_balance") {
-    print qq|
-        <input type=hidden name=nextsub value=generate_trial_balance>
-        <input type=hidden name=eur value=$eur>
        <tr>
-	  <th align=right>| . $locale->text('From') . qq|</th>
-          <td>
-            $button1
-            $button1_2
-          </td>
-	  <th align=right>| . $locale->text('Bis') . qq|</th>
-	  <td>
-            $button2
-            $button2_2
-          </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
-	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Heading') . qq|
-	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Subtotal') . qq|
-	  <input name=all_accounts class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('All Accounts') . qq|</td>
-	</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
 |;
   }
@@ -747,10 +645,8 @@ $jsscript
 	</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>
+	  <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>
@@ -892,10 +788,12 @@ $jsscript
 	  <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>
@@ -958,8 +856,7 @@ $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
@@ -981,32 +878,8 @@ $jsscript
 </table>
 
 <br>
-<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 zum Einlesen der Finanzamtdaten
-  USTVA->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>
@@ -1020,6 +893,9 @@ sub continue { call_sub($form->{"nextsub"}); }
 
 sub get_project {
   $lxdebug->enter_sub();
+
+  $auth->assert('report');
+
   my $nextsub = shift;
 
   $form->{project_id} = $form->{project_id_1};
@@ -1043,6 +919,8 @@ sub get_project {
 sub generate_income_statement {
   $lxdebug->enter_sub();
 
+  $auth->assert('report');
+
   $form->{padding} = "&nbsp;&nbsp;";
   $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
@@ -1210,74 +1088,391 @@ sub generate_income_statement {
 sub generate_balance_sheet {
   $lxdebug->enter_sub();
 
-  $form->{padding} = "&nbsp;&nbsp;";
-  $form->{bold}    = "<b>";
-  $form->{endbold} = "</b>";
-  $form->{br}      = "<br>";
+  $auth->assert('report');
+
+  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'));
+
+  $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0);
+  $form->{last_period} =
+    $locale->date(\%myconfig, $form->{compareasofdate}, 0);
+
+  my $attachment_basename;
+
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+  my @hidden_variables = ();
+  push @hidden_variables, qw(fromdate todate year cash );
+
+  my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
+
+  my %column_defs = (
+    'accno'                   => { 'text' => $locale->text('Account Number'), },
+    'description'             => { 'text' => $locale->text('Description'), },
+    'last_transaction'        => { 'text' => $locale->text('Last Transaction'), },
+    'soll_eb'                 => { 'text' => $locale->text('Debit Starting Balance'), },
+    'haben_eb'                => { 'text' => $locale->text('Credit Starting Balance'), },
+    'soll'                    => { 'text' => $locale->text('Debit'), },
+    'haben'                   => { 'text' => $locale->text('Credit'), },
+    'soll_kumuliert'          => { 'text' => $locale->text('Sum Debit'), },
+    'haben_kumuliert'         => { 'text' => $locale->text('Sum Credit'), },
+    'soll_saldo'              => { 'text' => $locale->text('Saldo Debit'), },
+    'haben_saldo'                => { 'text' => $locale->text('Saldo Credit'), }
+  );
+
+
+
+  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('trial_balance', @hidden_variables);
+
+  $report->set_sort_indicator($form->{sort}, 1);
+
+  my @options;
+
+
+  $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . "&nbsp; - &nbsp;" . $locale->date(\%myconfig, $form->{todate}, 0);
+  $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
+
+  $report->set_options('output_format'        => 'HTML',
+                       'title'                => $form->{title},
+                       'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
+    );
+  $report->set_options_from_form();
+  # $form->parse_html_template('report_generator/html_report_bilanz', $variables));
+  $form->{report_template} = 'report_generator/html_report_bilanz';
+  # add sort and escape callback, this one we use for the add sub
+  $form->{callback} = $href .= "&sort=$form->{sort}";
+
+  # escape callback for href
+  $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');
+
+#   foreach $accno (@{ $form->{TB} }) {
+# 
+#     $accno->{soll} = $accno->{debit};
+#     $accno->{haben} = $accno->{credit};
+#     map { $totals{$_}    += $accno->{$_} } @subtotal_columns;
+# 
+#     map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+# 
+#     map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+# 
+#     my $row = { };
+# 
+#     foreach my $column (@columns) {
+#       $row->{$column} = {
+#         'data'  => $accno->{$column},
+#         'align' => $column_alignment{$column},
+#       };
+#     }
+# 
+# 
+#     $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
+# 
+#     my $row_set = [ $row ];
+# 
+# 
+#     $report->add_data($row_set);
+# 
+#     $idx++;
+#   }
+# 
+#   $report->add_separator();
+# 
+#   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
+
+  $report->generate_with_headers();
+
+
+  $lxdebug->leave_sub();
+}
+
+sub generate_projects {
+  $lxdebug->enter_sub();
+
+  $auth->assert('report');
+
+  &get_project(generate_projects);
+  $form->{projectnumber} = $form->{projectnumber_1};
+
+  $form->{nextsub} = "generate_projects";
+  $form->{title}   = $locale->text('Project Transactions');
+  RP->trial_balance(\%myconfig, \%$form);
+
+  list_accounts('generate_projects');
+
+  $lxdebug->leave_sub();
+}
+
+# Antonio Gallardo
+#
+# D.S. Feb 16, 2001
+# included links to display transactions for period entered
+# added headers and subtotals
+#
+sub generate_trial_balance {
+  $lxdebug->enter_sub();
+
+  $auth->assert('report');
+
+  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.
+        $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);
+
+
+  $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;
+  $attachment_basename = $locale->text('trial_balance');
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+  my @hidden_variables = ();
+  push @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 Number'), },
+    'description'             => { 'text' => $locale->text('Description'), },
+    'last_transaction'        => { 'text' => $locale->text('Last Transaction'), },
+    'soll_eb'                 => { 'text' => $locale->text('Debit Starting Balance'), },
+    'haben_eb'                => { 'text' => $locale->text('Credit Starting Balance'), },
+    'soll'                    => { 'text' => $locale->text('Debit'), },
+    'haben'                   => { 'text' => $locale->text('Credit'), },
+    'soll_kumuliert'          => { 'text' => $locale->text('Sum Debit'), },
+    'haben_kumuliert'         => { 'text' => $locale->text('Sum Credit'), },
+    'soll_saldo'              => { 'text' => $locale->text('Saldo Debit'), },
+    'haben_saldo'                => { 'text' => $locale->text('Saldo Credit'), }
+  );
+
+
+
+  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);
+
+  $report->set_sort_indicator($form->{sort}, 1);
+
+  my @options;
+
+
+  $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . "&nbsp; - &nbsp;" . $locale->date(\%myconfig, $form->{todate}, 0);
+  $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
+
+  $report->set_options('output_format'        => 'HTML',
+                       '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
+  $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');
+
+  foreach $accno (@{ $form->{TB} }) {
 
-  RP->balance_sheet(\%myconfig, \%$form);
+    $accno->{soll} = $accno->{debit};
+    $accno->{haben} = $accno->{credit};
+    map { $totals{$_}    += $accno->{$_} } @subtotal_columns;
 
-  $form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate};
-  $form->{period} =
-    $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+    map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
 
-  ($form->{department}) = split /--/, $form->{department};
+    map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
 
-  # define Current Earnings account
-  $padding = ($form->{l_heading}) ? $form->{padding} : "";
-  push(@{ $form->{equity_account} },
-       $padding . $locale->text('Current Earnings'));
+    my $row = { };
 
-  $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0);
-  $form->{last_period} =
-    $locale->date(\%myconfig, $form->{compareasofdate}, 0);
+    foreach my $column (@columns) {
+      $row->{$column} = {
+        'data'  => $accno->{$column},
+        'align' => $column_alignment{$column},
+      };
+    }
 
-  $form->{IN} = "balance_sheet.html";
 
-  # setup company variables for the form
-  map { $form->{$_} = $myconfig{$_};
-        $form->{$_} =~ s/\\n/\n/g; }
-    (qw(company address businessnumber nativecurr));
+    $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
 
-  $form->{templates} = $myconfig{templates};
+    my $row_set = [ $row ];
 
-  $form->parse_template;
 
-  $lxdebug->leave_sub();
-}
+    $report->add_data($row_set);
 
-sub generate_projects {
-  $lxdebug->enter_sub();
+    $idx++;
+  }
 
-  &get_project(generate_projects);
-  $form->{projectnumber} = $form->{projectnumber_1};
+  $report->add_separator();
 
-  $form->{nextsub} = "generate_projects";
-  $form->{title}   = $locale->text('Project Transactions');
-  RP->trial_balance(\%myconfig, \%$form);
+  $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
-  list_accounts('generate_projects');
+  $report->generate_with_headers();
 
   $lxdebug->leave_sub();
+
 }
 
-# Antonio Gallardo
-#
-# D.S. Feb 16, 2001
-# included links to display transactions for period entered
-# added headers and subtotals
-#
-sub generate_trial_balance {
+sub create_subtotal_row {
   $lxdebug->enter_sub();
 
-  # get for each account initial balance, debits and credits
-  RP->trial_balance(\%myconfig, \%$form);
+  my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
+
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
+
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
 
-  $form->{nextsub} = "generate_trial_balance";
-  $form->{title}   = $locale->text('Trial Balance');
-  list_accounts('generate_trial_balance');
+  $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
+
+  map { $totals->{$_} = 0 } @{ $subtotal_columns };
 
   $lxdebug->leave_sub();
+
+  return $row;
 }
 
 sub create_list_accounts_subtotal_row {
@@ -1419,6 +1614,8 @@ sub list_accounts {
 sub generate_ar_aging {
   $lxdebug->enter_sub();
 
+  $auth->assert('general_ledger');
+
   # split customer
   ($form->{customer}) = split(/--/, $form->{customer});
 
@@ -1436,6 +1633,8 @@ sub generate_ar_aging {
 sub generate_ap_aging {
   $lxdebug->enter_sub();
 
+  $auth->assert('general_ledger');
+
   # split vendor
   ($form->{vendor}) = split(/--/, $form->{vendor});
 
@@ -1458,7 +1657,7 @@ sub create_aging_subtotal_row {
   my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
 
   foreach (@{ $periods }) {
-    $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
+    $row->{"$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
     $subtotals->{$_}      = 0;
   }
 
@@ -1470,9 +1669,11 @@ sub create_aging_subtotal_row {
 sub aging {
   $lxdebug->enter_sub();
 
+  $auth->assert('general_ledger');
+
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90);
+  my @columns = qw(statement ct invnumber transdate duedate amount open);
 
   my %column_defs = (
     'statement' => { 'text' => '', 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, },
@@ -1480,14 +1681,12 @@ sub aging {
     'invnumber' => { 'text' => $locale->text('Invoice'), },
     'transdate' => { 'text' => $locale->text('Date'), },
     'duedate'   => { 'text' => $locale->text('Due'), },
-    'c0'        => { 'text' => $locale->text('Current'), },
-    'c30'       => { 'text' => '30', },
-    'c60'       => { 'text' => '60', },
-    'c90'       => { 'text' => '90', },
+    'amount'        => { 'text' => $locale->text('Amount'), },
+    'open'       => { 'text' => $locale->text('Open'), },
   );
 
   my %column_alignment = ('statement' => 'center',
-                          map { $_ => 'right' } qw(c0 c30 c60 c90));
+                          map { $_ => 'right' } qw(open amount));
 
   $report->set_options('std_column_visibility' => 1);
   $report->set_columns(%column_defs);
@@ -1497,6 +1696,7 @@ sub aging {
   $report->set_export_options('generate_' . ($form->{arap} eq 'ar' ? 'ar' : 'ap') . '_aging', @hidden_variables);
 
   my @options;
+  my $attachment_basename;
 
   if ($form->{department}) {
     my ($department) = split /--/, $form->{department};
@@ -1506,13 +1706,21 @@ sub aging {
 
   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});
   }
 
-  push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+  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);
+  }
 
   my $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list');
 
@@ -1524,7 +1732,7 @@ sub aging {
 
   my $previous_ctid = 0;
   my $row_idx       = 0;
-  my @periods       = qw(0 30 60 90);
+  my @periods       = qw(open amount);
   my %subtotals     = map { $_ => 0 } @periods;
   my %totals        = map { $_ => 0 } @periods;
 
@@ -1534,9 +1742,9 @@ sub aging {
     }
 
     foreach my $key (@periods) {
-      $subtotals{$key}  += $ref->{"c${key}"};
-      $totals{$key}     += $ref->{"c${key}"};
-      $ref->{"c${key}"}  = $ref->{"c${key}"} != 0 ? $form->format_amount(\%myconfig, $ref->{"c${key}"}, 2) : '';
+      $subtotals{$key}  += $ref->{"$key"};
+      $totals{$key}     += $ref->{"$key"};
+      $ref->{"$key"}  = $ref->{"$key"} != 0 ? $form->format_amount(\%myconfig, $ref->{"$key"}, 2) : '';
     }
 
     my $row = { };
@@ -1572,7 +1780,7 @@ sub aging {
   if ($form->{arap} eq 'ar') {
     $raw_top_info_text    = $form->parse_html_template('rp/aging_ar_top');
     $raw_bottom_info_text = $form->parse_html_template('rp/aging_ar_bottom', { 'row_idx' => $row_idx,
-                                                                               'PRINT_OPTIONS' => print_options(1), });
+                                                                               '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);
   }
@@ -1599,6 +1807,8 @@ sub select_all {
 sub e_mail {
   $lxdebug->enter_sub();
 
+  $auth->assert('general_ledger');
+
   # get name and email addresses
   for $i (1 .. $form->{rowcount}) {
     if ($form->{"statement_$i"}) {
@@ -1674,6 +1884,7 @@ sub e_mail {
 
   # save all other variables
   foreach $key (keys %$form) {
+    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
     $form->{$key} =~ s/\"/&quot;/g;
     print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
   }
@@ -1703,6 +1914,8 @@ sub e_mail {
 sub send_email {
   $lxdebug->enter_sub();
 
+  $auth->assert('general_ledger');
+
   $form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
     unless $form->{subject};
 
@@ -1721,6 +1934,8 @@ sub send_email {
 sub print {
   $lxdebug->enter_sub();
 
+  $auth->assert('general_ledger');
+
   if ($form->{media} eq 'printer') {
     $form->error($locale->text('Select postscript or PDF!'))
       if ($form->{format} !~ /(postscript|pdf)/);
@@ -1755,18 +1970,7 @@ sub print {
 sub print_form {
   $lxdebug->enter_sub();
 
-  my %replacements =
-    (
-     "ä" => "ae", "ö" => "oe", "ü" => "ue",
-     "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
-     "ß" => "ss",
-     " " => "_"
-    );
-
-  foreach my $key (keys %replacements) {
-    my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key);
-    $replacements{$new_key} = $replacements{$key} if $new_key ne $key;
-  }
+  $auth->assert('general_ledger');
 
   $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
 
@@ -1785,9 +1989,7 @@ sub print_form {
   }
 
   $form->{IN}  = "$form->{type}.$suffix";
-  $form->{OUT} =
-    $form->{media} eq 'email'   ? $sendmail              :
-    $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
+  $form->{OUT} = $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
 
   # Save $form->{email} because it will be overwritten.
   $form->{EMAIL_RECIPIENT} = $form->{email};
@@ -1848,8 +2050,8 @@ sub print_form {
             $form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
         } (c0, c30, c60, c90, "");
 
-        $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix";
-        map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements));
+        $form->{attachment_filename} =  $locale->quote_special_chars('filenames', $locale->text("Statement") . "_$form->{todate}.$attachment_suffix");
+        $form->{attachment_filename} =~ s/\s+/_/g;
 
         $form->parse_template(\%myconfig, $userspath);
 
@@ -1869,6 +2071,9 @@ sub print_form {
 
 sub statement_details {
   $lxdebug->enter_sub();
+
+  $auth->assert('general_ledger');
+
   my ($ref) = @_;
 
   push @{ $form->{invnumber} }, $ref->{invnumber};
@@ -1892,6 +2097,8 @@ sub statement_details {
 sub generate_tax_report {
   $lxdebug->enter_sub();
 
+  $auth->assert('report');
+
   RP->tax_report(\%myconfig, \%$form);
 
   $descvar     = "$form->{accno}_description";
@@ -1902,13 +2109,13 @@ sub generate_tax_report {
 
   # construct href
   $href =
-    "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+    "$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}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+    "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
 
   $title = $form->escape($form->{title});
   $href .= "&title=$title";
@@ -1969,27 +2176,14 @@ sub generate_tax_report {
   $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>|;
+  $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;
 
@@ -2047,7 +2241,7 @@ sub generate_tax_report {
 
     $column_data{id}        = qq|<td>$ref->{id}</td>|;
     $column_data{invnumber} =
-      qq|<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>|;
+      qq|<td><a href=$module?action=edit&id=$ref->{id}&callback=$callback>$ref->{invnumber}</a></td>|;
     $column_data{transdate} = qq|<td>$ref->{transdate}</td>|;
     $column_data{name}      = qq|<td>$ref->{name}&nbsp;</td>|;
 
@@ -2144,6 +2338,8 @@ sub tax_subtotal {
 sub list_payments {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   if ($form->{account}) {
     ($form->{paymentaccounts}) = split /--/, $form->{account};
   }
@@ -2259,30 +2455,6 @@ sub list_payments {
   $lxdebug->leave_sub();
 }
 
-sub config {
-  $lxdebug->enter_sub();
-  edit();
-
-  #$form->header;
-  #print qq|Hallo|;
-  $lxdebug->leave_sub();
-}
-
-sub debug {
-
-  $form->debug();
-
-}
-
-sub winston_export {
-  $lxdebug->enter_sub();
-
-  #create_winston();
-  $form->{winston} = 1;
-  &generate_ustva();
-  $lxdebug->leave_sub();
-}
-
 sub print_options {
   $lxdebug->enter_sub();
 
@@ -2305,14 +2477,9 @@ sub print_options {
   $form->{OP}{ $form->{media} }    = "selected";
   $form->{SM}{ $form->{sendmode} } = "selected";
 
-  if ($form->{report} eq 'ustva') {
-    $type = qq|
-	    <option value=ustva $form->{PD}{ustva}>| . $locale->text('ustva');
-  } else {
-    $type = qq|
+  $type = qq|
 	    <option value=statement $form->{PD}{statement}>|
       . $locale->text('Statement');
-  }
 
   if ($form->{media} eq 'email') {
     $media = qq|
@@ -2331,14 +2498,9 @@ sub print_options {
 
   if ($latex_templates) {
     $format .= qq|
-            <option value=html $form->{DF}{html}>|
-      . $locale->text('HTML') . qq|
-	    <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
-    if ($form->{report} ne 'ustva') {
-      $format . qq|
-            <option value=postscript $form->{DF}{postscript}>|
-        . $locale->text('Postscript');
-    }
+            <option value=html $form->{DF}{html}>| . $locale->text('HTML')
+      . qq| <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF')
+      . qq| <option value=postscript $form->{DF}{postscript}>| . $locale->text('Postscript');
   }
 
   my $output = qq|
@@ -2370,6 +2532,9 @@ sub print_options {
 
 sub generate_bwa {
   $lxdebug->enter_sub();
+
+  $auth->assert('report');
+
   $form->{padding} = "&nbsp;&nbsp;";
   $form->{bold}    = "<b>";
   $form->{endbold} = "</b>";
@@ -2560,232 +2725,3 @@ sub generate_bwa {
   $lxdebug->leave_sub();
 }
 
-sub generate_ustva {
-  $lxdebug->enter_sub();
-
-  # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten
-  USTVA->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} = "";
-  }
-  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\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\n$shortcomparetodate";
-    $form->{period} .=
-        "\n$longcomparefromdate "
-      . $locale->text('bis')
-      . qq| $longcomparetodate|;
-  }
-
-  $form->{Datum_heute} =
-    $locale->date(\%myconfig, $form->current_date(\%myconfig), 0);
-
-  if (   $form->{format} eq 'pdf'
-      or $form->{format} eq 'postscript') {
-    $form->{padding} = "~~";
-    $form->{bold}    = "\textbf{";
-    $form->{endbold} = "}";
-    $form->{br}      = '\\\\';
-
-    @numbers = qw(51r 86r 97r 93r 96 43 45
-      66 62 67);
-    foreach $number (@numbers) {
-      $form->{$number} =~ s/,/~~/g;
-    }
-
-      } elsif ($form->{format} eq 'html') {
-    $form->{padding} = "&nbsp;&nbsp;";
-    $form->{bold}    = "<b>";
-    $form->{endbold} = "</b>";
-    $form->{br}      = "<br>"
-
-  }
-
-  # setup variables for the form
-  @a = qw(company address businessnumber);
-  map { $form->{$_} = $myconfig{$_} } @a;
-
-  $form->{address} =~ s/\\n/$form->{br}/g;
-
-  if ($form->{winston} eq '1') {
-    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();
-}