use File::Spec;
use List::MoreUtils qw(apply);
use POSIX ();
+use Encode qw(decode);
use SL::DBUtils;
my $base_path = $ENV{'SCRIPT_NAME'};
$base_path =~ s|[^/]+$||;
if (opendir my $dir, $path) {
- foreach my $file (sort { lc $a cmp lc $b } readdir $dir) {
+ foreach my $file (sort { lc $a cmp lc $b } map { decode("UTF-8", $_) } readdir $dir) {
next if (($file eq '.') || ($file eq '..'));
my $fname = $file;
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);
($path, $number) = ("einkaufslieferscheine", $form->{donumber});
} elsif ($form->{type} eq "credit_note") {
($path, $number) = ("gutschriften", $form->{invnumber});
+ } elsif ($form->{type} eq "letter") {
+ ($path, $number) = ("briefe", $form->{letternumber} );
} elsif ($form->{vc} eq "customer") {
($path, $number) = ("rechnungen", $form->{invnumber});
} elsif ($form->{vc} eq "vendor") {
# checks
foreach my $item (qw(tmpdir tmpfile type)){
next if $form->{$item};
- $::lxdebug->message(LXDebug::WARN(), 'Missing parameter');
+ $::lxdebug->message(LXDebug::WARN(), 'Missing parameter:' . $item);
$::form->error($::locale->text("Missing parameter for WebDAV file copy"));
}
if (! $webdav_folder){
$::lxdebug->leave_sub();
+ $::lxdebug->message(LXDebug::WARN(), 'Cannot check correct WebDAV folder');
$::form->error($::locale->text("Cannot check correct WebDAV folder"));
return undef;
}
$complete_path = File::Spec->catfile($form->{cwd}, $webdav_folder);
+
+ # maybe the path does not exist (automatic printing), see #2446
+ if (!-d $complete_path) {
+ # we need a chdir and restore old dir
+ my $current_dir = POSIX::getcwd();
+ chdir("$form->{cwd}");
+ mkdir_with_parents($webdav_folder);
+ chdir($current_dir);
+ }
+
opendir my $dh, $complete_path or die "Could not open $complete_path: $!";
my ($newest_name, $newest_time);
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");