Merge branch 'after-262'

[kivitendo-erp.git] / bin / mozilla / rp.pl

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 62abf66..1d84469 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -14,8 +14,8 @@
 #
 #  Contributors: Antonio Gallardo <agssa@ibw.com.ni>
 #                Benjamin Lee <benjaminlee@consultant.com>
-#               Philip Reetz <p.reetz@linet-services.de>
-#               Udo Spallek
+#                Philip Reetz <p.reetz@linet-services.de>
+#                Udo Spallek
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,10 +52,6 @@ require "bin/mozilla/reportgenerator.pl";
 # should there be any missing vars, declare them globally
 use strict;
 
-1;
-
-# end of main
-
 # this is for our long dates
 # $locale->text('January')
 # $locale->text('February')
@@ -89,6 +85,8 @@ use strict;
 # $locale->text('Trial Balance')
 # $locale->text('AR Aging')
 # $locale->text('AP Aging')
+# $locale->text('Search AR Aging')
+# $locale->text('Search AP Aging')
 # $locale->text('Tax collected')
 # $locale->text('Tax paid')
 # $locale->text('Receipts')
@@ -96,6 +94,7 @@ use strict;
 # $locale->text('Project Transactions')
 # $locale->text('Non-taxable Sales')
 # $locale->text('Non-taxable Purchases')
+# $locale->text('Business evaluation')
 
 # $form->parse_html_template('rp/html_report_susa')
 
@@ -111,10 +110,6 @@ my $rp_access_map = {
   '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;
 
@@ -137,8 +132,8 @@ sub report {
             'balance_sheet'        => 'Balance Sheet',
             'income_statement'     => 'Income Statement',
             'trial_balance'        => 'Trial Balance',
-            'ar_aging'             => 'AR Aging',
-            'ap_aging'             => 'Offene Verbindlichkeiten',
+            'ar_aging'             => 'Search AR Aging',
+            'ap_aging'             => 'Search AP Aging',
             'tax_collected'        => 'Tax collected',
             'tax_paid'             => 'Tax paid',
             'nontaxable_sales'     => 'Non-taxable Sales',
@@ -146,28 +141,28 @@ sub report {
             'receipts'             => 'Receipts',
             'payments'             => 'Payments',
             'projects'             => 'Project Transactions',
-            'bwa'                  => 'Betriebswirtschaftliche Auswertung',
+            'bwa'                  => 'Business evaluation',
   );
 
   $form->{title} = $locale->text($title{ $form->{report} });
 
-  my $accrual = ($main::eur) ? ""        : "checked";
-  my $cash    = ($main::eur) ? "checked" : "";
+  my $accrual = $::lx_office_conf{system}->{eur} ? ""        : "checked";
+  my $cash    = $::lx_office_conf{system}->{eur} ? "checked" : "";
 
   my $year = (localtime)[5] + 1900;
 
   # get departments
   $form->all_departments(\%myconfig);
-  if (@{ $form->{all_departments} }) {
+  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} || [] };
   }
 
   my $department = qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Department') . qq|</th>
-         <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+        </tr>
 | if $form->{selectdepartment};
 
   $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
