From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 16 Mar 2007 13:50:40 +0000 (+0000)
Subject: Einkaufs-/Verkaufsmasken: Da es das Zahlungsziel in den Masken nicht mehr gibt, müsse... 
X-Git-Tag: release-2.4.3^2~605
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7db43b70c4f9d19cd07f0159e1ac1b454630623f;p=kivitendo-erp.git

Einkaufs-/Verkaufsmasken: Da es das Zahlungsziel in den Masken nicht mehr gibt, müssen zur Berechnung des voreingestellten Fälligkeitsdatums die beim Kunden/Lieferanten eingestellten Zahlungskonditionen benutzt werden.
---

diff --git a/SL/IR.pm b/SL/IR.pm
index 5533a2775..9ddc48634 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -996,10 +996,11 @@ sub get_vendor {
   my $query = qq|SELECT v.name AS vendor, v.creditlimit, v.terms,
                  v.email, v.cc, v.bcc, v.language_id, v.payment_id,
 		 v.street, v.zipcode, v.city, v.country, v.taxzone_id,
-                 $duedate + v.terms AS duedate,
+                 $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
                  b.description AS business
                  FROM vendor v
                  LEFT JOIN business b ON b.id = v.business_id
+                 LEFT JOIN payment_terms pt ON v.payment_id = pt.id
 	         WHERE v.id = $form->{vendor_id}|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
diff --git a/SL/IS.pm b/SL/IS.pm
index 3ccda5675..dd3eaf428 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1681,11 +1681,15 @@ 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}|;
+  $query =~ s/[\n\t]/ /g;
+  $query =~ s/ +/ /g;
+  $main::lxdebug->message(1, "qq $query");
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);