X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=75dc0264b0b14f4af529eba60d3756f889685a23;hb=456a81dd3b5ccd8b4a48ea166d465ca2b9fb5b6b;hp=c059f2a76e082e1901b96583d1bdce78ec59957e;hpb=41250b507beff4ad9f5ca76c24e7bd7a4cdb8713;p=kivitendo-erp.git

diff --git a/SL/AR.pm b/SL/AR.pm
index c059f2a76..75dc0264b 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -34,6 +34,8 @@
 
 package AR;
 
+use Data::Dumper;
+
 sub post_transaction {
   $main::lxdebug->enter_sub();
 
@@ -52,13 +54,18 @@ sub post_transaction {
       $form->check_exchangerate($myconfig, $form->{currency},
                                 $form->{transdate}, 'buy');
   }
+  for $i (1 .. $form->{rowcount}) {
+    $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->{exchangerate} =
     ($exchangerate)
     ? $exchangerate
     : $form->parse_amount($myconfig, $form->{exchangerate});
 
-  for $i (1 .. 1) {
+  for $i (1 .. $form->{rowcount}) {
 
     $form->{"amount_$i"} =
       $form->round_amount($form->parse_amount($myconfig, $form->{"amount_$i"})
@@ -77,17 +84,32 @@ sub post_transaction {
   # taxincluded doesn't make sense if there is no amount
 
   $form->{taxincluded} = 0 if ($form->{amount} == 0);
+  for $i (1 .. $form->{rowcount}) {
+    ($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}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-  ($form->{AR}{tax}, $form->{taxrate}) = $sth->fetchrow_array;
-  $sth->finish;
+    $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}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
 
-  $form->{tax} = $form->{amount_1} * $form->{taxrate};
-  $form->{tax} = $form->round_amount($form->{tax} * $form->{exchangerate}, 2);
-  $form->{total_tax} += $form->{tax};
+    $sth->finish;
+    if (!$form->{"korrektur_$i"}) {
+      if ($form->{taxincluded} *= 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"};
+      }
+      $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"};
+  }
 
   # adjust paidaccounts if there is no date in the last row
   $form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
@@ -104,23 +126,6 @@ sub post_transaction {
 
   }
 
-  if ($form->{taxincluded} *= 1) {
-    for $i (1 .. 1) {
-      $tax =
-        $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{taxrate} + 1));
-      $amount = $form->{"amount_$i"} - $tax;
-      $form->{"amount_$i"} = $form->round_amount($amount, 2);
-      $diff += $amount - $form->{"amount_$i"};
-      $form->{tax} = $form->round_amount($tax, 2);
-      $form->{total_tax} = $form->{tax};
-    }
-
-    # deduct difference from amount_1
-    # $form->{amount_1} += $form->round_amount($diff, 2);
-    $form->{netamount} = $form->{amount_1};
-
-  }
-
   $form->{amount} = $form->{netamount} + $form->{total_tax};
   $form->{paid}   =
     $form->round_amount($form->{paid} * $form->{exchangerate}, 2);
@@ -199,24 +204,44 @@ sub post_transaction {
   }
 
   # add individual transactions for AR, amount and taxes
-  foreach my $item (keys %{ $form->{AR} }) {
-    if ($form->{$item} != 0) {
+  for $i (1 .. $form->{rowcount}) {
+    if ($form->{"amount_$i"} != 0) {
       $project_id = 'NULL';
-      if ($item =~ /amount_/) {
-        if ($form->{"project_id_$'"} && $form->{"projectnumber_$'"}) {
-          $project_id = $form->{"project_id_$'"};
+      if ("amount_$i" =~ /amount_/) {
+        if ($form->{"project_id_$i"} && $form->{"projectnumber_$i"}) {
+          $project_id = $form->{"project_id_$i"};
         }
       }
+      if ("amount_$i" =~ /amount/) {
+        $taxkey = $form->{AR_amounts}{"amount_$i"}{taxkey};
+      }
 
       # insert detail records in acc_trans
       $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}{$item}'),
-		  $form->{$item}, '$form->{transdate}', $project_id, '$form->{taxkey}')|;
+		                        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) {
+        # insert detail records in acc_trans
+        $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"}'),
+                    $form->{"tax_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
+        $dbh->do($query) || $form->dberror($query);
+      }
     }
   }
+  # add recievables
+  $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
+                                      project_id)
+              VALUES ($form->{id}, (SELECT c.id FROM chart c
+                                    WHERE c.accno = '$form->{AR_amounts}{receivables}'),
+              $form->{receivables}, '$form->{transdate}', $project_id)|;
+  $dbh->do($query) || $form->dberror($query);
+
 
   # add paid transactions
   for my $i (1 .. $form->{paidaccounts}) {