@@ -270,43 +265,43 @@ sub report {
 
 <input type=hidden name=title value="$form->{title}">
 
-<table width=100%>
+<table width=100% border="0">
   <tr>
     <th class=listtop>$form->{title}</th>
   </tr>
   <tr height="5"></tr>
   <tr>
     <td>
-      <table>
+      <table border="0">
       $department
 |;
 
   if ($form->{report} eq "projects") {
     print qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-         <td colspan=5><input name=projectnumber size=25</td>
-       </tr>
+        <tr>
+          <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>
+        </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|</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|</td>
+        </tr>
 
 $jsscript
 |;
@@ -314,86 +309,86 @@ $jsscript
 
   if ($form->{report} eq "income_statement") {
     print qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-         <td colspan=3>$projectnumber</td>
-       </tr>
+        <tr>
+          <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>
-       </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>
+        <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>
+        <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 = "";
     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>
-
-       </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>
+                <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
+          <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>
-         <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>
+                   <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
 |;
@@ -401,87 +396,87 @@ $jsscript
 
   if ($form->{report} eq "bwa") {
     print qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-         <td colspan=3>$projectnumber</td>
-       </tr>
+        <tr>
+          <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>
-       </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>
+        <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"
+        <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>
+                <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>
-
-       </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>
+                <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
+          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+              $button1
               $button1_2&nbsp;
-             | . $locale->text('Bis') . qq|&nbsp;
-             $button2
+              | . $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>
+        <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>
         <tr>
          <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
              <td><input name=decimalplaces size=3 value="2"></td>
@@ -494,40 +489,40 @@ $jsscript
   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>
+        <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>
+          <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>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
+          <td><input name=decimalplaces size=3 value="2"></td>
+        </tr>
       </table>
     </td>
   </tr>
   <tr>
     <td>
       <table>
-       <tr>
-         <th align=right>| . $locale->text('Method') . qq|</th>
-         <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
-         &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
-       </tr>
-
-       <tr>
-         <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
-         <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Heading') . qq|
-         <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Subtotal') . qq|
-         <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Account Number') . qq|</td>
-       </tr>
+        <tr>
+          <th align=right>| . $locale->text('Method') . qq|</th>
+          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+          &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+        </tr>
+
+        <tr>
+          <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+          <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Heading') . qq|
+          <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Subtotal') . qq|
+          <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Account Number') . qq|</td>
+        </tr>
 
 $jsscript
 |;
@@ -535,86 +530,86 @@ $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>
+        <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('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>
+        <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>
+        <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>
+                <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>
+                <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
+          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+              $button1
               $button1_2&nbsp;
-             | . $locale->text('Bis') . qq|&nbsp;
-             $button2
+              | . $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>
+        <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>
        <tr>
          <th align=right colspan=4>| . $locale->text('All Accounts') . qq|</th>
              <td><input name=all_accounts type=checkbox value=1></td>
@@ -635,15 +630,15 @@ $jsscript
 
     print qq|
         <input type=hidden name=nextsub value=generate_tax_report>
-       <tr>
-         <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>
-         <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Report for') . qq|</th>
-         <td colspan=3>
+        <tr>
+          <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>
+          <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Report for') . qq|</th>
+          <td colspan=3>
 |;
 
     $checked = "checked";
@@ -663,13 +658,13 @@ $jsscript
   <input type=hidden name=db value=$form->{db}>
   <input type=hidden name=sort value=transdate>
 
-         </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>
-       </tr>
+          </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>
+        </tr>
       </table>
     </td>
   </tr>
@@ -677,20 +672,20 @@ $jsscript
     <td>
       <table>
         <tr>
-         <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><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></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>
-             </tr>
-             <tr>
-               <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-               <td>|;
+          <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><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></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>
+              </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');
@@ -701,19 +696,19 @@ $jsscript
 
     print qq|</td>
                 <td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></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><input name="l_amount" class=checkbox type=checkbox value=Y></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>
-             </tr>
-           </table>
-         </td>
-       </tr>
+                <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><input name="l_amount" class=checkbox type=checkbox value=Y></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>
+              </tr>
+            </table>
+          </td>
+        </tr>
 |;
 
   }
@@ -728,34 +723,34 @@ $jsscript
         <input type=hidden name=sort value=transdate>
         <input type=hidden name=report value=$form->{report}>
 
-       <tr>
-         <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>
-         <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>|
+        <tr>
+          <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>
+          <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>|
+          &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>
-         <td colspan=3>
-           <table>
-             <tr>
-               <td><input name="l_id" class=checkbox type=checkbox value=Y></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><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-               <td>| . $locale->text('Date') . qq|</td>
-             </tr>
-             <tr>
-               <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-               <td>|;
+        </tr>
+        <tr>
+          <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><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></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>
+              </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');
@@ -766,17 +761,17 @@ $jsscript
 
     print qq|</td>
                 <td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></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>
-             </tr>
-             <tr>
-               <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-               <td>| . $locale->text('Subtotal') . qq|</td>
-             </tr>
-           </table>
-         </td>
-       </tr>
+                <td>| . $locale->text('Amount') . qq|</td>
+                <td><input name="l_amount" class=checkbox type=checkbox value=Y></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>
+              </tr>
+            </table>
+          </td>
+        </tr>
 |;
 
   }
@@ -806,25 +801,37 @@ $jsscript
       : qq|<input name=$form->{vc} size=35>|;
 
     print qq|
-       <tr>
-         <th align=right>| . $locale->text($label) . qq|</th>
-         <td>$vc</td>
-       </tr>
-       <tr>
-         <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
-             $button1
+        <tr>
+          <th align=right>| . $locale->text($label) . qq|</th>
+          <td>$vc</td>
+        </tr>
+        <tr>
+          <td>| . $locale->text('Review of Aging list') . qq|</td>
+          <td><select name="review_of_aging_list">
+              <option></option>
+              <option>0-30</option>
+              <option>30-60</option>
+              <option>60-90</option>
+              <option>90-120</option>
+              <option>> 120</option>
+              </select>
+          </td>
+        </tr>
+        <tr>
+          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+              $button1
               $button1_2&nbsp;
-             | . $locale->text('Bis') . qq|&nbsp;
-             $button2
+              | . $locale->text('Bis') . qq|&nbsp;
+              $button2
               $button2_2
           </td>
-       </tr>
+        </tr>
         <input type=hidden name=type value=statement>
         <input type=hidden name=format value=html>
-       <input type=hidden name=media value=screen>
+        <input type=hidden name=media value=screen>
 
-       <input type=hidden name=nextsub value=$nextsub>
-       <input type=hidden name=action value=$nextsub>
+        <input type=hidden name=nextsub value=$nextsub>
+        <input type=hidden name=action value=$nextsub>
 
 $jsscript
 |;
@@ -849,44 +856,44 @@ $jsscript
     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>
+            <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>
         <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>
         <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>
-         <td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th>
+          <td>
             $button1
             $button1_2
           </td>
-         <th align=right>| . $locale->text('Bis') . qq|</th>
-         <td>
+          <th align=right>| . $locale->text('Bis') . qq|</th>
+          <td>
             $button2
             $button2_2
           </td>
-       </tr>
+        </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>
-       </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>
+        </tr>
 
 $jsscript
 
-         <input type=hidden name=db value=$form->{db}>
-         <input type=hidden name=sort value=transdate>
+          <input type=hidden name=db value=$form->{db}>
+          <input type=hidden name=sort value=transdate>
 |;
 
   }
@@ -1057,7 +1064,8 @@ sub generate_income_statement {
         last SWITCH;
       };
     }
-  }
+    hotfix_reformat_date();
+  } # Ende Bericht für vorgewählten Zeitraum (warum auch immer die Prüfung (custom eq true) ist ...
 
   RP->income_statement(\%myconfig, \%$form);
 
