X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIS.pm;h=cd860ae31491d277f03cf9cb91e29877fa4526c8;hb=9d047497dcea5258e2fab7eb2cbe8606a74f27e0;hp=3ccda5675d840950551ab731d4f6f131f1b55ee8;hpb=e0f7d45d9b5934471fdb2b5d70e74a60f9e86982;p=kivitendo-erp.git

diff --git a/SL/IS.pm b/SL/IS.pm
index 3ccda5675..cd860ae31 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -920,23 +920,25 @@ sub post_invoice {
   
         if ($form->{amount}{ $form->{id} }{ $form->{AR} } != 0) {
           $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                      transdate, project_id)
+                      transdate, taxkey, project_id)
                       VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                          WHERE c.accno = '$form->{AR}'),
-                      $amount, '$form->{"datepaid_$i"}', ?)|;
-          do_query($form, $dbh, $query, $project_id);
+                                          WHERE c.accno = ?),
+                      $amount, '$form->{"datepaid_$i"}',
+                      (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+          do_query($form, $dbh, $query, $form->{AR}, $form->{AR}, $project_id);
         }
   
         # record payment
         $form->{"paid_$i"} *= -1;
   
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                    source, memo, project_id)
+                    source, memo, taxkey, project_id)
                     VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                        WHERE c.accno = '$accno'),
+                                        WHERE c.accno = ?),
                     $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
-                    '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
-        do_query($form, $dbh, $query, $project_id);
+                    '$form->{"source_$i"}', '$form->{"memo_$i"}',
+                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        do_query($form, $dbh, $query, $accno, $accno, $project_id);
   
         # exchangerate difference
         $form->{fx}{$accno}{ $form->{"datepaid_$i"} } +=
@@ -976,12 +978,13 @@ sub post_invoice {
         ) {
 
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-	            transdate, cleared, fx_transaction, project_id)
+	            transdate, cleared, fx_transaction, taxkey, project_id)
 		    VALUES ($form->{id},
 		           (SELECT c.id FROM chart c
-		            WHERE c.accno = '$accno'),
-		    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
-        do_query($form, $dbh, $query, $project_id);
+		            WHERE c.accno = ?),
+		    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1',
+                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        do_query($form, $dbh, $query, $accno, $accno, $project_id);
       }
     }
   }
@@ -1681,10 +1684,11 @@ sub get_customer {
   my $query = qq|SELECT c.name AS customer, c.discount, c.creditlimit, c.terms,
                  c.email, c.cc, c.bcc, c.language_id, c.payment_id AS customer_payment_id,
 		 c.street, c.zipcode, c.city, c.country,
-	         $duedate + c.terms AS duedate, c.notes AS intnotes,
+	         $duedate + COALESCE(pt.terms_netto, 0) AS duedate, c.notes AS intnotes,
 		 b.discount AS tradediscount, b.description AS business, c.klass as customer_klass, c.taxzone_id
                  FROM customer c
 		 LEFT JOIN business b ON (b.id = c.business_id)
+                 LEFT JOIN payment_terms pt ON c.payment_id = pt.id
 	         WHERE c.id = $form->{customer_id}|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);