X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=e909890f83760f5672308d2017e14a495cf86a81;hb=72539cb39a3d19f930a8e0e41e46bf41afe9a8f1;hp=971573992064e7eb1f58700cb211de5dd74b1cf4;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/SL/AP.pm b/SL/AP.pm
index 971573992..e909890f8 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -32,7 +32,6 @@
 #
 #======================================================================
 
-
 package AP;
 
 sub post_transaction {
@@ -42,24 +41,40 @@ sub post_transaction {
 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
-  
+
   my ($null, $taxrate, $amount);
   my $exchangerate = 0;
-  
+
   ($null, $form->{department_id}) = split(/--/, $form->{department});
   $form->{department_id} *= 1;
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;
   } else {
-    $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'sell');
+    $exchangerate =
+      $form->check_exchangerate($myconfig, $form->{currency},
+                                $form->{transdate}, 'sell');
+
+    $form->{exchangerate} =
+      ($exchangerate)
+      ? $exchangerate
+      : $form->parse_amount($myconfig, $form->{exchangerate});
+  }
 
-    $form->{exchangerate} = ($exchangerate) ? $exchangerate : $form->parse_amount($myconfig, $form->{exchangerate});
+  for $i (1 .. $form->{rowcount}) {
+    $form->{AP_amounts}{"amount_$i"} =
+      (split(/--/, $form->{"AP_amount_$i"}))[0];
   }
+  ($form->{AP_amounts}{payables}) = split(/--/, $form->{APselected});
+  ($form->{AP}{payables})         = split(/--/, $form->{APselected});
 
   # reverse and parse amounts
-  for my $i (1 .. 1) {
-    $form->{"amount_$i"} = $form->round_amount($form->parse_amount($myconfig, $form->{"amount_$i"}) * $form->{exchangerate} * -1, 2);
+  for my $i (1 .. $form->{rowcount}) {
+    $form->{"amount_$i"} =
+      $form->round_amount(
+                         $form->parse_amount($myconfig, $form->{"amount_$i"}) *
+                           $form->{exchangerate} * -1,
+                         2);
     $amount += ($form->{"amount_$i"} * -1);
   }
 
@@ -68,70 +83,65 @@ sub post_transaction {
 
   # taxincluded doesn't make sense if there is no amount
   $form->{taxincluded} = 0 if ($form->{amount} == 0);
-  
-  $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->{AP}{"tax"}, $form->{taxrate}) =  $sth->fetchrow_array;
-  $sth->finish;
-  
-  $formtax = $form->parse_amount($myconfig, $form->{"tax"});
-  
-  $form->{"tax"} = $form->{amount} * $form->{taxrate};
-  $form->{"tax"} = $form->round_amount($form->{"tax"} * $form->{exchangerate}, 2) * -1;
-  
-  if ($form->{taxcheck}) {
-    $form->{"tax"} = $formtax * -1;
+
+  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_$i"}|;
+    $sth = $dbh->prepare($query);
+    $sth->execute || $form->dberror($query);
+    ($form->{AP_amounts}{"tax_$i"}, $form->{"taxrate_$i"}) =
+      $sth->fetchrow_array;
+    $form->{AP_amounts}{"tax_$i"}{taxkey}    = $form->{"taxkey_$i"};
+    $form->{AP_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));
+        $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->{netamount} += $form->{"amount_$i"};
+      }
+    }
+    $form->{total_tax} += $form->{"tax_$i"} * -1;
   }
-  
-  $form->{total_tax} += ($form->{"tax"} * -1);
-  
- 
 
   # adjust paidaccounts if there is no date in the last row
   $form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
-  
+
   $form->{invpaid} = 0;
+  $form->{netamount} *= -1;
+
   # add payments
   for my $i (1 .. $form->{paidaccounts}) {
-    $form->{"paid_$i"} = $form->round_amount($form->parse_amount($myconfig, $form->{"paid_$i"}), 2);
-    
+    $form->{"paid_$i"} =
+      $form->round_amount($form->parse_amount($myconfig, $form->{"paid_$i"}),
+                          2);
+
     $form->{invpaid} += $form->{"paid_$i"};
     $form->{datepaid} = $form->{"datepaid_$i"};
 
   }
-  
-  $form->{invpaid} = $form->round_amount($form->{invpaid} * $form->{exchangerate}, 2);
-  
-  if ($form->{taxincluded} *= 1) {
-    for $i (1 .. 1) {
-      $tax = $form->{"amount_$i"} - ( $form->{"amount_$i"} / ($form->{taxrate} + 1)) ;
-      if ($form->{taxcheck}) {
-       $tax = $formtax *- 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} * -1;
-    }
-    print (STDERR "Steuer $form->{tax}\n");
-    print (STDERR "TotalSteuer $form->{total_tax}\n");
-    # deduct taxes from amount
-    # $form->{amount} -= $form->{total_tax};
-    # deduct difference from amount_1
-    # $form->{amount_1} += $form->round_amount($diff, 2);
-    $form->{amount} = $form->{amount_1} * -1;
-  }
 