@@ -1116,46 +1124,40 @@ sub generate_income_statement {
 }
 
 sub generate_balance_sheet {
-  $main::lxdebug->enter_sub();
-
-  $main::auth->assert('report');
+  $::lxdebug->enter_sub;
+  $::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->{endbold} = "</b>";
-  $form->{br}      = "<br>";
+  $::form->{decimalplaces} = $::form->{decimalplaces} * 1 || 2;
+  $::form->{padding}       = "&nbsp;&nbsp;";
+  $::form->{bold}          = "<b>";
+  $::form->{endbold}       = "</b>";
+  $::form->{br}            = "<br>";
 
-  my $data = RP->balance_sheet(\%myconfig, \%$form);
+  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->{asofdate} ||= $::form->current_date;
+  $::form->{period}     = $::locale->date(\%::myconfig, $::form->current_date, 1);
 
-  ($form->{department}) = split /--/, $form->{department};
+  ($::form->{department}) = split /--/, $::form->{department};
 
   # define Current Earnings account
-  my $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);
+  $::form->{this_period} = $::locale->date(\%::myconfig, $::form->{asofdate}, 0);
+  $::form->{last_period} = $::locale->date(\%::myconfig, $::form->{compareasofdate}, 0);
 
-  $form->{IN} = "balance_sheet.html";
+#  $::form->{IN} = "balance_sheet.html";
 
   # setup company variables for the form
