X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIR.pm;h=936cc98fedea0c3eaed86ceca0fb8aeaf292bdd6;hb=af59820cb06ba396ba10ecd88f43a92c331a6066;hp=f3c2674b05d493f3fd3791a66bc69f1753038a8c;hpb=94e11003809e9090514026a733e58e72e636a6bb;p=kivitendo-erp.git diff --git a/SL/IR.pm b/SL/IR.pm index f3c2674b0..936cc98fe 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) { @@ -1277,4 +1283,42 @@ sub post_payment { return $rc; } +sub get_duedate { + $main::lxdebug->enter_sub(); + + my $self = shift; + my %params = @_; + + if (!$params{vendor_id} || !$params{invdate}) { + $main::lxdebug->leave_sub(); + return $params{default}; + } + + my $myconfig = \%main::myconfig; + my $form = $main::form; + + my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig); + + my $query = qq|SELECT ?::date + pt.terms_netto + FROM vendor v + LEFT JOIN payment_terms pt ON (pt.id = v.payment_id) + WHERE v.id = ?|; + + my ($sth, $duedate); + + if (($sth = $dbh->prepare($query)) && $sth->execute($params{invdate}, conv_i($params{vendor_id}))) { + ($duedate) = $sth->fetchrow_array(); + $sth->finish(); + } else { + $dbh->rollback(); + } + + $duedate ||= $params{default}; + + $main::lxdebug->leave_sub(); + + return $duedate; +} + + 1;