X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/14de4f7cc44ebf65b4e68c95c3638c3e9d94df7c..cac2ae9bcd47fc55d35c37e25dbb03cd6ac6edeb:/SL/Form.pm diff --git a/SL/Form.pm b/SL/Form.pm index 5fd0e687d..56acec2bf 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -1032,6 +1032,12 @@ sub parse_template { $self->{"myconfig_${_}"} = $myconfig->{$_} for grep { $_ ne 'dbpasswd' } keys %{ $myconfig }; $self->{$_} = $defaults->$_ for qw(co_ustid); $self->{"myconfig_${_}"} = $defaults->$_ for qw(address businessnumber co_ustid company duns sepa_creditor_id taxnumber); + $self->{AUTH} = $::auth; + $self->{INSTANCE_CONF} = $::instance_conf; + $self->{LOCALE} = $::locale; + $self->{LXCONFIG} = $::lx_office_conf; + $self->{LXDEBUG} = $::lxdebug; + $self->{MYCONFIG} = \%::myconfig; $self->{copies} = 1 if (($self->{copies} *= 1) <= 0); @@ -1075,7 +1081,7 @@ sub parse_template { close OUT if $self->{OUT}; - my $copy_to_webdav = $::instance_conf->get_webdav && $::instance_conf->get_webdav_documents && !$self->{preview}; + my $copy_to_webdav = $::instance_conf->get_webdav && $::instance_conf->get_webdav_documents && !$self->{preview} && $self->{tmpdir} && $self->{tmpfile} && $self->{type}; if ($self->{media} eq 'file') { copy(join('/', $self->{cwd}, $userspath, $self->{tmpfile}), $out =~ m|^/| ? $out : join('/', $self->{cwd}, $out)) if $template->uses_temp_file; @@ -1422,7 +1428,7 @@ sub date_closed { $main::lxdebug->enter_sub(); my ($self, $date, $myconfig) = @_; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh; my $query = "SELECT 1 FROM defaults WHERE ? < closedto"; my $sth = prepare_execute_query($self, $dbh, $query, conv_date($date)); @@ -1455,7 +1461,7 @@ sub date_max_future { $main::lxdebug->enter_sub(); my ($self, $date, $myconfig) = @_; - my $dbh = $self->dbconnect($myconfig); + my $dbh = $self->get_standard_dbh; my $query = "SELECT 1 FROM defaults WHERE ? - current_date > max_future_booking_interval"; my $sth = prepare_execute_query($self, $dbh, $query, conv_date($date)); @@ -1944,7 +1950,7 @@ sub get_duedate { : $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"); - my $duedate = $terms->calc_date(reference_date => $reference_date)->to_kivitendo; + my $duedate = $terms ? $terms->calc_date(reference_date => $reference_date)->to_kivitendo : undef; $main::lxdebug->leave_sub();