-  map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr));
+  map { $::form->{$_} = $::myconfig{$_} } qw(company address businessnumber nativecurr);
 
-  $form->{templates} = $myconfig{templates};
+  $::form->{templates} = $::myconfig{templates};
 
-  $form->header();
-  print $form->parse_html_template('rp/balance_sheet', $data);
-#  $form->parse_template();
+  $::form->header;
+  print $::form->parse_html_template('rp/balance_sheet', $data);
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub generate_projects {
@@ -1293,6 +1295,7 @@ sub generate_trial_balance {
         last SWITCH;
       };
     }
+    hotfix_reformat_date();
   }
 
 
@@ -1300,7 +1303,7 @@ sub generate_trial_balance {
   RP->trial_balance(\%myconfig, \%$form, 'beginning_balances' => 1);
 
 
-  $form->{rowcount} = scalar @{ $form->{TB} };
+  $form->{rowcount} = scalar @{ $form->{TB} || [] };
   $form->{title} = sprintf($locale->text('Trial balance between %s and %s'), $form->{fromdate}, $form->{todate});
 
   my @columns = (
@@ -1367,6 +1370,7 @@ sub generate_trial_balance {
                        'pdf_template'         => 'rp/html_report_susa',
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   # add sort and escape callback, this one we use for the add sub
   $form->{callback} = $href .= "&sort=$form->{sort}";
@@ -1381,7 +1385,7 @@ sub generate_trial_balance {
   my $edit_url = build_std_url('action=edit', 'type', 'vc');
 
   my $idx;
-  foreach my $accno (@{ $form->{TB} }) {
+  foreach my $accno (@{ $form->{TB} || [] }) {
 
     $accno->{soll} = $accno->{debit};
     $accno->{haben} = $accno->{credit};
@@ -1518,6 +1522,7 @@ sub list_accounts {
                        'std_column_visibility' => 1,
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
@@ -1528,7 +1533,7 @@ sub list_accounts {
   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} };
+  my @tb             = sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} || [] };
 
   # sort the whole thing by account numbers and display
   foreach my $idx (0 .. scalar(@tb) - 1) {
@@ -1670,8 +1675,8 @@ sub aging {
     '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'), },
+    'amount'    => { 'text' => $locale->text('Amount'), },
+    'open'      => { 'text' => $locale->text('Open'), },
   );
 
   my %column_alignment = ('statement' => 'center',
@@ -1718,6 +1723,8 @@ sub aging {
                        'title'                => $form->{title},
                        'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
     );
+  $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   my $previous_ctid = 0;
   my $row_idx       = 0;
@@ -1774,8 +1781,6 @@ sub aging {
                          'raw_bottom_info_text' => $raw_bottom_info_text);
   }
 
-  $report->set_options_from_form();
-
   $report->generate_with_headers();
 
   $main::lxdebug->leave_sub();
@@ -1823,7 +1828,7 @@ sub e_mail {
   if ($myconfig{role} eq 'admin') {
     $bcc = qq|
           <th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
-         <td><input name=bcc size=30 value="$form->{bcc}"></td>
+          <td><input name=bcc size=30 value="$form->{bcc}"></td>
 |;
   }
 
@@ -1847,16 +1852,16 @@ sub e_mail {
     <td>
       <table width=100%>
         <tr>
-         <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>
-         <td><input name=cc size=30 value="$form->{cc}"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
-         <td><input name=subject size=30 value="$form->{subject}"></td>
-         $bcc
-       </tr>
+          <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>
+          <td><input name=cc size=30 value="$form->{cc}"></td>
+        </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
+          <td><input name=subject size=30 value="$form->{subject}"></td>
+          $bcc
+        </tr>
       </table>
     </td>
   </tr>
@@ -1864,11 +1869,11 @@ sub e_mail {
     <td>
       <table width=100%>
         <tr>
-         <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>
-       </tr>
+          <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>
+        </tr>
       </table>
     </td>
   </tr>
@@ -2066,7 +2071,7 @@ sub print_form {
         $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);
+        $form->parse_template(\%myconfig);
 
       }
     }
@@ -2074,9 +2079,9 @@ sub print_form {
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-       $form->{addition} = "PRINTED";
-       $form->{what_done} = $form->{type};
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "PRINTED";
+    $form->{what_done} = $form->{type};
+    $form->save_history;
   }
   # /saving the history
   $main::lxdebug->leave_sub();
@@ -2125,19 +2130,19 @@ sub generate_tax_report {
   my $descvar     = "$form->{accno}_description";
   my $description = $form->escape($form->{$descvar});
   my $ratevar     = "$form->{accno}_rate";
-  our $taxrate; # most likely error
+  my ($subtotalnetamount, $subtotaltax, $subtotal) = (0, 0, 0);
 
   my $department = $form->escape($form->{department});
 
   # construct href
   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}";
+    "$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&report=$form->{report}";
 
   # construct callback
   $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}";
+    "$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&report=$form->{report}";
 
   my $title = $form->escape($form->{title});
   $href .= "&title=$title";
@@ -2148,6 +2153,7 @@ sub generate_tax_report {
 
   my @columns =
     $form->sort_columns(qw(id transdate invnumber name netamount tax amount));
+  my @column_index;
 
   foreach my $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {
@@ -2227,13 +2233,13 @@ sub generate_tax_report {
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>
+        <tr class=listheading>
 |;
 
   map { print "$column_header{$_}\n" } @column_index;
 
   print qq|
-       </tr>
+        </tr>
 |;
 
   # add sort and escape callback
@@ -2252,7 +2258,7 @@ sub generate_tax_report {
 
     if ($form->{l_subtotal} eq 'Y') {
       if ($sameitem ne $ref->{ $form->{sort} }) {
-        &tax_subtotal;
+        tax_subtotal(\@column_index, \$subtotalnetamount, \$subtotaltax, \$subtotal);
         $sameitem = $ref->{ $form->{sort} };
       }
     }
@@ -2268,6 +2274,7 @@ sub generate_tax_report {
       $ref->{$_} = $form->format_amount(\%myconfig, $ref->{$_}, 2, "&nbsp;");
     } qw(netamount tax amount);
 
+    my %column_data;
     $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>|;
@@ -2280,26 +2287,27 @@ sub generate_tax_report {
     $i++;
     $i %= 2;
     print qq|
-       <tr class=listrow$i>
+        <tr class=listrow$i>
 |;
 
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
 
   }
 
   if ($form->{l_subtotal} eq 'Y') {
-    &tax_subtotal;
+    tax_subtotal(\@column_index, \$subtotalnetamount, \$subtotaltax, \$subtotal);
   }
 
+  my %column_data;
   map { $column_data{$_} = qq|<th>&nbsp;</th>| } @column_index;
 
   print qq|
         </tr>
-       <tr class=listtotal>
+        <tr class=listtotal>
 |;
 
   my $total          = $form->format_amount(\%myconfig, $totalnetamount + $totaltax, 2, "&nbsp;");
@@ -2332,27 +2340,30 @@ sub generate_tax_report {
 sub tax_subtotal {
   $main::lxdebug->enter_sub();
 
+  my ($column_index, $subtotalnetamount, $subtotaltax, $subtotal) = @_;
+
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
+  my %column_data;
+  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;");
+  $$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;");
 
-  $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{netamount} = "<th class=listsubtotal align=right>$$subtotalnetamount</th>";
+  $column_data{tax}       = "<th class=listsubtotal align=right>$$subtotaltax</th>";
+  $column_data{amount}    = "<th class=listsubtotal align=right>$$subtotal</th>";
 
-  $subtotalnetamount = 0;
-  $subtotaltax       = 0;
+  $$subtotalnetamount = 0;
+  $$subtotaltax       = 0;
 
   print qq|
-       <tr class=listsubtotal>
+        <tr class=listsubtotal>
 |;
-  map { print "\n$column_data{$_}" } @column_index;
+  map { print "\n$column_data{$_}" } @{ $column_index };
 
   print qq|
         </tr>
@@ -2426,6 +2437,8 @@ sub list_payments {
     );
   $report->set_options_from_form();
 
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
+
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
@@ -2520,26 +2533,23 @@ sub print_options {
 
   my ($media);
   my $type = qq|
-           <option value=statement $form->{PD}{statement}>|
-      . $locale->text('Statement');
+            <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} && $main::latex_templates) {
+            <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
+    if ($myconfig{printer} && $::lx_office_conf{print_templates}->{latex}) {
       $media .= qq|
-            <option value=printer $form->{OP}{printer}>|
-        . $locale->text('Printer');
+            <option value=printer $form->{OP}{printer}>| . $locale->text('Printer');
     }
   }
 
   my $format;
-  if ($main::latex_templates) {
+  if ($::lx_office_conf{print_templates}->{latex}) {
     $format .= qq|
             <option value=html $form->{DF}{html}>| . $locale->text('HTML')
       . qq| <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF')
@@ -2554,7 +2564,7 @@ sub print_options {
     <td><select name=media>$media</select></td>
 |;
 
-  if ($myconfig{printer} && $main::latex_templates && $form->{media} ne 'email') {
+  if ($myconfig{printer} && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email') {
     $output .= qq|
       <td>| . $locale->text('Copies') . qq|
       <input name=copies size=2 value=$form->{copies}></td>
@@ -2720,13 +2730,22 @@ sub generate_bwa {
         last SWITCH;
       };
     }
+    hotfix_reformat_date();
   } 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};
+    # die konvertierungen nur dann durchführen, wenn auch daten gesetzt sind.
+    # ansonsten ist die prüfung in RP.pm
+    # if (defined ($form->{fromdate|todate}=='..'))
+    # immer wahr
+    if ($form->{fromdate}){
+      my ($yy, $mm, $dd) = $locale->parse_date(\%myconfig, $form->{fromdate});
+      my $datetime = $locale->parse_date_to_object(\%myconfig, $form->{fromdate});
+      $datetime->set( month      => 1,
+                      day        => 1);
+      $form->{comparefromdate} = $locale->format_date(\%::myconfig, $datetime);
+    }
+    if ($form->{todate}){
+      $form->{comparetodate}   = $form->{todate};
+    }
   }
 
   RP->bwa(\%myconfig, \%$form);
@@ -2771,4 +2790,32 @@ sub generate_bwa {
 
   $main::lxdebug->leave_sub();
 }
+###
+# Hotfix, um das Datumsformat, die unten hart auf deutsches Datumsformat eingestellt
+# sind, entsprechend mit anderem Formaten (z.B. iso-kodiert) zum Laufen zu bringen (S.a.: Bug 1388)
+sub hotfix_reformat_date {
+
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  if ($myconfig{dateformat} ne 'dd.mm.yyyy'){
+    my $current_dateformat = $myconfig{dateformat};
+    $myconfig{dateformat} = 'dd.mm.yyyy';
+    $form->{fromdate} = $main::locale->reformat_date(\%myconfig, $form->{fromdate}, $current_dateformat);
+    $form->{todate} = $main::locale->reformat_date(\%myconfig, $form->{todate}, $current_dateformat);
+    $form->{comparefromdate} = $main::locale->reformat_date(\%myconfig, $form->{comparefromdate}, $current_dateformat)
+      unless (!defined ($form->{comparefromdate}));
+    $form->{comparetodate} = $main::locale->reformat_date(\%myconfig, $form->{comparetodate}, $current_dateformat)
+      unless (!defined ($form->{comparetodate}));
 
+    # Und wieder zurücksetzen
+    $myconfig{dateformat} =  $current_dateformat; #'dd.mm.yyyy';
+  } # Ende Hotifx Bug 1388
+
+  $main::lxdebug->leave_sub();
+
+}
+1;