X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=fe687ee8652e9a534b3717750f24ea3ca85d31d3;hb=311a645bc3b3a74052c7c0565afaad77961102a8;hp=2ca402907cb2ab10d0e30a9689f7bd99289b69fd;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/SL/AR.pm b/SL/AR.pm
index 2ca402907..fe687ee86 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -34,6 +34,7 @@
 
 package AR;
 
+use Data::Dumper;
 
 sub post_transaction {
   $main::lxdebug->enter_sub();
@@ -43,101 +44,134 @@ sub post_transaction {
   my ($null, $taxrate, $amount, $tax, $diff);
   my $exchangerate = 0;
   my $i;
-  
+
   my $dbh = $form->dbconnect_noauto($myconfig);
-  
+
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;
   } else {
-    $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'buy');
+    $exchangerate =
+      $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->{exchangerate} = ($exchangerate) ? $exchangerate : $form->parse_amount($myconfig, $form->{exchangerate}); 
+  ($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 .. $form->{rowcount}) {
+
+    $form->{"amount_$i"} =
+      $form->round_amount($form->parse_amount($myconfig, $form->{"amount_$i"})
+                            * $form->{exchangerate},
+                          2);
 
- 
-  for $i (1 .. 1) {
-    
-    $form->{"amount_$i"} = $form->round_amount($form->parse_amount($myconfig, $form->{"amount_$i"}) * $form->{exchangerate}, 2);
-    
     $form->{netamount} += $form->{"amount_$i"};
+
+    # parse tax_$i for later
+    $form->{"tax_$i"} = $form->parse_amount($myconfig, $form->{"tax_$i"});
   }
+
   # this is for ar
-  
-  $form->{amount} = $form->{netamount}; 
-  
-  $form->{tax}=0;
+
+  $form->{amount} = $form->{netamount};
+
+  $form->{tax}       = 0;
+  $form->{netamount} = 0;
+  $form->{total_tax} = 0;
+
   # 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->{AR}{tax}, $form->{taxrate}) =  $sth->fetchrow_array;
-  $sth->finish;
-  
-  $form->{tax} = $form->{amount_1} * $form->{taxrate};
-  $form->{tax} = $form->round_amount($form->{tax} * $form->{exchangerate}, 2);
-  $form->{total_tax} += $form->{tax};
-  
-  # adjust paidaccounts if there is no date in the last row
-  $form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
-  $form->{paid} = 0;
-  # add payments
-  for $i (1 .. $form->{paidaccounts}) {
-    $form->{"paid_$i"} = $form->round_amount($form->parse_amount($myconfig, $form->{"paid_$i"}), 2);
-    
-    $form->{paid} += $form->{"paid_$i"};
-    $form->{datepaid} = $form->{"datepaid_$i"};
-
-  }
+  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->{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"};
 
-  if ($form->{taxincluded} *= 1) {
-    for $i (1 .. 1) {
-      $tax = $form->{"amount_$i"} - ( $form->{"amount_$i"} / ($form->{taxrate} + 1)) ;
+    $sth->finish;
+    if ($form->{taxincluded} *= 1) {
+      if (!$form->{"korrektur_$i"}) {
+      $tax =
+        $form->{"amount_$i"} -
+        ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
+      } else {
+        $tax = $form->{"tax_$i"};
+      }
       $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};
+      $form->{"tax_$i"} = $form->round_amount($tax, 2);
+      $form->{netamount} += $form->{"amount_$i"};
+    } else {
+      if (!$form->{"korrektur_$i"}) {
+        $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"};
+  }
 
-    # deduct difference from amount_1
-    # $form->{amount_1} += $form->round_amount($diff, 2);
-    $form->{netamount} = $form->{amount_1};
+  # adjust paidaccounts if there is no date in the last row
+  $form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
+  $form->{paid} = 0;
+
+  # add payments
+  for $i (1 .. $form->{paidaccounts}) {
+    $form->{"paid_$i"} =
+      $form->round_amount($form->parse_amount($myconfig, $form->{"paid_$i"}),
+                          2);
+
+    $form->{paid} += $form->{"paid_$i"};
+    $form->{datepaid} = $form->{"datepaid_$i"};
 
   }
 
   $form->{amount} = $form->{netamount} + $form->{total_tax};
-  $form->{paid} = $form->round_amount($form->{paid} * $form->{exchangerate}, 2);
-  
+  $form->{paid}   =
+    $form->round_amount($form->{paid} * $form->{exchangerate}, 2);
 
   my ($query, $sth, $null);
-  
+
   ($null, $form->{employee_id}) = split /--/, $form->{employee};
   unless ($form->{employee_id}) {
-    $form->get_employee($dbh); 
+    $form->get_employee($dbh);
   }
-  
+
   # if we have an id delete old records
   if ($form->{id}) {
 
     # delete detail records
     $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 ar (invnumber, employee_id)
                 VALUES ('$uid', $form->{employee_id})|;
     $dbh->do($query) || $form->dberror($query);
-    
+
     $query = qq|SELECT a.id FROM ar a
                 WHERE a.invnumber = '$uid'|;
     $sth = $dbh->prepare($query);
@@ -148,7 +182,6 @@ sub post_transaction {
 
   }
 
-  
   # update department
   ($null, $form->{department_id}) = split(/--/, $form->{department});
   $form->{department_id} *= 1;
@@ -178,124 +211,161 @@ sub post_transaction {
 	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
 
-  
   # amount for AR account
   $form->{receivables} = $form->round_amount($form->{amount}, 2) * -1;
 
-
   # update exchangerate
   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-    $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0);
+    $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate},
+                               $form->{exchangerate}, 0);
   }
+
   # 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}) {
     if ($form->{"paid_$i"} != 0) {
-      
+
       $form->{"AR_paid_$i"} =~ s/\"//g;
       ($form->{AR}{"paid_$i"}) = split(/--/, $form->{"AR_paid_$i"});
-      $form->{"datepaid_$i"} = $form->{transdate} unless ($form->{"datepaid_$i"});
-     
+      $form->{"datepaid_$i"} = $form->{transdate}
+        unless ($form->{"datepaid_$i"});
+
       $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"}, 'buy');
-	
-	$form->{"exchangerate_$i"} = ($exchangerate) ? $exchangerate : $form->parse_amount($myconfig, $form->{"exchangerate_$i"}); 
+        $exchangerate =
+          $form->check_exchangerate($myconfig, $form->{currency},
+                                    $form->{"datepaid_$i"}, 'buy');
+
+        $form->{"exchangerate_$i"} =
+          ($exchangerate)
+          ? $exchangerate
+          : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
       }
-      
-     
+
       # if there is no amount and invtotal is zero there is no exchangerate
       if ($form->{amount} == 0 && $form->{netamount} == 0) {
-	$form->{exchangerate} = $form->{"exchangerate_$i"};
+        $form->{exchangerate} = $form->{"exchangerate_$i"};
       }
-      
+
       # receivables amount
-      $amount = $form->round_amount($form->{"paid_$i"} * $form->{exchangerate}, 2);
-      
+      $amount =
+        $form->round_amount($form->{"paid_$i"} * $form->{exchangerate}, 2);
+
       if ($form->{receivables} != 0) {
-	# add receivable
-	$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
+
+        # add receivable
+        $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->{AR}{receivables}'),
 		    $amount, '$form->{"datepaid_$i"}')|;
-	$dbh->do($query) || $form->dberror($query);
+        $dbh->do($query) || $form->dberror($query);
       }
       $form->{receivables} = $amount;
-      
+
       $form->{"memo_$i"} =~ s/\'/\'\'/g;
 
       if ($form->{"paid_$i"} != 0) {
-	# add payment
-	$amount = $form->{"paid_$i"} * -1;
-	$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
+
+        # add payment
+        $amount = $form->{"paid_$i"} * -1;
+        $query  = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
 		    transdate, source, memo)
 		    VALUES ($form->{id},
 			   (SELECT c.id FROM chart c
 			    WHERE c.accno = '$form->{AR}{"paid_$i"}'),
 		    $amount, '$form->{"datepaid_$i"}',
 		    '$form->{"source_$i"}', '$form->{"memo_$i"}')|;
-	$dbh->do($query) || $form->dberror($query);
-	
-	
-	# exchangerate difference for payment
-	$amount = $form->round_amount($form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1) * -1, 2);
-	  
-	if ($amount != 0) {
-	  $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
+        $dbh->do($query) || $form->dberror($query);
+
+        # exchangerate difference for payment
+        $amount =
+          $form->round_amount(
+                    $form->{"paid_$i"} * ($form->{"exchangerate_$i"} - 1) * -1,
+                    2);
+
+        if ($amount != 0) {
+          $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->{AR}{"paid_$i"}'),
 		      $amount, '$form->{"datepaid_$i"}', '1', '0')|;
-	  $dbh->do($query) || $form->dberror($query);
-	}
-	  
-	# exchangerate gain/loss
-	$amount = $form->round_amount($form->{"paid_$i"} * ($form->{exchangerate} - $form->{"exchangerate_$i"}) * -1, 2);
-	
-	if ($amount != 0) {
-	  $accno = ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno};
-	  $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
+          $dbh->do($query) || $form->dberror($query);
+        }
+
+        # exchangerate gain/loss
+        $amount =
+          $form->round_amount(
+                   $form->{"paid_$i"} *
+                     ($form->{exchangerate} - $form->{"exchangerate_$i"}) * -1,
+                   2);
+
+        if ($amount != 0) {
+          $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 exchangerate record
       if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-	$form->update_exchangerate($dbh, $form->{currency}, $form->{"datepaid_$i"}, $form->{"exchangerate_$i"}, 0);
+        $form->update_exchangerate($dbh, $form->{currency},
+                                   $form->{"datepaid_$i"},
+                                   $form->{"exchangerate_$i"}, 0);
       }
     }
   }
 
- 
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
@@ -304,8 +374,6 @@ sub post_transaction {
   return $rc;
 }
 
-
-
 sub delete_transaction {
   $main::lxdebug->enter_sub();
 
@@ -319,18 +387,16 @@ sub delete_transaction {
 
   $query = qq|DELETE FROM acc_trans WHERE trans_id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   # commit
   my $rc = $dbh->commit;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 
   return $rc;
 }
 
-
-
 sub ar_transactions {
   $main::lxdebug->enter_sub();
 
@@ -347,7 +413,7 @@ sub ar_transactions {
 	         FROM ar a
 	      JOIN customer c ON (a.customer_id = c.id)
 	      LEFT JOIN employee e ON (a.employee_id = e.id)|;
-	      
+
   my $where = "1 = 1";
   if ($form->{customer_id}) {
     $where .= " AND a.customer_id = $form->{customer_id}";
@@ -373,37 +439,38 @@ sub ar_transactions {
     my $notes = $form->like(lc $form->{notes});
     $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->{open});
+      $where .= " AND a.amount = a.paid"  if ($form->{closed});
     }
   }
 
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $form->{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";
-  
+
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
   while (my $ar = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $form->{AR} }, $ar;
   }
-  
+
   $sth->finish;
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 1;