Merging tax fixes for transactions screens from branches/1.2

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

1 files changed, 6 insertions, 3 deletions

diff --git a/bin/aa.pl b/bin/aa.pl
index 85324570..9e27c2b5 100644
--- a/bin/aa.pl
+++ b/bin/aa.pl
@@ -692,12 +692,14 @@ qq|<td><input name="description_$i" size=40 value="$form->{"description_$i"}"></
 	</tr>
 |;
     }
-
     foreach $item ( split / /, $form->{taxaccounts} ) {
 
+	if($form->{"calctax_$item"}){
+             $form->{invtotal} += $form->{"tax_$item"};
+	}
         $form->{"calctax_$item"} =
           ( $form->{"calctax_$item"} ) ? "checked" : "";
-
+         
         $form->{"tax_$item"} =
           $form->format_amount( \%myconfig, $form->{"tax_$item"}, 2 );
 
@@ -705,7 +707,8 @@ qq|<td><input name="description_$i" size=40 value="$form->{"description_$i"}"></
         <tr>
 	  <td><input name="tax_$item" size=10 value=$form->{"tax_$item"}></td>
 	  <td align=right><input name="calctax_$item" class=checkbox type=checkbox value=1 $form->{"calctax_$item"}></td>
-	  <td><select name="$form->{ARAP}_tax_$item">$form->{"select$form->{ARAP}_tax_$item"}</select></td>
+ 	  <td><select name="$form->{ARAP}_tax_$item">
+ 	<option value="$form->{ARAP}_tax_$item">$item--$form->{"${item}_description"}</option></select></td>
 	</tr>
 |;