Merging bugfixes from current branches/1.2

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

1 files changed, 12 insertions, 8 deletions

diff --git a/bin/is.pl b/bin/is.pl
index 5d5c880f..ac2235d6 100644
--- a/bin/is.pl
+++ b/bin/is.pl
@@ -539,20 +539,20 @@ qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</texta
     }
 
     if ( !$form->{taxincluded} ) {
-
         my @taxes = Tax::init_taxes( $form, $form->{taxaccounts} );
-        $form->{invtotal} +=
-          Tax::calculate_taxes( \@taxes, $form, $form->{invsubtotal}, 0 );
         foreach $item (@taxes) {
             my $taccno = $item->account;
+	    $form->{invtotal} += $form->round_amount( 
+                $form->{"${taccno}_rate"} * $form->{"${taccno}_base"}, 2);
             $form->{"${taccno}_total"} =
-              $form->format_amount( \%myconfig, $item->value, 2 );
+              $form->format_amount( \%myconfig,
+                $form->{"${taccno}_rate"} * $form->{"${taccno}_base"}, 2 );
             $tax .= qq|
         <tr>
       	<th align=right>$form->{"${taccno}_description"}</th>
       	<td align=right>$form->{"${taccno}_total"}</td>
         </tr>
-	| if $item->value;
+	| if $form->{"${taccno}_base"};
         }
 
         $form->{invsubtotal} =
@@ -777,12 +777,15 @@ qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></t
                 for ( "update", "ship_to", "print", "e_mail", "post",
                     "schedule" )
                 {
-                    $a{$_} = 1;
+                    $allowed{$_} = 1;
                 }
                 $a{'print_and_post'} = 1 if ${LedgerSMB::Sysconfig::latex};
 
+                for ( keys %button ) { delete $button{$_} if !$allowed{$_} }
+            }
+            elsif ($closedto) {
+                %button = ();
             }
-            for ( keys %button ) { delete $button{$_} if !$a{$_} }
         }
 
         for ( sort { $button{$a}->{ndx} <=> $button{$b}->{ndx} } keys %button )
@@ -988,7 +991,8 @@ sub update {
                 }
                 if ( !$form->{taxincluded} ) {
                     my @taxes =
-                      Tax::init_taxes( $form, $form->{"taxaccounts_$i"} );
+                      Tax::init_taxes( $form, $form->{"taxaccounts_$i"},
+                        $form->{taxaccounts} );
                     $amount +=
                       Tax::calculate_taxes( \@taxes, $form, $amount, 0 );
                 }