X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=106212c772364e41f746472b5dea1fb1d4ff0cfa;hb=15f549fdb43fba2d99817c659533dfa02638bf27;hp=f20d61a41a5c10e38ea26a94a2a56e0ef33018c6;hpb=a4b22a8f008d6431597fa80de26bcb0fa10e8d7b;p=kivitendo-erp.git

diff --git a/SL/AP.pm b/SL/AP.pm
index f20d61a41..106212c77 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -222,14 +222,8 @@ sub post_transaction {
   for $i (1 .. $form->{rowcount}) {
     if ($form->{"amount_$i"} != 0) {
       my $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};
-      }
+      $project_id = conv_i($form->{"project_id_$i"});
+      $taxkey = $form->{AP_amounts}{"amount_$i"}{taxkey};
 
       # insert detail records in acc_trans
       $query =
@@ -239,7 +233,7 @@ sub post_transaction {
         qq|  ?, ?, ?, ?)|;
       @values = ($form->{id}, $form->{AP_amounts}{"amount_$i"},
                  $form->{"amount_$i"}, conv_date($form->{transdate}),
-                 conv_i($project_id), $taxkey);
+                 $project_id, $taxkey);
       do_query($form, $dbh, $query, @values);
 
       if ($form->{"tax_$i"} != 0) {
@@ -251,7 +245,7 @@ sub post_transaction {
           qq|  ?, ?, ?, ?)|;
         @values = ($form->{id}, $form->{AP_amounts}{"tax_$i"},
                    $form->{"tax_$i"}, conv_date($form->{transdate}),
-                   conv_date($project_id), $taxkey);
+                   $project_id, $taxkey);
         do_query($form, $dbh, $query, @values);
       }
 
@@ -260,11 +254,10 @@ sub post_transaction {
 
   # add payables
   $query =
-    qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id) | .
-    qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | .
-    qq|  ?, ?, ?)|;
+    qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate) | .
+    qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?)|;
   @values = ($form->{id}, $form->{AP_amounts}{payables}, $form->{payables},
-             conv_date($form->{transdate}), conv_i($project_id));
+             conv_date($form->{transdate}));
   do_query($form, $dbh, $query, @values);
 
   # if there is no amount but a payment record a payable
@@ -275,6 +268,7 @@ sub post_transaction {
   # add paid transactions
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"} != 0) {
+      my $project_id = conv_i($form->{"paid_project_id_$i"});
 
       $exchangerate = 0;
       if ($form->{currency} eq $form->{defaultcurrency}) {
@@ -307,21 +301,21 @@ sub post_transaction {
                             2);
       if ($form->{payables}) {
         $query =
-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate) | .
-          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?)|;
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id) | .
+          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?)|;
         @values = ($form->{id}, $form->{AP}{payables}, $amount,
-                   conv_date($form->{"datepaid_$i"}));
+                   conv_date($form->{"datepaid_$i"}), $project_id);
         do_query($form, $dbh, $query, @values);
       }
       $form->{payables} = $amount;
 
       # add payment
       $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo) | .
-        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?)|;
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id) | .
+        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?, ?)|;
       @values = ($form->{id}, $form->{AP}{"paid_$i"}, $form->{"paid_$i"},
                  conv_date($form->{"datepaid_$i"}), $form->{"source_$i"},
-                 $form->{"memo_$i"});
+                 $form->{"memo_$i"}, $project_id);
       do_query($form, $dbh, $query, @values);
 
       # add exchange rate difference
@@ -330,10 +324,10 @@ sub post_transaction {
                             ($form->{"exchangerate_$i"} - 1), 2);
       if ($amount != 0) {
         $query =
-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared) | .
-          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 't', 'f')|;
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id) | .
+          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 't', 'f', ?)|;
         @values = ($form->{id}, $form->{AP}{"paid_$i"}, $amount,
-                   conv_date($form->{"datepaid_$i"}));
+                   conv_date($form->{"datepaid_$i"}), $project_id);
         do_query($form, $dbh, $query, @values);
       }
 
@@ -345,11 +339,11 @@ sub post_transaction {
 
       if ($amount != 0) {
         $query =
-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared) | .
-          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 't', 'f')|;
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id) | .
+          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 't', 'f', ?)|;
         @values = ($form->{id}, ($amount > 0) ?
                    $form->{fxgain_accno} : $form->{fxloss_accno},
-                   $amount, conv_date($form->{"datepaid_$i"}));
+                   $amount, conv_date($form->{"datepaid_$i"}), $project_id);
         do_query($form, $dbh, $query, @values);
       }
 
@@ -523,7 +517,7 @@ sub post_payment {
   # connect to database, turn off autocommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  $form->{datepaid} = $form->{invdate};
+  $form->{datepaid} = $form->{transdate};
 
   # total payments, don't move we need it here
   for my $i (1 .. $form->{paidaccounts}) {
@@ -533,17 +527,19 @@ sub post_payment {
   }
 
   $form->{exchangerate} =
-      $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate},
+      $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate},
                               "buy");
 
   my (@values, $query);
 
+  my ($accno_ap) = split(/--/, $form->{APselected});
+
   # record payments and offsetting AP
   for my $i (1 .. $form->{paidaccounts}) {
 
     if ($form->{"paid_$i"} != 0) {
       my ($accno) = split /--/, $form->{"AP_paid_$i"};
-      $form->{"datepaid_$i"} = $form->{invdate}
+      $form->{"datepaid_$i"} = $form->{transdate}
         unless ($form->{"datepaid_$i"});
       $form->{datepaid} = $form->{"datepaid_$i"};
 
@@ -566,21 +562,21 @@ sub post_payment {
         $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"},
                             2) * -1;
 
-
       $query =
         qq|DELETE FROM acc_trans | .
         qq|WHERE trans_id = ? | .
         qq|  AND chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?) | .
         qq|  AND amount = ? AND transdate = ?|;
-      @values = ($form->{id}, $form->{AP}, $amount,
+      @values = ($form->{id}, $accno_ap, $amount,
                  conv_date($form->{"datepaid_$i"}));
       do_query($form, $dbh, $query, @values);
 
       $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate) | .
-        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?)|;
-      @values = ($form->{id}, $form->{AP}, $amount,
-                 conv_date($form->{"datepaid_$i"}));
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id) | .
+        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?)|;
+      @values = ($form->{id}, $accno_ap, $amount,
+                 conv_date($form->{"datepaid_$i"}),
+                 conv_i($form->{"paid_project_id_$i"}));
       do_query($form, $dbh, $query, @values);
 
       $query =
@@ -594,11 +590,12 @@ sub post_payment {
       do_query($form, $dbh, $query, @values);
 
       $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo) | .
-        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?)|;
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id) | .
+        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?, ?)|;
       @values = ($form->{id}, $accno, $form->{"paid_$i"},
                  $form->{"datepaid_$i"},
-                 $form->{"source_$i"}, $form->{"memo_$i"});
+                 $form->{"source_$i"}, $form->{"memo_$i"},
+                 conv_i($form->{"paid_project_id_$i"}));
       do_query($form, $dbh, $query, @values);
 
       # gain/loss