-  $form->{netamount} = $form->{amount};
-  
+  $form->{invpaid} =
+    $form->round_amount($form->{invpaid} * $form->{exchangerate}, 2);
+
   # store invoice total, this goes into ap table
-  $form->{invtotal} = $form->{amount} + $form->{total_tax};
-  
+  $form->{invtotal} = $form->{netamount} + $form->{total_tax};
+
   # amount for total AP
   $form->{payables} = $form->{invtotal};
- 
 
   my ($query, $sth);
 
@@ -142,19 +152,19 @@ sub post_transaction {
     $query = qq|DELETE FROM acc_trans WHERE trans_id = $form->{id}|;
 
     $dbh->do($query) || $form->dberror($query);
-    
+
   } else {
-    my $uid = rand().time;
+    my $uid = rand() . time;
 
     $uid .= $form->{login};
 
-    $uid = substr($uid,2,75);
+    $uid = substr($uid, 2, 75);
 
     $query = qq|INSERT INTO ap (invnumber, employee_id)
                 VALUES ('$uid', (SELECT e.id FROM employee e
 		                 WHERE e.login = '$form->{login}') )|;
     $dbh->do($query) || $form->dberror($query);
-    
+
     $query = qq|SELECT a.id FROM ap a
                 WHERE a.invnumber = '$uid'|;
     $sth = $dbh->prepare($query);
@@ -162,14 +172,14 @@ sub post_transaction {
 
     ($form->{id}) = $sth->fetchrow_array;
     $sth->finish;
-   
+
   }
 
   $form->{invnumber} = $form->{id} unless $form->{invnumber};
-  
+
   # escape '
   map { $form->{$_} =~ s/\'/\'\'/g } qw(invnumber ordnumber notes);
-    
+
   $form->{datepaid} = $form->{transdate} unless ($form->{datepaid});
   my $datepaid = ($form->{invpaid} != 0) ? qq|'$form->{datepaid}'| : 'NULL';
 
@@ -191,74 +201,107 @@ sub post_transaction {
 	     |;
   $dbh->do($query) || $form->dberror($query);
 
-
   # update exchangerate
   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-    $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, 0, $form->{exchangerate});
+    $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, 0,
+                               $form->{exchangerate});
   }
 
   # add individual transactions
-  foreach my $item (keys %{ $form->{AP} }) {
-    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->{AP_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->{AP}{$item}'),
-		  $form->{$item}, '$form->{transdate}', $project_id, '$form->{taxkey}')|;
+                                         WHERE c.accno = '$form->{AP_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->{AP_amounts}{"tax_$i"}'),
+                    $form->{"tax_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
+        $dbh->do($query) || $form->dberror($query);
+      }
+
     }
   }
 
+  # add payables
+  $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->{AP_amounts}{payables}'),
+              $form->{payables}, '$form->{transdate}', $project_id)|;
+  $dbh->do($query) || $form->dberror($query);
+
   # if there is no amount but a payment record a payable
   if ($form->{amount} == 0 && $form->{invtotal} == 0) {
     $form->{payables} = $form->{invpaid};
   }
- 
+
   # add paid transactions
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"} != 0) {
 
       $exchangerate = 0;
       if ($form->{currency} eq $form->{defaultcurrency}) {
-	$form->{"exchangerate_$i"} = 1;
+        $form->{"exchangerate_$i"} = 1;
       } else {
-	$exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell');
-
-	$form->{"exchangerate_$i"} = ($exchangerate) ? $exchangerate : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
+        $exchangerate =
+          $form->check_exchangerate($myconfig, $form->{currency},
+                                    $form->{"datepaid_$i"}, 'sell');
+
+        $form->{"exchangerate_$i"} =
+          ($exchangerate)
+          ? $exchangerate
+          : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
       }
       $form->{"AP_paid_$i"} =~ s/\"//g;
+
       # get paid account
 
       ($form->{AP}{"paid_$i"}) = split(/--/, $form->{"AP_paid_$i"});
-      $form->{"datepaid_$i"} = $form->{transdate} unless ($form->{"datepaid_$i"});
+      $form->{"datepaid_$i"} = $form->{transdate}
+        unless ($form->{"datepaid_$i"});
 
       # if there is no amount and invtotal is zero there is no exchangerate
       if ($form->{amount} == 0 && $form->{invtotal} == 0) {
-	$form->{exchangerate} = $form->{"exchangerate_$i"};
+        $form->{exchangerate} = $form->{"exchangerate_$i"};
       }
