X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FCommon.pm;h=82cadbfaf702366cc766c5968f28d952c214ebd0;hb=fde1df0bd4e3da82104727925ef68c4360247e5f;hp=d6260251eb0040b8bb436660277ae52bec79833d;hpb=ac84f80b460db32e6a989a250b3fc1093680fe9a;p=kivitendo-erp.git

diff --git a/SL/Common.pm b/SL/Common.pm
index d6260251e..82cadbfaf 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -397,11 +397,13 @@ sub get_vc_details {
          vc.*,
          pt.description AS payment_terms,
          b.description AS business,
-         l.description AS language
+         l.description AS language,
+         dt.description AS delivery_terms
        FROM ${vc} vc
        LEFT JOIN payment_terms pt ON (vc.payment_id = pt.id)
        LEFT JOIN business b ON (vc.business_id = b.id)
        LEFT JOIN language l ON (vc.language_id = l.id)
+       LEFT JOIN delivery_terms dt ON (vc.delivery_term_id = dt.id)
        WHERE vc.id = ?|;
   my $ref = selectfirst_hashref_query($form, $dbh, $query, $vc_id);
 
@@ -645,7 +647,7 @@ sub copy_file_to_webdav_folder {
 
   my $timestamp =  get_current_formatted_time();
   my $new_file  =  File::Spec->catfile($form->{cwd}, $webdav_folder, $form->generate_attachment_filename());
-  $new_file     =~ s/\./$timestamp\./;
+  $new_file =~ s{(.*)\.}{$1$timestamp\.};
 
   if (!File::Copy::copy($current_file, $new_file)) {
     $::lxdebug->message(LXDebug::WARN(), "Copy file from $current_file to $new_file failed: $ERRNO");