Doing a simple Perltidy commit so that I can evaluate differences between the branches and make sure patches are up to date

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

1 files changed, 862 insertions, 658 deletions

diff --git a/bin/hr.pl b/bin/hr.pl
index 160b4c87..78b098c0 100644
--- a/bin/hr.pl
+++ b/bin/hr.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):
@@ -43,59 +43,88 @@ use LedgerSMB::HR;
 use LedgerSMB::User;
 
 1;
-# end of main
-
 
+# end of main
 
 sub add {
 
-  $label = "Add ".ucfirst $form->{db};
-  $form->{title} = $locale->text($label);
+    $label = "Add " . ucfirst $form->{db};
+    $form->{title} = $locale->text($label);
 
-  $form->{callback} = "$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}" unless $form->{callback};
+    $form->{callback} =
+"$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}"
+      unless $form->{callback};
 
-  &{ "$form->{db}_links" };
-  
-}
+    &{"$form->{db}_links"};
 
+}
 
-sub search { &{ "search_$form->{db}" } };
-  
+sub search { &{"search_$form->{db}"} }
 
 sub search_employee {
 
-  $form->{title} = $locale->text('Employees');
-
-  @a = ();
-
-  push @a, qq|<input name="l_ndx" type=checkbox class=checkbox value=Y> |.$locale->text('Pos');
-  push @a, qq|<input name="l_id" type=checkbox class=checkbox value=Y> |.$locale->text('ID');
-  push @a, qq|<input name="l_employeenumber" type=checkbox class=checkbox value=Y checked> |.$locale->text('Employee Number');
-  push @a, qq|<input name="l_name" type=checkbox class=checkbox value=Y checked> |.$locale->text('Employee Name');
-  push @a, qq|<input name="l_address" type=checkbox class=checkbox value=Y> |.$locale->text('Address');
-  push @a, qq|<input name="l_city" type=checkbox class=checkbox value=Y> |.$locale->text('City');
-  push @a, qq|<input name="l_state" type=checkbox class=checkbox value=Y> |.$locale->text('State/Province');
-  push @a, qq|<input name="l_zipcode" type=checkbox class=checkbox value=Y> |.$locale->text('Zip/Postal Code');
-  push @a, qq|<input name="l_country" type=checkbox class=checkbox value=Y> |.$locale->text('Country');
-  push @a, qq|<input name="l_workphone" type=checkbox class=checkbox value=Y checked> |.$locale->text('Work Phone');
-  push @a, qq|<input name="l_homephone" type=checkbox class=checkbox value=Y checked> |.$locale->text('Home Phone');
-  push @a, qq|<input name="l_startdate" type=checkbox class=checkbox value=Y checked> |.$locale->text('Startdate');
-  push @a, qq|<input name="l_enddate" type=checkbox class=checkbox value=Y checked> |.$locale->text('Enddate');
-  push @a, qq|<input name="l_sales" type=checkbox class=checkbox value=Y> |.$locale->text('Sales');
-  push @a, qq|<input name="l_manager" type=checkbox class=checkbox value=Y> |.$locale->text('Manager');
-  push @a, qq|<input name="l_role" type=checkbox class=checkbox value=Y checked> |.$locale->text('Role');
-  push @a, qq|<input name="l_login" type=checkbox class=checkbox value=Y checked> |.$locale->text('Login');
-  push @a, qq|<input name="l_email" type=checkbox class=checkbox value=Y> |.$locale->text('E-mail');
-  push @a, qq|<input name="l_ssn" type=checkbox class=checkbox value=Y> |.$locale->text('SSN');
-  push @a, qq|<input name="l_dob" type=checkbox class=checkbox value=Y> |.$locale->text('DOB');
-  push @a, qq|<input name="l_iban" type=checkbox class=checkbox value=Y> |.$locale->text('IBAN');
-  push @a, qq|<input name="l_bic" type=checkbox class=checkbox value=Y> |.$locale->text('BIC');
-  push @a, qq|<input name="l_notes" type=checkbox class=checkbox value=Y> |.$locale->text('Notes');
- 
+    $form->{title} = $locale->text('Employees');
+
+    @a = ();
+
+    push @a, qq|<input name="l_ndx" type=checkbox class=checkbox value=Y> |
+      . $locale->text('Pos');
+    push @a, qq|<input name="l_id" type=checkbox class=checkbox value=Y> |
+      . $locale->text('ID');
+    push @a,
+qq|<input name="l_employeenumber" type=checkbox class=checkbox value=Y checked> |
+      . $locale->text('Employee Number');
+    push @a,
+      qq|<input name="l_name" type=checkbox class=checkbox value=Y checked> |
+      . $locale->text('Employee Name');
+    push @a, qq|<input name="l_address" type=checkbox class=checkbox value=Y> |
+      . $locale->text('Address');
+    push @a, qq|<input name="l_city" type=checkbox class=checkbox value=Y> |
+      . $locale->text('City');
+    push @a, qq|<input name="l_state" type=checkbox class=checkbox value=Y> |
+      . $locale->text('State/Province');
+    push @a, qq|<input name="l_zipcode" type=checkbox class=checkbox value=Y> |
+      . $locale->text('Zip/Postal Code');
+    push @a, qq|<input name="l_country" type=checkbox class=checkbox value=Y> |
+      . $locale->text('Country');
+    push @a,
+qq|<input name="l_workphone" type=checkbox class=checkbox value=Y checked> |
+      . $locale->text('Work Phone');
+    push @a,
+qq|<input name="l_homephone" type=checkbox class=checkbox value=Y checked> |
+      . $locale->text('Home Phone');
+    push @a,
+qq|<input name="l_startdate" type=checkbox class=checkbox value=Y checked> |
+      . $locale->text('Startdate');
+    push @a,
+      qq|<input name="l_enddate" type=checkbox class=checkbox value=Y checked> |
+      . $locale->text('Enddate');
+    push @a, qq|<input name="l_sales" type=checkbox class=checkbox value=Y> |
+      . $locale->text('Sales');
+    push @a, qq|<input name="l_manager" type=checkbox class=checkbox value=Y> |
+      . $locale->text('Manager');
+    push @a,
+      qq|<input name="l_role" type=checkbox class=checkbox value=Y checked> |
+      . $locale->text('Role');
+    push @a,
+      qq|<input name="l_login" type=checkbox class=checkbox value=Y checked> |
+      . $locale->text('Login');
+    push @a, qq|<input name="l_email" type=checkbox class=checkbox value=Y> |
+      . $locale->text('E-mail');
+    push @a, qq|<input name="l_ssn" type=checkbox class=checkbox value=Y> |
+      . $locale->text('SSN');
+    push @a, qq|<input name="l_dob" type=checkbox class=checkbox value=Y> |
+      . $locale->text('DOB');
+    push @a, qq|<input name="l_iban" type=checkbox class=checkbox value=Y> |
+      . $locale->text('IBAN');
+    push @a, qq|<input name="l_bic" type=checkbox class=checkbox value=Y> |
+      . $locale->text('BIC');
+    push @a, qq|<input name="l_notes" type=checkbox class=checkbox value=Y> |
+      . $locale->text('Notes');
+
+    $form->header;
 
-  $form->header;
-  
-  print qq|
+    print qq|
 <body>
 
 <form method=post action=$form->{script}>
@@ -109,45 +138,54 @@ sub search_employee {
     <td>
       <table>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Employee Number').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Employee Number') . qq|</th>
 	  <td colspan=3><input name=employeenumber size=20></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Employee Name').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Employee Name') . qq|</th>
 	  <td colspan=3><input name=name size=35></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Startdate').qq|</th>
-	  <td>|.$locale->text('From').qq| <input name=startdatefrom size=11 title="$myconfig{dateformat}"> |.$locale->text('To').qq| <input name=startdateto size=11 title="$myconfig{dateformat}"></td>
+	  <th align=right nowrap>| . $locale->text('Startdate') . qq|</th>
+	  <td>|
+      . $locale->text('From')
+      . qq| <input name=startdatefrom size=11 title="$myconfig{dateformat}"> |
+      . $locale->text('To')
+      . qq| <input name=startdateto size=11 title="$myconfig{dateformat}"></td>
 	</tr>
 	<tr valign=top>
-	  <th align=right nowrap>|.$locale->text('Notes').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
 	  <td colspan=3><input name=notes size=40></td>
 	</tr>
 	<tr>
 	  <td></td>
-	  <td colspan=3><input name=status class=radio type=radio value=all checked>&nbsp;|.$locale->text('All').qq|
-	  <input name=status class=radio type=radio value=active>&nbsp;|.$locale->text('Active').qq|
-	  <input name=status class=radio type=radio value=inactive>&nbsp;|.$locale->text('Inactive').qq|
-	  <input name=status class=radio type=radio value=orphaned>&nbsp;|.$locale->text('Orphaned').qq|
-	  <input name=sales class=checkbox type=checkbox value=Y>&nbsp;|.$locale->text('Sales').qq|
+	  <td colspan=3><input name=status class=radio type=radio value=all checked>&nbsp;|
+      . $locale->text('All') . qq|
+	  <input name=status class=radio type=radio value=active>&nbsp;|
+      . $locale->text('Active') . qq|
+	  <input name=status class=radio type=radio value=inactive>&nbsp;|
+      . $locale->text('Inactive') . qq|
+	  <input name=status class=radio type=radio value=orphaned>&nbsp;|
+      . $locale->text('Orphaned') . qq|
+	  <input name=sales class=checkbox type=checkbox value=Y>&nbsp;|
+      . $locale->text('Sales') . qq|
 	</tr>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Include in Report').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
 	  <td colspan=3>
 	    <table>
 |;
 
