Formatting with Perltidy

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1068 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 1799 insertions, 1491 deletions

diff --git a/bin/rp.pl b/bin/rp.pl
index 7eeee0fe..aca6133a 100755
--- a/bin/rp.pl
+++ b/bin/rp.pl
@@ -8,9 +8,9 @@
 # with permission.
 #
 # This file contains source code included with or based on SQL-Ledger which
-# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed 
-# under the GNU General Public License version 2 or, at your option, any later 
-# version.  For a full list including contact information of contributors, 
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
 # maintainers, and copyright holders, see the CONTRIBUTORS file.
 #
 # Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
@@ -38,16 +38,16 @@
 #======================================================================
 #
 # module for preparing Income Statement and Balance Sheet
-# 
+#
 #======================================================================
 
-
 require "bin/arap.pl";
 
 use LedgerSMB::PE;
 use LedgerSMB::RP;
 
 1;
+
 # end of main
 
 # this is for our long dates
@@ -91,75 +91,91 @@ use LedgerSMB::RP;
 # $locale->text('Non-taxable Sales')
 # $locale->text('Non-taxable Purchases')
 
-
 sub report {
 
-  %report = ( balance_sheet	=> { title => 'Balance Sheet' },
-             income_statement	=> { title => 'Income Statement' },
-             trial_balance	=> { title => 'Trial Balance' },
-	     ar_aging		=> { title => 'AR Aging', vc => 'customer' },
-	     ap_aging		=> { title => 'AP Aging', vc => 'vendor' },
-	     tax_collected	=> { title => 'Tax collected', vc => 'customer' },
-	     tax_paid		=> { title => 'Tax paid' },
-	     nontaxable_sales	=> { title => 'Non-taxable Sales', vc => 'customer' },
-	     nontaxable_purchases => { title => 'Non-taxable Purchases' },
-	     receipts		=> { title => 'Receipts', vc => 'customer' },
-	     payments		=> { title => 'Payments' },
-	     projects		=> { title => 'Project Transactions' },
-	     inv_activity	=> { title => 'Inventory Activity'},
-	   );
-  
-  $form->{title} = $locale->text($report{$form->{report}}->{title});
-
-  $gifi = qq|
+    %report = (
+        balance_sheet    => { title => 'Balance Sheet' },
+        income_statement => { title => 'Income Statement' },
+        trial_balance    => { title => 'Trial Balance' },
+        ar_aging         => { title => 'AR Aging', vc => 'customer' },
+        ap_aging         => { title => 'AP Aging', vc => 'vendor' },
+        tax_collected    => { title => 'Tax collected', vc => 'customer' },
+        tax_paid         => { title => 'Tax paid' },
+        nontaxable_sales => { title => 'Non-taxable Sales', vc => 'customer' },
+        nontaxable_purchases => { title => 'Non-taxable Purchases' },
+        receipts             => { title => 'Receipts', vc => 'customer' },
+        payments             => { title => 'Payments' },
+        projects             => { title => 'Project Transactions' },
+        inv_activity         => { title => 'Inventory Activity' },
+    );
+
+    $form->{title} = $locale->text( $report{ $form->{report} }->{title} );
+
+    $gifi = qq|
 <tr>
-  <th align=right>|.$locale->text('Accounts').qq|</th>
-  <td><input name=accounttype class=radio type=radio value=standard checked> |.$locale->text('Standard').qq|
+  <th align=right>| . $locale->text('Accounts') . qq|</th>
+  <td><input name=accounttype class=radio type=radio value=standard checked> |
+      . $locale->text('Standard') . qq|
    
-      <input name=accounttype class=radio type=radio value=gifi> |.$locale->text('GIFI').qq|
+      <input name=accounttype class=radio type=radio value=gifi> |
+      . $locale->text('GIFI') . qq|
   </td>
 </tr>
 |;
-  
-    
-  # get departments
-  $form->all_departments(\%myconfig, undef, $report{$form->{report}}->{vc});
-  if (@{ $form->{all_department} }) {
-    $form->{selectdepartment} = "<option>\n";
 
-    for (@{ $form->{all_department} }) { $form->{selectdepartment} .= qq|<option value="$_->{description}--$_->{id}">$_->{description}\n| }
-  }
- 
-  $department = qq|
+    # get departments
+    $form->all_departments( \%myconfig, undef,
+        $report{ $form->{report} }->{vc} );
+    if ( @{ $form->{all_department} } ) {
+        $form->{selectdepartment} = "<option>\n";
+
+        for ( @{ $form->{all_department} } ) {
+            $form->{selectdepartment} .=
+qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
+        }
+    }
+
+    $department = qq|
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Department').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
 	  <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
 	</tr>
 | if $form->{selectdepartment};
 
-  if (@{ $form->{all_years} }) {
-    # accounting years
-    $form->{selectaccountingyear} = "<option>\n";
-    for (@{ $form->{all_years} }) { $form->{selectaccountingyear} .= qq|<option>$_\n| }
+    if ( @{ $form->{all_years} } ) {
+
+        # accounting years
+        $form->{selectaccountingyear} = "<option>\n";
+        for ( @{ $form->{all_years} } ) {
+            $form->{selectaccountingyear} .= qq|<option>$_\n|;
+        }
 
-    $form->{selectaccountingmonth} = "<option>\n";
-    for (sort keys %{ $form->{all_month} }) { $form->{selectaccountingmonth} .= qq|<option value=$_>|.$locale->text($form->{all_month}{$_}).qq|\n| }
+        $form->{selectaccountingmonth} = "<option>\n";
+        for ( sort keys %{ $form->{all_month} } ) {
+            $form->{selectaccountingmonth} .=
+              qq|<option value=$_>|
+              . $locale->text( $form->{all_month}{$_} ) . qq|\n|;
+        }
 
-    $selectfrom = qq|
+        $selectfrom = qq|
         <tr>
-	  <th align=right>|.$locale->text('Period').qq|</th>
+	  <th align=right>| . $locale->text('Period') . qq|</th>
 	  <td colspan=3>
 	  <select name=month>$form->{selectaccountingmonth}</select>
 	  <select name=year>$form->{selectaccountingyear}</select>
-	  <input name=interval class=radio type=radio value=0 checked>&nbsp;|.$locale->text('Current').qq|
-	  <input name=interval class=radio type=radio value=1>&nbsp;|.$locale->text('Month').qq|
-	  <input name=interval class=radio type=radio value=3>&nbsp;|.$locale->text('Quarter').qq|
-	  <input name=interval class=radio type=radio value=12>&nbsp;|.$locale->text('Year').qq|
+	  <input name=interval class=radio type=radio value=0 checked>&nbsp;|
+          . $locale->text('Current') . qq|
+	  <input name=interval class=radio type=radio value=1>&nbsp;|
+          . $locale->text('Month') . qq|
+	  <input name=interval class=radio type=radio value=3>&nbsp;|
+          . $locale->text('Quarter') . qq|
+	  <input name=interval class=radio type=radio value=12>&nbsp;|
+          . $locale->text('Year') . qq|
 	  </td>
 	</tr>
 |;
 
-    $selectto = qq|
+        $selectto = qq|
         <tr>
 	  <th align=right></th>
 	  <td>
@@ -168,35 +184,39 @@ sub report {
 	  </td>
 	</tr>
 |;
-  }
-
+    }
 
-  $summary = qq|
+    $summary = qq|
 	<tr>
 	  <th></th>
-	  <td><input name=summary type=radio class=radio value=1 checked> |.$locale->text('Summary').qq|
-	  <input name=summary type=radio class=radio value=0> |.$locale->text('Detail').qq|
+	  <td><input name=summary type=radio class=radio value=1 checked> |
+      . $locale->text('Summary') . qq|
+	  <input name=summary type=radio class=radio value=0> |
+      . $locale->text('Detail') . qq|
 	  </td>
 	</tr>
 |;
 
-  # get projects
-  $form->all_projects(\%myconfig);
-  if (@{ $form->{all_project} }) {
-    $form->{selectproject} = "<option>\n";
-    for (@{ $form->{all_project} }) { $form->{selectproject} .= qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n| }
+    # get projects
+    $form->all_projects( \%myconfig );
+    if ( @{ $form->{all_project} } ) {
+        $form->{selectproject} = "<option>\n";
+        for ( @{ $form->{all_project} } ) {
+            $form->{selectproject} .=
+qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n|;
+        }
 
-    $project = qq|
+        $project = qq|
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Project').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Project') . qq|</th>
 	  <td colspan=3><select name=projectnumber>$form->{selectproject}</select></td>
 	</tr>|;
 
-  }
- 
-  $form->header;
- 
-  print qq|
+    }
+
+    $form->header;
+
+    print qq|
 <body>
 
 <form method=post action=$form->{script}>
@@ -214,14 +234,14 @@ sub report {
       $department
 |;
 
-  if ($form->{report} eq "projects") {
-    print qq|
+    if ( $form->{report} eq "projects" ) {
+        print qq|
         $project
         <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><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	$selectfrom
@@ -232,99 +252,110 @@ sub report {
     <td>
       <table>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Include in Report').qq|</th>
-	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Heading').qq|
-	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Subtotal').qq|</td>
+	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
+          . $locale->text('Heading') . qq|
+	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
+          . $locale->text('Subtotal')
+          . qq|</td>
 	</tr>
 |;
-  }
+    }
 
-  if ($form->{report} eq "inv_activity"){
+    if ( $form->{report} eq "inv_activity" ) {
         $gifi = '';
         print qq|
        <input type=hidden name=nextsub value=generate_inv_activity>
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
        <tr>
-	  <th align=right>|.$locale->text('Period').qq|</th>
+	  <th align=right>| . $locale->text('Period') . qq|</th>
 	  <td colspan=3>
 	  <select name=frommonth>$form->{selectaccountingmonth}</select>
 	  <select name=fromyear>$form->{selectaccountingyear}</select>
-	  <input name=interval class=radio type=radio value=0 checked>|.$locale->text('Current').qq|
-	  <input name=interval class=radio type=radio value=1>|.$locale->text('Month').qq|
-	  <input name=interval class=radio type=radio value=3>|.$locale->text('Quarter').qq|
-	  <input name=interval class=radio type=radio value=12>|.$locale->text('Year').qq|
+	  <input name=interval class=radio type=radio value=0 checked>|
+          . $locale->text('Current') . qq|
+	  <input name=interval class=radio type=radio value=1>|
+          . $locale->text('Month') . qq|
+	  <input name=interval class=radio type=radio value=3>|
+          . $locale->text('Quarter') . qq|
+	  <input name=interval class=radio type=radio value=12>|
+          . $locale->text('Year') . qq|
 	  </td>
 	</tr>
         </table>
         <table>
           <tr>
-            <th>|.$locale->text("Part Number").qq|</th>
+            <th>| . $locale->text("Part Number") . qq|</th>
             <td><input name=partnumber></td>
-            <th>|.$locale->text('Description').qq|</th>
+            <th>| . $locale->text('Description') . qq|</th>
             <td><input type=text name=description></td>
           </tr>|;
-  }
-  if ($form->{report} eq "income_statement") {
-    print qq|
+    }
+    if ( $form->{report} eq "income_statement" ) {
+        print qq|
 	$project
         <input type=hidden name=nextsub value=generate_income_statement>
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 |;
 
-    if ($selectfrom) {
-      print qq|
+        if ($selectfrom) {
+            print qq|
         <tr>
-	  <th align=right>|.$locale->text('Period').qq|</th>
+	  <th align=right>| . $locale->text('Period') . qq|</th>
 	  <td colspan=3>
 	  <select name=frommonth>$form->{selectaccountingmonth}</select>
 	  <select name=fromyear>$form->{selectaccountingyear}</select>
-	  <input name=interval class=radio type=radio value=0 checked>&nbsp;|.$locale->text('Current').qq|
-	  <input name=interval class=radio type=radio value=1>&nbsp;|.$locale->text('Month').qq|
-	  <input name=interval class=radio type=radio value=3>&nbsp;|.$locale->text('Quarter').qq|
-	  <input name=interval class=radio type=radio value=12>&nbsp;|.$locale->text('Year').qq|
+	  <input name=interval class=radio type=radio value=0 checked>&nbsp;|
+              . $locale->text('Current') . qq|
+	  <input name=interval class=radio type=radio value=1>&nbsp;|
+              . $locale->text('Month') . qq|
+	  <input name=interval class=radio type=radio value=3>&nbsp;|
+              . $locale->text('Quarter') . qq|
+	  <input name=interval class=radio type=radio value=12>&nbsp;|
+              . $locale->text('Year') . qq|
 	  </td>
 	</tr>
 |;
-    }
+        }
 
-    print qq|
+        print qq|
 
 	<tr>
-	  <th align=right>|.$locale->text('Compare to').qq|</th>
+	  <th align=right>| . $locale->text('Compare to') . qq|</th>
 	</tr>
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=comparefromdate size=11 title="$myconfig{dateformat}"></td>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=comparetodate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 |;
 
-    if ($selectto) {
-      print qq|
+        if ($selectto) {
+            print qq|
         <tr>
-	  <th align=right>|.$locale->text('Period').qq|</th>
+	  <th align=right>| . $locale->text('Period') . qq|</th>
 	  <td>
 	  <select name=comparemonth>$form->{selectaccountingmonth}</select>
 	  <select name=compareyear>$form->{selectaccountingyear}</select>
 	  </td>
 	</tr>
 |;
-    }
+        }
 
-    print qq|
+        print qq|
 	<tr>
-	  <th align=right>|.$locale->text('Decimalplaces').qq|</th>
+	  <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
 	  <td><input name=decimalplaces size=3 value=2></td>
 	</tr>
       </table>
@@ -334,58 +365,64 @@ sub report {
     <td>
       <table>
 	<tr>
-	  <th align=right>|.$locale->text('Method').qq|</th>
-	  <td colspan=3><input name=method class=radio type=radio value=accrual checked>|.$locale->text('Accrual').qq|
-	  &nbsp;<input name=method class=radio type=radio value=cash>|.$locale->text('Cash').qq|</td>
+	  <th align=right>| . $locale->text('Method') . qq|</th>
+	  <td colspan=3><input name=method class=radio type=radio value=accrual checked>|
+          . $locale->text('Accrual') . qq|
+	  &nbsp;<input name=method class=radio type=radio value=cash>|
+          . $locale->text('Cash')
+          . qq|</td>
 	</tr>
 
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Include in Report').qq|</th>
-	  <td colspan=3><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Heading').qq|
-	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Subtotal').qq|
-	  <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Account Number').qq|</td>
+	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+	  <td colspan=3><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>
 |;
-  }
-
+    }
 
-  if ($form->{report} eq "balance_sheet") {
-    print qq|
+    if ( $form->{report} eq "balance_sheet" ) {
+        print qq|
         <input type=hidden name=nextsub value=generate_balance_sheet>
 	<tr>
-	  <th align=right>|.$locale->text('as at').qq|</th>
+	  <th align=right>| . $locale->text('as at') . qq|</th>
 	  <td><input name=asofdate size=11 title="$myconfig{dateformat}" value=$form->{asofdate}></td>
 |;
 
-   if ($selectfrom) {
-     print qq|
+        if ($selectfrom) {
+            print qq|
 	  <td>
 	  <select name=asofmonth>$form->{selectaccountingmonth}</select>
 	  <select name=asofyear>$form->{selectaccountingyear}</select>
 	  </td>
 |;
-   }
+        }
 
-   print qq|
+        print qq|
 	</tr>
 
-	  <th align=right nowrap>|.$locale->text('Compare to').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
 	  <td><input name=compareasofdate size=11 title="$myconfig{dateformat}"></td>
 	  <td>
 |;
 
-   if ($selectto) {
-     print qq|
+        if ($selectto) {
+            print qq|
 	  <select name=compareasofmonth>$form->{selectaccountingmonth}</select>
 	  <select name=compareasofyear>$form->{selectaccountingyear}</select>
 	  </td>
 |;
-   }
+        }
 
-   print qq|
+        print qq|
 	</tr>
 	<tr>
-	  <th align=right>|.$locale->text('Decimalplaces').qq|</th>
+	  <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
 	  <td><input name=decimalplaces size=3 value=2></td>
 	</tr>
       </table>
@@ -395,28 +432,34 @@ sub report {
     <td>
       <table>
 	<tr>
-	  <th align=right>|.$locale->text('Method').qq|</th>
-	  <td colspan=3><input name=method class=radio type=radio value=accrual checked>|.$locale->text('Accrual').qq|
-	  &nbsp;<input name=method class=radio type=radio value=cash>|.$locale->text('Cash').qq|</td>
+	  <th align=right>| . $locale->text('Method') . qq|</th>
+	  <td colspan=3><input name=method class=radio type=radio value=accrual checked>|
+          . $locale->text('Accrual') . qq|
+	  &nbsp;<input name=method class=radio type=radio value=cash>|
+          . $locale->text('Cash')
+          . qq|</td>
 	</tr>
 
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Include in Report').qq|</th>
-	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Heading').qq|
-	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Subtotal').qq|
-	  <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Account Number').qq|</td>
+	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
+          . $locale->text('Heading') . qq|
+	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
+          . $locale->text('Subtotal') . qq|
+	  <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;|
+          . $locale->text('Account Number')
+          . qq|</td>
 	</tr>
 |;
-  }
-
+    }
 
-  if ($form->{report} eq "trial_balance") {
-    print qq|
+    if ( $form->{report} eq "trial_balance" ) {
+        print qq|
         <input type=hidden name=nextsub value=generate_trial_balance>
         <tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	$selectfrom
@@ -427,50 +470,54 @@ sub report {
     <td>
       <table>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Include in Report').qq|</th>
-	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Heading').qq|
-	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Subtotal').qq|
-	  <input name=all_accounts class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('All Accounts').qq|</td>
+	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+	  <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
+          . $locale->text('Heading') . qq|
+	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
+          . $locale->text('Subtotal') . qq|
+	  <input name=all_accounts class=checkbox type=checkbox value=Y>&nbsp;|
+          . $locale->text('All Accounts')
+          . qq|</td>
 	</tr>
 |;
-  }
+    }
 
-  
-  if ($form->{report} =~ /^tax_/) {
-    $gifi = "";
+    if ( $form->{report} =~ /^tax_/ ) {
+        $gifi = "";
 
-    $form->{db} = ($form->{report} =~ /_collected/) ? "ar" : "ap";
-    
-    RP->get_taxaccounts(\%myconfig, \%$form);
+        $form->{db} = ( $form->{report} =~ /_collected/ ) ? "ar" : "ap";
 
-    print qq|
+        RP->get_taxaccounts( \%myconfig, \%$form );
+
+        print qq|
         <input type=hidden name=nextsub value=generate_tax_report>
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	$selectfrom
 	$summary
 	<tr>
-	  <th align=right>|.$locale->text('Report for').qq|</th>
+	  <th align=right>| . $locale->text('Report for') . qq|</th>
 	  <td colspan=3>
 |;
 
-  $checked = "checked";
-  foreach $ref (@{ $form->{taxaccounts} }) {
-    
-    print qq|<input name=accno class=radio type=radio value=$ref->{accno} $checked>&nbsp;$ref->{description}
+        $checked = "checked";
+        foreach $ref ( @{ $form->{taxaccounts} } ) {
+
+            print
+qq|<input name=accno class=radio type=radio value=$ref->{accno} $checked>&nbsp;$ref->{description}
 
     <input name="$ref->{accno}_description" type=hidden value="$ref->{description}">
     <input name="$ref->{accno}_rate" type=hidden value="$ref->{rate}">|;
 
-    $checked = "";
+            $checked = "";
 
-  }
+        }
 
-  print qq|
+        print qq|
   <input type=hidden name=db value=$form->{db}>
   <input type=hidden name=sort value=transdate>
 
@@ -478,35 +525,37 @@ sub report {
 	</tr>
 |;
 
-
-  if (@{ $form->{gifi_taxaccounts} }) {
-    print qq|
+        if ( @{ $form->{gifi_taxaccounts} } ) {
+            print qq|
         <tr>
-	  <th align=right>|.$locale->text('GIFI').qq|</th>
+	  <th align=right>| . $locale->text('GIFI') . qq|</th>
 	  <td colspan=3>
 |;
 
-    foreach $ref (@{ $form->{gifi_taxaccounts} }) {
-      
-      print qq|<input name=accno class=radio type=radio value="gifi_$ref->{accno}">&nbsp;$ref->{description}
+            foreach $ref ( @{ $form->{gifi_taxaccounts} } ) {
+
+                print
+qq|<input name=accno class=radio type=radio value="gifi_$ref->{accno}">&nbsp;$ref->{description}
 
       <input name="gifi_$ref->{accno}_description" type=hidden value="$ref->{description}">
       <input name="gifi_$ref->{accno}_rate" type=hidden value="$ref->{rate}">|;
 
-    }
+            }
 
-    print qq|
+            print qq|
 	  </td>
 	</tr>
 |;
-  }
-
+        }
 
-print qq|
+        print qq|
 	<tr>
-	  <th align=right>|.$locale->text('Method').qq|</th>
-	  <td colspan=3><input name=method class=radio type=radio value=accrual checked>|.$locale->text('Accrual').qq|
-	  &nbsp;<input name=method class=radio type=radio value=cash>|.$locale->text('Cash').qq|</td>
+	  <th align=right>| . $locale->text('Method') . qq|</th>
+	  <td colspan=3><input name=method class=radio type=radio value=accrual checked>|
+          . $locale->text('Accrual') . qq|
+	  &nbsp;<input name=method class=radio type=radio value=cash>|
+          . $locale->text('Cash')
+          . qq|</td>
 	</tr>
       </table>
     </td>
@@ -515,60 +564,59 @@ print qq|
     <td>
       <table>
         <tr>
-	  <th align=right>|.$locale->text('Include in Report').qq|</th>
+	  <th align=right>| . $locale->text('Include in Report') . qq|</th>
 	  <td>
 	    <table>
 	      <tr>
 		<td><input name="l_id" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('ID').qq|</td>
+		<td>| . $locale->text('ID') . qq|</td>
 		<td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Invoice').qq|</td>
+		<td>| . $locale->text('Invoice') . qq|</td>
 		<td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Date').qq|</td>
+		<td>| . $locale->text('Date') . qq|</td>
 	      </tr>
 	      <tr>
 		<td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
 |;
-		
-  if ($form->{db} eq 'ar') {
-    print qq|<td>|.$locale->text('Customer').qq|</td>|;
-  }
-  if ($form->{db} eq 'ap') {
-    print qq|<td>|.$locale->text('Vendor').qq|</td>|;
-  }
-  
-  print qq|
+
+        if ( $form->{db} eq 'ar' ) {
+            print qq|<td>| . $locale->text('Customer') . qq|</td>|;
+        }
+        if ( $form->{db} eq 'ap' ) {
+            print qq|<td>| . $locale->text('Vendor') . qq|</td>|;
+        }
+
+        print qq|
   	        <td><input name="l_description" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Description').qq|</td>
+		<td>| . $locale->text('Description') . qq|</td>
 		<td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Amount').qq|</td>
+		<td>| . $locale->text('Amount') . qq|</td>
 		
 		<td><input name="l_tax" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Tax').qq|</td>
+		<td>| . $locale->text('Tax') . qq|</td>
 		
                 <td><input name="l_total" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Total').qq|</td>
+		<td>| . $locale->text('Total') . qq|</td>
 	      </tr>
 	      <tr>
 	      </tr>
 	      <tr>
 	        <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('Subtotal').qq|</td>
+		<td>| . $locale->text('Subtotal') . qq|</td>
 	      </tr>
 	    </table>
 	  </td>
 	</tr>
 |;
 
-  }
+    }
 
-  
-  if ($form->{report} =~ /^nontaxable_/) {
-    $gifi = "";
+    if ( $form->{report} =~ /^nontaxable_/ ) {
+        $gifi = "";
 
-    $form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap";
-    
-    print qq|
+        $form->{db} = ( $form->{report} =~ /_sales/ ) ? "ar" : "ap";
+
+        print qq|
         <input type=hidden name=nextsub value=generate_tax_report>
 
         <input type=hidden name=db value=$form->{db}>
@@ -576,88 +624,99 @@ print qq|
         <input type=hidden name=report value=$form->{report}>
 
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	$selectfrom
 	$summary
 	<tr>
-	  <th align=right>|.$locale->text('Method').qq|</th>
-	  <td colspan=3><input name=method class=radio type=radio value=accrual checked>|.$locale->text('Accrual').qq|
-	  &nbsp;<input name=method class=radio type=radio value=cash>|.$locale->text('Cash').qq|</td>
+	  <th align=right>| . $locale->text('Method') . qq|</th>
+	  <td colspan=3><input name=method class=radio type=radio value=accrual checked>|
+          . $locale->text('Accrual') . qq|
+	  &nbsp;<input name=method class=radio type=radio value=cash>|
+          . $locale->text('Cash')
+          . qq|</td>
 	</tr>
         <tr>
-	  <th align=right>|.$locale->text('Include in Report').qq|</th>
+	  <th align=right>| . $locale->text('Include in Report') . qq|</th>
 	  <td colspan=3>
 	    <table>
 	      <tr>
 		<td><input name="l_id" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('ID').qq|</td>
+		<td>| . $locale->text('ID') . qq|</td>
 		<td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Invoice').qq|</td>
+		<td>| . $locale->text('Invoice') . qq|</td>
 		<td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Date').qq|</td>
+		<td>| . $locale->text('Date') . qq|</td>
 	      </tr>
 	      <tr>
 		<td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
 |;
-		
-  if ($form->{db} eq 'ar') {
-    print qq|<td>|.$locale->text('Customer').qq|</td>|;
-  }
-  if ($form->{db} eq 'ap') {
-    print qq|<td>|.$locale->text('Vendor').qq|</td>|;
-  }
-  
-  print qq|
+
+        if ( $form->{db} eq 'ar' ) {
+            print qq|<td>| . $locale->text('Customer') . qq|</td>|;
+        }
+        if ( $form->{db} eq 'ap' ) {
+            print qq|<td>| . $locale->text('Vendor') . qq|</td>|;
+        }
+
+        print qq|
 	        <td><input name="l_description" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Description').qq|</td>
+		<td>| . $locale->text('Description') . qq|</td>
                 <td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
-		<td>|.$locale->text('Amount').qq|</td>
+		<td>| . $locale->text('Amount') . qq|</td>
 	      </tr>
 	      <tr>
 	        <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-		<td>|.$locale->text('Subtotal').qq|</td>
+		<td>| . $locale->text('Subtotal') . qq|</td>
 	      </tr>
 	    </table>
 	  </td>
 	</tr>
 |;
 
-  }
+    }
 
+    if (   ( $form->{report} eq "ar_aging" )
+        || ( $form->{report} eq "ap_aging" ) )
+    {
+        $gifi = "";
 
-  if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
-    $gifi = "";
+        if ( $form->{report} eq 'ar_aging' ) {
+            $label = $locale->text('Customer');
+            $form->{vc} = 'customer';
+        }
+        else {
+            $label = $locale->text('Vendor');
+            $form->{vc} = 'vendor';
+        }
 
-    if ($form->{report} eq 'ar_aging') {
-      $label = $locale->text('Customer');
-      $form->{vc} = 'customer';
-    } else {
-      $label = $locale->text('Vendor');
-      $form->{vc} = 'vendor';
-    }
-      
-    $nextsub = "generate_$form->{report}";
-    
-    # setup vc selection
-    $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
+        $nextsub = "generate_$form->{report}";
 
-    for (@{ $form->{"all_$form->{vc}"} }) { $vc .= qq|<option value="$_->{name}--$_->{id}">$_->{name}\n| }
-    
-    $vc = ($vc) ? qq|<select name=$form->{vc}><option>\n$vc</select>| : qq|<input name=$form->{vc} size=35>|;
-    
-    $postscript = "postscript" if $myconfig{printer};
+        # setup vc selection
+        $form->all_vc( \%myconfig, $form->{vc},
+            ( $form->{vc} eq 'customer' ) ? "AR" : "AP" );
 
-    print qq|
+        for ( @{ $form->{"all_$form->{vc}"} } ) {
+            $vc .= qq|<option value="$_->{name}--$_->{id}">$_->{name}\n|;
+        }
+
+        $vc =
+          ($vc)
+          ? qq|<select name=$form->{vc}><option>\n$vc</select>|
+          : qq|<input name=$form->{vc} size=35>|;
+
+        $postscript = "postscript" if $myconfig{printer};
+
+        print qq|
 	<tr>
-	  <th align=right>|.$locale->text($label).qq|</th>
+	  <th align=right>| . $locale->text($label) . qq|</th>
 	  <td>$vc</td>
 	</tr>
 	<tr>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	$selectto
@@ -671,16 +730,22 @@ print qq|
 	<tr>
 	  <table>
 	    <tr>
-	      <th>|.$locale->text('Include in Report').qq|</th>
+	      <th>| . $locale->text('Include in Report') . qq|</th>
 
 	      <td>
 	        <table>
 		  <tr>
-	            <td nowrap><input name=overdue type=radio class=radio value=0 checked> |.$locale->text('Aged').qq|</td>
- 	            <td nowrap><input name=overdue type=radio class=radio value=1> |.$locale->text('Overdue').qq|</td>
+	            <td nowrap><input name=overdue type=radio class=radio value=0 checked> |
+          . $locale->text('Aged')
+          . qq|</td>
+ 	            <td nowrap><input name=overdue type=radio class=radio value=1> |
+          . $locale->text('Overdue')
+          . qq|</td>
 	          </tr>
 		  <tr>
-		    <td nowrap width=70><input name=c0 type=checkbox class=checkbox value=1 checked> |.$locale->text('Current').qq|</td>
+		    <td nowrap width=70><input name=c0 type=checkbox class=checkbox value=1 checked> |
+          . $locale->text('Current')
+          . qq|</td>
 		    <td nowrap width=70><input name=c30 type=checkbox class=checkbox value=1 checked> 30</td>
 		    <td nowrap width=70><input name=c60 type=checkbox class=checkbox value=1 checked> 60</td>
 		    <td nowrap width=70><input name=c90 type=checkbox class=checkbox value=1 checked> 90</td>
@@ -693,70 +758,70 @@ print qq|
 	</tr>
 
 |;
-  }
+    }
 
-# above action can be removed if there is more than one input field
+    # above action can be removed if there is more than one input field
 
+    if ( $form->{report} =~ /(receipts|payments)$/ ) {
+        $gifi = "";
 
-  if ($form->{report} =~ /(receipts|payments)$/) {
-    $gifi = "";
+        $form->{db} = ( $form->{report} =~ /payments$/ ) ? "ap" : "ar";
 
-    $form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar";
+        RP->paymentaccounts( \%myconfig, \%$form );
 
-    RP->paymentaccounts(\%myconfig, \%$form);
+        $selection = "<option>\n";
+        foreach $ref ( @{ $form->{PR} } ) {
+            $paymentaccounts .= "$ref->{accno} ";
+            $selection       .= "<option>$ref->{accno}--$ref->{description}\n";
+        }
 
-    $selection = "<option>\n";
-    foreach $ref (@{ $form->{PR} }) {
-      $paymentaccounts .= "$ref->{accno} ";
-      $selection .= "<option>$ref->{accno}--$ref->{description}\n";
-    }
-    
-    chop $paymentaccounts;
+        chop $paymentaccounts;
 
-    print qq|
+        print qq|
         <input type=hidden name=nextsub value=list_payments>
         <tr>
-	  <th align=right nowrap>|.$locale->text('Account').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Account') . qq|</th>
           <td colspan=3><select name=account>$selection</select>
 	    <input type=hidden name=paymentaccounts value="$paymentaccounts">
 	  </td>
 	</tr>
         <tr>
-	  <th align=right nowrap>|.$locale->text('Description').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Description') . qq|</th>
           <td colspan=3><input name=description size=35></td>
 	</tr>
         <tr>
-	  <th align=right nowrap>|.$locale->text('Source').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Source') . qq|</th>
           <td colspan=3><input name=source></td>
 	</tr>
         <tr>
-	  <th align=right nowrap>|.$locale->text('Memo').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Memo') . qq|</th>
           <td colspan=3><input name=memo size=30></td>
 	</tr>
 	<tr>
-	  <th align=right>|.$locale->text('From').qq|</th>
+	  <th align=right>| . $locale->text('From') . qq|</th>
 	  <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-	  <th align=right>|.$locale->text('To').qq|</th>
+	  <th align=right>| . $locale->text('To') . qq|</th>
 	  <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	$selectfrom
         <tr>
 	  <td align=right><input type=checkbox class=checkbox name=fx_transaction value=1 checked></td>
-	  <td colspan=3>|.$locale->text('Include Exchange Rate Difference').qq|</td>
+	  <td colspan=3>|
+          . $locale->text('Include Exchange Rate Difference')
+          . qq|</td>
 	</tr>
         <tr>
 	  <td align=right><input name=l_subtotal class=checkbox type=checkbox value=Y></td>
-	  <td align=left colspan=3>|.$locale->text('Subtotal').qq|</th>
+	  <td align=left colspan=3>| . $locale->text('Subtotal') . qq|</th>
 	</tr>
 	  
 	  <input type=hidden name=db value=$form->{db}>
 	  <input type=hidden name=sort value=transdate>
 |;
 
-  }
-
+    }
 
-  print qq|
+    print qq|
 
 $gifi
 
@@ -773,17 +838,19 @@ $gifi
 <input type="hidden" name="login" value="$form->{login}">
 <input type="hidden" name="sessionid" value="$form->{sessionid}">
 
-<button type="submit" class="submit" name="action" value="continue">|.$locale->text('Continue').qq|</button>
+<button type="submit" class="submit" name="action" value="continue">|
+      . $locale->text('Continue')
+      . qq|</button>
 
 </form>
 |;
 
-  if ($form->{lynx}) {
-    require "bin/menu.pl";
-    &menubar;
-  }
+    if ( $form->{lynx} ) {
+        require "bin/menu.pl";
+        &menubar;
+    }
 
-  print qq|
+    print qq|
 
 </body>
 </html>
@@ -791,69 +858,69 @@ $gifi
 
 }
 
-
-sub continue { &{$form->{nextsub}} };
+sub continue { &{ $form->{nextsub} } }
 
 sub generate_inv_activity {
-  $form->header;
+    $form->header;
 
-  RP->inventory_activity(\%myconfig, \%$form);
+    RP->inventory_activity( \%myconfig, \%$form );
 
-  $title = $form->escape($form->{title});
-  
-#  if ($form->{department}) {
-#    ($department) = split /--/, $form->{department};
-#    $options = $locale->text('Department')." : $department<br>";
-#    $department = $form->escape($form->{department});
-#  }
-##  if ($form->{projectnumber}) {
-#    ($projectnumber) = split /--/, $form->{projectnumber};
-#    $options .= $locale->text('Project Number')." : $projectnumber<br>";
-#    $projectnumber = $form->escape($form->{projectnumber});
-#  }
+    $title = $form->escape( $form->{title} );
 
-  # if there are any dates
-  if ($form->{fromdate} || $form->{todate}) {
-    if ($form->{fromdate}) {
-      $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
-    }
-    if ($form->{todate}) {
-      $todate = $locale->date(\%myconfig, $form->{todate}, 1);
+    #  if ($form->{department}) {
+    #    ($department) = split /--/, $form->{department};
+    #    $options = $locale->text('Department')." : $department<br>";
+    #    $department = $form->escape($form->{department});
+    #  }
+##  if ($form->{projectnumber}) {
+    #    ($projectnumber) = split /--/, $form->{projectnumber};
+    #    $options .= $locale->text('Project Number')." : $projectnumber<br>";
+    #    $projectnumber = $form->escape($form->{projectnumber});
+    #  }
+
+    # if there are any dates
+    if ( $form->{fromdate} || $form->{todate} ) {
+        if ( $form->{fromdate} ) {
+            $fromdate = $locale->date( \%myconfig, $form->{fromdate}, 1 );
+        }
+        if ( $form->{todate} ) {
+            $todate = $locale->date( \%myconfig, $form->{todate}, 1 );
+        }
+
+        $form->{period} = "$fromdate - $todate";
     }
-    
-    $form->{period} = "$fromdate - $todate";
-  } else {
-    $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+    else {
+        $form->{period} =
+          $locale->date( \%myconfig, $form->current_date( \%myconfig ), 1 );
 
-  }
-  $options .= $form->{period};
+    }
+    $options .= $form->{period};
 
-  @column_index = qw(partnumber description sold revenue received expense);
+    @column_index = qw(partnumber description sold revenue received expense);
 
-  $href = qq|rp.pl?path=$form->{path}&action=continue&accounttype=$form->{accounttype}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|;
+    $href =
+qq|rp.pl?path=$form->{path}&action=continue&accounttype=$form->{accounttype}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|;
 
-  $column_header{partnumber} = qq|
+    $column_header{partnumber} = qq|
 	<th class=listheading><a class=listheading href="$href&sort_col=partnumber">|
-		.$locale->text('Part Number').qq|</a></th>|;
-  $column_header{description} = qq|
+      . $locale->text('Part Number') . qq|</a></th>|;
+    $column_header{description} = qq|
 	<th class=listheading><a class=listheading href="$href&sort_col=description">|
-		.$locale->text('Description').qq|</a></th>|;
-  $column_header{sold} = qq|
+      . $locale->text('Description') . qq|</a></th>|;
+    $column_header{sold} = qq|
 	<th class=listheading><a class=listheading href="$href&sort_col=sold">|
-		.$locale->text('Sold').qq|</a></th>|;
-  $column_header{revenue} = qq|
+      . $locale->text('Sold') . qq|</a></th>|;
+    $column_header{revenue} = qq|
 	<th class=listheading><a class=listheading href="$href&sort_col=revenue">|
-		.$locale->text('Revenue').qq|</a></th>|;
-  $column_header{received} = qq|
+      . $locale->text('Revenue') . qq|</a></th>|;
+    $column_header{received} = qq|
 	<th class=listheading><a class=listheading href="$href&sort_col=received">|
-		.$locale->text('Received').qq|</a></th>|;
-  $column_header{expense} = qq|
+      . $locale->text('Received') . qq|</a></th>|;
+    $column_header{expense} = qq|
 	<th class=listheading><a class=listheading href="$href&sort_col=expense">|
-		.$locale->text('Expense').qq|</a></th>|;
-
+      . $locale->text('Expense') . qq|</a></th>|;
 
-
-  print qq|
+    print qq|
 <body>
 
 <table width=100%>
@@ -869,62 +936,68 @@ sub generate_inv_activity {
       <table width=100%>
 	<tr>|;
 
-  map { print "$column_header{$_}\n" } @column_index;
+    map { print "$column_header{$_}\n" } @column_index;
 
-  print qq|
+    print qq|
         </tr>
 |;
 
+    if ( $form->{sort_col} eq 'qty' || $form->{sort_col} eq 'revenue' ) {
+        $form->{sort_type} = 'numeric';
+    }
+    $i    = 0;
+    $cols = "l_transdate=Y&l_name=Y&l_invnumber=Y&summary=1";
+    $dates =
+"transdatefrom=$form->{fromdate}&transdateto=$form->{todate}&year=$form->{fromyear}&month=$form->{frommonth}&interval=$form->{interval}";
+    $base =
+      "path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}";
+
+    $form->{callback} = "rp.pl?action=continue&$base";
+    $form->{callback} = $form->escape( $form->{callback} );
+    $callback         = "callback=$form->{callback}";
+
+    # sort the whole thing by account numbers and display
+    foreach $ref ( @{ $form->{TB} } ) {
+        $description = $form->escape( $ref->{description} );
+        $i           = $i % 2;
+
+        $pnumhref =
+          "ic.pl?action=edit&id=$ref->{id}&$base&callback=$form->{callback}";
+        $soldhref =
+"ar.pl?action=transactions&partsid=$ref->{id}&$base&$cols&$dates&$callback";
+        $rechref =
+"ap.pl?action=transactions&partsid=$ref->{id}&$base&$cols&$dates&callback=$form->{callback}";
+
+        $ml = ( $ref->{category} =~ /(A|E)/ ) ? -1 : 1;
+
+        $debit = $form->format_amount( \%myconfig, $ref->{debit}, 2, "&nbsp;" );
+        $credit =
+          $form->format_amount( \%myconfig, $ref->{credit}, 2, "&nbsp;" );
+        $begbalance =
+          $form->format_amount( \%myconfig, $ref->{balance} * $ml, 2,
+            "&nbsp;" );
+        $endbalance =
+          $form->format_amount( \%myconfig,
+            ( $ref->{balance} + $ref->{amount} ) * $ml,
+            2, "&nbsp;" );
+
+        $ref->{partnumber} = qq|<a href="$pnumhref">$ref->{partnumber}</a>|;
+        $ref->{sold}       = qq|<a href="$soldhref">$ref->{sold}</a>|;
+        $ref->{received}   = qq|<a href="$rechref">$ref->{received}<a/>|;
+        map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
 
- 
-  if ($form->{sort_col} eq 'qty' || $form->{sort_col} eq 'revenue'){
-    $form->{sort_type} = 'numeric';
-  } 
-  $i = 0;
-  $cols = "l_transdate=Y&l_name=Y&l_invnumber=Y&summary=1";
-  $dates= "transdatefrom=$form->{fromdate}&transdateto=$form->{todate}&year=$form->{fromyear}&month=$form->{frommonth}&interval=$form->{interval}";
-  $base="path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}";
-
-  $form->{callback} = "rp.pl?action=continue&$base";
-  $form->{callback} = $form->escape($form->{callback});
-  $callback = "callback=$form->{callback}";
-  # sort the whole thing by account numbers and display
-  foreach $ref (@{ $form->{TB} }) {
-    $description = $form->escape($ref->{description});
-    $i = $i % 2; 
-
-    $pnumhref="ic.pl?action=edit&id=$ref->{id}&$base&callback=$form->{callback}";
-    $soldhref="ar.pl?action=transactions&partsid=$ref->{id}&$base&$cols&$dates&$callback";
-    $rechref="ap.pl?action=transactions&partsid=$ref->{id}&$base&$cols&$dates&callback=$form->{callback}";    
-
-    $ml = ($ref->{category} =~ /(A|E)/) ? -1 : 1;
-    
-    $debit = $form->format_amount(\%myconfig, $ref->{debit}, 2, "&nbsp;");
-    $credit = $form->format_amount(\%myconfig, $ref->{credit}, 2, "&nbsp;");
-    $begbalance = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, "&nbsp;");
-    $endbalance = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2, "&nbsp;");
-
-    $ref->{partnumber} = qq|<a href="$pnumhref">$ref->{partnumber}</a>|;
-    $ref->{sold} = qq|<a href="$soldhref">$ref->{sold}</a>|;
-    $ref->{received} = qq|<a href="$rechref">$ref->{received}<a/>|;
-    map { $column_data{$_} = "<td>&nbsp;</td>" } 
-		@column_index;
-   
-    
-
-    print qq|
+        print qq|
       <tr class=listrow$i>
       |;
-    map { print "<td>$ref->{$_}</td>\n" } @column_index;
-    
-    print qq|
+        map { print "<td>$ref->{$_}</td>\n" } @column_index;
+
+        print qq|
       </tr>
 |;
-  ++$i;
-  }
-
+        ++$i;
+    }
 
-  print qq|
+    print qq|
 	</tr>
       </table>
     </td>
@@ -940,109 +1013,125 @@ sub generate_inv_activity {
 
 }
 
-
 sub generate_income_statement {
 
-  $form->{padding} = "&nbsp;&nbsp;";
-  $form->{bold} = "<b>";
-  $form->{endbold} = "</b>";
-  $form->{br} = "<br>";
-  
-  RP->income_statement(\%myconfig, \%$form);
-
-  ($form->{department}) = split /--/, $form->{department};
-  ($form->{projectnumber}) = split /--/, $form->{projectnumber};
-  
-  $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
-  $form->{todate} = $form->current_date(\%myconfig) unless $form->{todate};
-
-  # if there are any dates construct a where
-  if ($form->{fromdate} || $form->{todate}) {
-    
-    unless ($form->{todate}) {
-      $form->{todate} = $form->current_date(\%myconfig);
-    }
-
-    $longtodate = $locale->date(\%myconfig, $form->{todate}, 1);
-    $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0);
-    
-    $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
-    $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
-    
-    $form->{this_period} = "$shortfromdate<br>\n$shorttodate";
-    $form->{period} = $locale->text('for Period').qq|<br>\n$longfromdate |.$locale->text('To').qq| $longtodate|;
-  }
-
-  if ($form->{comparefromdate} || $form->{comparetodate}) {
-    $longcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 1);
-    $shortcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 0);
-    
-    $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
-    $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
-    
-    $form->{last_period} = "$shortcomparefromdate<br>\n$shortcomparetodate";
-    $form->{period} .= "<br>\n$longcomparefromdate ".$locale->text('To').qq| $longcomparetodate|;
-  }
-
-  # setup variables for the form
-  @a = qw(company address businessnumber);
-  for (@a) { $form->{$_} = $myconfig{$_} }
-  $form->{address} =~ s/\\n/<br>/g;
-
-  $form->{templates} = $myconfig{templates};
-
-  $form->{IN} = "income_statement.html";
-  
-  $form->parse_template;
+    $form->{padding} = "&nbsp;&nbsp;";
+    $form->{bold}    = "<b>";
+    $form->{endbold} = "</b>";
+    $form->{br}      = "<br>";
 
-}
+    RP->income_statement( \%myconfig, \%$form );
 
+    ( $form->{department} )    = split /--/, $form->{department};
+    ( $form->{projectnumber} ) = split /--/, $form->{projectnumber};
 
-sub generate_balance_sheet {
+    $form->{period} =
+      $locale->date( \%myconfig, $form->current_date( \%myconfig ), 1 );
+    $form->{todate} = $form->current_date( \%myconfig ) unless $form->{todate};
 
-  $form->{padding} = "&nbsp;&nbsp;";
-  $form->{bold} = "<b>";
-  $form->{endbold} = "</b>";
-  $form->{br} = "<br>";
-  
-  RP->balance_sheet(\%myconfig, \%$form);
+    # if there are any dates construct a where
+    if ( $form->{fromdate} || $form->{todate} ) {
 
-  $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'));
+        unless ( $form->{todate} ) {
+            $form->{todate} = $form->current_date( \%myconfig );
+        }
 
-  $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0);
-  $form->{last_period} = $locale->date(\%myconfig, $form->{compareasofdate}, 0);
+        $longtodate  = $locale->date( \%myconfig, $form->{todate}, 1 );
+        $shorttodate = $locale->date( \%myconfig, $form->{todate}, 0 );
 
-  $form->{IN} = "balance_sheet.html";
+        $longfromdate  = $locale->date( \%myconfig, $form->{fromdate}, 1 );
+        $shortfromdate = $locale->date( \%myconfig, $form->{fromdate}, 0 );
 
-  # setup company variables for the form
-  for (qw(company address businessnumber nativecurr)) { $form->{$_} = $myconfig{$_} }
-  $form->{address} =~ s/\\n/<br>/g;
+        $form->{this_period} = "$shortfromdate<br>\n$shorttodate";
+        $form->{period} =
+            $locale->text('for Period')
+          . qq|<br>\n$longfromdate |
+          . $locale->text('To')
+          . qq| $longtodate|;
+    }
 
-  $form->{templates} = $myconfig{templates};
-	  
-  $form->parse_template;
+    if ( $form->{comparefromdate} || $form->{comparetodate} ) {
+        $longcomparefromdate =
+          $locale->date( \%myconfig, $form->{comparefromdate}, 1 );
+        $shortcomparefromdate =
+          $locale->date( \%myconfig, $form->{comparefromdate}, 0 );
+
+        $longcomparetodate =
+          $locale->date( \%myconfig, $form->{comparetodate}, 1 );
+        $shortcomparetodate =
+          $locale->date( \%myconfig, $form->{comparetodate}, 0 );
+
+        $form->{last_period} = "$shortcomparefromdate<br>\n$shortcomparetodate";
+        $form->{period} .=
+            "<br>\n$longcomparefromdate "
+          . $locale->text('To')
+          . qq| $longcomparetodate|;
+    }
+
+    # setup variables for the form
+    @a = qw(company address businessnumber);
+    for (@a) { $form->{$_} = $myconfig{$_} }
+    $form->{address} =~ s/\\n/<br>/g;
+
+    $form->{templates} = $myconfig{templates};
+
+    $form->{IN} = "income_statement.html";
+
+    $form->parse_template;
 
 }
 
+sub generate_balance_sheet {
 
-sub generate_projects {
+    $form->{padding} = "&nbsp;&nbsp;";
+    $form->{bold}    = "<b>";
+    $form->{endbold} = "</b>";
+    $form->{br}      = "<br>";
+
+    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 );
 
-  $form->{nextsub} = "generate_projects";
-  $form->{title} = $locale->text('Project Transactions');
+    $form->{IN} = "balance_sheet.html";
 
-  RP->trial_balance(\%myconfig, \%$form);
-  
-  &list_accounts;
+    # setup company variables for the form
+    for (qw(company address businessnumber nativecurr)) {
+        $form->{$_} = $myconfig{$_};
+    }
+    $form->{address} =~ s/\\n/<br>/g;
+
+    $form->{templates} = $myconfig{templates};
+
+    $form->parse_template;
 
 }
 
+sub generate_projects {
+
+    $form->{nextsub} = "generate_projects";
+    $form->{title}   = $locale->text('Project Transactions');
+
+    RP->trial_balance( \%myconfig, \%$form );
+
+    &list_accounts;
+
+}
 
 # Antonio Gallardo
 #
@@ -1051,72 +1140,83 @@ sub generate_projects {
 # added headers and subtotals
 #
 sub generate_trial_balance {
-  
-  # get for each account initial balance, debits and credits
-  RP->trial_balance(\%myconfig, \%$form);
 
-  $form->{nextsub} = "generate_trial_balance";
-  $form->{title} = $locale->text('Trial Balance');
+    # get for each account initial balance, debits and credits
+    RP->trial_balance( \%myconfig, \%$form );
 
-  $form->{callback} = "$form->{script}?action=generate_trial_balance";
-  for (qw(login path sessionid nextsub fromdate todate month year interval l_heading l_subtotal all_accounts accounttype title)) { $form->{callback} .= "&$_=$form->{$_}" }
-  $form->{callback} = $form->escape($form->{callback});
-  
-  &list_accounts;
+    $form->{nextsub} = "generate_trial_balance";
+    $form->{title}   = $locale->text('Trial Balance');
 
-}
+    $form->{callback} = "$form->{script}?action=generate_trial_balance";
+    for (
+        qw(login path sessionid nextsub fromdate todate month year interval l_heading l_subtotal all_accounts accounttype title)
+      )
+    {
+        $form->{callback} .= "&$_=$form->{$_}";
+    }
+    $form->{callback} = $form->escape( $form->{callback} );
 
+    &list_accounts;
 
-sub list_accounts {
+}
 
-  $title = $form->escape($form->{title});
-  
-  if ($form->{department}) {
-    ($department) = split /--/, $form->{department};
-    $options = $locale->text('Department')." : $department<br>";
-    $department = $form->escape($form->{department});
-  }
-  if ($form->{projectnumber}) {
-    ($projectnumber) = split /--/, $form->{projectnumber};
-    $options .= $locale->text('Project Number')." : $projectnumber<br>";
-    $projectnumber = $form->escape($form->{projectnumber});
-  }
+sub list_accounts {
 
-  # if there are any dates
-  if ($form->{fromdate} || $form->{todate}) {
+    $title = $form->escape( $form->{title} );
 
-    if ($form->{fromdate}) {
-      $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
+    if ( $form->{department} ) {
+        ($department) = split /--/, $form->{department};
+        $options    = $locale->text('Department') . " : $department<br>";
+        $department = $form->escape( $form->{department} );
     }
-    if ($form->{todate}) {
-      $todate = $locale->date(\%myconfig, $form->{todate}, 1);
+    if ( $form->{projectnumber} ) {
+        ($projectnumber) = split /--/, $form->{projectnumber};
+        $options .= $locale->text('Project Number') . " : $projectnumber<br>";
+        $projectnumber = $form->escape( $form->{projectnumber} );
     }
-    
-    $form->{period} = "$fromdate - $todate";
-  } else {
-    $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
 
-  }
-  $options .= $form->{period};
+    # if there are any dates
+    if ( $form->{fromdate} || $form->{todate} ) {
 
-  @column_index = qw(accno description begbalance debit credit endbalance);
-
-  $column_header{accno} = qq|<th class=listheading>|.$locale->text('Account').qq|</th>|;
-  $column_header{description} = qq|<th class=listheading>|.$locale->text('Description').qq|</th>|;
-  $column_header{debit} = qq|<th class=listheading>|.$locale->text('Debit').qq|</th>|;
-  $column_header{credit} = qq|<th class=listheading>|.$locale->text('Credit').qq|</th>|;
-  $column_header{begbalance} = qq|<th class=listheading>|.$locale->text('Balance').qq|</th>|;
-  $column_header{endbalance} = qq|<th class=listheading>|.$locale->text('Balance').qq|</th>|;
+        if ( $form->{fromdate} ) {
+            $fromdate = $locale->date( \%myconfig, $form->{fromdate}, 1 );
+        }
+        if ( $form->{todate} ) {
+            $todate = $locale->date( \%myconfig, $form->{todate}, 1 );
+        }
 
+        $form->{period} = "$fromdate - $todate";
+    }
+    else {
+        $form->{period} =
+          $locale->date( \%myconfig, $form->current_date( \%myconfig ), 1 );
 
-  if ($form->{accounttype} eq 'gifi') {
-    $column_header{accno} = qq|<th class=listheading>|.$locale->text('GIFI').qq|</th>|;
-  }
-  
+    }
+    $options .= $form->{period};
+
+    @column_index = qw(accno description begbalance debit credit endbalance);
+
+    $column_header{accno} =
+      qq|<th class=listheading>| . $locale->text('Account') . qq|</th>|;
+    $column_header{description} =
+      qq|<th class=listheading>| . $locale->text('Description') . qq|</th>|;
+    $column_header{debit} =
+      qq|<th class=listheading>| . $locale->text('Debit') . qq|</th>|;
+    $column_header{credit} =
+      qq|<th class=listheading>| . $locale->text('Credit') . qq|</th>|;
+    $column_header{begbalance} =
+      qq|<th class=listheading>| . $locale->text('Balance') . qq|</th>|;
+    $column_header{endbalance} =
+      qq|<th class=listheading>| . $locale->text('Balance') . qq|</th>|;
+
+    if ( $form->{accounttype} eq 'gifi' ) {
+        $column_header{accno} =
+          qq|<th class=listheading>| . $locale->text('GIFI') . qq|</th>|;
+    }
 
-  $form->header;
+    $form->header;
 
-  print qq|
+    print qq|
 <body>
 
 <table width=100%>
@@ -1132,172 +1232,216 @@ sub list_accounts {
       <table width=100%>
 	<tr>|;
 
-  for (@column_index) { print "$column_header{$_}\n" }
+    for (@column_index) { print "$column_header{$_}\n" }
 
-  print qq|
+    print qq|
         </tr>
 |;
 
-
-  
-  # sort the whole thing by account numbers and display
-  foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} }) {
-
-    $description = $form->escape($ref->{description});
-    
-    $href = qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&prevreport=$form->{callback}|;
-    
-    if ($form->{accounttype} eq 'gifi') {
-      $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description";
-      $na = $locale->text('N/A');
-      if (!$ref->{accno}) {
-	for (qw(accno description)) { $ref->{$_} = $na }
-      }
-    } else {
-      $href .= "&accno=$ref->{accno}&description=$description";
-    }
-
-    $ml = ($ref->{category} =~ /(A|E)/) ? -1 : 1;
-    $ml *= -1 if $ref->{contra};
-    
-    $debit = $form->format_amount(\%myconfig, $ref->{debit}, 2, "&nbsp;");
-    $credit = $form->format_amount(\%myconfig, $ref->{credit}, 2, "&nbsp;");
-    $begbalance = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, "&nbsp;");
-    $endbalance = $form->format_amount(\%myconfig, ($ref->{balance} + $ref->{amount}) * $ml, 2, "&nbsp;");
-
- 
-    if ($ref->{charttype} eq "H" && $subtotal && $form->{l_subtotal}) {
-
-      if ($subtotal) {
-
-	for (qw(accno begbalance endbalance)) { $column_data{$_} = "<th>&nbsp;</th>" }
-
-	$subtotalbegbalance = $form->format_amount(\%myconfig, $subtotalbegbalance, 2, "&nbsp;");
-	$subtotalendbalance = $form->format_amount(\%myconfig, $subtotalendbalance, 2, "&nbsp;");
-	$subtotaldebit = $form->format_amount(\%myconfig, $subtotaldebit, 2, "&nbsp;");
-	$subtotalcredit = $form->format_amount(\%myconfig, $subtotalcredit, 2, "&nbsp;");
-	
-	$column_data{description} = "<th class=listsubtotal>$subtotaldescription</th>";
-	$column_data{begbalance} = "<th align=right class=listsubtotal>$subtotalbegbalance</th>";
-	$column_data{endbalance} = "<th align=right class=listsubtotal>$subtotalendbalance</th>";
-	$column_data{debit} = "<th align=right class=listsubtotal>$subtotaldebit</th>";
-	$column_data{credit} = "<th align=right class=listsubtotal>$subtotalcredit</th>";
-	
-	print qq|
+    # sort the whole thing by account numbers and display
+    foreach $ref ( sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} } ) {
+
+        $description = $form->escape( $ref->{description} );
+
+        $href =
+qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&prevreport=$form->{callback}|;
+
+        if ( $form->{accounttype} eq 'gifi' ) {
+            $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description";
+            $na = $locale->text('N/A');
+            if ( !$ref->{accno} ) {
+                for (qw(accno description)) { $ref->{$_} = $na }
+            }
+        }
+        else {
+            $href .= "&accno=$ref->{accno}&description=$description";
+        }
+
+        $ml = ( $ref->{category} =~ /(A|E)/ ) ? -1 : 1;
+        $ml *= -1 if $ref->{contra};
+
+        $debit = $form->format_amount( \%myconfig, $ref->{debit}, 2, "&nbsp;" );
+        $credit =
+          $form->format_amount( \%myconfig, $ref->{credit}, 2, "&nbsp;" );
+        $begbalance =
+          $form->format_amount( \%myconfig, $ref->{balance} * $ml, 2,
+            "&nbsp;" );
+        $endbalance =
+          $form->format_amount( \%myconfig,
+            ( $ref->{balance} + $ref->{amount} ) * $ml,
+            2, "&nbsp;" );
+
+        if ( $ref->{charttype} eq "H" && $subtotal && $form->{l_subtotal} ) {
+
+            if ($subtotal) {
+
+                for (qw(accno begbalance endbalance)) {
+                    $column_data{$_} = "<th>&nbsp;</th>";
+                }
+
+                $subtotalbegbalance =
+                  $form->format_amount( \%myconfig, $subtotalbegbalance, 2,
+                    "&nbsp;" );
+                $subtotalendbalance =
+                  $form->format_amount( \%myconfig, $subtotalendbalance, 2,
+                    "&nbsp;" );
+                $subtotaldebit =
+                  $form->format_amount( \%myconfig, $subtotaldebit, 2,
+                    "&nbsp;" );
+                $subtotalcredit =
+                  $form->format_amount( \%myconfig, $subtotalcredit, 2,
+                    "&nbsp;" );
+
+                $column_data{description} =
+                  "<th class=listsubtotal>$subtotaldescription</th>";
+                $column_data{begbalance} =
+                  "<th align=right class=listsubtotal>$subtotalbegbalance</th>";
+                $column_data{endbalance} =
+                  "<th align=right class=listsubtotal>$subtotalendbalance</th>";
+                $column_data{debit} =
+                  "<th align=right class=listsubtotal>$subtotaldebit</th>";
+                $column_data{credit} =
+                  "<th align=right class=listsubtotal>$subtotalcredit</th>";
+
+                print qq|
 	  <tr class=listsubtotal>
 |;
-	for (@column_index) { print "$column_data{$_}\n" }
-	
-	print qq|
+                for (@column_index) { print "$column_data{$_}\n" }
+
+                print qq|
 	  </tr>
 |;
-      }
-    }
- 
-    if ($ref->{charttype} eq "H") {
-      $subtotal = 1;
-      $subtotaldescription = $ref->{description};
-      $subtotaldebit = $ref->{debit};
-      $subtotalcredit = $ref->{credit};
-      $subtotalbegbalance = 0;
-      $subtotalendbalance = 0;
-
-      if ($form->{l_heading}) {
-	if (! $form->{all_accounts}) {
-	  if (($subtotaldebit + $subtotalcredit) == 0) {
-	    $subtotal = 0;
-	    next;
-	  }
-	}
-      } else {
-	$subtotal = 0;
-	if ($form->{all_accounts} || ($form->{l_subtotal} && (($subtotaldebit + $subtotalcredit) != 0))) {
-	  $subtotal = 1;
-	}
-	next;
-      }
-      
-      for (qw(accno debit credit begbalance endbalance)) { $column_data{$_} = "<th>&nbsp;</th>" }
-      $column_data{description} = "<th class=listheading>$ref->{description}</th>";
-    }
-
-    if ($ref->{charttype} eq "A") {
-      $column_data{accno} = "<td><a href=$href>$ref->{accno}</a></td>";
-      $column_data{description} = "<td>$ref->{description}</td>";
-      $column_data{debit} = "<td align=right>$debit</td>";
-      $column_data{credit} = "<td align=right>$credit</td>";
-      $column_data{begbalance} = "<td align=right>$begbalance</td>";
-      $column_data{endbalance} = "<td align=right>$endbalance</td>";
-    
-      $totaldebit += $ref->{debit};
-      $totalcredit += $ref->{credit};
-
-      $cml = ($ref->{contra}) ? -1 : 1;
-
-      $subtotalbegbalance += $ref->{balance} * $ml * $cml;
-      $subtotalendbalance += ($ref->{balance} + $ref->{amount}) * $ml * $cml;
-
-    }
- 
-   
-    if ($ref->{charttype} eq "H") {
-      print qq|
+            }
+        }
+
+        if ( $ref->{charttype} eq "H" ) {
+            $subtotal            = 1;
+            $subtotaldescription = $ref->{description};
+            $subtotaldebit       = $ref->{debit};
+            $subtotalcredit      = $ref->{credit};
+            $subtotalbegbalance  = 0;
+            $subtotalendbalance  = 0;
+
+            if ( $form->{l_heading} ) {
+                if ( !$form->{all_accounts} ) {
+                    if ( ( $subtotaldebit + $subtotalcredit ) == 0 ) {
+                        $subtotal = 0;
+                        next;
+                    }
+                }
+            }
+            else {
+                $subtotal = 0;
+                if (
+                    $form->{all_accounts}
+                    || ( $form->{l_subtotal}
+                        && ( ( $subtotaldebit + $subtotalcredit ) != 0 ) )
+                  )
+                {
+                    $subtotal = 1;
+                }
+                next;
+            }
+
+            for (qw(accno debit credit begbalance endbalance)) {
+                $column_data{$_} = "<th>&nbsp;</th>";
+            }
+            $column_data{description} =
+              "<th class=listheading>$ref->{description}</th>";
+        }
+
+        if ( $ref->{charttype} eq "A" ) {
+            $column_data{accno} = "<td><a href=$href>$ref->{accno}</a></td>";
+            $column_data{description} = "<td>$ref->{description}</td>";
+            $column_data{debit}       = "<td align=right>$debit</td>";
+            $column_data{credit}      = "<td align=right>$credit</td>";
+            $column_data{begbalance}  = "<td align=right>$begbalance</td>";
+            $column_data{endbalance}  = "<td align=right>$endbalance</td>";
+
+            $totaldebit  += $ref->{debit};
+            $totalcredit += $ref->{credit};
+
+            $cml = ( $ref->{contra} ) ? -1 : 1;
+
+            $subtotalbegbalance += $ref->{balance} * $ml * $cml;
+            $subtotalendbalance +=
+              ( $ref->{balance} + $ref->{amount} ) * $ml * $cml;
+
+        }
+
+        if ( $ref->{charttype} eq "H" ) {
+            print qq|
       <tr class=listheading>
 |;
-    }
-    if ($ref->{charttype} eq "A") {
-      $i++; $i %= 2;
-      print qq|
+        }
+        if ( $ref->{charttype} eq "A" ) {
+            $i++;
+            $i %= 2;
+            print qq|
       <tr class=listrow$i>
 |;
-    }
-    
-    for (@column_index) { print "$column_data{$_}\n" }
-    
-    print qq|
+        }
+
+        for (@column_index) { print "$column_data{$_}\n" }
+
+        print qq|
       </tr>
 |;
-  }
-
-
-  # print last subtotal
-  if ($subtotal && $form->{l_subtotal}) {
-    for (qw(accno begbalance endbalance)) { $column_data{$_} = "<th>&nbsp;</th>" }
-    $subtotalbegbalance = $form->format_amount(\%myconfig, $subtotalbegbalance, 2, "&nbsp;");
-    $subtotalendbalance = $form->format_amount(\%myconfig, $subtotalendbalance, 2, "&nbsp;");
-    $subtotaldebit = $form->format_amount(\%myconfig, $subtotaldebit, 2, "&nbsp;");
-    $subtotalcredit = $form->format_amount(\%myconfig, $subtotalcredit, 2, "&nbsp;");
-    $column_data{description} = "<th class=listsubtotal>$subtotaldescription</th>";
-    $column_data{begbalance} = "<th align=right class=listsubtotal>$subtotalbegbalance</th>";
-    $column_data{endbalance} = "<th align=right class=listsubtotal>$subtotalendbalance</th>";
-    $column_data{debit} = "<th align=right class=listsubtotal>$subtotaldebit</th>";
-    $column_data{credit} = "<th align=right class=listsubtotal>$subtotalcredit</th>";
-    
-    print qq|
+    }
+
+    # print last subtotal
+    if ( $subtotal && $form->{l_subtotal} ) {
+        for (qw(accno begbalance endbalance)) {
+            $column_data{$_} = "<th>&nbsp;</th>";
+        }
+        $subtotalbegbalance =
+          $form->format_amount( \%myconfig, $subtotalbegbalance, 2, "&nbsp;" );
+        $subtotalendbalance =
+          $form->format_amount( \%myconfig, $subtotalendbalance, 2, "&nbsp;" );
+        $subtotaldebit =
+          $form->format_amount( \%myconfig, $subtotaldebit, 2, "&nbsp;" );
+        $subtotalcredit =
+          $form->format_amount( \%myconfig, $subtotalcredit, 2, "&nbsp;" );
+        $column_data{description} =
+          "<th class=listsubtotal>$subtotaldescription</th>";
+        $column_data{begbalance} =
+          "<th align=right class=listsubtotal>$subtotalbegbalance</th>";
+        $column_data{endbalance} =
+          "<th align=right class=listsubtotal>$subtotalendbalance</th>";
+        $column_data{debit} =
+          "<th align=right class=listsubtotal>$subtotaldebit</th>";
+        $column_data{credit} =
+          "<th align=right class=listsubtotal>$subtotalcredit</th>";
+
+        print qq|
     <tr class=listsubtotal>
 |;
-    for (@column_index) { print "$column_data{$_}\n" }
-    
-    print qq|
+        for (@column_index) { print "$column_data{$_}\n" }
+
+        print qq|
     </tr>
 |;
-  }
-  
-  $totaldebit = $form->format_amount(\%myconfig, $totaldebit, 2, "&nbsp;");
-  $totalcredit = $form->format_amount(\%myconfig, $totalcredit, 2, "&nbsp;");
+    }
 
-  for (qw(accno description begbalance endbalance)) { $column_data{$_} = "<th>&nbsp;</th>" }
- 
-  $column_data{debit} = qq|<th align=right class=listtotal>$totaldebit</th>|;
-  $column_data{credit} = qq|<th align=right class=listtotal>$totalcredit</th>|;
-  
-  print qq|
+    $totaldebit = $form->format_amount( \%myconfig, $totaldebit, 2, "&nbsp;" );
+    $totalcredit =
+      $form->format_amount( \%myconfig, $totalcredit, 2, "&nbsp;" );
+
+    for (qw(accno description begbalance endbalance)) {
+        $column_data{$_} = "<th>&nbsp;</th>";
+    }
+
+    $column_data{debit} = qq|<th align=right class=listtotal>$totaldebit</th>|;
+    $column_data{credit} =
+      qq|<th align=right class=listtotal>$totalcredit</th>|;
+
+    print qq|
         <tr class=listtotal>
 |;
 
-  for (@column_index) { print "$column_data{$_}\n" }
+    for (@column_index) { print "$column_data{$_}\n" }
 
-  print qq|
+    print qq|
 	</tr>
       </table>
     </td>
@@ -1313,120 +1457,137 @@ sub list_accounts {
 
 }
 
-
 sub generate_ar_aging {
 
-  # split customer
-  ($form->{customer}) = split(/--/, $form->{customer});
-  $customer = $form->escape($form->{customer},1);
-  $title = $form->escape($form->{title},1);
-  $media = $form->escape($form->{media},1);
+    # split customer
+    ( $form->{customer} ) = split( /--/, $form->{customer} );
+    $customer = $form->escape( $form->{customer}, 1 );
+    $title    = $form->escape( $form->{title},    1 );
+    $media    = $form->escape( $form->{media},    1 );
 
-  $form->{ct} = "customer";
-  $form->{arap} = "ar";
+    $form->{ct}   = "customer";
+    $form->{arap} = "ar";
 
-  RP->aging(\%myconfig, \%$form);
+    RP->aging( \%myconfig, \%$form );
 
-  $form->{callback} = qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&sessionid=$form->{sessionid}&todate=$form->{todate}&customer=$customer&title=$title&type=$form->{type}&format=$form->{format}&media=$media&summary=$form->{summary}|;
-  
-  &aging;
-  
-}
+    $form->{callback} =
+qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&sessionid=$form->{sessionid}&todate=$form->{todate}&customer=$customer&title=$title&type=$form->{type}&format=$form->{format}&media=$media&summary=$form->{summary}|;
 
+    &aging;
 
-sub generate_ap_aging {
-  
-  # split vendor
-  ($form->{vendor}) = split(/--/, $form->{vendor});
-  $vendor = $form->escape($form->{vendor},1);
-  $title = $form->escape($form->{title},1);
-  $media = $form->escape($form->{media},1);
-
-  $form->{ct} = "vendor";
-  $form->{arap} = "ap";
-  
-  RP->aging(\%myconfig, \%$form);
-
-  $form->{callback} = qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&sessionid=$form->{sessionid}&todate=$form->{todate}&vendor=$vendor&title=$title&type=$form->{type}&format=$form->{format}&media=$media&summary=$form->{summary}|;
-
-  &aging;
-  
 }
 
+sub generate_ap_aging {
+
+    # split vendor
+    ( $form->{vendor} ) = split( /--/, $form->{vendor} );
+    $vendor = $form->escape( $form->{vendor}, 1 );
+    $title  = $form->escape( $form->{title},  1 );
+    $media  = $form->escape( $form->{media},  1 );
+
+    $form->{ct}   = "vendor";
+    $form->{arap} = "ap";
+
+    RP->aging( \%myconfig, \%$form );
+
+    $form->{callback} =
+qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&sessionid=$form->{sessionid}&todate=$form->{todate}&vendor=$vendor&title=$title&type=$form->{type}&format=$form->{format}&media=$media&summary=$form->{summary}|;
+
+    &aging;
+
+}
 
 sub aging {
 
-  $form->header;
-  
-  $column_header{statement} = qq|<th class=listheading width=1%>&nbsp;</th>|;
-  $column_header{ct} = qq|<th class=listheading width=60%>|.$locale->text(ucfirst $form->{ct}).qq|</th>|;
-  $column_header{language} = qq|<th class=listheading>|.$locale->text('Language').qq|</th>|;
-  $column_header{invnumber} = qq|<th class=listheading>|.$locale->text('Invoice').qq|</th>|;
-  $column_header{ordnumber} = qq|<th class=listheading>|.$locale->text('Order').qq|</th>|;
-  $column_header{transdate} = qq|<th class=listheading nowrap>|.$locale->text('Date').qq|</th>|;
-  $column_header{duedate} = qq|<th class=listheading nowrap>|.$locale->text('Due Date').qq|</th>|;
-  $column_header{c0} = qq|<th class=listheading width=10% nowrap>|.$locale->text('Current').qq|</th>|;
-  $column_header{c30} = qq|<th class=listheading width=10% nowrap>30</th>|;
-  $column_header{c60} = qq|<th class=listheading width=10% nowrap>60</th>|;
-  $column_header{c90} = qq|<th class=listheading width=10% nowrap>90</th>|;
-  $column_header{total} = qq|<th class=listheading width=10% nowrap>|.$locale->text('Total').qq|</th>|;
-  
-  @column_index = qw(statement ct);
-
-  if (@{ $form->{all_language} } && $form->{arap} eq 'ar') {
-    push @column_index, "language";
-    $form->{selectlanguage} = qq|<option>\n|;
-
-    for (@{ $form->{all_language} }) { $form->{selectlanguage} .= qq|<option value="$_->{code}">$_->{description}\n| }
-  }
-  
-  @c = ();
-  for (qw(c0 c30 c60 c90)) {
-    if ($form->{$_}) {
-      push @c, $_;
-      $form->{callback} .= "&$_=$form->{$_}";
-    }
-  }
-    
-  if (!$form->{summary}) {
-    push @column_index, qw(invnumber ordnumber transdate duedate);
-  }
-  push @column_index, @c;
-  push @column_index, "total";
-
-  $option = $locale->text('Aged');
-  if ($form->{overdue}) {
-    $option= $locale->text('Aged Overdue');
-    $form->{callback} .= "&overdue=$form->{overdue}";
-  }
-  
-  if ($form->{department}) {
-      $option .= "\n<br>" if $option;
-      ($department) = split /--/, $form->{department};
-      $option .= $locale->text('Department')." : $department";
-      $department = $form->escape($form->{department},1);
-      $form->{callback} .= "&department=$department";
-  }
-    
-  if ($form->{arap} eq 'ar') {
-    if ($form->{customer}) {
-      $option .= "\n<br>" if $option;
-      $option .= $form->{customer};
-    }
-  }
-  if ($form->{arap} eq 'ap') {
-    shift @column_index;
-    if ($form->{vendor}) {
-      $option .= "\n<br>" if $option;
-      $option .= $form->{vendor};
-    }
-  }
-
-  $todate = $locale->date(\%myconfig, $form->{todate}, 1);
-  $option .= "\n<br>" if $option;
-  $option .= $locale->text('for Period')." ".$locale->text('To')." $todate";
-
-  print qq|
+    $form->header;
+
+    $column_header{statement} = qq|<th class=listheading width=1%>&nbsp;</th>|;
+    $column_header{ct} =
+        qq|<th class=listheading width=60%>|
+      . $locale->text( ucfirst $form->{ct} )
+      . qq|</th>|;
+    $column_header{language} =
+      qq|<th class=listheading>| . $locale->text('Language') . qq|</th>|;
+    $column_header{invnumber} =
+      qq|<th class=listheading>| . $locale->text('Invoice') . qq|</th>|;
+    $column_header{ordnumber} =
+      qq|<th class=listheading>| . $locale->text('Order') . qq|</th>|;
+    $column_header{transdate} =
+      qq|<th class=listheading nowrap>| . $locale->text('Date') . qq|</th>|;
+    $column_header{duedate} =
+      qq|<th class=listheading nowrap>| . $locale->text('Due Date') . qq|</th>|;
+    $column_header{c0} =
+        qq|<th class=listheading width=10% nowrap>|
+      . $locale->text('Current')
+      . qq|</th>|;
+    $column_header{c30} = qq|<th class=listheading width=10% nowrap>30</th>|;
+    $column_header{c60} = qq|<th class=listheading width=10% nowrap>60</th>|;
+    $column_header{c90} = qq|<th class=listheading width=10% nowrap>90</th>|;
+    $column_header{total} =
+        qq|<th class=listheading width=10% nowrap>|
+      . $locale->text('Total')
+      . qq|</th>|;
+
+    @column_index = qw(statement ct);
+
+    if ( @{ $form->{all_language} } && $form->{arap} eq 'ar' ) {
+        push @column_index, "language";
+        $form->{selectlanguage} = qq|<option>\n|;
+
+        for ( @{ $form->{all_language} } ) {
+            $form->{selectlanguage} .=
+              qq|<option value="$_->{code}">$_->{description}\n|;
+        }
+    }
+
+    @c = ();
+    for (qw(c0 c30 c60 c90)) {
+        if ( $form->{$_} ) {
+            push @c, $_;
+            $form->{callback} .= "&$_=$form->{$_}";
+        }
+    }
+
+    if ( !$form->{summary} ) {
+        push @column_index, qw(invnumber ordnumber transdate duedate);
+    }
+    push @column_index, @c;
+    push @column_index, "total";
+
+    $option = $locale->text('Aged');
+    if ( $form->{overdue} ) {
+        $option = $locale->text('Aged Overdue');
+        $form->{callback} .= "&overdue=$form->{overdue}";
+    }
+
+    if ( $form->{department} ) {
+        $option .= "\n<br>" if $option;
+        ($department) = split /--/, $form->{department};
+        $option .= $locale->text('Department') . " : $department";
+        $department = $form->escape( $form->{department}, 1 );
+        $form->{callback} .= "&department=$department";
+    }
+
+    if ( $form->{arap} eq 'ar' ) {
+        if ( $form->{customer} ) {
+            $option .= "\n<br>" if $option;
+            $option .= $form->{customer};
+        }
+    }
+    if ( $form->{arap} eq 'ap' ) {
+        shift @column_index;
+        if ( $form->{vendor} ) {
+            $option .= "\n<br>" if $option;
+            $option .= $form->{vendor};
+        }
+    }
+
+    $todate = $locale->date( \%myconfig, $form->{todate}, 1 );
+    $option .= "\n<br>" if $option;
+    $option .=
+      $locale->text('for Period') . " " . $locale->text('To') . " $todate";
+
+    print qq|
 <body>
 
 <form method=post action=$form->{script}>
@@ -1444,56 +1605,62 @@ sub aging {
       <table width=100%>
 |;
 
-  $ctid = 0;
-  $i = 0;
-  $k = 0;
-  $l = $#{ $form->{AG} };
-
-  foreach $ref (@{ $form->{AG} }) {
-
-    if ($curr ne $ref->{curr}) {
-      $ctid = 0;
-      for (@column_index) { $column_data{$_} = qq|<th>&nbsp;</th>| }
-      if ($curr) {
-	$c0total = $form->format_amount(\%myconfig, $c0total, 2, "&nbsp");
-	$c30total = $form->format_amount(\%myconfig, $c30total, 2, "&nbsp");
-	$c60total = $form->format_amount(\%myconfig, $c60total, 2, "&nbsp");
-	$c90total = $form->format_amount(\%myconfig, $c90total, 2, "&nbsp");
-	$total = $form->format_amount(\%myconfig, $total, 2, "&nbsp");
-	
-	for (qw(ct statement language)) { $column_data{$_} = qq|<td>&nbsp;</td>| }
-	$column_data{c0} = qq|<th align=right>$c0total</th>|;
-	$column_data{c30} = qq|<th align=right>$c30total</th>|;
-	$column_data{c60} = qq|<th align=right>$c60total</th>|;
-	$column_data{c90} = qq|<th align=right>$c90total</th>|;
-	$column_data{total} = qq|<th align=right>$total</th>|;
-
-	print qq|
+    $ctid = 0;
+    $i    = 0;
+    $k    = 0;
+    $l    = $#{ $form->{AG} };
+
+    foreach $ref ( @{ $form->{AG} } ) {
+
+        if ( $curr ne $ref->{curr} ) {
+            $ctid = 0;
+            for (@column_index) { $column_data{$_} = qq|<th>&nbsp;</th>| }
+            if ($curr) {
+                $c0total =
+                  $form->format_amount( \%myconfig, $c0total, 2, "&nbsp" );
+                $c30total =
+                  $form->format_amount( \%myconfig, $c30total, 2, "&nbsp" );
+                $c60total =
+                  $form->format_amount( \%myconfig, $c60total, 2, "&nbsp" );
+                $c90total =
+                  $form->format_amount( \%myconfig, $c90total, 2, "&nbsp" );
+                $total = $form->format_amount( \%myconfig, $total, 2, "&nbsp" );
+
+                for (qw(ct statement language)) {
+                    $column_data{$_} = qq|<td>&nbsp;</td>|;
+                }
+                $column_data{c0}    = qq|<th align=right>$c0total</th>|;
+                $column_data{c30}   = qq|<th align=right>$c30total</th>|;
+                $column_data{c60}   = qq|<th align=right>$c60total</th>|;
+                $column_data{c90}   = qq|<th align=right>$c90total</th>|;
+                $column_data{total} = qq|<th align=right>$total</th>|;
+
+                print qq|
 	<tr class=listtotal>
 |;
 
-	for (@column_index) { print "$column_data{$_}\n" }
+                for (@column_index) { print "$column_data{$_}\n" }
 
-	print qq|
+                print qq|
 	  </tr>
 |;
 
-	$c0subtotal = 0;
-	$c30subtotal = 0;
-	$c60subtotal = 0;
-	$c90subtotal = 0;
-	$subtotal = 0;
-	
-	$c0total = 0;
-	$c30total = 0;
-	$c60total = 0;
-	$c90total = 0;
-	$total = 0;
- 
-      }
-      
-      $curr = $ref->{curr};
-      print qq|
+                $c0subtotal  = 0;
+                $c30subtotal = 0;
+                $c60subtotal = 0;
+                $c90subtotal = 0;
+                $subtotal    = 0;
+
+                $c0total  = 0;
+                $c30total = 0;
+                $c60total = 0;
+                $c90total = 0;
+                $total    = 0;
+
+            }
+
+            $curr = $ref->{curr};
+            print qq|
         <tr>
 	  <td></td>
 	  <th>$curr</th>
@@ -1502,162 +1669,196 @@ sub aging {
 	<tr class=listheading>
 |;
 
-      for (@column_index) { print "$column_header{$_}\n" }
-  
-      print qq|
+            for (@column_index) { print "$column_header{$_}\n" }
+
+            print qq|
 	</tr>
 |;
-    }
-    
-    $k++;
-    
-    if ($ctid != $ref->{ctid}) {
+        }
 
-      $i++;
+        $k++;
 
-      $column_data{ct} = qq|<td>$ref->{name}</td>|;
-      
-      if ($form->{selectlanguage}) {
-	$form->{"selectlanguage_$i"} = $form->{selectlanguage};
-	$form->{"selectlanguage_$i"} =~ s/(<option value="\Q$ref->{language_code}\E")/$1 selected/;
-	$column_data{language} = qq|<td><select name="language_code_$i">$form->{"selectlanguage_$i"}</select></td>|;
-      }
-      
-      $column_data{statement} = qq|<td><input name="statement_$i" type=checkbox class=checkbox value=1 $ref->{checked}>
-      <input type=hidden name="$form->{ct}_id_$i" value=$ref->{ctid}>
-      <input type=hidden name="curr_$i" value=$ref->{curr}>
-      </td>|;
+        if ( $ctid != $ref->{ctid} ) {
 
-    }
-
-    $ctid = $ref->{ctid};
-
-    for (qw(c0 c30 c60 c90)) { $ref->{$_} = $form->round_amount($ref->{$_} / $ref->{exchangerate}, 2) }
-
-    $c0subtotal += $ref->{c0};
-    $c30subtotal += $ref->{c30};
-    $c60subtotal += $ref->{c60};
-    $c90subtotal += $ref->{c90};
+            $i++;
 
-    $c0total += $ref->{c0};
-    $c30total += $ref->{c30};
-    $c60total += $ref->{c60};
-    $c90total += $ref->{c90};
-    
-    $ref->{total} = ($ref->{c0} + $ref->{c30} + $ref->{c60} + $ref->{c90});
-    $subtotal += $ref->{total};
-    $total += $ref->{total};
+            $column_data{ct} = qq|<td>$ref->{name}</td>|;
 
-    $ref->{c0} = $form->format_amount(\%myconfig, $ref->{c0}, 2, "&nbsp;");
-    $ref->{c30} = $form->format_amount(\%myconfig, $ref->{c30}, 2, "&nbsp;");
-    $ref->{c60} = $form->format_amount(\%myconfig, $ref->{c60}, 2, "&nbsp;");
-    $ref->{c90} = $form->format_amount(\%myconfig, $ref->{c90}, 2, "&nbsp;");
-    $ref->{total} = $form->format_amount(\%myconfig, $ref->{total}, 2, "&nbsp;");
+            if ( $form->{selectlanguage} ) {
+                $form->{"selectlanguage_$i"} = $form->{selectlanguage};
+                $form->{"selectlanguage_$i"} =~
+                  s/(<option value="\Q$ref->{language_code}\E")/$1 selected/;
+                $column_data{language} =
+qq|<td><select name="language_code_$i">$form->{"selectlanguage_$i"}</select></td>|;
+            }
 
-    $href = qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&sessionid=$form->{sessionid}&callback=|.$form->escape($form->{callback});
-    
-    $column_data{invnumber} = qq|<td><a href=$href>$ref->{invnumber}</a></td>|;
-    for (qw(ordnumber transdate duedate)) { $column_data{$_} = qq|<td>$ref->{$_}</td>| }
-    for (qw(c0 c30 c60 c90 total)) { $column_data{$_} = qq|<td align=right>$ref->{$_}</td>| }
-    
-    if (!$form->{summary}) {
+            $column_data{statement} =
+qq|<td><input name="statement_$i" type=checkbox class=checkbox value=1 $ref->{checked}>
+      <input type=hidden name="$form->{ct}_id_$i" value=$ref->{ctid}>
+      <input type=hidden name="curr_$i" value=$ref->{curr}>
+      </td>|;
 
-      $j++; $j %= 2;
-      print qq|
+        }
+
+        $ctid = $ref->{ctid};
+
+        for (qw(c0 c30 c60 c90)) {
+            $ref->{$_} =
+              $form->round_amount( $ref->{$_} / $ref->{exchangerate}, 2 );
+        }
+
+        $c0subtotal  += $ref->{c0};
+        $c30subtotal += $ref->{c30};
+        $c60subtotal += $ref->{c60};
+        $c90subtotal += $ref->{c90};
+
+        $c0total  += $ref->{c0};
+        $c30total += $ref->{c30};
+        $c60total += $ref->{c60};
+        $c90total += $ref->{c90};
+
+        $ref->{total} =
+          ( $ref->{c0} + $ref->{c30} + $ref->{c60} + $ref->{c90} );
+        $subtotal += $ref->{total};
+        $total    += $ref->{total};
+
+        $ref->{c0} =
+          $form->format_amount( \%myconfig, $ref->{c0}, 2, "&nbsp;" );
+        $ref->{c30} =
+          $form->format_amount( \%myconfig, $ref->{c30}, 2, "&nbsp;" );
+        $ref->{c60} =
+          $form->format_amount( \%myconfig, $ref->{c60}, 2, "&nbsp;" );
+        $ref->{c90} =
+          $form->format_amount( \%myconfig, $ref->{c90}, 2, "&nbsp;" );
+        $ref->{total} =
+          $form->format_amount( \%myconfig, $ref->{total}, 2, "&nbsp;" );
+
+        $href =
+qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&sessionid=$form->{sessionid}&callback=|
+          . $form->escape( $form->{callback} );
+
+        $column_data{invnumber} =
+          qq|<td><a href=$href>$ref->{invnumber}</a></td>|;
+        for (qw(ordnumber transdate duedate)) {
+            $column_data{$_} = qq|<td>$ref->{$_}</td>|;
+        }
+        for (qw(c0 c30 c60 c90 total)) {
+            $column_data{$_} = qq|<td align=right>$ref->{$_}</td>|;
+        }
+
+        if ( !$form->{summary} ) {
+
+            $j++;
+            $j %= 2;
+            print qq|
         <tr class=listrow$j>
 |;
 
-      for (@column_index) { print "$column_data{$_}\n" }
+            for (@column_index) { print "$column_data{$_}\n" }
 
-      print qq|
+            print qq|
         </tr>
 |;
 
-      for (qw(ct statement language)) { $column_data{$_} = qq|<td>&nbsp;</td>| }
-      
-    }
-   
-    # print subtotal
-    $nextid = ($k <= $l) ? $form->{AG}->[$k]->{ctid} : 0;
-    if ($ctid != $nextid) {
-
-      $c0subtotal = $form->format_amount(\%myconfig, $c0subtotal, 2, "&nbsp");
-      $c30subtotal = $form->format_amount(\%myconfig, $c30subtotal, 2, "&nbsp");
-      $c60subtotal = $form->format_amount(\%myconfig, $c60subtotal, 2, "&nbsp");
-      $c90subtotal = $form->format_amount(\%myconfig, $c90subtotal, 2, "&nbsp");
-      $subtotal = $form->format_amount(\%myconfig, $subtotal, 2, "&nbsp");
-
-      if ($form->{summary}) {
-	$column_data{c0} = qq|<td align=right>$c0subtotal</th>|;
-	$column_data{c30} = qq|<td align=right>$c30subtotal</th>|;
-	$column_data{c60} = qq|<td align=right>$c60subtotal</th>|;
-	$column_data{c90} = qq|<td align=right>$c90subtotal</th>|;
-	$column_data{total} = qq|<td align=right>$subtotal</th>|;
-
-	$j++; $j %= 2;
-	print qq|
+            for (qw(ct statement language)) {
+                $column_data{$_} = qq|<td>&nbsp;</td>|;
+            }
+
+        }
+
+        # print subtotal
+        $nextid = ( $k <= $l ) ? $form->{AG}->[$k]->{ctid} : 0;
+        if ( $ctid != $nextid ) {
+
+            $c0subtotal =
+              $form->format_amount( \%myconfig, $c0subtotal, 2, "&nbsp" );
+            $c30subtotal =
+              $form->format_amount( \%myconfig, $c30subtotal, 2, "&nbsp" );
+            $c60subtotal =
+              $form->format_amount( \%myconfig, $c60subtotal, 2, "&nbsp" );
+            $c90subtotal =
+              $form->format_amount( \%myconfig, $c90subtotal, 2, "&nbsp" );
+            $subtotal =
+              $form->format_amount( \%myconfig, $subtotal, 2, "&nbsp" );
+
+            if ( $form->{summary} ) {
+                $column_data{c0}    = qq|<td align=right>$c0subtotal</th>|;
+                $column_data{c30}   = qq|<td align=right>$c30subtotal</th>|;
+                $column_data{c60}   = qq|<td align=right>$c60subtotal</th>|;
+                $column_data{c90}   = qq|<td align=right>$c90subtotal</th>|;
+                $column_data{total} = qq|<td align=right>$subtotal</th>|;
+
+                $j++;
+                $j %= 2;
+                print qq|
       <tr class=listrow$j>
 |;
 
-	for (@column_index) { print "$column_data{$_}\n" }
+                for (@column_index) { print "$column_data{$_}\n" }
 
-	print qq|
+                print qq|
       </tr>
 |;
 
-      } else {
+            }
+            else {
 
-	for (@column_index) { $column_data{$_} = qq|<th>&nbsp;</th>| }
+                for (@column_index) { $column_data{$_} = qq|<th>&nbsp;</th>| }
 
-	$column_data{c0} = qq|<th class=listsubtotal align=right>$c0subtotal</th>|;
-	$column_data{c30} = qq|<th class=listsubtotal align=right>$c30subtotal</th>|;
-	$column_data{c60} = qq|<th class=listsubtotal align=right>$c60subtotal</th>|;
-	$column_data{c90} = qq|<th class=listsubtotal align=right>$c90subtotal</th>|;
-	$column_data{total} = qq|<th class=listsubtotal align=right>$subtotal</th>|;
+                $column_data{c0} =
+                  qq|<th class=listsubtotal align=right>$c0subtotal</th>|;
+                $column_data{c30} =
+                  qq|<th class=listsubtotal align=right>$c30subtotal</th>|;
+                $column_data{c60} =
+                  qq|<th class=listsubtotal align=right>$c60subtotal</th>|;
+                $column_data{c90} =
+                  qq|<th class=listsubtotal align=right>$c90subtotal</th>|;
+                $column_data{total} =
+                  qq|<th class=listsubtotal align=right>$subtotal</th>|;
 
-	# print subtotals
-	print qq|
+                # print subtotals
+                print qq|
 	<tr class=listsubtotal>
 |;
-	for (@column_index) { print "$column_data{$_}\n" }
+                for (@column_index) { print "$column_data{$_}\n" }
 
-	print qq|
+                print qq|
 	</tr>
 |;
 
-      }
-      
-      $c0subtotal = 0;
-      $c30subtotal = 0;
-      $c60subtotal = 0;
-      $c90subtotal = 0;
-      $subtotal = 0;
-      
+            }
+
+            $c0subtotal  = 0;
+            $c30subtotal = 0;
+            $c60subtotal = 0;
+            $c90subtotal = 0;
+            $subtotal    = 0;
+
+        }
     }
-  }
-  
-  print qq|
+
+    print qq|
         </tr>
         <tr class=listtotal>
 |;
 
-  for (@column_index) { $column_data{$_} = qq|<th>&nbsp;</th>| }
+    for (@column_index) { $column_data{$_} = qq|<th>&nbsp;</th>| }
+
+    $c0total  = $form->format_amount( \%myconfig, $c0total,  2, "&nbsp;" );
+    $c30total = $form->format_amount( \%myconfig, $c30total, 2, "&nbsp;" );
+    $c60total = $form->format_amount( \%myconfig, $c60total, 2, "&nbsp;" );
+    $c90total = $form->format_amount( \%myconfig, $c90total, 2, "&nbsp;" );
+    $total    = $form->format_amount( \%myconfig, $total,    2, "&nbsp;" );
 
-  $c0total = $form->format_amount(\%myconfig, $c0total, 2, "&nbsp;");
-  $c30total = $form->format_amount(\%myconfig, $c30total, 2, "&nbsp;");
-  $c60total = $form->format_amount(\%myconfig, $c60total, 2, "&nbsp;");
-  $c90total = $form->format_amount(\%myconfig, $c90total, 2, "&nbsp;");
-  $total = $form->format_amount(\%myconfig, $total, 2, "&nbsp;");
-  
-  $column_data{c0} = qq|<th align=right class=listtotal>$c0total</th>|;
-  $column_data{c30} = qq|<th align=right class=listtotal>$c30total</th>|;
-  $column_data{c60} = qq|<th align=right class=listtotal>$c60total</th>|;
-  $column_data{c90} = qq|<th align=right class=listtotal>$c90total</th>|;
-  $column_data{total} = qq|<th align=right class=listtotal>$total</th>|;
+    $column_data{c0}    = qq|<th align=right class=listtotal>$c0total</th>|;
+    $column_data{c30}   = qq|<th align=right class=listtotal>$c30total</th>|;
+    $column_data{c60}   = qq|<th align=right class=listtotal>$c60total</th>|;
+    $column_data{c90}   = qq|<th align=right class=listtotal>$c90total</th>|;
+    $column_data{total} = qq|<th align=right class=listtotal>$total</th>|;
 
-  for (@column_index) { print "$column_data{$_}\n" }
-  
-  print qq|
+    for (@column_index) { print "$column_data{$_}\n" }
+
+    print qq|
 	</tr>
 	<input type=hidden name=rowcount value=$i>
       </table>
@@ -1668,9 +1869,9 @@ sub aging {
     <td>
 |;
 
-  &print_options if ($form->{arap} eq 'ar');
+    &print_options if ( $form->{arap} eq 'ar' );
 
-  print qq|
+    print qq|
     </td>
   </tr>
   <tr>
@@ -1679,33 +1880,42 @@ sub aging {
 </table>
 |;
 
-  if ($form->{arap} eq 'ar') {
+    if ( $form->{arap} eq 'ar' ) {
 
-    $form->hide_form(qw(todate title summary overdue c0 c30 c60 c90 callback arap ct department path login sessionid));
-    
-  print qq|
+        $form->hide_form(
+            qw(todate title summary overdue c0 c30 c60 c90 callback arap ct department path login sessionid)
+        );
+
+        print qq|
 <input type=hidden name=$form->{ct} value="$form->{$form->{ct}}">
 |;
 
-# type=submit $locale->text('Select all')
-# type=submit $locale->text('Print')
-# type=submit $locale->text('E-mail')
+        # type=submit $locale->text('Select all')
+        # type=submit $locale->text('Print')
+        # type=submit $locale->text('E-mail')
+
+        %button = (
+            'select_all' =>
+              { ndx => 1, key => 'A', value => $locale->text('Select all') },
+            'print' =>
+              { ndx => 2, key => 'P', value => $locale->text('Print') },
+            'e_mail' =>
+              { ndx => 5, key => 'E', value => $locale->text('E-mail') },
+        );
 
-    %button = ('select_all' => { ndx => 1, key => 'A', value => $locale->text('Select all') },
-               'print' => { ndx => 2, key => 'P', value => $locale->text('Print') },
-	       'e_mail' => { ndx => 5, key => 'E', value => $locale->text('E-mail') },
-	      );
-    
-    for (sort { $button{$a}->{ndx} <=> $button{$b}->{ndx} } keys %button) { $form->print_button(\%button, $_) }
-    
-  }
+        for ( sort { $button{$a}->{ndx} <=> $button{$b}->{ndx} } keys %button )
+        {
+            $form->print_button( \%button, $_ );
+        }
 
-  if ($form->{lynx}) {
-    require "bin/menu.pl";
-    &menubar;
-  }
+    }
+
+    if ( $form->{lynx} ) {
+        require "bin/menu.pl";
+        &menubar;
+    }
 
-  print qq|
+    print qq|
 </form>
 
 </body>
@@ -1714,59 +1924,64 @@ sub aging {
 
 }
 
-
 sub select_all {
 
-  RP->aging(\%myconfig, \%$form);
+    RP->aging( \%myconfig, \%$form );
 
-  for (@{ $form->{AG} }) { $_->{checked} = "checked" }
+    for ( @{ $form->{AG} } ) { $_->{checked} = "checked" }
 
-  &aging;
+    &aging;
 
 }
 
-
 sub print_options {
 
-  $form->{sendmode} = "attachment";
-  $form->{copies} = 1 unless $form->{copies};
-  
-  $form->{PD}{$form->{type}} = "selected";
-  $form->{DF}{$form->{format}} = "selected";
-  $form->{SM}{$form->{sendmode}} = "selected";
-  
-  $format = qq|
+    $form->{sendmode} = "attachment";
+    $form->{copies} = 1 unless $form->{copies};
+
+    $form->{PD}{ $form->{type} }     = "selected";
+    $form->{DF}{ $form->{format} }   = "selected";
+    $form->{SM}{ $form->{sendmode} } = "selected";
+
+    $format = qq|
             <option value=html $form->{PD}{format}>html|;
-	    
-  $type = qq|
-	    <option value=statement $form->{PD}{statement}>|.$locale->text('Statement');
 
-  
-  if ($form->{media} eq 'email') {
-    $media = qq|
+    $type = qq|
+	    <option value=statement $form->{PD}{statement}>|
+      . $locale->text('Statement');
+
+    if ( $form->{media} eq 'email' ) {
+        $media = qq|
             <td><select name=sendmode>
-	    <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=attachment $form->{SM}{attachment}>|
+          . $locale->text('Attachment') . qq|
+	    <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
+    }
+    else {
+        $media = qq|
             <td><select name=media>
-	    <option value=screen>|.$locale->text('Screen');
-    if (%{LedgerSMB::Sysconfig::printer} && ${LedgerSMB::Sysconfig::latex}) {
-      for (sort keys %{LedgerSMB::Sysconfig::printer}) { $media .= qq|
-            <option value="$_">$_| }
+	    <option value=screen>| . $locale->text('Screen');
+        if (   %{LedgerSMB::Sysconfig::printer}
+            && ${LedgerSMB::Sysconfig::latex} )
+        {
+            for ( sort keys %{LedgerSMB::Sysconfig::printer} ) {
+                $media .= qq|
+            <option value="$_">$_|;
+            }
+        }
     }
-  }
 
-  $media =~ s/(<option value="\Q$form->{media}\E")/$1 selected/;
-  $media .= qq|</select></td>|;
+    $media =~ s/(<option value="\Q$form->{media}\E")/$1 selected/;
+    $media .= qq|</select></td>|;
 
-  if (${LedgerSMB::Sysconfig::latex}) {
-    $format .= qq|
-            <option value=postscript $form->{DF}{postscript}>|.$locale->text('Postscript').qq|
-	    <option value=pdf $form->{DF}{pdf}>|.$locale->text('PDF');
-  }
+    if ( ${LedgerSMB::Sysconfig::latex} ) {
+        $format .= qq|
+            <option value=postscript $form->{DF}{postscript}>|
+          . $locale->text('Postscript') . qq|
+	    <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
+    }
 
-  print qq|
+    print qq|
 <table>
   <tr>
     <td><select name=type>$type</select></td>
@@ -1774,52 +1989,55 @@ sub print_options {
     $media
 |;
 
-  if (%{LedgerSMB::Sysconfig::printer} && ${LedgerSMB::Sysconfig::latex} && $form->{media} ne 'email') {
-    print qq|
-      <td>|.$locale->text('Copies').qq|
+    if (   %{LedgerSMB::Sysconfig::printer}
+        && ${LedgerSMB::Sysconfig::latex}
+        && $form->{media} ne 'email' )
+    {
+        print qq|
+      <td>| . $locale->text('Copies') . qq|
       <input name=copies size=2 value=$form->{copies}></td>
 |;
-  }
-  
-  print qq|
+    }
+
+    print qq|
   </tr>
 </table>
 |;
 
 }
 
-
 sub e_mail {
 
-  # get name and email addresses
-  for $i (1 .. $form->{rowcount}) {
-    if ($form->{"statement_$i"}) {
-      $form->{"$form->{ct}_id"} = $form->{"$form->{ct}_id_$i"};
-      $form->{"statement_1"} = 1;
-      $form->{"language_code_1"} = $form->{"language_code_$i"};
-      $form->{"curr_1"} = $form->{"curr_$i"};
-      RP->get_customer(\%myconfig, \%$form);
-      $selected = 1;
-      last;
+    # get name and email addresses
+    for $i ( 1 .. $form->{rowcount} ) {
+        if ( $form->{"statement_$i"} ) {
+            $form->{"$form->{ct}_id"}  = $form->{"$form->{ct}_id_$i"};
+            $form->{"statement_1"}     = 1;
+            $form->{"language_code_1"} = $form->{"language_code_$i"};
+            $form->{"curr_1"}          = $form->{"curr_$i"};
+            RP->get_customer( \%myconfig, \%$form );
+            $selected = 1;
+            last;
+        }
     }
-  }
 
-  $form->error($locale->text('Nothing selected!')) unless $selected;
+    $form->error( $locale->text('Nothing selected!') ) unless $selected;
 
-  if ($myconfig{role} =~ /(admin|manager)/) {
-    $bcc = qq|
-          <th align=right nowrap=true>|.$locale->text('Bcc').qq|</th>
+    if ( $myconfig{role} =~ /(admin|manager)/ ) {
+        $bcc = qq|
+          <th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
 	  <td><input name=bcc size=30 value="$form->{bcc}"></td>
 |;
-  }
+    }
+
+    $title =
+      $locale->text( 'E-mail Statement to [_1]', $form->{ $form->{ct} } );
 
-  $title = $locale->text('E-mail Statement to [_1]', $form->{$form->{ct}});
+    $form->{media} = "email";
 
-  $form->{media} = "email";
-  
-  $form->header;
+    $form->header;
 
-  print qq|
+    print qq|
 <body>
 
 <form method=post action=$form->{script}>
@@ -1833,13 +2051,13 @@ sub e_mail {
     <td>
       <table width=100%>
         <tr>
-	  <th align=right nowrap>|.$locale->text('E-mail').qq|</th>
+	  <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
 	  <td><input name=email size=30 value="$form->{email}"></td>
-	  <th align=right nowrap>|.$locale->text('Cc').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
 	  <td><input name=cc size=30 value="$form->{cc}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Subject').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
 	  <td><input name=subject size=30 value="$form->{subject}"></td>
 	  $bcc
 	</tr>
@@ -1850,7 +2068,7 @@ sub e_mail {
     <td>
       <table width=100%>
         <tr>
-	  <th align=left nowrap>|.$locale->text('Message').qq|</th>
+	  <th align=left nowrap>| . $locale->text('Message') . qq|</th>
 	</tr>
 	<tr>
 	  <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
@@ -1862,13 +2080,15 @@ sub e_mail {
     <td>
 |;
 
-  &print_options;
+    &print_options;
 
-  for (qw(email cc bcc subject message type sendmode format action nextsub)) { delete $form->{$_} }
+    for (qw(email cc bcc subject message type sendmode format action nextsub)) {
+        delete $form->{$_};
+    }
 
-  $form->hide_form;
+    $form->hide_form;
 
-  print qq|
+    print qq|
     </td>
   </tr>
   <tr>
@@ -1879,7 +2099,9 @@ sub e_mail {
 <input type="hidden" name="nextsub" value="send_email">
 
 <br>
-<button name="action" class="submit" type="submit" value="continue">|.$locale->text('Continue').qq|</button>
+<button name="action" class="submit" type="submit" value="continue">|
+      . $locale->text('Continue')
+      . qq|</button>
 </form>
 
 </body>
@@ -1888,277 +2110,310 @@ sub e_mail {
 
 }
 
-
 sub send_email {
 
-  $form->{OUT} = "${LedgerSMB::Sysconfig::sendmail}";
-  $form->{printmode} = '|-';
+    $form->{OUT}       = "${LedgerSMB::Sysconfig::sendmail}";
+    $form->{printmode} = '|-';
 
-  $form->{subject} = $locale->text('Statement - [_1]', $form->{todate}) unless $form->{subject};
-  $form->isblank("email", $locale->text('E-mail address missing!'));
+    $form->{subject} = $locale->text( 'Statement - [_1]', $form->{todate} )
+      unless $form->{subject};
+    $form->isblank( "email", $locale->text('E-mail address missing!') );
 
-  RP->aging(\%myconfig, \%$form);
-  
-  &print_form;
-  
-  $form->redirect($locale->text('Statement sent to [_1]', $form->{$form->{ct}}));
+    RP->aging( \%myconfig, \%$form );
 
-}
+    &print_form;
 
+    $form->redirect(
+        $locale->text( 'Statement sent to [_1]', $form->{ $form->{ct} } ) );
 
+}
 
 sub print {
 
-  if ($form->{media} !~ /(screen|email)/) {
-    $form->error($locale->text('Select postscript or PDF!')) if ($form->{format} !~ /(postscript|pdf)/);
-  }
-  
-  for $i (1 .. $form->{rowcount}) {
-    if ($form->{"statement_$i"}) {
-      $form->{"$form->{ct}_id"} = $form->{"$form->{ct}_id_$i"};
-      $language_code = $form->{"language_code_$i"};
-      $curr = $form->{"curr_$i"};
-      $selected = 1;
-      last;
-    }
-  }
-
-  $form->error($locale->text('Nothing selected!')) unless $selected;
-     
- 
-  if ($form->{media} !~ /(screen|email)/) {
-    $form->{OUT} = ${LedgerSMB::Sysconfig::printer}{$form->{media}};
-    $form->{printmode} = '|-';
-    $form->{"$form->{ct}_id"} = "";
-    $SIG{INT} = 'IGNORE';
-  } else {
-    $form->{"statement_1"} = 1;
-    $form->{"language_code_1"} = $language_code;
-    $form->{"curr_1"} = $curr;
-  }
-
-  RP->aging(\%myconfig, \%$form);
- 
-  &print_form;
+    if ( $form->{media} !~ /(screen|email)/ ) {
+        $form->error( $locale->text('Select postscript or PDF!') )
+          if ( $form->{format} !~ /(postscript|pdf)/ );
+    }
 
-  $form->redirect($locale->text('Statements sent to printer!')) if ($form->{media} !~ /(screen|email)/);
+    for $i ( 1 .. $form->{rowcount} ) {
+        if ( $form->{"statement_$i"} ) {
+            $form->{"$form->{ct}_id"} = $form->{"$form->{ct}_id_$i"};
+            $language_code            = $form->{"language_code_$i"};
+            $curr                     = $form->{"curr_$i"};
+            $selected                 = 1;
+            last;
+        }
+    }
 
-}
+    $form->error( $locale->text('Nothing selected!') ) unless $selected;
+
+    if ( $form->{media} !~ /(screen|email)/ ) {
+        $form->{OUT}       = ${LedgerSMB::Sysconfig::printer}{ $form->{media} };
+        $form->{printmode} = '|-';
+        $form->{"$form->{ct}_id"} = "";
+        $SIG{INT} = 'IGNORE';
+    }
+    else {
+        $form->{"statement_1"}     = 1;
+        $form->{"language_code_1"} = $language_code;
+        $form->{"curr_1"}          = $curr;
+    }
+
+    RP->aging( \%myconfig, \%$form );
+
+    &print_form;
 
+    $form->redirect( $locale->text('Statements sent to printer!') )
+      if ( $form->{media} !~ /(screen|email)/ );
+
+}
 
 sub print_form {
-  
-  $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
-
-  $form->{templates} = "$myconfig{templates}";
-
-  # setup variables for the form
-  @a = qw(company address businessnumber tel fax);
-  for (@a) { $form->{$_} = $myconfig{$_} }
-  $form->{address} =~ s/\\n/\n/g;
-
-  $form->format_string(@a);
-  
-  $form->{IN} = "$form->{type}.html";
-
-  if ($form->{format} eq 'postscript') {
-    $form->{IN} =~ s/html$/tex/;
-  }
-  if ($form->{format} eq 'pdf') {
-    $form->{IN} =~ s/html$/tex/;
-  }
-
-  @a = qw(name address1 address2 city state zipcode country contact);
-  push @a, "$form->{ct}phone", "$form->{ct}fax", "$form->{ct}taxnumber";
-  push @a, 'email' if ! $form->{media} eq 'email';
-
-  $i = 0;
-  while (@{ $form->{AG} }) {
-
-    $ref = shift @{ $form->{AG} };
-    
-    if ($ctid != $ref->{ctid}) {
-      
-      $ctid = $ref->{ctid};
-      $i++;
-
-      if ($form->{"statement_$i"}) {
-	
-	for (@a) { $form->{$_} = $ref->{$_} }
-	$form->format_string(@a);
 
-	$form->{$form->{ct}} = $form->{name};
-	$form->{"$form->{ct}_id"} = $ref->{ctid};
-	$form->{language_code} = $form->{"language_code_$i"};
-	$form->{currency} = $form->{"curr_$i"};
-	
-	for (qw(invnumber ordnumber ponumber notes invdate duedate)) { $form->{$_} = () }
-	$form->{total} = 0;
-	foreach $item (qw(c0 c30 c60 c90)) {
-	  $form->{$item} = ();
-	  $form->{"${item}total"} = 0;
-	}
-
-	&statement_details($ref) if $ref->{curr} eq $form->{currency};
-
-        while ($ref) {
-
-	  if (scalar (@{ $form->{AG} }) > 0) {
-	    # one or more left to go
-	    if ($ctid == $form->{AG}->[0]->{ctid}) {
-	      $ref = shift @{ $form->{AG} };
-	      &statement_details($ref) if $ref->{curr} eq $form->{currency};
-	      # any more?
-	      $ref = scalar (@{ $form->{AG} });
-	    } else {
-	      $ref = 0;
-	    }
-	  } else {
-	    # set initial ref to 0
-	    $ref = 0;
-	  }
-
-	}
-	
-	for ("c0", "c30", "c60", "c90", "") { $form->{"${_}total"} = $form->format_amount(\%myconfig, $form->{"${_}total"}, 2) }
+    $form->{statementdate} = $locale->date( \%myconfig, $form->{todate}, 1 );
 
-	$form->parse_template(\%myconfig, ${LedgerSMB::Sysconfig::userspath});
-	
-      }
+    $form->{templates} = "$myconfig{templates}";
+
+    # setup variables for the form
+    @a = qw(company address businessnumber tel fax);
+    for (@a) { $form->{$_} = $myconfig{$_} }
+    $form->{address} =~ s/\\n/\n/g;
+
+    $form->format_string(@a);
+
+    $form->{IN} = "$form->{type}.html";
+
+    if ( $form->{format} eq 'postscript' ) {
+        $form->{IN} =~ s/html$/tex/;
+    }
+    if ( $form->{format} eq 'pdf' ) {
+        $form->{IN} =~ s/html$/tex/;
     }
-  }
 
-}
+    @a = qw(name address1 address2 city state zipcode country contact);
+    push @a, "$form->{ct}phone", "$form->{ct}fax", "$form->{ct}taxnumber";
+    push @a, 'email' if !$form->{media} eq 'email';
+
+    $i = 0;
+    while ( @{ $form->{AG} } ) {
+
+        $ref = shift @{ $form->{AG} };
+
+        if ( $ctid != $ref->{ctid} ) {
+
+            $ctid = $ref->{ctid};
+            $i++;
+
+            if ( $form->{"statement_$i"} ) {
+
+                for (@a) { $form->{$_} = $ref->{$_} }
+                $form->format_string(@a);
+
+                $form->{ $form->{ct} }    = $form->{name};
+                $form->{"$form->{ct}_id"} = $ref->{ctid};
+                $form->{language_code}    = $form->{"language_code_$i"};
+                $form->{currency}         = $form->{"curr_$i"};
+
+                for (qw(invnumber ordnumber ponumber notes invdate duedate)) {
+                    $form->{$_} = ();
+                }
+                $form->{total} = 0;
+                foreach $item (qw(c0 c30 c60 c90)) {
+                    $form->{$item} = ();
+                    $form->{"${item}total"} = 0;
+                }
+
+                &statement_details($ref) if $ref->{curr} eq $form->{currency};
+
+                while ($ref) {
+
+                    if ( scalar( @{ $form->{AG} } ) > 0 ) {
+
+                        # one or more left to go
+                        if ( $ctid == $form->{AG}->[0]->{ctid} ) {
+                            $ref = shift @{ $form->{AG} };
+                            &statement_details($ref)
+                              if $ref->{curr} eq $form->{currency};
 
+                            # any more?
+                            $ref = scalar( @{ $form->{AG} } );
+                        }
+                        else {
+                            $ref = 0;
+                        }
+                    }
+                    else {
+
+                        # set initial ref to 0
+                        $ref = 0;
+                    }
+
+                }
+
+                for ( "c0", "c30", "c60", "c90", "" ) {
+                    $form->{"${_}total"} =
+                      $form->format_amount( \%myconfig, $form->{"${_}total"},
+                        2 );
+                }
+
+                $form->parse_template( \%myconfig,
+                    ${LedgerSMB::Sysconfig::userspath} );
+
+            }
+        }
+    }
+
+}
 
 sub statement_details {
-  my ($ref) = @_;
-
-  $ref->{invdate} = $ref->{transdate};
-  my @a = qw(invnumber ordnumber ponumber notes invdate duedate);
-  for (@a) { $form->{"${_}_1"} = $ref->{$_} }
-  $form->format_string(qw(invnumber_1 ordnumber_1 ponumber_1 notes_1));
-  for (@a) { push @{ $form->{$_} }, $form->{"${_}_1"} }
-  
-  foreach $item (qw(c0 c30 c60 c90)) {
-    eval { $ref->{$item} = $form->round_amount($ref->{$item} / $ref->{exchangerate}, 2) };
-    $form->{"${item}total"} += $ref->{$item};
-    $form->{total} += $ref->{$item};
-    push @{ $form->{$item} }, $form->format_amount(\%myconfig, $ref->{$item}, 2);
-  }
+    my ($ref) = @_;
+
+    $ref->{invdate} = $ref->{transdate};
+    my @a = qw(invnumber ordnumber ponumber notes invdate duedate);
+    for (@a) { $form->{"${_}_1"} = $ref->{$_} }
+    $form->format_string(qw(invnumber_1 ordnumber_1 ponumber_1 notes_1));
+    for (@a) { push @{ $form->{$_} }, $form->{"${_}_1"} }
+
+    foreach $item (qw(c0 c30 c60 c90)) {
+        eval {
+            $ref->{$item} =
+              $form->round_amount( $ref->{$item} / $ref->{exchangerate}, 2 );
+        };
+        $form->{"${item}total"} += $ref->{$item};
+        $form->{total}          += $ref->{$item};
+        push @{ $form->{$item} },
+          $form->format_amount( \%myconfig, $ref->{$item}, 2 );
+    }
 
 }
- 
 
 sub generate_tax_report {
 
-  RP->tax_report(\%myconfig, \%$form);
-
-  $descvar = "$form->{accno}_description";
-  $description = $form->escape($form->{$descvar});
-  $ratevar = "$form->{accno}_rate";
-  $taxrate = $form->{"$form->{accno}_rate"};
-  
-  if ($form->{accno} =~ /^gifi_/) {
-    $descvar = "gifi_$form->{accno}_description";
-    $description = $form->escape($form->{$descvar});
-    $ratevar = "gifi_$form->{accno}_rate";
-    $taxrate = $form->{"gifi_$form->{accno}_rate"};
-  }
-  
-  $department = $form->escape($form->{department});
-  
-  # construct href
-  $href = "$form->{script}?path=$form->{path}&direction=$form->{direction}&oldsort=$form->{oldsort}&action=generate_tax_report&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&summary=$form->{summary}&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);
-
-  $form->sort_order();
-
-  $callback = "$form->{script}?path=$form->{path}&direction=$form->{direction}&oldsort=$form->{oldsort}&action=generate_tax_report&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&summary=$form->{summary}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
-
-  $form->{title} = $locale->text('GIFI')." - " if ($form->{accno} =~ /^gifi_/);
-
-  $title = $form->escape($form->{title});
-  $href .= "&title=$title";
-  $title = $form->escape($form->{title},1);
-  $callback .= "&title=$title";
-  
-  $form->{title} = qq|$form->{title} $form->{"$form->{accno}_description"} |;
-
-  @columns = $form->sort_columns(qw(id transdate invnumber name description netamount tax total));
-
-  $form->{"l_description"} = "" if $form->{summary};
-  
-  foreach $item (@columns) {
-    if ($form->{"l_$item"} eq "Y") {
-      push @column_index, $item;
-
-      # add column to href and callback
-      $callback .= "&l_$item=Y";
-      $href .= "&l_$item=Y";
-    }
-  }
-
-
-  if ($form->{l_subtotal} eq 'Y') {
-    $callback .= "&l_subtotal=Y";
-    $href .= "&l_subtotal=Y";
-  }
-  
-  
-  if ($form->{department}) {
-    ($department) = split /--/, $form->{department};
-    $option = $locale->text('Department')." : $department";
-  }
-  
-  # if there are any dates
-  if ($form->{fromdate} || $form->{todate}) {
-    if ($form->{fromdate}) {
-      $fromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
-    }
-    if ($form->{todate}) {
-      $todate = $locale->date(\%myconfig, $form->{todate}, 1);
-    }
-    
-    $form->{period} = "$fromdate - $todate";
-  } else {
-    $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
-  }
-
-
-  if ($form->{db} eq 'ar') {
-    $name = $locale->text('Customer');
-    $invoice = 'is.pl';
-    $arap = 'ar.pl';
-  }
-  if ($form->{db} eq 'ap') {
-    $name = $locale->text('Vendor');
-    $invoice = 'ir.pl';
-    $arap = 'ap.pl';
-  }
-
-  $option .= "<br>" if $option;
-  $option .= "$form->{period}";
-  
- 
-  $column_header{id} = qq|<th><a class=listheading href=$href&sort=id>|.$locale->text('ID').qq|</th>|;
-  $column_header{invnumber} = qq|<th><a class=listheading href=$href&sort=invnumber>|.$locale->text('Invoice').qq|</th>|;
-  $column_header{transdate} = qq|<th><a class=listheading href=$href&sort=transdate>|.$locale->text('Date').qq|</th>|;
-  $column_header{netamount} = qq|<th class=listheading>|.$locale->text('Amount').qq|</th>|;
-  $column_header{tax} = qq|<th class=listheading>|.$locale->text('Tax').qq|</th>|;
-  $column_header{total} = 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{description} = qq|<th><a class=listheading href=$href&sort=description>|.$locale->text('Description').qq|</th>|;
-
-  
-  $form->header;
-
-  print qq|
+    RP->tax_report( \%myconfig, \%$form );
+
+    $descvar     = "$form->{accno}_description";
+    $description = $form->escape( $form->{$descvar} );
+    $ratevar     = "$form->{accno}_rate";
+    $taxrate     = $form->{"$form->{accno}_rate"};
+
+    if ( $form->{accno} =~ /^gifi_/ ) {
+        $descvar     = "gifi_$form->{accno}_description";
+        $description = $form->escape( $form->{$descvar} );
+        $ratevar     = "gifi_$form->{accno}_rate";
+        $taxrate     = $form->{"gifi_$form->{accno}_rate"};
+    }
+
+    $department = $form->escape( $form->{department} );
+
+    # construct href
+    $href =
+"$form->{script}?path=$form->{path}&direction=$form->{direction}&oldsort=$form->{oldsort}&action=generate_tax_report&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&summary=$form->{summary}&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 );
+
+    $form->sort_order();
+
+    $callback =
+"$form->{script}?path=$form->{path}&direction=$form->{direction}&oldsort=$form->{oldsort}&action=generate_tax_report&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&summary=$form->{summary}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+
+    $form->{title} = $locale->text('GIFI') . " - "
+      if ( $form->{accno} =~ /^gifi_/ );
+
+    $title = $form->escape( $form->{title} );
+    $href .= "&title=$title";
+    $title = $form->escape( $form->{title}, 1 );
+    $callback .= "&title=$title";
+
+    $form->{title} = qq|$form->{title} $form->{"$form->{accno}_description"} |;
+
+    @columns =
+      $form->sort_columns(
+        qw(id transdate invnumber name description netamount tax total));
+
+    $form->{"l_description"} = "" if $form->{summary};
+
+    foreach $item (@columns) {
+        if ( $form->{"l_$item"} eq "Y" ) {
+            push @column_index, $item;
+
+            # add column to href and callback
+            $callback .= "&l_$item=Y";
+            $href     .= "&l_$item=Y";
+        }
+    }
+
+    if ( $form->{l_subtotal} eq 'Y' ) {
+        $callback .= "&l_subtotal=Y";
+        $href     .= "&l_subtotal=Y";
+    }
+
+    if ( $form->{department} ) {
+        ($department) = split /--/, $form->{department};
+        $option = $locale->text('Department') . " : $department";
+    }
+
+    # if there are any dates
+    if ( $form->{fromdate} || $form->{todate} ) {
+        if ( $form->{fromdate} ) {
+            $fromdate = $locale->date( \%myconfig, $form->{fromdate}, 1 );
+        }
+        if ( $form->{todate} ) {
+            $todate = $locale->date( \%myconfig, $form->{todate}, 1 );
+        }
+
+        $form->{period} = "$fromdate - $todate";
+    }
+    else {
+        $form->{period} =
+          $locale->date( \%myconfig, $form->current_date( \%myconfig ), 1 );
+    }
+
+    if ( $form->{db} eq 'ar' ) {
+        $name    = $locale->text('Customer');
+        $invoice = 'is.pl';
+        $arap    = 'ar.pl';
+    }
+    if ( $form->{db} eq 'ap' ) {
+        $name    = $locale->text('Vendor');
+        $invoice = 'ir.pl';
+        $arap    = 'ap.pl';
+    }
+
+    $option .= "<br>" if $option;
+    $option .= "$form->{period}";
+
+    $column_header{id} =
+        qq|<th><a class=listheading href=$href&sort=id>|
+      . $locale->text('ID')
+      . qq|</th>|;
+    $column_header{invnumber} =
+        qq|<th><a class=listheading href=$href&sort=invnumber>|
+      . $locale->text('Invoice')
+      . qq|</th>|;
+    $column_header{transdate} =
+        qq|<th><a class=listheading href=$href&sort=transdate>|
+      . $locale->text('Date')
+      . qq|</th>|;
+    $column_header{netamount} =
+      qq|<th class=listheading>| . $locale->text('Amount') . qq|</th>|;
+    $column_header{tax} =
+      qq|<th class=listheading>| . $locale->text('Tax') . qq|</th>|;
+    $column_header{total} =
+      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{description} =
+        qq|<th><a class=listheading href=$href&sort=description>|
+      . $locale->text('Description')
+      . qq|</th>|;
+
+    $form->header;
+
+    print qq|
 <body>
 
 <table width=100%>
@@ -2175,84 +2430,94 @@ sub generate_tax_report {
 	<tr class=listheading>
 |;
 
-  for (@column_index) { print "$column_header{$_}\n" }
-  
-  print qq|
+    for (@column_index) { print "$column_header{$_}\n" }
+
+    print qq|
 	</tr>
 |;
 
-  # add sort and escape callback
-  $callback = $form->escape($callback . "&sort=$form->{sort}");
-    
-  if (@{ $form->{TR} }) {
-    $sameitem = $form->{TR}->[0]->{$form->{sort}};
-  }
+    # add sort and escape callback
+    $callback = $form->escape( $callback . "&sort=$form->{sort}" );
 
-  foreach $ref (@{ $form->{TR} }) {
-
-    $module = ($ref->{invoice}) ? $invoice : $arap;
-    $module = 'ps.pl' if $ref->{till};
-    
-    if ($form->{l_subtotal} eq 'Y') {
-      if ($sameitem ne $ref->{$form->{sort}}) {
-	&tax_subtotal;
-	$sameitem = $ref->{$form->{sort}};
-      }
+    if ( @{ $form->{TR} } ) {
+        $sameitem = $form->{TR}->[0]->{ $form->{sort} };
     }
 
-    $totalnetamount += $ref->{netamount};
-    $totaltax += $ref->{tax};
-    $ref->{total} = $ref->{netamount} + $ref->{tax};
+    foreach $ref ( @{ $form->{TR} } ) {
 
-    $subtotalnetamount += $ref->{netamount};
-    $subtotaltax += $ref->{tax};
-    
-    for (qw(netamount tax total)) { $ref->{$_} = $form->format_amount(\%myconfig, $ref->{$_}, 2, "&nbsp;"); }
-    
-    $column_data{id} = qq|<td>$ref->{id}</td>|;
-    $column_data{invnumber} = qq|<td><a href=$module?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&sessionid=$form->{sessionid}&callback=$callback>$ref->{invnumber}</a></td>|;
+        $module = ( $ref->{invoice} ) ? $invoice : $arap;
+        $module = 'ps.pl' if $ref->{till};
 
-    for (qw(id transdate name partnumber description)) { $column_data{$_} = qq|<td>$ref->{$_}</td>| }
-    
-    for (qw(netamount tax total)) { $column_data{$_} = qq|<td align=right>$ref->{$_}</td>| }
+        if ( $form->{l_subtotal} eq 'Y' ) {
+            if ( $sameitem ne $ref->{ $form->{sort} } ) {
+                &tax_subtotal;
+                $sameitem = $ref->{ $form->{sort} };
+            }
+        }
 
-    $i++; $i %= 2;
-    print qq|
+        $totalnetamount += $ref->{netamount};
+        $totaltax       += $ref->{tax};
+        $ref->{total} = $ref->{netamount} + $ref->{tax};
+
+        $subtotalnetamount += $ref->{netamount};
+        $subtotaltax       += $ref->{tax};
+
+        for (qw(netamount tax total)) {
+            $ref->{$_} =
+              $form->format_amount( \%myconfig, $ref->{$_}, 2, "&nbsp;" );
+        }
+
+        $column_data{id} = qq|<td>$ref->{id}</td>|;
+        $column_data{invnumber} =
+qq|<td><a href=$module?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&sessionid=$form->{sessionid}&callback=$callback>$ref->{invnumber}</a></td>|;
+
+        for (qw(id transdate name partnumber description)) {
+            $column_data{$_} = qq|<td>$ref->{$_}</td>|;
+        }
+
+        for (qw(netamount tax total)) {
+            $column_data{$_} = qq|<td align=right>$ref->{$_}</td>|;
+        }
+
+        $i++;
+        $i %= 2;
+        print qq|
 	<tr class=listrow$i>
 |;
 
-    for (@column_index) { print "$column_data{$_}\n" }
+        for (@column_index) { print "$column_data{$_}\n" }
 
-    print qq|
+        print qq|
 	</tr>
 |;
- 
-  }
- 
-  if ($form->{l_subtotal} eq 'Y') {
-    &tax_subtotal;
-  }
-
-  
-  for (@column_index) { $column_data{$_} = qq|<th>&nbsp;</th>| }
-  
-  print qq|
+
+    }
+
+    if ( $form->{l_subtotal} eq 'Y' ) {
+        &tax_subtotal;
+    }
+
+    for (@column_index) { $column_data{$_} = qq|<th>&nbsp;</th>| }
+
+    print qq|
         </tr>
 	<tr class=listtotal>
 |;
 
-  $total = $form->format_amount(\%myconfig, $totalnetamount + $totaltax, 2, "&nbsp;");
-  $totalnetamount = $form->format_amount(\%myconfig, $totalnetamount, 2, "&nbsp;");
-  $totaltax = $form->format_amount(\%myconfig, $totaltax, 2, "&nbsp;");
-  
-  $column_data{netamount} = qq|<th class=listtotal align=right>$totalnetamount</th>|;
-  $column_data{tax} = qq|<th class=listtotal align=right>$totaltax</th>|;
-  $column_data{total} = qq|<th class=listtotal align=right>$total</th>|;
- 
-  for (@column_index) { print "$column_data{$_}\n" }
- 
-    
-  print qq|
+    $total = $form->format_amount( \%myconfig, $totalnetamount + $totaltax,
+        2, "&nbsp;" );
+    $totalnetamount =
+      $form->format_amount( \%myconfig, $totalnetamount, 2, "&nbsp;" );
+    $totaltax = $form->format_amount( \%myconfig, $totaltax, 2, "&nbsp;" );
+
+    $column_data{netamount} =
+      qq|<th class=listtotal align=right>$totalnetamount</th>|;
+    $column_data{tax}   = qq|<th class=listtotal align=right>$totaltax</th>|;
+    $column_data{total} = qq|<th class=listtotal align=right>$total</th>|;
+
+    for (@column_index) { print "$column_data{$_}\n" }
+
+    print qq|
         </tr>
       </table>
     </td>
@@ -2268,124 +2533,157 @@ sub generate_tax_report {
 
 }
 
-
 sub tax_subtotal {
 
-  for (@column_index) { $column_data{$_} = "<td>&nbsp;</td>" }
+    for (@column_index) { $column_data{$_} = "<td>&nbsp;</td>" }
 
-  $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;");
-  
-  $column_data{netamount} = "<th class=listsubtotal align=right>$subtotalnetamount</th>";
-  $column_data{tax} = "<th class=listsubtotal align=right>$subtotaltax</th>";
-  $column_data{total} = "<th class=listsubtotal align=right>$subtotal</th>";
+    $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;" );
 
-  $subtotalnetamount = 0;
-  $subtotaltax = 0;
-  
-  print qq|
+    $column_data{netamount} =
+      "<th class=listsubtotal align=right>$subtotalnetamount</th>";
+    $column_data{tax} = "<th class=listsubtotal align=right>$subtotaltax</th>";
+    $column_data{total} = "<th class=listsubtotal align=right>$subtotal</th>";
+
+    $subtotalnetamount = 0;
+    $subtotaltax       = 0;
+
+    print qq|
 	<tr class=listsubtotal>
 |;
-  for (@column_index) { print "\n$column_data{$_}" }
+    for (@column_index) { print "\n$column_data{$_}" }
 
-  print qq|
+    print qq|
         </tr>
 |;
-  
+
 }
 
+sub list_payments {
+
+    if ( $form->{account} ) {
+        ( $form->{paymentaccounts} ) = split /--/, $form->{account};
+    }
+    if ( $form->{department} ) {
+        ( $department, $form->{department_id} ) = split /--/,
+          $form->{department};
+        $option = $locale->text('Department') . " : $department";
+    }
+
+    RP->payments( \%myconfig, \%$form );
 
+    @columns = $form->sort_columns(qw(transdate name paid source memo));
 
-sub list_payments {
+    if ( $form->{till} ) {
+        @columns =
+          $form->sort_columns(qw(transdate name paid curr source till));
+        if ( $myconfig{role} ne 'user' ) {
+            @columns =
+              $form->sort_columns(
+                qw(transdate name paid curr source till employee));
+        }
+    }
 
+    # construct href
+    $title = $form->escape( $form->{title} );
+    $form->{paymentaccounts} =~ s/ /%20/g;
 
-  if ($form->{account}) {
-    ($form->{paymentaccounts}) = split /--/, $form->{account};
-  }
-  if ($form->{department}) {
-    ($department, $form->{department_id}) = split /--/, $form->{department};
-    $option = $locale->text('Department')." : $department";
-  }
-
-  RP->payments(\%myconfig, \%$form);
-  
-  @columns = $form->sort_columns(qw(transdate name paid source memo));
-
-  if ($form->{till}) {
-    @columns = $form->sort_columns(qw(transdate name paid curr source till));
-    if ($myconfig{role} ne 'user') {
-      @columns = $form->sort_columns(qw(transdate name paid curr source till employee));
-    }
-  }
-  
-  # construct href
-  $title = $form->escape($form->{title});
-  $form->{paymentaccounts} =~ s/ /%20/g;
-  
-  $href = "$form->{script}?path=$form->{path}&direction=$form->{direction}&sort=$form->{sort}&oldsort=$form->{oldsort}&action=list_payments&till=$form->{till}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&l_subtotal=$form->{l_subtotal}&prepayment=$form->{prepayment}&paymentaccounts=$form->{paymentaccounts}&title=".$form->escape($form->{title});
-  
-  $form->sort_order();
-
-  $form->{callback} = "$form->{script}?path=$form->{path}&direction=$form->{direction}&sort=$form->{sort}&oldsort=$form->{oldsort}&action=list_payments&till=$form->{till}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&l_subtotal=$form->{l_subtotal}&prepayment=$form->{prepayment}&paymentaccounts=$form->{paymentaccounts}&title=".$form->escape($form->{title},1);
-
-  if ($form->{account}) {
-    $callback .= "&account=".$form->escape($form->{account},1);
-    $href .= "&account=".$form->escape($form->{account});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Account')." : $form->{account}";
-  }
-  if ($form->{department}) {
-    $callback .= "&department=".$form->escape($form->{department},1);
-    $href .= "&department=".$form->escape($form->{department});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Department')." : $form->{department}";
-  }
-  if ($form->{description}) {
-    $callback .= "&description=".$form->escape($form->{description},1);
-    $href .= "&description=".$form->escape($form->{description});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Description')." : $form->{description}";
-  }
-  if ($form->{source}) {
-    $callback .= "&source=".$form->escape($form->{source},1);
-    $href .= "&source=".$form->escape($form->{source});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Source')." : $form->{source}";
-  }
-  if ($form->{memo}) {
-    $callback .= "&memo=".$form->escape($form->{memo},1);
-    $href .= "&memo=".$form->escape($form->{memo});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Memo')." : $form->{memo}";
-  }
-  if ($form->{fromdate}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('From')."&nbsp;".$locale->date(\%myconfig, $form->{fromdate}, 1);
-  }
-  if ($form->{todate}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('To')."&nbsp;".$locale->date(\%myconfig, $form->{todate}, 1);
-  }
-
-  $callback = $form->escape($form->{callback});
- 
-  $column_header{name} = "<th><a class=listheading href=$href&sort=name>".$locale->text('Description')."</a></th>";
-  $column_header{transdate} = "<th><a class=listheading href=$href&sort=transdate>".$locale->text('Date')."</a></th>";
-  $column_header{paid} = "<th class=listheading>".$locale->text('Amount')."</a></th>";
-  $column_header{curr} = "<th class=listheading>".$locale->text('Curr')."</a></th>";
-  $column_header{source} = "<th><a class=listheading href=$href&sort=source>".$locale->text('Source')."</a></th>";
-  $column_header{memo} = "<th><a class=listheading href=$href&sort=memo>".$locale->text('Memo')."</a></th>";
-
-  $column_header{employee} = "<th><a class=listheading href=$href&sort=employee>".$locale->text('Salesperson')."</a></th>";
-  $column_header{till} = "<th><a class=listheading href=$href&sort=till>".$locale->text('Till')."</a></th>";
-  
-  @column_index = @columns;
-  $colspan = $#column_index + 1;
-
-  $form->header;
-
-  print qq|
+    $href =
+"$form->{script}?path=$form->{path}&direction=$form->{direction}&sort=$form->{sort}&oldsort=$form->{oldsort}&action=list_payments&till=$form->{till}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&l_subtotal=$form->{l_subtotal}&prepayment=$form->{prepayment}&paymentaccounts=$form->{paymentaccounts}&title="
+      . $form->escape( $form->{title} );
+
+    $form->sort_order();
+
+    $form->{callback} =
+"$form->{script}?path=$form->{path}&direction=$form->{direction}&sort=$form->{sort}&oldsort=$form->{oldsort}&action=list_payments&till=$form->{till}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&l_subtotal=$form->{l_subtotal}&prepayment=$form->{prepayment}&paymentaccounts=$form->{paymentaccounts}&title="
+      . $form->escape( $form->{title}, 1 );
+
+    if ( $form->{account} ) {
+        $callback .= "&account=" . $form->escape( $form->{account}, 1 );
+        $href   .= "&account=" . $form->escape( $form->{account} );
+        $option .= "\n<br>" if ($option);
+        $option .= $locale->text('Account') . " : $form->{account}";
+    }
+    if ( $form->{department} ) {
+        $callback .= "&department=" . $form->escape( $form->{department}, 1 );
+        $href   .= "&department=" . $form->escape( $form->{department} );
+        $option .= "\n<br>" if ($option);
+        $option .= $locale->text('Department') . " : $form->{department}";
+    }
+    if ( $form->{description} ) {
+        $callback .= "&description=" . $form->escape( $form->{description}, 1 );
+        $href   .= "&description=" . $form->escape( $form->{description} );
+        $option .= "\n<br>" if ($option);
+        $option .= $locale->text('Description') . " : $form->{description}";
+    }
+    if ( $form->{source} ) {
+        $callback .= "&source=" . $form->escape( $form->{source}, 1 );
+        $href   .= "&source=" . $form->escape( $form->{source} );
+        $option .= "\n<br>" if ($option);
+        $option .= $locale->text('Source') . " : $form->{source}";
+    }
+    if ( $form->{memo} ) {
+        $callback .= "&memo=" . $form->escape( $form->{memo}, 1 );
+        $href   .= "&memo=" . $form->escape( $form->{memo} );
+        $option .= "\n<br>" if ($option);
+        $option .= $locale->text('Memo') . " : $form->{memo}";
+    }
+    if ( $form->{fromdate} ) {
+        $option .= "\n<br>" if ($option);
+        $option .=
+            $locale->text('From') . "&nbsp;"
+          . $locale->date( \%myconfig, $form->{fromdate}, 1 );
+    }
+    if ( $form->{todate} ) {
+        $option .= "\n<br>" if ($option);
+        $option .=
+            $locale->text('To') . "&nbsp;"
+          . $locale->date( \%myconfig, $form->{todate}, 1 );
+    }
+
+    $callback = $form->escape( $form->{callback} );
+
+    $column_header{name} =
+        "<th><a class=listheading href=$href&sort=name>"
+      . $locale->text('Description')
+      . "</a></th>";
+    $column_header{transdate} =
+        "<th><a class=listheading href=$href&sort=transdate>"
+      . $locale->text('Date')
+      . "</a></th>";
+    $column_header{paid} =
+      "<th class=listheading>" . $locale->text('Amount') . "</a></th>";
+    $column_header{curr} =
+      "<th class=listheading>" . $locale->text('Curr') . "</a></th>";
+    $column_header{source} =
+        "<th><a class=listheading href=$href&sort=source>"
+      . $locale->text('Source')
+      . "</a></th>";
+    $column_header{memo} =
+        "<th><a class=listheading href=$href&sort=memo>"
+      . $locale->text('Memo')
+      . "</a></th>";
+
+    $column_header{employee} =
+        "<th><a class=listheading href=$href&sort=employee>"
+      . $locale->text('Salesperson')
+      . "</a></th>";
+    $column_header{till} =
+        "<th><a class=listheading href=$href&sort=till>"
+      . $locale->text('Till')
+      . "</a></th>";
+
+    @column_index = @columns;
+    $colspan      = $#column_index + 1;
+
+    $form->header;
+
+    print qq|
 <body>
 
 <table width=100%>
@@ -2402,100 +2700,109 @@ sub list_payments {
 	<tr class=listheading>
 |;
 
-  for (@column_index) { print "\n$column_header{$_}" }
+    for (@column_index) { print "\n$column_header{$_}" }
 
-  print qq|
+    print qq|
         </tr>
 |;
 
-  
-  foreach $ref (sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} }) {
+    foreach $ref ( sort { $a->{accno} cmp $b->{accno} } @{ $form->{PR} } ) {
 
-    next unless @{ $form->{$ref->{id}} };
+        next unless @{ $form->{ $ref->{id} } };
 
-    print qq|
+        print qq|
         <tr>
 	  <th colspan=$colspan align=left>$ref->{accno}--$ref->{description}</th>
 	</tr>
 |;
 
-    if (@{ $form->{$ref->{id}} }) {
-      $sameitem = $form->{$ref->{id}}[0]->{$form->{sort}};
-    }
-    
-    foreach $payment (@{ $form->{$ref->{id}} }) {
-
-      if ($form->{l_subtotal}) {
-	if ($payment->{$form->{sort}} ne $sameitem) {
-	  # print subtotal
-	  &payment_subtotal;
-	}
-      }
-      
-      next if ($form->{till} && ! $payment->{till});
-      
-      $column_data{name} = "<td>$payment->{name}&nbsp;</td>";
-      $column_data{transdate} = "<td>$payment->{transdate}&nbsp;</td>";
-      $column_data{paid} = "<td align=right>".$form->format_amount(\%myconfig, $payment->{paid}, 2, "&nbsp;")."</td>";
-      $column_data{curr} = "<td>$payment->{curr}</td>";
-      $column_data{source} = "<td>$payment->{source}&nbsp;</td>";
-      $column_data{memo} = "<td>$payment->{memo}&nbsp;</td>";
-      $column_data{employee} = "<td>$payment->{employee}&nbsp;</td>";
-      $column_data{till} = "<td>$payment->{till}&nbsp;</td>";
-
-      $subtotalpaid += $payment->{paid};
-      $accounttotalpaid += $payment->{paid};
-      $totalpaid += $payment->{paid};
-       
-      $i++; $i %= 2;
-      print qq|
+        if ( @{ $form->{ $ref->{id} } } ) {
+            $sameitem = $form->{ $ref->{id} }[0]->{ $form->{sort} };
+        }
+
+        foreach $payment ( @{ $form->{ $ref->{id} } } ) {
+
+            if ( $form->{l_subtotal} ) {
+                if ( $payment->{ $form->{sort} } ne $sameitem ) {
+
+                    # print subtotal
+                    &payment_subtotal;
+                }
+            }
+
+            next if ( $form->{till} && !$payment->{till} );
+
+            $column_data{name}      = "<td>$payment->{name}&nbsp;</td>";
+            $column_data{transdate} = "<td>$payment->{transdate}&nbsp;</td>";
+            $column_data{paid} =
+              "<td align=right>"
+              . $form->format_amount( \%myconfig, $payment->{paid}, 2,
+                "&nbsp;" )
+              . "</td>";
+            $column_data{curr}     = "<td>$payment->{curr}</td>";
+            $column_data{source}   = "<td>$payment->{source}&nbsp;</td>";
+            $column_data{memo}     = "<td>$payment->{memo}&nbsp;</td>";
+            $column_data{employee} = "<td>$payment->{employee}&nbsp;</td>";
+            $column_data{till}     = "<td>$payment->{till}&nbsp;</td>";
+
+            $subtotalpaid     += $payment->{paid};
+            $accounttotalpaid += $payment->{paid};
+            $totalpaid        += $payment->{paid};
+
+            $i++;
+            $i %= 2;
+            print qq|
 	<tr class=listrow$i>
 |;
 
-      for (@column_index) { print "\n$column_data{$_}" }
+            for (@column_index) { print "\n$column_data{$_}" }
 
-      print qq|
+            print qq|
         </tr>
 |;
 
-      $sameitem = $payment->{$form->{sort}};
-      
-    }
+            $sameitem = $payment->{ $form->{sort} };
 
-    &payment_subtotal if $form->{l_subtotal};
-    
-    # print account totals
-    for (@column_index) { $column_data{$_} = "<td>&nbsp;</td>" }
+        }
 
-    $column_data{paid} = "<th class=listtotal align=right>".$form->format_amount(\%myconfig, $accounttotalpaid, 2, "&nbsp;")."</th>";
-     
-    print qq|
+        &payment_subtotal if $form->{l_subtotal};
+
+        # print account totals
+        for (@column_index) { $column_data{$_} = "<td>&nbsp;</td>" }
+
+        $column_data{paid} =
+            "<th class=listtotal align=right>"
+          . $form->format_amount( \%myconfig, $accounttotalpaid, 2, "&nbsp;" )
+          . "</th>";
+
+        print qq|
 	<tr class=listtotal>
 |;
 
-    for (@column_index) { print "\n$column_data{$_}" }
+        for (@column_index) { print "\n$column_data{$_}" }
 
-    print qq|
+        print qq|
         </tr>
 |;
 
-    $accounttotalpaid = 0;
-     
-  }
+        $accounttotalpaid = 0;
 
+    }
 
-  # print total
-  for (@column_index) { $column_data{$_} = "<td>&nbsp;</td>" }
+    # print total
+    for (@column_index) { $column_data{$_} = "<td>&nbsp;</td>" }
+
+    $column_data{paid} =
+      "<th class=listtotal align=right>"
+      . $form->format_amount( \%myconfig, $totalpaid, 2, "&nbsp;" ) . "</th>";
 
-  $column_data{paid} = "<th class=listtotal align=right>".$form->format_amount(\%myconfig, $totalpaid, 2, "&nbsp;")."</th>";
-     
-  print qq|
+    print qq|
         <tr class=listtotal>
 |;
 
-  for (@column_index) { print "\n$column_data{$_}" }
+    for (@column_index) { print "\n$column_data{$_}" }
 
-  print qq|
+    print qq|
         </tr>
 
       </table>
@@ -2507,12 +2814,12 @@ sub list_payments {
 </table>
 |;
 
-  if ($form->{lynx}) {
-    require "bin/menu.pl";
-    &menubar;
-  }
+    if ( $form->{lynx} ) {
+        require "bin/menu.pl";
+        &menubar;
+    }
 
-  print qq|
+    print qq|
  
 </body>
 </html>
@@ -2520,27 +2827,28 @@ sub list_payments {
 
 }
 
-
 sub payment_subtotal {
 
-  if ($subtotalpaid != 0) {
-    for (@column_index) { $column_data{$_} = "<td>&nbsp;</td>" }
+    if ( $subtotalpaid != 0 ) {
+        for (@column_index) { $column_data{$_} = "<td>&nbsp;</td>" }
 
-    $column_data{paid} = "<th class=listsubtotal align=right>".$form->format_amount(\%myconfig, $subtotalpaid, 2, "&nbsp;")."</th>";
+        $column_data{paid} =
+            "<th class=listsubtotal align=right>"
+          . $form->format_amount( \%myconfig, $subtotalpaid, 2, "&nbsp;" )
+          . "</th>";
 
-    print qq|
+        print qq|
   <tr class=listsubtotal>
 |;
 
-    for (@column_index) { print "\n$column_data{$_}" }
+        for (@column_index) { print "\n$column_data{$_}" }
 
-    print qq|
+        print qq|
   </tr>
 |;
-  }
+    }
 
-  $subtotalpaid = 0;
+    $subtotalpaid = 0;
 
 }
 
-