X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a34c05f386bc2abb45a097dcb4d68e8ab2f5af94..52b6788d553612645ff597bc6b5a2b7620901204:/SL/IR.pm diff --git a/SL/IR.pm b/SL/IR.pm index 6cd555669..17dcaf388 100644 --- a/SL/IR.pm +++ b/SL/IR.pm @@ -371,7 +371,7 @@ sub post_invoice { CVar->get_non_editable_ic_cvars(form => $form, dbh => $dbh, - row => $i, + row => $i, sub_module => 'invoice', may_converted_from => ['delivery_order_items', 'orderitems', 'invoice']); @@ -1135,7 +1135,7 @@ sub get_vendor { v.email, v.cc, v.bcc, v.language_id, v.payment_id, v.delivery_term_id, v.street, v.zipcode, v.city, v.country, v.taxzone_id, cu.name AS curr, v.direct_debit, $duedate + COALESCE(pt.terms_netto, 0) AS duedate, - b.description AS business + b.discount AS tradediscount, 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)