X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=72a36ae5710732a6f660e2cb13f029f119da68f9;hb=b2c8e6aad4973545057c6529445c0f5f6f2a1cbe;hp=f1c9197ee0d30696144d99ad38b793f715344203;hpb=bbc63419b26661a6d5c9bf859dc79cfb63069048;p=kivitendo-erp.git diff --git a/SL/IR.pm b/SL/IR.pm index f1c9197ee..72a36ae57 100644 --- a/SL/IR.pm +++ b/SL/IR.pm @@ -35,6 +35,7 @@ package IR; use SL::AM; +use SL::ARAP; use SL::Common; use SL::DBUtils; use SL::DO; @@ -562,6 +563,11 @@ sub post_invoice { 'to_id' => $form->{id}, ); } + delete $form->{convert_from_do_ids}; + + ARAP->close_orders_if_billed('dbh' => $dbh, + 'arap_id' => $form->{id}, + 'table' => 'ap',); my $rc = 1; if (!$provided_dbh) { @@ -860,7 +866,7 @@ sub get_vendor { } my $query = qq|SELECT - v.name AS vendor, v.creditlimit, v.terms, v.notes AS intnotes, + v.id AS vendor_id, 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,