From: Philip Reetz <p.reetz@linet-services.de>
Date: Sat, 10 Nov 2007 15:05:30 +0000 (+0000)
Subject: Fehler bei neuen Rechnungen ohne Umwandlung
X-Git-Tag: release-2.6.0beta1~417
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a5f409be8c9f981038b94d5e1822185c73ad3949;p=kivitendo-erp.git

Fehler bei neuen Rechnungen ohne Umwandlung
---

diff --git a/SL/IS.pm b/SL/IS.pm
index a24468652..2cf148268 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1513,7 +1513,7 @@ sub get_customer {
   }
 
   my $cid = conv_i($form->{customer_id});
-
+  my $payment_id = ($form->{payment_id}) ? "($form->{payment_id} = pt.id) OR" : "";
   # get customer
   $query =
     qq|SELECT
@@ -1525,7 +1525,7 @@ sub get_customer {
          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 (($form->{payment_id} = pt.id) OR (c.payment_id = pt.id))
+       LEFT JOIN payment_terms pt ON ($payment_id (c.payment_id = pt.id))
        WHERE c.id = ?|;
   push @values, $cid;
   $ref = selectfirst_hashref_query($form, $dbh, $query, @values);