X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=9a6ca9ddc67dc13fced51e1b261e018b295bf252;hb=a143b82a56e889cfda60c2d42fe7d0bdaf73aa83;hp=2a74e0612b12c654f873935cb679aecb8433670f;hpb=7b825818e1875b623243daaef4ed436e5bbfb1ff;p=kivitendo-erp.git diff --git a/SL/IR.pm b/SL/IR.pm index 2a74e0612..9a6ca9ddc 100644 --- a/SL/IR.pm +++ b/SL/IR.pm @@ -995,7 +995,7 @@ sub get_vendor { $form->{vendor_id} *= 1; # get vendor - my $query = qq|SELECT v.name AS vendor, v.creditlimit, v.terms, + my $query = qq|SELECT v.name AS vendor, v.creditlimit, v.terms, v.notes AS intnotes, v.email, v.cc, v.bcc, v.language_id, v.payment_id, v.street, v.zipcode, v.city, v.country, v.taxzone_id, $duedate + COALESCE(pt.terms_netto, 0) AS duedate, @@ -1013,13 +1013,15 @@ sub get_vendor { $query = qq|SELECT o.amount, (SELECT e.sell FROM exchangerate e - WHERE e.curr = o.curr AND e.transdate = o.transdate) + WHERE e.curr = o.curr AND e.transdate = o.transdate) AS exch FROM oe o WHERE o.vendor_id = ? AND o.quotation = '0' AND o.closed = '0'|; - while (my ($amount, $exch) = selectfirst_array_query($form, $dbh, $query, $form->{vendor_id})) { + my $sth = prepare_execute_query($form, $dbh, $query, $form->{vendor_id}); + while (my ($amount, $exch) = $sth->fetchrow_array()) { $exch = 1 unless $exch; $form->{creditremaining} -= $amount * $exch; } + $sth->finish(); # get shipto if we do not convert an order or invoice if (!$form->{shipto}) {