X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/82ee22347be2f2ee96d09a9fd0b45710f9552582..f921dcbbe1ea7ac327f37270af3a16ac52b9ff86:/SL/AR.pm

diff --git a/SL/AR.pm b/SL/AR.pm
index 75dc0264b..a6b0f42d3 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -55,10 +55,11 @@ sub post_transaction {
                                 $form->{transdate}, 'buy');
   }
   for $i (1 .. $form->{rowcount}) {
-    $form->{AR_amounts}{"amount_$i"} = (split(/--/, $form->{"AR_amount_$i"}))[0];
+    $form->{AR_amounts}{"amount_$i"} =
+      (split(/--/, $form->{"AR_amount_$i"}))[0];
   }
   ($form->{AR_amounts}{receivables}) = split(/--/, $form->{ARselected});
-  ($form->{AR}{receivables}) = split(/--/, $form->{ARselected});
+  ($form->{AR}{receivables})         = split(/--/, $form->{ARselected});
 
   $form->{exchangerate} =
     ($exchangerate)
@@ -85,28 +86,33 @@ sub post_transaction {
 
   $form->{taxincluded} = 0 if ($form->{amount} == 0);
   for $i (1 .. $form->{rowcount}) {
-    ($form->{"taxkey_$i"},      $NULL)         = split /--/, $form->{"taxchart_$i"};
+    ($form->{"taxkey_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
 
     $query =
       qq| SELECT c.accno, t.rate FROM chart c, tax t where c.id=t.chart_id AND t.taxkey=$form->{"taxkey_$i"}|;
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
-    ($form->{AR_amounts}{"tax_$i"}, $form->{"taxrate_$i"}) = $sth->fetchrow_array;
-    $form->{AR_amounts}{"tax_$i"}{taxkey} = $form->{"taxkey_$i"};
+    ($form->{AR_amounts}{"tax_$i"}, $form->{"taxrate_$i"}) =
+      $sth->fetchrow_array;
+    $form->{AR_amounts}{"tax_$i"}{taxkey}    = $form->{"taxkey_$i"};
     $form->{AR_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
 
     $sth->finish;
     if (!$form->{"korrektur_$i"}) {
       if ($form->{taxincluded} *= 1) {
-        $tax = $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
+        $tax =
+          $form->{"amount_$i"} -
+          ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
         $amount = $form->{"amount_$i"} - $tax;
         $form->{"amount_$i"} = $form->round_amount($amount, 2);
         $diff += $amount - $form->{"amount_$i"};
         $form->{"tax_$i"} = $form->round_amount($tax, 2);
         $form->{netamount} += $form->{"amount_$i"};
+      } else {
+        $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
+        $form->{"tax_$i"} =
+          $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
       }
-      $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
-      $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
     }
     $form->{total_tax} += $form->{"tax_$i"};
   }
@@ -223,9 +229,11 @@ sub post_transaction {
 		                        WHERE c.accno = '$form->{AR_amounts}{"amount_$i"}'),
 		  $form->{"amount_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
       $dbh->do($query) || $form->dberror($query);
-      if ($form->{"tax_$i"} !=0) {
+      if ($form->{"tax_$i"} != 0) {
+
         # insert detail records in acc_trans
-        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
                                           project_id, taxkey)
                     VALUES ($form->{id}, (SELECT c.id FROM chart c
                                           WHERE c.accno = '$form->{AR_amounts}{"tax_$i"}'),
@@ -234,6 +242,7 @@ sub post_transaction {
       }
     }
   }
+
   # add recievables
   $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
                                       project_id)
@@ -242,7 +251,6 @@ sub post_transaction {
               $form->{receivables}, '$form->{transdate}', $project_id)|;
   $dbh->do($query) || $form->dberror($query);
 
-
   # add paid transactions
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"} != 0) {