From: Jan Büren Date: Wed, 22 Jan 2014 11:48:49 +0000 (+0100) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.1.0beta1~21^2^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/738e3a611167c1b799b5257547d0e89a179dc5e1?hp=e161c8a64cf8e4d5ab9c5779adc4acb7faee1454 Merge branch 'master' of github.com:kivitendo/kivitendo-erp --- diff --git a/SL/Form.pm b/SL/Form.pm index a11b7adb6..eb3565d44 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -1955,8 +1955,8 @@ sub get_duedate { my $terms = $self->{payment_id} ? SL::DB::PaymentTerm->new(id => $self->{payment_id}) ->load : $self->{customer_id} ? SL::DB::Customer ->new(id => $self->{customer_id})->load->payment : $self->{vendor_id} ? SL::DB::Vendor ->new(id => $self->{vendor_id}) ->load->payment - : croak("Missing field in \$::form: payment_id, customer_id or vendor_id"); - + : $self->{invdate} ? undef # no payment terms, therefore invdate == duedate + : croak("Missing field in \$::form: payment_id, customer_id, vendor_id or invdate"); my $duedate = $terms ? $terms->calc_date(reference_date => $reference_date)->to_kivitendo : undef; $main::lxdebug->leave_sub();