Beim Umwandeln von Auftrag in Rechnung wurden die Zahlungsbedingungen des Kunden...

[kivitendo-erp.git] / SL / IS.pm

diff --git a/SL/IS.pm b/SL/IS.pm
index 76825169cf8a62b9d2f5f9e5bf2e1b2be5fe699f..a244686525c630c9f13b6cf4756254c62718ddca 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1518,14 +1518,14 @@ sub get_customer {
   $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.email, c.cc, c.bcc, c.language_id, c.payment_id,
          c.street, c.zipcode, c.city, c.country,
          c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id,
          $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
          b.discount AS tradediscount, b.description AS business
        FROM customer c
        LEFT JOIN business b ON (b.id = c.business_id)
-       LEFT JOIN payment_terms pt ON (c.payment_id = pt.id)
+       LEFT JOIN payment_terms pt ON (($form->{payment_id} = pt.id) OR (c.payment_id = pt.id))
        WHERE c.id = ?|;
   push @values, $cid;
   $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
@@ -1550,23 +1550,6 @@ sub get_customer {
   $ref = selectfirst_hashref_query($form, $dbh, $query, $cid);
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
-  #check whether payment_terms are better than old payment_terms
-  if (($form->{payment_id} ne "") && ($form->{customer_payment_id} ne "")) {
-    $query =
-      qq|SELECT
-          (SELECT ranking FROM payment_terms WHERE id = ?),
-          (SELECT ranking FROM payment_terms WHERE id = ?)|;
-    my ($old_ranking, $new_ranking)
-      = selectrow_query($form, $dbh, $query, conv_i($form->{payment_id}), conv_i($form->{customer_payment_id}));
-    if ($new_ranking > $old_ranking) {
-      $form->{payment_id} = $form->{customer_payment_id};
-    }
-  }
-
-  if ($form->{payment_id} eq "") {
-    $form->{payment_id} = $form->{customer_payment_id};
-  }
-
   $form->{creditremaining} = $form->{creditlimit};
   $query = qq|SELECT SUM(amount - paid) FROM ar WHERE customer_id = ?|;
   my ($value) = selectrow_query($form, $dbh, $query, $cid);
@@ -1755,19 +1738,6 @@ sub retrieve_item {
       }
     }
 
-    #check whether payment_terms are better than old payment_terms
-    if (($form->{payment_id} ne "") && ($form->{part_payment_id} ne "")) {
-      $query =
-        qq|SELECT
-            (SELECT ranking FROM payment_terms WHERE id = ?),
-            (SELECT ranking FROM payment_terms WHERE id = ?)|;
-      my ($old_ranking, $new_ranking)
-        = selectrow_query($form, $dbh, $query, conv_i($form->{payment_id}), conv_i($form->{part_payment_id}));
-      if ($new_ranking > $old_ranking) {
-        $form->{payment_id} = $form->{customer_payment_id};
-      }
-    }
-
     if ($form->{payment_id} eq "") {
       $form->{payment_id} = $form->{part_payment_id};
     }