-      
-      $amount = $form->round_amount($form->{"paid_$i"} * $form->{exchangerate} * -1, 2);
+
+      $amount =
+        $form->round_amount($form->{"paid_$i"} * $form->{exchangerate} * -1,
+                            2);
       if ($form->{payables}) {
-	$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
+        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
 		    transdate)
 		    VALUES ($form->{id},
 		           (SELECT c.id FROM chart c
 			    WHERE c.accno = '$form->{AP}{payables}'),
 		    $amount, '$form->{"datepaid_$i"}')|;
-	$dbh->do($query) || $form->dberror($query);
+        $dbh->do($query) || $form->dberror($query);
       }
       $form->{payables} = $amount;
 
       $form->{"memo_$i"} =~ s/\'/\'\'/g;
+
       # add payment
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
                   transdate, source, memo)
@@ -268,40 +311,49 @@ sub post_transaction {
 		  $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
 		  '$form->{"source_$i"}', '$form->{"memo_$i"}')|;
       $dbh->do($query) || $form->dberror($query);
-      
+
       # add exchange rate difference
-      $amount = $form->round_amount($form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1), 2);
+      $amount =
+        $form->round_amount(
+                         $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1),
+                         2);
       if ($amount != 0) {
-	$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
+        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
 		    transdate, fx_transaction, cleared)
 		    VALUES ($form->{id},
 		           (SELECT c.id FROM chart c
 			    WHERE c.accno = '$form->{AP}{"paid_$i"}'),
 		    $amount, '$form->{"datepaid_$i"}', '1', '0')|;
 
-	$dbh->do($query) || $form->dberror($query);
+        $dbh->do($query) || $form->dberror($query);
       }
 
       # exchangerate gain/loss
-      $amount = $form->round_amount($form->{"paid_$i"} * ($form->{exchangerate} - $form->{"exchangerate_$i"}), 2);
+      $amount =
+        $form->round_amount(
+                        $form->{"paid_$i"} *
+                          ($form->{exchangerate} - $form->{"exchangerate_$i"}),
+                        2);
 
       if ($amount != 0) {
-	$accno = ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno};
-	$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
+        $accno = ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno};
+        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
 		    transdate, fx_transaction, cleared)
 		    VALUES ($form->{id}, (SELECT c.id FROM chart c
 					  WHERE c.accno = '$accno'),
 		    $amount, '$form->{"datepaid_$i"}', '1', '0')|;
-	$dbh->do($query) || $form->dberror($query);
+        $dbh->do($query) || $form->dberror($query);
       }
 
       # update exchange rate record
       if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-	$form->update_exchangerate($dbh, $form->{currency}, $form->{"datepaid_$i"}, 0, $form->{"exchangerate_$i"});
+        $form->update_exchangerate($dbh, $form->{currency},
+                                   $form->{"datepaid_$i"},
+                                   0, $form->{"exchangerate_$i"});
       }
     }
   }
-  
+
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
@@ -310,9 +362,6 @@ sub post_transaction {
   return $rc;
 }
 
-
-
-
 sub delete_transaction {
   $main::lxdebug->enter_sub();
 
@@ -326,7 +375,7 @@ sub delete_transaction {
 
   $query = qq|DELETE FROM acc_trans WHERE trans_id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -336,9 +385,6 @@ sub delete_transaction {
   return $rc;
 }
 
-
-
-
 sub ap_transactions {
   $main::lxdebug->enter_sub();
 
@@ -355,7 +401,7 @@ sub ap_transactions {
 	      LEFT JOIN employee e ON (a.employee_id = e.id)|;
 
   my $where = "1 = 1";
-  
+
   if ($form->{vendor_id}) {
     $where .= " AND a.vendor_id = $form->{vendor_id}";
   } else {
@@ -381,19 +427,21 @@ sub ap_transactions {
     $where .= " AND lower(a.notes) LIKE '$notes'";
   }
 
-  $where .= " AND a.transdate >= '$form->{transdatefrom}'" if $form->{transdatefrom};
-  $where .= " AND a.transdate <= '$form->{transdateto}'" if $form->{transdateto};
+  $where .= " AND a.transdate >= '$form->{transdatefrom}'"
+    if $form->{transdatefrom};
+  $where .= " AND a.transdate <= '$form->{transdateto}'"
+    if $form->{transdateto};
   if ($form->{open} || $form->{closed}) {
     unless ($form->{open} && $form->{closed}) {
       $where .= " AND a.amount <> a.paid" if ($form->{open});
-      $where .= " AND a.amount = a.paid" if ($form->{closed});
+      $where .= " AND a.amount = a.paid"  if ($form->{closed});
     }
   }
 
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $self->{l_employee};
   my $sortorder = join ', ', $form->sort_columns(@a);
-  $sortorder = $form->{sort} unless $sortorder;
+  $sortorder = $form->{sort} if $form->{sort};
 
   $query .= "WHERE $where
              ORDER by $sortorder";
@@ -404,13 +452,12 @@ sub ap_transactions {
   while (my $ap = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $form->{AP} }, $ap;
   }
-  
+
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
 1;