-  while (@a) {
-    print qq|<tr>\n|;
-    for (1 .. 5) {
-      print qq|<td nowrap>|. shift @a;
-      print qq|</td>\n|;
+    while (@a) {
+        print qq|<tr>\n|;
+        for ( 1 .. 5 ) {
+            print qq|<td nowrap>| . shift @a;
+            print qq|</td>\n|;
+        }
+        print qq|</tr>\n|;
     }
-    print qq|</tr>\n|;
-  }
 
-  print qq|
+    print qq|
 	    </table>
 	  </td>
 	</tr>
@@ -162,136 +200,208 @@ sub search_employee {
 <input type=hidden name=nextsub value=list_employees>
 |;
 
-  $form->hide_form(qw(db path login sessionid));
+    $form->hide_form(qw(db path login sessionid));
 
-  print qq|
+    print qq|
 <br>
-<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>
 |;
 }
 
-
 sub list_employees {
 
-  HR->employees(\%myconfig, \%$form);
-  
-  $href = "$form->{script}?action=list_employees&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}";
-  
-  $form->sort_order();
+    HR->employees( \%myconfig, \%$form );
+
+    $href =
+"$form->{script}?action=list_employees&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}";
+
+    $form->sort_order();
+
+    $callback =
+"$form->{script}?action=list_employees&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}";
 
-  $callback = "$form->{script}?action=list_employees&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}";
-  
-  @columns = $form->sort_columns(qw(id employeenumber name address city state zipcode country workphone homephone email startdate enddate ssn dob iban bic sales role manager login notes));
-  unshift @columns, "ndx";
+    @columns =
+      $form->sort_columns(
+        qw(id employeenumber name address city state zipcode country workphone homephone email startdate enddate ssn dob iban bic sales role manager login notes)
+      );
+    unshift @columns, "ndx";
 
-  foreach $item (@columns) {
-    if ($form->{"l_$item"} eq "Y") {
-      push @column_index, $item;
+    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";
+            # add column to href and callback
+            $callback .= "&l_$item=Y";
+            $href     .= "&l_$item=Y";
+        }
+    }
+
+    %role = (
+        user       => $locale->text('User'),
+        supervisor => $locale->text('Supervisor'),
+        manager    => $locale->text('Manager'),
+        admin      => $locale->text('Administrator')
+    );
+
+    $option = $locale->text('All');
+
+    if ( $form->{status} eq 'sales' ) {
+        $option = $locale->text('Sales');
+    }
+    if ( $form->{status} eq 'orphaned' ) {
+        $option = $locale->text('Orphaned');
     }
-  }
-
-  %role = ( user	=> $locale->text('User'),
-            supervisor	=> $locale->text('Supervisor'),
-	    manager	=> $locale->text('Manager'),
-            admin	=> $locale->text('Administrator')
-	  );
-  
-  $option = $locale->text('All');
-
-  if ($form->{status} eq 'sales') {
-    $option = $locale->text('Sales');
-  }
-  if ($form->{status} eq 'orphaned') {
-    $option = $locale->text('Orphaned');
-  }
-  if ($form->{status} eq 'active') {
-    $option = $locale->text('Active');
-  }
-  if ($form->{status} eq 'inactive') {
-    $option = $locale->text('Inactive');
-  }
-  
-  if ($form->{employeenumber}) {
-    $callback .= "&employeenumber=".$form->escape($form->{employeenumber},1);
-    $href .= "&employeenumber=".$form->escape($form->{employeenumber});
-    $option .= "\n<br>".$locale->text('Employee Number')." : $form->{employeenumber}";
-  }
-  if ($form->{name}) {
-    $callback .= "&name=".$form->escape($form->{name},1);
-    $href .= "&name=".$form->escape($form->{name});
-    $option .= "\n<br>".$locale->text('Employee Name')." : $form->{name}";
-  }
-  if ($form->{startdatefrom}) {
-    $callback .= "&startdatefrom=$form->{startdatefrom}";
-    $href .= "&startdatefrom=$form->{startdatefrom}";
-    $fromdate = $locale->date(\%myconfig, $form->{startdatefrom}, 1);
-  }
-  if ($form->{startdateto}) {
-    $callback .= "&startdateto=$form->{startdateto}";
-    $href .= "&startdateto=$form->{startdateto}";
-    $todate = $locale->date(\%myconfig, $form->{startdateto}, 1);
-  }
-  if ($fromdate || $todate) {
-    $option .= "\n<br>".$locale->text('Startdate')." $fromdate - $todate";
-  }
-  
-  if ($form->{notes}) {
-    $callback .= "&notes=".$form->escape($form->{notes},1);
-    $href .= "&notes=".$form->escape($form->{notes});
-    $option .= "\n<br>" if $option;
-    $option .= $locale->text('Notes')." : $form->{notes}";
-  }
-
-  $form->{callback} = "$callback&sort=$form->{sort}";
-  $callback = $form->escape($form->{callback});
-
-  $column_header{ndx} = qq|<th class=listheading>&nbsp;</th>|;
-  $column_header{id} = qq|<th class=listheading>|.$locale->text('ID').qq|</th>|;
-  $column_header{employeenumber} = qq|<th><a class=listheading href=$href&sort=employeenumber>|.$locale->text('Number').qq|</a></th>|;
-  $column_header{name} = qq|<th><a class=listheading href=$href&sort=name>|.$locale->text('Name').qq|</a></th>|;
-  $column_header{manager} = qq|<th><a class=listheading href=$href&sort=manager>|.$locale->text('Manager').qq|</a></th>|;
-  $column_header{address} = qq|<th class=listheading>|.$locale->text('Address').qq|</a></th>|;
-  $column_header{city} = qq|<th><a class=listheading href=$href&sort=city>|.$locale->text('City').qq|</a></th>|;
-  $column_header{state} = qq|<th><a class=listheading href=$href&sort=state>|.$locale->text('State/Province').qq|</a></th>|;
-  $column_header{zipcode} = qq|<th><a class=listheading href=$href&sort=zipcode>|.$locale->text('Zip/Postal Code').qq|</a></th>|;
-  $column_header{country} = qq|<th><a class=listheading href=$href&sort=country>|.$locale->text('Country').qq|</a></th>|;
-  $column_header{workphone} = qq|<th><a class=listheading href=$href&sort=workphone>|.$locale->text('Work Phone').qq|</a></th>|;
-  $column_header{homephone} = qq|<th><a class=listheading href=$href&sort=homephone>|.$locale->text('Home Phone').qq|</a></th>|;
-  
-  $column_header{startdate} = qq|<th><a class=listheading href=$href&sort=startdate>|.$locale->text('Startdate').qq|</a></th>|;
-  $column_header{enddate} = qq|<th><a class=listheading href=$href&sort=enddate>|.$locale->text('Enddate').qq|</a></th>|;
-  $column_header{notes} = qq|<th><a class=listheading href=$href&sort=notes>|.$locale->text('Notes').qq|</a></th>|;
-  $column_header{role} = qq|<th><a class=listheading href=$href&sort=role>|.$locale->text('Role').qq|</a></th>|;
-  $column_header{login} = qq|<th><a class=listheading href=$href&sort=login>|.$locale->text('Login').qq|</a></th>|;
-  
-  $column_header{sales} = qq|<th class=listheading>|.$locale->text('S').qq|</th>|;
-  $column_header{email} = qq|<th><a class=listheading href=$href&sort=email>|.$locale->text('E-mail').qq|</a></th>|;
-  $column_header{ssn} = qq|<th><a class=listheading href=$href&sort=ssn>|.$locale->text('SSN').qq|</a></th>|;
-  $column_header{dob} = qq|<th><a class=listheading href=$href&sort=dob>|.$locale->text('DOB').qq|</a></th>|;
-  $column_header{iban} = qq|<th><a class=listheading href=$href&sort=iban>|.$locale->text('IBAN').qq|</a></th>|;
-  $column_header{bic} = qq|<th><a class=listheading href=$href&sort=bic>|.$locale->text('BIC').qq|</a></th>|;
-  
-  $form->{title} = $locale->text('Employees');
-
-  $form->header;
-
-  print qq|
+    if ( $form->{status} eq 'active' ) {
+        $option = $locale->text('Active');
+    }
+    if ( $form->{status} eq 'inactive' ) {
+        $option = $locale->text('Inactive');
+    }
+
+    if ( $form->{employeenumber} ) {
+        $callback .=
+          "&employeenumber=" . $form->escape( $form->{employeenumber}, 1 );
+        $href .= "&employeenumber=" . $form->escape( $form->{employeenumber} );
+        $option .= "\n<br>"
+          . $locale->text('Employee Number')
+          . " : $form->{employeenumber}";
+    }
+    if ( $form->{name} ) {
+        $callback .= "&name=" . $form->escape( $form->{name}, 1 );
+        $href .= "&name=" . $form->escape( $form->{name} );
+        $option .=
+          "\n<br>" . $locale->text('Employee Name') . " : $form->{name}";
+    }
+    if ( $form->{startdatefrom} ) {
+        $callback .= "&startdatefrom=$form->{startdatefrom}";
+        $href     .= "&startdatefrom=$form->{startdatefrom}";
+        $fromdate = $locale->date( \%myconfig, $form->{startdatefrom}, 1 );
+    }
+    if ( $form->{startdateto} ) {
+        $callback .= "&startdateto=$form->{startdateto}";
+        $href     .= "&startdateto=$form->{startdateto}";
+        $todate = $locale->date( \%myconfig, $form->{startdateto}, 1 );
+    }
+    if ( $fromdate || $todate ) {
+        $option .=
+          "\n<br>" . $locale->text('Startdate') . " $fromdate - $todate";
+    }
+
+    if ( $form->{notes} ) {
+        $callback .= "&notes=" . $form->escape( $form->{notes}, 1 );
+        $href   .= "&notes=" . $form->escape( $form->{notes} );
+        $option .= "\n<br>" if $option;
+        $option .= $locale->text('Notes') . " : $form->{notes}";
+    }
+
+    $form->{callback} = "$callback&sort=$form->{sort}";
+    $callback = $form->escape( $form->{callback} );
+
+    $column_header{ndx} = qq|<th class=listheading>&nbsp;</th>|;
+    $column_header{id} =
+      qq|<th class=listheading>| . $locale->text('ID') . qq|</th>|;
+    $column_header{employeenumber} =
+        qq|<th><a class=listheading href=$href&sort=employeenumber>|
+      . $locale->text('Number')
+      . qq|</a></th>|;
+    $column_header{name} =
+        qq|<th><a class=listheading href=$href&sort=name>|
+      . $locale->text('Name')
+      . qq|</a></th>|;
+    $column_header{manager} =
+        qq|<th><a class=listheading href=$href&sort=manager>|
+      . $locale->text('Manager')
+      . qq|</a></th>|;
+    $column_header{address} =
+      qq|<th class=listheading>| . $locale->text('Address') . qq|</a></th>|;
+    $column_header{city} =
+        qq|<th><a class=listheading href=$href&sort=city>|
+      . $locale->text('City')
+      . qq|</a></th>|;
+    $column_header{state} =
+        qq|<th><a class=listheading href=$href&sort=state>|
+      . $locale->text('State/Province')
+      . qq|</a></th>|;
+    $column_header{zipcode} =
+        qq|<th><a class=listheading href=$href&sort=zipcode>|
+      . $locale->text('Zip/Postal Code')
+      . qq|</a></th>|;
+    $column_header{country} =
+        qq|<th><a class=listheading href=$href&sort=country>|
+      . $locale->text('Country')
+      . qq|</a></th>|;
+    $column_header{workphone} =
+        qq|<th><a class=listheading href=$href&sort=workphone>|
+      . $locale->text('Work Phone')
+      . qq|</a></th>|;
+    $column_header{homephone} =
+        qq|<th><a class=listheading href=$href&sort=homephone>|
+      . $locale->text('Home Phone')
+      . qq|</a></th>|;
+
+    $column_header{startdate} =
+        qq|<th><a class=listheading href=$href&sort=startdate>|
+      . $locale->text('Startdate')
+      . qq|</a></th>|;
+    $column_header{enddate} =
+        qq|<th><a class=listheading href=$href&sort=enddate>|
+      . $locale->text('Enddate')
+      . qq|</a></th>|;
+    $column_header{notes} =
+        qq|<th><a class=listheading href=$href&sort=notes>|
+      . $locale->text('Notes')
+      . qq|</a></th>|;
+    $column_header{role} =
+        qq|<th><a class=listheading href=$href&sort=role>|
+      . $locale->text('Role')
+      . qq|</a></th>|;
+    $column_header{login} =
+        qq|<th><a class=listheading href=$href&sort=login>|
+      . $locale->text('Login')
+      . qq|</a></th>|;
+
+    $column_header{sales} =
+      qq|<th class=listheading>| . $locale->text('S') . qq|</th>|;
+    $column_header{email} =
+        qq|<th><a class=listheading href=$href&sort=email>|
+      . $locale->text('E-mail')
+      . qq|</a></th>|;
+    $column_header{ssn} =
+        qq|<th><a class=listheading href=$href&sort=ssn>|
+      . $locale->text('SSN')
+      . qq|</a></th>|;
+    $column_header{dob} =
+        qq|<th><a class=listheading href=$href&sort=dob>|
+      . $locale->text('DOB')
+      . qq|</a></th>|;
+    $column_header{iban} =
+        qq|<th><a class=listheading href=$href&sort=iban>|
+      . $locale->text('IBAN')
+      . qq|</a></th>|;
+    $column_header{bic} =
+        qq|<th><a class=listheading href=$href&sort=bic>|
+      . $locale->text('BIC')
+      . qq|</a></th>|;
+
+    $form->{title} = $locale->text('Employees');
+
+    $form->header;
+
+    print qq|
 <body>
 
 <table width=100%>
@@ -308,58 +418,65 @@ sub list_employees {
 	<tr class=listheading>
 |;
 
-  for (@column_index) { print "$column_header{$_}\n" }
-  
-  print qq|
+    for (@column_index) { print "$column_header{$_}\n" }
+
+    print qq|
         </tr>
 |;
 
-  $i = 0;
-  foreach $ref (@{ $form->{all_employee} }) {
+    $i = 0;
+    foreach $ref ( @{ $form->{all_employee} } ) {
 
-    $i++;
-    
-    $ref->{notes} =~ s/\r?\n/<br>/g;
-    for (@column_index) { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" }
+        $i++;
 
-    $column_data{ndx} = "<td align=right>$i</td>";
-    
-    $column_data{sales} = ($ref->{sales}) ? "<td>x</td>" : "<td>&nbsp;</td>";
-    $column_data{role} = qq|<td>$role{"$ref->{role}"}&nbsp;</td>|;
-    $column_date{address} = qq|$ref->{address1} $ref->{address2}|;
+        $ref->{notes} =~ s/\r?\n/<br>/g;
+        for (@column_index) { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" }
 
-    $column_data{name} = "<td><a href=$form->{script}?action=edit&db=employee&id=$ref->{id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}&callback=$callback>$ref->{name}&nbsp;</td>";
+        $column_data{ndx} = "<td align=right>$i</td>";
 
-    if ($ref->{email}) {
-      $email = $ref->{email};
-      $email =~ s/</\&lt;/;
-      $email =~ s/>/\&gt;/;
-      
-      $column_data{email} = qq|<td><a href="mailto:$ref->{email}">$email</a></td>|;
-    }
+        $column_data{sales} =
+          ( $ref->{sales} ) ? "<td>x</td>" : "<td>&nbsp;</td>";
+        $column_data{role}    = qq|<td>$role{"$ref->{role}"}&nbsp;</td>|;
+        $column_date{address} = qq|$ref->{address1} $ref->{address2}|;
+
+        $column_data{name} =
+"<td><a href=$form->{script}?action=edit&db=employee&id=$ref->{id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}&callback=$callback>$ref->{name}&nbsp;</td>";
+
+        if ( $ref->{email} ) {
+            $email = $ref->{email};
+            $email =~ s/</\&lt;/;
+            $email =~ s/>/\&gt;/;
+
+            $column_data{email} =
+              qq|<td><a href="mailto:$ref->{email}">$email</a></td>|;
+        }
 
-    $j++; $j %= 2;
-    print "
+        $j++;
+        $j %= 2;
+        print "
         <tr class=listrow$j>
 ";
 
-    for (@column_index) { print "$column_data{$_}\n" }
+        for (@column_index) { print "$column_data{$_}\n" }
 
-    print qq|
+        print qq|
         </tr>
 |;
-    
-  }
-
-  $i = 1;
-  $button{'HR--Employees--Add Employee'}{code} = qq|<button class="submit" type="submit" name="action" value="add_employee">|.$locale->text('Add Employee').qq|</button> |;
-  $button{'HR--Employees--Add Employee'}{order} = $i++;
-
-  foreach $item (split /;/, $myconfig{acs}) {
-    delete $button{$item};
-  }
-  
-  print qq|
+
+    }
+
+    $i = 1;
+    $button{'HR--Employees--Add Employee'}{code} =
+qq|<button class="submit" type="submit" name="action" value="add_employee">|
+      . $locale->text('Add Employee')
+      . qq|</button> |;
+    $button{'HR--Employees--Add Employee'}{order} = $i++;
+
+    foreach $item ( split /;/, $myconfig{acs} ) {
+        delete $button{$item};
+    }
+
+    print qq|
       </table>
     </td>
   </tr>
@@ -372,138 +489,148 @@ sub list_employees {
 <form method=post action=$form->{script}>
 |;
 
-  $form->hide_form(qw(callback db path login sessionid));
-  
-  foreach $item (sort { $a->{order} <=> $b->{order} } %button) {
-    print $item->{code};
-  }
+    $form->hide_form(qw(callback db path login sessionid));
+
+    foreach $item ( sort { $a->{order} <=> $b->{order} } %button ) {
+        print $item->{code};
+    }
 
-  if ($form->{lynx}) {
-    require "bin/menu.pl";
-    &menubar;
-  }
+    if ( $form->{lynx} ) {
+        require "bin/menu.pl";
+        &menubar;
+    }
 
-  print qq|
+    print qq|
   </form>
 
 </body>
 </html>
 |;
- 
-}
 
+}
 
 sub edit {
 
-# $locale->text('Edit Employee')
-# $locale->text('Edit Deduction')
+    # $locale->text('Edit Employee')
+    # $locale->text('Edit Deduction')
 
-  $label = ucfirst $form->{db};
-  $form->{title} = "Edit $label";
+    $label = ucfirst $form->{db};
+    $form->{title} = "Edit $label";
 
-  &{ "$form->{db}_links" };
-  
-}
+    &{"$form->{db}_links"};
 
+}
 
 sub employee_links {
 
-#$form->{deductions} = 1;
-  HR->get_employee(\%myconfig, \%$form);
+    #$form->{deductions} = 1;
+    HR->get_employee( \%myconfig, \%$form );
 
-  for (keys %$form) { $form->{$_} = $form->quote($form->{$_}) }
+    for ( keys %$form ) { $form->{$_} = $form->quote( $form->{$_} ) }
 
-  if (@{ $form->{all_deduction} }) {
-    $form->{selectdeduction} = "<option>\n";
-    for (@{ $form->{all_deduction} }) { $form->{selectdeduction} .= qq|<option value="$_->{description}--$_->{id}">$_->{description}\n| }
-  }
+    if ( @{ $form->{all_deduction} } ) {
+        $form->{selectdeduction} = "<option>\n";
+        for ( @{ $form->{all_deduction} } ) {
+            $form->{selectdeduction} .=
+qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
+        }
+    }
 
-  $form->{manager} = "$form->{manager}--$form->{managerid}";
+    $form->{manager} = "$form->{manager}--$form->{managerid}";
 
-  if (@{ $form->{all_manager} }) {
-    $form->{selectmanager} = "<option>\n";
-    for (@{ $form->{all_manager} }) { $form->{selectmanager} .= qq|<option value="$_->{name}--$_->{id}">$_->{name}\n| }
-  }
+    if ( @{ $form->{all_manager} } ) {
+        $form->{selectmanager} = "<option>\n";
+        for ( @{ $form->{all_manager} } ) {
+            $form->{selectmanager} .=
+              qq|<option value="$_->{name}--$_->{id}">$_->{name}\n|;
+        }
+    }
 
-  %role = ( user	=> $locale->text('User'),
-            supervisor	=> $locale->text('Supervisor'),
-	    manager	=> $locale->text('Manager'),
-            admin	=> $locale->text('Administrator')
-	  );
-  
-  $form->{selectrole} = "<option>\n";
-  for (qw(user supervisor manager admin)) { $form->{selectrole} .= "<option value=$_>$role{$_}\n" }
+    %role = (
+        user       => $locale->text('User'),
+        supervisor => $locale->text('Supervisor'),
+        manager    => $locale->text('Manager'),
+        admin      => $locale->text('Administrator')
+    );
 
-  $i = 1;
-  foreach $ref (@{ $form->{all_employeededuction} }) {
-    $form->{"deduction_$i"} = "$ref->{description}--$ref->{id}" if $ref->{id};
-    for (qw(before after rate)) { $form->{"${_}_$i"} = $ref->{$_} }
-    $i++;
-  }
-  $form->{deduction_rows} = $i - 1;
+    $form->{selectrole} = "<option>\n";
+    for (qw(user supervisor manager admin)) {
+        $form->{selectrole} .= "<option value=$_>$role{$_}\n";
+    }
 
-  &employee_header;
-  &employee_footer;
+    $i = 1;
+    foreach $ref ( @{ $form->{all_employeededuction} } ) {
+        $form->{"deduction_$i"} = "$ref->{description}--$ref->{id}"
+          if $ref->{id};
+        for (qw(before after rate)) { $form->{"${_}_$i"} = $ref->{$_} }
+        $i++;
+    }
+    $form->{deduction_rows} = $i - 1;
 
-}
+    &employee_header;
+    &employee_footer;
 
+}
 
 sub employee_header {
 
-  $sales = qq|<input type=hidden name=sales value=$form->{sales}>|;
-  $form->{sales} = ($form->{sales}) ? "checked" : "";
+    $sales = qq|<input type=hidden name=sales value=$form->{sales}>|;
+    $form->{sales} = ( $form->{sales} ) ? "checked" : "";
 
-  $form->{selectrole} =~ s/ selected//;
-  $form->{selectrole} =~ s/option value=\Q$form->{role}\E>/option value=$form->{role} selected>/;
+    $form->{selectrole} =~ s/ selected//;
+    $form->{selectrole} =~
+      s/option value=\Q$form->{role}\E>/option value=$form->{role} selected>/;
 
-  $form->{selectdeduction} = $form->unescape($form->{selectdeduction});
-  
-  $form->{selectmanager} = $form->unescape($form->{selectmanager});
-  $form->{selectmanager} =~ s/ selected//;
-  $form->{selectmanager} =~ s/(<option value="\Q$form->{manager}\E")/$1 selected/;
+    $form->{selectdeduction} = $form->unescape( $form->{selectdeduction} );
 
-  $sales .= qq|
+    $form->{selectmanager} = $form->unescape( $form->{selectmanager} );
+    $form->{selectmanager} =~ s/ selected//;
+    $form->{selectmanager} =~
+      s/(<option value="\Q$form->{manager}\E")/$1 selected/;
+
+    $sales .= qq|
 <input type=hidden name=role value=$form->{role}>
 <input type=hidden name=manager value=$form->{manager}>
 |;
 
-  if ($myconfig{role} ne 'user') {
-    $sales = qq|
+    if ( $myconfig{role} ne 'user' ) {
+        $sales = qq|
         <tr>
-	  <th align=right>|.$locale->text('Sales').qq|</th>
+	  <th align=right>| . $locale->text('Sales') . qq|</th>
 	  <td><input name=sales class=checkbox type=checkbox value=1 $form->{sales}></td>
 	</tr>
         <tr>
-	  <th align=right>|.$locale->text('Role').qq|</th>
+	  <th align=right>| . $locale->text('Role') . qq|</th>
 	  <td><select name=role>$form->{selectrole}</select></td>
 	</tr>
 |;
 
-    if ($form->{selectmanager}) {
-      $sales .= qq|
+        if ( $form->{selectmanager} ) {
+            $sales .= qq|
         <tr>
-	  <th align=right>|.$locale->text('Manager').qq|</th>
+	  <th align=right>| . $locale->text('Manager') . qq|</th>
 	  <td><select name=manager>$form->{selectmanager}</select></td>
 	</tr>
 |;
+        }
     }
-  }
-  
-  $form->{deduction_rows}++;
-  
-  for $i (1 .. $form->{deduction_rows}) {
-    $form->{"selectdeduction_$i"} = $form->{selectdeduction};
-    if ($form->{"deduction_$i"}) {
-      $form->{"selectdeduction_$i"} =~ s/(<option value="\Q$form->{"deduction_$i"}\E")/$1 selected/;
+
+    $form->{deduction_rows}++;
+
+    for $i ( 1 .. $form->{deduction_rows} ) {
+        $form->{"selectdeduction_$i"} = $form->{selectdeduction};
+        if ( $form->{"deduction_$i"} ) {
+            $form->{"selectdeduction_$i"} =~
+              s/(<option value="\Q$form->{"deduction_$i"}\E")/$1 selected/;
+        }
     }
-  }
 
-  $form->{selectdeduction} = $form->escape($form->{selectdeduction},1);
-  $form->{selectmanager} = $form->escape($form->{selectmanager},1);
+    $form->{selectdeduction} = $form->escape( $form->{selectdeduction}, 1 );
+    $form->{selectmanager}   = $form->escape( $form->{selectmanager},   1 );
 
-  $form->header;
+    $form->header;
 
-  print qq|
+    print qq|
 <body>
 
 <form method=post action=$form->{script}>
@@ -530,15 +657,15 @@ sub employee_header {
 	  <td>
 	    <table>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Number').qq|</th>
+		<th align=right nowrap>| . $locale->text('Number') . qq|</th>
 		<td><input name=employeenumber size=32 maxlength=32 value="$form->{employeenumber}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Name').qq|</th>
+		<th align=right nowrap>| . $locale->text('Name') . qq|</th>
 		<td><input name=name size=35 maxlength=64 value="$form->{name}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Address').qq|</th>
+		<th align=right nowrap>| . $locale->text('Address') . qq|</th>
 		<td><input name=address1 size=35 maxlength=32 value="$form->{address1}"></td>
 	      </tr>
 	      <tr>
@@ -546,23 +673,23 @@ sub employee_header {
 		<td><input name=address2 size=35 maxlength=32 value="$form->{address2}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('City').qq|</th>
+		<th align=right nowrap>| . $locale->text('City') . qq|</th>
 		<td><input name=city size=35 maxlength=32 value="$form->{city}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('State/Province').qq|</th>
+		<th align=right nowrap>| . $locale->text('State/Province') . qq|</th>
 		<td><input name=state size=35 maxlength=32 value="$form->{state}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Zip/Postal Code').qq|</th>
+		<th align=right nowrap>| . $locale->text('Zip/Postal Code') . qq|</th>
 		<td><input name=zipcode size=10 maxlength=10 value="$form->{zipcode}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Country').qq|</th>
+		<th align=right nowrap>| . $locale->text('Country') . qq|</th>
 		<td><input name=country size=35 maxlength=32 value="$form->{country}"></td>
 	      </tr>
 	      <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=35 value="$form->{email}"></td>
 	      </tr>
 	      <tr>
@@ -572,36 +699,36 @@ sub employee_header {
 	  <td>
 	    <table>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Work Phone').qq|</th>
+		<th align=right nowrap>| . $locale->text('Work Phone') . qq|</th>
 		<td><input name=workphone size=20 maxlength=20 value="$form->{workphone}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Home Phone').qq|</th>
+		<th align=right nowrap>| . $locale->text('Home Phone') . qq|</th>
 		<td><input name=homephone size=20 maxlength=20 value="$form->{homephone}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Startdate').qq|</th>
+		<th align=right nowrap>| . $locale->text('Startdate') . qq|</th>
 		<td><input name=startdate size=11 title="$myconfig{dateformat}" value=$form->{startdate}></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Enddate').qq|</th>
+		<th align=right nowrap>| . $locale->text('Enddate') . qq|</th>
 		<td><input name=enddate size=11 title="$myconfig{dateformat}" value=$form->{enddate}></td>
 	      </tr>
 
 	      <tr>
-		<th align=right nowrap>|.$locale->text('SSN').qq|</th>
+		<th align=right nowrap>| . $locale->text('SSN') . qq|</th>
 		<td><input name=ssn size=20 maxlength=20 value="$form->{ssn}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('DOB').qq|</th>
+		<th align=right nowrap>| . $locale->text('DOB') . qq|</th>
 		<td><input name=dob size=11 title="$myconfig{dateformat}" value=$form->{dob}></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('IBAN').qq|</th>
+		<th align=right nowrap>| . $locale->text('IBAN') . qq|</th>
 		<td><input name=iban size=34 maxlength=34 value="$form->{iban}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('BIC').qq|</th>
+		<th align=right nowrap>| . $locale->text('BIC') . qq|</th>
 		<td><input name=bic size=11 maxlength=11 value="$form->{bic}"></td>
 	      </tr>
 	    </table>
@@ -611,45 +738,51 @@ sub employee_header {
     </td>
   </tr>
   <tr>
-    <th align=left nowrap>|.$locale->text('Notes').qq|</th>
+    <th align=left nowrap>| . $locale->text('Notes') . qq|</th>
   </tr>
   <tr>
     <td><textarea name=notes rows=3 cols=60 wrap=soft>$form->{notes}</textarea></td>
   </tr>
 |;
 
-    if ($form->{selectdeduction}) {
+    if ( $form->{selectdeduction} ) {
 
-      print qq|
+        print qq|
   <tr>
     <td>
       <table width=100%>
         <tr class=listheading>
-	  <th class=listheading>|.$locale->text('Payroll Deduction').qq|</th>
-	  <th class=listheading colspan=3>|.$locale->text('Allowances').qq|</th>
+	  <th class=listheading>| . $locale->text('Payroll Deduction') . qq|</th>
+	  <th class=listheading colspan=3>| . $locale->text('Allowances') . qq|</th>
 	</tr>
 
         <tr class=listheading>
 	  <th></th>
-	  <th class=listheading>|.$locale->text('Before Deduction').qq|</th>
-	  <th class=listheading>|.$locale->text('After Deduction').qq|</th>
-	  <th class=listheading>|.$locale->text('Rate').qq|</th>
+	  <th class=listheading>| . $locale->text('Before Deduction') . qq|</th>
+	  <th class=listheading>| . $locale->text('After Deduction') . qq|</th>
+	  <th class=listheading>| . $locale->text('Rate') . qq|</th>
 	</tr>
 |;
 
-    for $i (1 .. $form->{deduction_rows}) {
-      print qq|
+        for $i ( 1 .. $form->{deduction_rows} ) {
+            print qq|
         <tr>
 	  <td><select name="deduction_$i">$form->{"selectdeduction_$i"}</select></td>
-	  <td><input name="before_$i" value=|.$form->format_amount(\%myconfig, $form->{"before_$i"}, 2).qq|></td>
-	  <td><input name="after_$i" value=|.$form->format_amount(\%myconfig, $form->{"after_$i"}, 2).qq|></td>
-	  <td><input name="rate_$i" size=5 value=|.$form->format_amount(\%myconfig, $form->{"rate_$i"}).qq|></td>
+	  <td><input name="before_$i" value=|
+              . $form->format_amount( \%myconfig, $form->{"before_$i"}, 2 )
+              . qq|></td>
+	  <td><input name="after_$i" value=|
+              . $form->format_amount( \%myconfig, $form->{"after_$i"}, 2 )
+              . qq|></td>
+	  <td><input name="rate_$i" size=5 value=|
+              . $form->format_amount( \%myconfig, $form->{"rate_$i"} )
+              . qq|></td>
 	</tr>
 |;
+        }
     }
-  }
 
-  print qq|
+    print qq|
       </table>
     </td>
   </tr>
@@ -661,11 +794,9 @@ sub employee_header {
 
 }
 
-
-
 sub employee_footer {
 
-  print qq|
+    print qq|
 <input name=id type=hidden value=$form->{id}>
 
 <input type=hidden name=db value=$form->{db}>
@@ -679,23 +810,33 @@ sub employee_footer {
 
 <br>
 
-<button class="submit" type="submit" name="action" value="update">|.$locale->text('Update').qq|</button>
-<button class="submit" type="submit" name="action" value="save">|.$locale->text('Save').qq|</button>
+<button class="submit" type="submit" name="action" value="update">|
+      . $locale->text('Update')
+      . qq|</button>
+<button class="submit" type="submit" name="action" value="save">|
+      . $locale->text('Save')
+      . qq|</button>
 |;
 
-  if ($form->{id}) {
-    print qq|<button class="submit" type="submit" name="action" value="save_as_new">|.$locale->text('Save as new').qq|</button>\n|;
-    if ($form->{status} eq 'orphaned') {
-      print qq|<button class="submit" type="submit" name="action" value="delete">|.$locale->text('Delete').qq|</button>\n|;
+    if ( $form->{id} ) {
+        print
+qq|<button class="submit" type="submit" name="action" value="save_as_new">|
+          . $locale->text('Save as new')
+          . qq|</button>\n|;
+        if ( $form->{status} eq 'orphaned' ) {
+            print
+qq|<button class="submit" type="submit" name="action" value="delete">|
+              . $locale->text('Delete')
+              . qq|</button>\n|;
+        }
     }
-  }
 
-  if ($form->{lynx}) {
-    require "bin/menu.pl";
-    &menubar;
-  }
+    if ( $form->{lynx} ) {
+        require "bin/menu.pl";
+        &menubar;
+    }
 
-  print qq|
+    print qq|
  
   </form>
 
@@ -705,84 +846,97 @@ sub employee_footer {
 
 }
 
-
-sub save { &{ "save_$form->{db}" } };
-
+sub save { &{"save_$form->{db}"} }
 
 sub save_employee {
 
-  $form->isblank("name", $locale->text("Name missing!"));
-  HR->save_employee(\%myconfig, \%$form);
+    $form->isblank( "name", $locale->text("Name missing!") );
+    HR->save_employee( \%myconfig, \%$form );
 
-  # if it is a login change memberfile and .conf
-  if ($form->{employeelogin}) {
-    $user = LedgerSMB::User->new($form->{employeelogin});
+    # if it is a login change memberfile and .conf
+    if ( $form->{employeelogin} ) {
+        $user = LedgerSMB::User->new( $form->{employeelogin} );
 
-    for (qw(name email role)) { $user->{$_} = $form->{$_} }
+        for (qw(name email role)) { $user->{$_} = $form->{$_} }
 
-    # assign $myconfig for db
-    for (qw(dbconnect dbhost dbport dbpasswd)) { $user->{$_} = $myconfig{$_} }
-    
-    for (qw(dbpasswd password)) { $user->{"old_$_"} = $user->{$_} }
-    $user->{packpw} = 1;
+        # assign $myconfig for db
+        for (qw(dbconnect dbhost dbport dbpasswd)) {
+            $user->{$_} = $myconfig{$_};
+        }
 
-    $user->save_member() if $user->{login};
-  }
-  
-  $form->redirect($locale->text('Employee saved!'));
-  
-}
+        for (qw(dbpasswd password)) { $user->{"old_$_"} = $user->{$_} }
+        $user->{packpw} = 1;
+
+        $user->save_member() if $user->{login};
+    }
 
+    $form->redirect( $locale->text('Employee saved!') );
 
-sub delete { &{ "delete_$form->{db}" } };
+}
 
+sub delete { &{"delete_$form->{db}"} }
 
 sub delete_employee {
 
-  HR->delete_employee(\%myconfig, \%$form);
-  $form->redirect($locale->text('Employee deleted!'));
-  
+    HR->delete_employee( \%myconfig, \%$form );
+    $form->redirect( $locale->text('Employee deleted!') );
+
 }
 
+sub continue { &{ $form->{nextsub} } }
 
-sub continue { &{ $form->{nextsub} } };
+sub add_employee  { &add }
+sub add_deduction { &add }
 
-sub add_employee { &add };
-sub add_deduction { &add };
+sub search_deduction {
 
+    HR->deductions( \%myconfig, \%$form );
 
-sub search_deduction {
+    $href =
+"$form->{script}?action=search_deduction&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}";
 
-  HR->deductions(\%myconfig, \%$form);
-  
-  $href = "$form->{script}?action=search_deduction&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}";
+    $form->sort_order();
 
-  $form->sort_order();
+    $callback =
+"$form->{script}?action=search_deduction&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}";
 
-  $callback = "$form->{script}?action=search_deduction&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}";
-  
-  @column_index = $form->sort_columns(qw(description rate amount above below employeepays employerpays ap_accno expense_accno));
+    @column_index =
+      $form->sort_columns(
+        qw(description rate amount above below employeepays employerpays ap_accno expense_accno)
+      );
 
- 
-  $form->{callback} = $callback;
-  $callback = $form->escape($form->{callback});
-
-  $column_header{description} = qq|<th class=listheading href=$href>|.$locale->text('Description').qq|</th>|;
-  $column_header{rate} = qq|<th class=listheading nowrap>|.$locale->text('Rate').qq|<br>%</th>|;
-  $column_header{amount} = qq|<th class=listheading>|.$locale->text('Amount').qq|</th>|;
-  $column_header{above} = qq|<th class=listheading>|.$locale->text('Above').qq|</th>|;
-  $column_header{below} = qq|<th class=listheading>|.$locale->text('Below').qq|</th>|;
-  $column_header{employerpays} = qq|<th class=listheading>|.$locale->text('Employer').qq|</th>|;
-  $column_header{employeepays} = qq|<th class=listheading>|.$locale->text('Employee').qq|</th>|;
-  
-  $column_header{ap_accno} = qq|<th class=listheading>|.$locale->text('AP').qq|</th>|;
-  $column_header{expense_accno} = qq|<th class=listheading>|.$locale->text('Expense').qq|</th>|;
-  
-  $form->{title} = $locale->text('Deductions');
-
-  $form->header;
-
-  print qq|
+    $form->{callback} = $callback;
+    $callback = $form->escape( $form->{callback} );
+
+    $column_header{description} =
+        qq|<th class=listheading href=$href>|
+      . $locale->text('Description')
+      . qq|</th>|;
+    $column_header{rate} =
+        qq|<th class=listheading nowrap>|
+      . $locale->text('Rate')
+      . qq|<br>%</th>|;
+    $column_header{amount} =
+      qq|<th class=listheading>| . $locale->text('Amount') . qq|</th>|;
+    $column_header{above} =
+      qq|<th class=listheading>| . $locale->text('Above') . qq|</th>|;
+    $column_header{below} =
+      qq|<th class=listheading>| . $locale->text('Below') . qq|</th>|;
+    $column_header{employerpays} =
+      qq|<th class=listheading>| . $locale->text('Employer') . qq|</th>|;
+    $column_header{employeepays} =
+      qq|<th class=listheading>| . $locale->text('Employee') . qq|</th>|;
+
+    $column_header{ap_accno} =
+      qq|<th class=listheading>| . $locale->text('AP') . qq|</th>|;
+    $column_header{expense_accno} =
+      qq|<th class=listheading>| . $locale->text('Expense') . qq|</th>|;
+
+    $form->{title} = $locale->text('Deductions');
+
+    $form->header;
+
+    print qq|
 <body>
 
 <table width=100%>
@@ -799,55 +953,73 @@ sub search_deduction {
 	<tr class=listheading>
 |;
 
-  for (@column_index) { print "$column_header{$_}\n" }
-  
-  print qq|
+    for (@column_index) { print "$column_header{$_}\n" }
+
+    print qq|
         </tr>
 |;
 
-  
-  foreach $ref (@{ $form->{all_deduction} }) {
-
-    $rate = $form->format_amount(\%myconfig, $ref->{rate} * 100, "", "&nbsp;");
-    
-    $column_data{rate} = "<td align=right>$rate</td>";
-
-    for (qw(amount below above)) { $column_data{$_} = "<td align=right>".$form->format_amount(\%myconfig, $ref->{$_}, 2, "&nbsp;")."</td>" }
-      
-    for (qw(ap_accno expense_accno)) { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" }
-    
-    for (qw(employerpays employeepays)) { $column_data{$_} = "<td align=right>".$form->format_amount(\%myconfig, $ref->{$_}, "", "&nbsp;")."</td>" }
-    
-    if ($ref->{description} ne $sameitem) {
-      $column_data{description} = "<td><a href=$form->{script}?action=edit&db=$form->{db}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&callback=$callback>$ref->{description}</a></td>";
-    } else {
-      $column_data{description} = "<td>&nbsp;</td>";
-    }
-
-    $i++; $i %= 2;
-    print "
+    foreach $ref ( @{ $form->{all_deduction} } ) {
+
+        $rate =
+          $form->format_amount( \%myconfig, $ref->{rate} * 100, "", "&nbsp;" );
+
+        $column_data{rate} = "<td align=right>$rate</td>";
+
+        for (qw(amount below above)) {
+            $column_data{$_} =
+                "<td align=right>"
+              . $form->format_amount( \%myconfig, $ref->{$_}, 2, "&nbsp;" )
+              . "</td>";
+        }
+
+        for (qw(ap_accno expense_accno)) {
+            $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>";
+        }
+
+        for (qw(employerpays employeepays)) {
+            $column_data{$_} =
+                "<td align=right>"
+              . $form->format_amount( \%myconfig, $ref->{$_}, "", "&nbsp;" )
+              . "</td>";
+        }
+
+        if ( $ref->{description} ne $sameitem ) {
+            $column_data{description} =
+"<td><a href=$form->{script}?action=edit&db=$form->{db}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&callback=$callback>$ref->{description}</a></td>";
+        }
+        else {
+            $column_data{description} = "<td>&nbsp;</td>";
+        }
+
+        $i++;
+        $i %= 2;
+        print "
         <tr class=listrow$i>
 ";
 
-    for (@column_index) { print "$column_data{$_}\n" }
+        for (@column_index) { print "$column_data{$_}\n" }
 
-    print qq|
+        print qq|
         </tr>
 |;
 
-    $sameitem = $ref->{description};
-    
-  }
+        $sameitem = $ref->{description};
 
-  $i = 1;
-  $button{'HR--Deductions--Add Deduction'}{code} = qq|<button class="submit" type="submit" name="action" value="add_deduction">|.$locale->text('Add Deduction').qq|</button> |;
-  $button{'HR--Deductions--Add Deduction'}{order} = $i++;
+    }
+
+    $i = 1;
+    $button{'HR--Deductions--Add Deduction'}{code} =
+qq|<button class="submit" type="submit" name="action" value="add_deduction">|
+      . $locale->text('Add Deduction')
+      . qq|</button> |;
+    $button{'HR--Deductions--Add Deduction'}{order} = $i++;
 
-  foreach $item (split /;/, $myconfig{acs}) {
-    delete $button{$item};
-  }
-  
-  print qq|
+    foreach $item ( split /;/, $myconfig{acs} ) {
+        delete $button{$item};
+    }
+
+    print qq|
       </table>
     </td>
   </tr>
@@ -868,108 +1040,115 @@ sub search_deduction {
 <input type=hidden name=sessionid value=$form->{sessionid}>
 |;
 
-  foreach $item (sort { $a->{order} <=> $b->{order} } %button) {
-    print $item->{code};
-  }
+    foreach $item ( sort { $a->{order} <=> $b->{order} } %button ) {
+        print $item->{code};
+    }
 
-  if ($form->{lynx}) {
-    require "bin/menu.pl";
-    &menubar;
-  }
+    if ( $form->{lynx} ) {
+        require "bin/menu.pl";
+        &menubar;
+    }
 
-  print qq|
+    print qq|
   </form>
 
 </body>
 </html>
 |;
- 
-}
 
+}
 
 sub deduction_links {
-  
-  HR->get_deduction(\%myconfig, \%$form);
-
-  $i = 1;
-  foreach $ref (@{ $form->{deductionrate} }) {
-    for (keys %$ref) { $form->{"${_}_$i"} = $ref->{$_} }
-    $i++;
-  }
-  $form->{rate_rows} = $i - 1;
-  
-  $i = 1;
-  foreach $ref (@{ $form->{deductionbase} }) {
-    $form->{"base_$i"} = "$ref->{description}--$ref->{id}" if $ref->{id};
-    $form->{"maximum_$i"} = $ref->{maximum};
-    $i++;
-  }
-  $form->{base_rows} = $i - 1;
-
-  $i = 1;
-  foreach $ref (@{ $form->{deductionafter} }) {
-    $form->{"after_$i"} = "$ref->{description}--$ref->{id}" if $ref->{id};
-    $i++;
-  }
-  $form->{after_rows} = $i - 1;
-  
-  $form->{employeepays} = 1;
-  
-  $selectaccount = "<option>\n";
-  for (@{ $form->{ap_accounts} }) { $selectaccount .= "<option>$_->{accno}--$_->{description}\n" }
-
-  $form->{ap_accno} = qq|$form->{ap_accno}--$form->{ap_description}|;
-  $form->{selectap} = $selectaccount;
-
-  $selectaccount = "<option>\n";
-  for (@{ $form->{expense_accounts} }) { $selectaccount .= "<option>$_->{accno}--$_->{description}\n" }
-
-  $form->{expense_accno} = qq|$form->{expense_accno}--$form->{expense_description}|;
-  $form->{selectexpense} = $selectaccount;
-
-  for (1 .. $form->{rate_rows}) { $form->{"rate_$_"} *= 100 }
-
-  $form->{selectbase} = "<option>\n";
-  for (@{ $form->{all_deduction} }) { $form->{selectbase} .= qq|<option value="$_->{description}--$_->{id}">$_->{description}\n| }
-  
-  &deduction_header;
-  &deduction_footer;
-  
-}
 
+    HR->get_deduction( \%myconfig, \%$form );
 
-sub deduction_header {
+    $i = 1;
+    foreach $ref ( @{ $form->{deductionrate} } ) {
+        for ( keys %$ref ) { $form->{"${_}_$i"} = $ref->{$_} }
+        $i++;
+    }
+    $form->{rate_rows} = $i - 1;
 
-  $selectap = $form->{selectap};
-  $selectap =~ s/option>\Q$form->{ap_accno}\E/option selected>$form->{ap_accno}/;
-  $selectexpense = $form->{selectexpense};
-  $selectexpense =~ s/option>\Q$form->{expense_accno}\E/option selected>$form->{expense_accno}/;
+    $i = 1;
+    foreach $ref ( @{ $form->{deductionbase} } ) {
+        $form->{"base_$i"} = "$ref->{description}--$ref->{id}" if $ref->{id};
+        $form->{"maximum_$i"} = $ref->{maximum};
+        $i++;
+    }
+    $form->{base_rows} = $i - 1;
 
+    $i = 1;
+    foreach $ref ( @{ $form->{deductionafter} } ) {
+        $form->{"after_$i"} = "$ref->{description}--$ref->{id}" if $ref->{id};
+        $i++;
+    }
+    $form->{after_rows} = $i - 1;
 
-  $form->{rate_rows}++;
-  $form->{base_rows}++;
-  $form->{after_rows}++;
+    $form->{employeepays} = 1;
 
-  $form->{selectbase} = $form->unescape($form->{selectbase});
-  
-  for $i (1 .. $form->{base_rows}) {
-    $form->{"selectbase_$i"} = $form->{selectbase};
-    if ($form->{"base_$i"}) {
-      $form->{"selectbase_$i"} =~ s/(<option value="\Q$form->{"base_$i"}\E")/$1 selected/;
+    $selectaccount = "<option>\n";
+    for ( @{ $form->{ap_accounts} } ) {
+        $selectaccount .= "<option>$_->{accno}--$_->{description}\n";
     }
-  }
-  for $i (1 .. $form->{after_rows}) {
-    $form->{"selectafter_$i"} = $form->{selectbase};
-    if ($form->{"after_$i"}) {
-      $form->{"selectafter_$i"} =~ s/(<option value="\Q$form->{"after_$i"}\E")/$1 selected/;
+
+    $form->{ap_accno} = qq|$form->{ap_accno}--$form->{ap_description}|;
+    $form->{selectap} = $selectaccount;
+
+    $selectaccount = "<option>\n";
+    for ( @{ $form->{expense_accounts} } ) {
+        $selectaccount .= "<option>$_->{accno}--$_->{description}\n";
     }
-  }
- 
 
-  $form->header;
+    $form->{expense_accno} =
+      qq|$form->{expense_accno}--$form->{expense_description}|;
+    $form->{selectexpense} = $selectaccount;
+
+    for ( 1 .. $form->{rate_rows} ) { $form->{"rate_$_"} *= 100 }
+
+    $form->{selectbase} = "<option>\n";
+    for ( @{ $form->{all_deduction} } ) {
+        $form->{selectbase} .=
+          qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
+    }
+
+    &deduction_header;
+    &deduction_footer;
+
+}
+
+sub deduction_header {
+
+    $selectap = $form->{selectap};
+    $selectap =~
+      s/option>\Q$form->{ap_accno}\E/option selected>$form->{ap_accno}/;
+    $selectexpense = $form->{selectexpense};
+    $selectexpense =~
+s/option>\Q$form->{expense_accno}\E/option selected>$form->{expense_accno}/;
+
+    $form->{rate_rows}++;
+    $form->{base_rows}++;
+    $form->{after_rows}++;
+
+    $form->{selectbase} = $form->unescape( $form->{selectbase} );
+
+    for $i ( 1 .. $form->{base_rows} ) {
+        $form->{"selectbase_$i"} = $form->{selectbase};
+        if ( $form->{"base_$i"} ) {
+            $form->{"selectbase_$i"} =~
+              s/(<option value="\Q$form->{"base_$i"}\E")/$1 selected/;
+        }
+    }
+    for $i ( 1 .. $form->{after_rows} ) {
+        $form->{"selectafter_$i"} = $form->{selectbase};
+        if ( $form->{"after_$i"} ) {
+            $form->{"selectafter_$i"} =~
+              s/(<option value="\Q$form->{"after_$i"}\E")/$1 selected/;
+        }
+    }
+
+    $form->header;
 
-  
-  print qq|
+    print qq|
 <body>
 
 <form method=post action=$form->{script}>
@@ -978,7 +1157,8 @@ sub deduction_header {
 
 <input type=hidden name=selectap value="$form->{selectap}">
 <input type=hidden name=selectexpense value="$form->{selectexpense}">
-<input type=hidden name=selectbase value="|.$form->escape($form->{selectbase},1).qq|">
+<input type=hidden name=selectbase value="|
+      . $form->escape( $form->{selectbase}, 1 ) . qq|">
 
 <input type=hidden name=rate_rows value=$form->{rate_rows}>
 <input type=hidden name=base_rows value=$form->{base_rows}>
@@ -993,53 +1173,68 @@ sub deduction_header {
     <td>
       <table>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Description').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Description') . qq|</th>
 	  <td><input name=description size=35 value="$form->{description}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('AP').qq|</th>
+	  <th align=right nowrap>| . $locale->text('AP') . qq|</th>
 	  <td><select name=ap_accno>$selectap</select></td>
-	  <th align=right nowrap>|.$locale->text('Employee pays').qq| x</th>
-	  <td><input name=employeepays size=4 value=|.$form->format_amount(\%myconfig, $form->{employeepays}).qq|></td>
+	  <th align=right nowrap>| . $locale->text('Employee pays') . qq| x</th>
+	  <td><input name=employeepays size=4 value=|
+      . $form->format_amount( \%myconfig, $form->{employeepays} )
+      . qq|></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>|.$locale->text('Expense').qq|</th>
+	  <th align=right nowrap>| . $locale->text('Expense') . qq|</th>
 	  <td><select name=expense_accno>$selectexpense</select></td>
-	  <th align=right nowrap>|.$locale->text('Employer pays').qq| x</th>
-	  <td><input name=employerpays size=4 value=|.$form->format_amount(\%myconfig, $form->{employerpays}).qq|></td>
+	  <th align=right nowrap>| . $locale->text('Employer pays') . qq| x</th>
+	  <td><input name=employerpays size=4 value=|
+      . $form->format_amount( \%myconfig, $form->{employerpays} )
+      . qq|></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td></td>
-	  <th align=right nowrap>|.$locale->text('Exempt age <').qq|</th>
-	  <td><input name=fromage size=4 value=|.$form->format_amount(\%myconfig, $form->{fromage}).qq|></td>
+	  <th align=right nowrap>| . $locale->text('Exempt age <') . qq|</th>
+	  <td><input name=fromage size=4 value=|
+      . $form->format_amount( \%myconfig, $form->{fromage} )
+      . qq|></td>
 	  <th align=right nowrap>&gt;</th>
-	  <td><input name=toage size=4 value=|.$form->format_amount(\%myconfig, $form->{toage}).qq|>
+	  <td><input name=toage size=4 value=|
+      . $form->format_amount( \%myconfig, $form->{toage} ) . qq|>
         </tr>
 	<tr>
 	  <td></td>
 	  <td>
 	    <table>
 	      <tr class=listheading>
-	        <th class=listheading>|.$locale->text('Rate').qq| %</th>
-		<th class=listheading>|.$locale->text('Amount').qq|</th>
-		<th class=listheading>|.$locale->text('Above').qq|</th>
-		<th class=listheading>|.$locale->text('Below').qq|</th>
+	        <th class=listheading>| . $locale->text('Rate') . qq| %</th>
+		<th class=listheading>| . $locale->text('Amount') . qq|</th>
+		<th class=listheading>| . $locale->text('Above') . qq|</th>
+		<th class=listheading>| . $locale->text('Below') . qq|</th>
 	      </tr>
 |;
 
-  for $i (1 .. $form->{rate_rows}) {
-    print qq|
+    for $i ( 1 .. $form->{rate_rows} ) {
+        print qq|
 	      <tr>
-		<td><input name="rate_$i" size=10 value=|.$form->format_amount(\%myconfig, $form->{"rate_$i"}).qq|></td>
-		<td><input name="amount_$i" size=10 value=|.$form->format_amount(\%myconfig, $form->{"amount_$i"}, 2).qq|></td>
-		<td><input name="above_$i" size=10 value=|.$form->format_amount(\%myconfig, $form->{"above_$i"}, 2).qq|></td>
-		<td><input name="below_$i" size=10 value=|.$form->format_amount(\%myconfig, $form->{"below_$i"}, 2).qq|></td>
+		<td><input name="rate_$i" size=10 value=|
+          . $form->format_amount( \%myconfig, $form->{"rate_$i"} )
+          . qq|></td>
+		<td><input name="amount_$i" size=10 value=|
+          . $form->format_amount( \%myconfig, $form->{"amount_$i"}, 2 )
+          . qq|></td>
+		<td><input name="above_$i" size=10 value=|
+          . $form->format_amount( \%myconfig, $form->{"above_$i"}, 2 )
+          . qq|></td>
+		<td><input name="below_$i" size=10 value=|
+          . $form->format_amount( \%myconfig, $form->{"below_$i"}, 2 )
+          . qq|></td>
 	      </tr>
 |;
-  }
+    }
 
-  print qq|
+    print qq|
 	    </table>
 	  </td>
 	</tr>
@@ -1047,42 +1242,44 @@ sub deduction_header {
     </td>
   </tr>
 |;
-  
-  print qq|
+
+    print qq|
   <tr>
     <td>
       <table>
 |;
 
-  $basedon = $locale->text('Based on');
-  $maximum = $locale->text('Maximum');
-  
-  for $i (1 .. $form->{base_rows}) {
-    print qq|
+    $basedon = $locale->text('Based on');
+    $maximum = $locale->text('Maximum');
+
+    for $i ( 1 .. $form->{base_rows} ) {
+        print qq|
 	<tr>
 	  <th>$basedon</th>
 	  <td><select name="base_$i">$form->{"selectbase_$i"}</select></td>
 	  <th>$maximum</th>
-	  <td><input name="maximum_$i" value=|.$form->format_amount(\%myconfig, $form->{"maximum_$i"}, 2).qq|></td>
+	  <td><input name="maximum_$i" value=|
+          . $form->format_amount( \%myconfig, $form->{"maximum_$i"}, 2 )
+          . qq|></td>
 	</tr>
 |;
-    $basedon = "";
-    $maximum = "";
-  }
+        $basedon = "";
+        $maximum = "";
+    }
 
-  $deductafter = $locale->text('Deduct after');
-  
-  for $i (1 .. $form->{after_rows}) {
-    print qq|
+    $deductafter = $locale->text('Deduct after');
+
+    for $i ( 1 .. $form->{after_rows} ) {
+        print qq|
 	<tr>
 	  <th>$deductafter</th>
 	  <td><select name="after_$i">$form->{"selectafter_$i"}</select></td>
 	</tr>
 |;
-    $deductafter = "";
-  }
+        $deductafter = "";
+    }
 
-  print qq|
+    print qq|
       </table>
     </td>
   </tr>
@@ -1094,11 +1291,9 @@ sub deduction_header {
 
 }
 
-
-
 sub deduction_footer {
 
-  print qq|
+    print qq|
 <input name="id" type="hidden" value="$form->{id}">
 
 <input type="hidden" name="db" value="$form->{db}">
@@ -1111,24 +1306,34 @@ sub deduction_footer {
 
 <br>
 
-<button class="submit" type="submit" name="action" value="update">|.$locale->text("Update").qq|</button>
-<button class="submit" type="submit" name="action" value="save">|.$locale->text("Save").qq|</button>
+<button class="submit" type="submit" name="action" value="update">|
+      . $locale->text("Update")
+      . qq|</button>
+<button class="submit" type="submit" name="action" value="save">|
+      . $locale->text("Save")
+      . qq|</button>
 |;
 
-  if ($form->{id}) {
-    print qq|<button class="submit" type="submit" name="action" value="save_as_new">|.$locale->text('Save as new').qq|</button>\n|;
-    
-    if ($form->{status} eq 'orphaned') {
-      print qq|<button class="submit" type="submit" name="action" value="delete">|.$locale->text('Delete').qq|</button>\n|;
+    if ( $form->{id} ) {
+        print
+qq|<button class="submit" type="submit" name="action" value="save_as_new">|
+          . $locale->text('Save as new')
+          . qq|</button>\n|;
+
+        if ( $form->{status} eq 'orphaned' ) {
+            print
+qq|<button class="submit" type="submit" name="action" value="delete">|
+              . $locale->text('Delete')
+              . qq|</button>\n|;
+        }
     }
-  }
 
-  if ($form->{lynx}) {
-    require "bin/menu.pl";
-    &menubar;
-  }
+    if ( $form->{lynx} ) {
+        require "bin/menu.pl";
+        &menubar;
+    }
 
-  print qq|
+    print qq|
  
   </form>
 
@@ -1138,124 +1343,123 @@ sub deduction_footer {
 
 }
 
-
-sub update { &{ "update_$form->{db}" }; }
-sub save { &{ "save_$form->{db}" } };
-
+sub update { &{"update_$form->{db}"}; }
+sub save   { &{"save_$form->{db}"} }
 
 sub update_deduction {
 
-  # if rate or amount is blank remove row
-  @flds = qw(rate amount above below);
-  $count = 0;
-  @a = ();
-  for $i (1 .. $form->{rate_rows}) {
-    for (@flds) { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) }
-    if ($form->{"rate_$i"} || $form->{"amount_$i"}) {
-      push @a, {};
-      $j = $#a;
-
-      for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
-      $count++;
+    # if rate or amount is blank remove row
+    @flds  = qw(rate amount above below);
+    $count = 0;
+    @a     = ();
+    for $i ( 1 .. $form->{rate_rows} ) {
+        for (@flds) {
+            $form->{"${_}_$i"} =
+              $form->parse_amount( \%myconfig, $form->{"${_}_$i"} );
+        }
+        if ( $form->{"rate_$i"} || $form->{"amount_$i"} ) {
+            push @a, {};
+            $j = $#a;
+
+            for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
+            $count++;
+        }
     }
-  }
-  $form->redo_rows(\@flds, \@a, $count, $form->{rate_rows});
-  $form->{rate_rows} = $count;
-
-
-  @flds = qw(base maximum);
-  $count = 0;
-  @a = ();
-  for $i (1 .. $form->{"base_rows"}) {
-    $form->{"maximum_$i"} = $form->parse_amount(\%myconfig, $form->{"maximum_$i"});
-    if ($form->{"base_$i"}) {
-      push @a, {};
-      $j = $#a;
-
-      for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
-      $count++;
+    $form->redo_rows( \@flds, \@a, $count, $form->{rate_rows} );
+    $form->{rate_rows} = $count;
+
+    @flds  = qw(base maximum);
+    $count = 0;
+    @a     = ();
+    for $i ( 1 .. $form->{"base_rows"} ) {
+        $form->{"maximum_$i"} =
+          $form->parse_amount( \%myconfig, $form->{"maximum_$i"} );
+        if ( $form->{"base_$i"} ) {
+            push @a, {};
+            $j = $#a;
+
+            for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
+            $count++;
+        }
     }
-  }
-  $form->redo_rows(\@flds, \@a, $count, $form->{"base_rows"});
-  $form->{"base_rows"} = $count;
-
-
-  @flds = qw(after);
-  $count = 0;
-  @a = ();
-  for $i (1 .. $form->{"after_rows"}) {
-    if ($form->{"after_$i"}) {
-      push @a, {};
-      $j = $#a;
-
-      for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
-      $count++;
+    $form->redo_rows( \@flds, \@a, $count, $form->{"base_rows"} );
+    $form->{"base_rows"} = $count;
+
+    @flds  = qw(after);
+    $count = 0;
+    @a     = ();
+    for $i ( 1 .. $form->{"after_rows"} ) {
+        if ( $form->{"after_$i"} ) {
+            push @a, {};
+            $j = $#a;
+
+            for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
+            $count++;
+        }
     }
-  }
-  $form->redo_rows(\@flds, \@a, $count, $form->{"after_rows"});
-  $form->{"after_rows"} = $count;
+    $form->redo_rows( \@flds, \@a, $count, $form->{"after_rows"} );
+    $form->{"after_rows"} = $count;
 
-  &deduction_header;
-  &deduction_footer;
+    &deduction_header;
+    &deduction_footer;
 
 }
 
-
 sub update_employee {
 
-  # if rate or amount is blank remove row
-  @flds = qw(before after);
-  $count = 0;
-  @a = ();
-  for $i (1 .. $form->{deduction_rows}) {
-    for (@flds) { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) }
-    if ($form->{"deduction_$i"}) {
-      push @a, {};
-      $j = $#a;
-
-      for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
-      $count++;
+    # if rate or amount is blank remove row
+    @flds  = qw(before after);
+    $count = 0;
+    @a     = ();
+    for $i ( 1 .. $form->{deduction_rows} ) {
+        for (@flds) {
+            $form->{"${_}_$i"} =
+              $form->parse_amount( \%myconfig, $form->{"${_}_$i"} );
+        }
+        if ( $form->{"deduction_$i"} ) {
+            push @a, {};
+            $j = $#a;
+
+            for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
+            $count++;
+        }
     }
-  }
-  $form->redo_rows(\@flds, \@a, $count, $form->{deduction_rows});
-  $form->{deduction_rows} = $count;
+    $form->redo_rows( \@flds, \@a, $count, $form->{deduction_rows} );
+    $form->{deduction_rows} = $count;
 
-  &employee_header;
-  &employee_footer;
+    &employee_header;
+    &employee_footer;
 
 }
- 
 
 sub save_as_new {
 
-  $form->{id} = 0;
-  delete $form->{employeelogin};
+    $form->{id} = 0;
+    delete $form->{employeelogin};
 
-  &save;
+    &save;
 
 }
 
-
 sub save_deduction {
 
-  $form->isblank("description", $locale->text("Description missing!"));
+    $form->isblank( "description", $locale->text("Description missing!") );
 
-  unless ($form->{"rate_1"} || $form->{"amount_1"}) {
-    $form->isblank("rate_1", $locale->text("Rate missing!")) unless $form->{"amount_1"};
-    $form->isblank("amount_1", $locale->text("Amount missing!"));
-  }
-  
-  HR->save_deduction(\%myconfig, \%$form);
-  $form->redirect($locale->text('Deduction saved!'));
-  
-}
+    unless ( $form->{"rate_1"} || $form->{"amount_1"} ) {
+        $form->isblank( "rate_1", $locale->text("Rate missing!") )
+          unless $form->{"amount_1"};
+        $form->isblank( "amount_1", $locale->text("Amount missing!") );
+    }
 
+    HR->save_deduction( \%myconfig, \%$form );
+    $form->redirect( $locale->text('Deduction saved!') );
+
+}
 
 sub delete_deduction {
 
-  HR->delete_deduction(\%myconfig, \%$form);
-  $form->redirect($locale->text('Deduction deleted!'));
-  
-}
+    HR->delete_deduction( \%myconfig, \%$form );
+    $form->redirect( $locale->text('Deduction deleted!') );
 
+}