Order: mehr fehlende Sachen in Doku ergänzt

[kivitendo-erp.git] / SL / Common.pm

diff --git a/SL/Common.pm b/SL/Common.pm
index 82cadbf..f1aa53c 100644 (file)
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -62,7 +62,7 @@ sub retrieve_parts {
     next unless $form->{$_};
 
     $filter .= qq| AND ($_ ILIKE ?)|;
-    push @filter_values, '%' . $form->{$_} . '%';
+    push @filter_values, like($form->{$_});
   }
 
   if ($form->{no_assemblies}) {
@@ -100,80 +100,6 @@ sub retrieve_parts {
   return $parts;
 }
 
-sub retrieve_projects {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form, $order_by, $order_dir) = @_;
-
-  my $dbh = $form->dbconnect($myconfig);
-
-  my (@filter_values, $filter);
-  if ($form->{"projectnumber"}) {
-    $filter .= qq| AND (projectnumber ILIKE ?)|;
-    push(@filter_values, '%' . $form->{"projectnumber"} . '%');
-  }
-  if ($form->{"description"}) {
-    $filter .= qq| AND (description ILIKE ?)|;
-    push(@filter_values, '%' . $form->{"description"} . '%');
-  }
-  substr($filter, 1, 3) = "WHERE" if ($filter);
-
-  $order_by =~ s/[^a-zA-Z_]//g;
-  $order_dir = $order_dir ? "ASC" : "DESC";
-
-  my $query =
-    qq|SELECT id, projectnumber, description | .
-    qq|FROM project $filter | .
-    qq|ORDER BY $order_by $order_dir|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute(@filter_values) || $form->dberror($query . " (" . join(", ", @filter_values) . ")");
-  my $projects = [];
-  while (my $ref = $sth->fetchrow_hashref()) {
-    push(@{$projects}, $ref);
-  }
-  $sth->finish();
-  $dbh->disconnect();
-
-  $main::lxdebug->leave_sub();
-
-  return $projects;
-}
-
-sub retrieve_employees {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form, $order_by, $order_dir) = @_;
-
-  my $dbh = $form->dbconnect($myconfig);
-
-  my (@filter_values, $filter);
-  if ($form->{"name"}) {
-    $filter .= qq| AND (name ILIKE ?)|;
-    push(@filter_values, '%' . $form->{"name"} . '%');
-  }
-  substr($filter, 1, 3) = "WHERE" if ($filter);
-
-  $order_by =~ s/[^a-zA-Z_]//g;
-  $order_dir = $order_dir ? "ASC" : "DESC";
-
-  my $query =
-    qq|SELECT id, name | .
-    qq|FROM employee $filter | .
-    qq|ORDER BY $order_by $order_dir|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute(@filter_values) || $form->dberror($query . " (" . join(", ", @filter_values) . ")");
-  my $employees = [];
-  while (my $ref = $sth->fetchrow_hashref()) {
-    push(@{$employees}, $ref);
-  }
-  $sth->finish();
-  $dbh->disconnect();
-
-  $main::lxdebug->leave_sub();
-
-  return $employees;
-}
-
 sub retrieve_customers_or_vendors {
   $main::lxdebug->enter_sub();
 
@@ -184,7 +110,7 @@ sub retrieve_customers_or_vendors {
   my (@filter_values, $filter);
   if ($form->{"name"}) {
     $filter .= " AND (TABLE.name ILIKE ?)";
-    push(@filter_values, '%' . $form->{"name"} . '%');
+    push(@filter_values, like($form->{"name"}));
   }
   if (!$form->{"obsolete"}) {
     $filter .= " AND NOT TABLE.obsolete";
@@ -247,7 +173,7 @@ sub retrieve_delivery_customer {
   my (@filter_values, $filter);
   if ($form->{"name"}) {
     $filter .= qq| (name ILIKE ?) AND|;
-    push(@filter_values, '%' . $form->{"name"} . '%');
+    push(@filter_values, like($form->{"name"}));
   }
 
   $order_by =~ s/[^a-zA-Z_]//g;
@@ -283,7 +209,7 @@ sub retrieve_vendor {
   my (@filter_values, $filter);
   if ($form->{"name"}) {
     $filter .= qq| (name ILIKE ?) AND|;
-    push(@filter_values, '%' . $form->{"name"} . '%');
+    push(@filter_values, like($form->{"name"}));
   }
 
   $order_by =~ s/[^a-zA-Z_]//g;
@@ -447,6 +373,13 @@ sub get_shipto_by_id {
 
   map { $form->{"${prefix}${_}"} = $ref->{$_} } keys %{ $ref } if $ref;
 
+  my $cvars = CVar->get_custom_variables(
+    dbh      => $dbh,
+    module   => 'ShipTo',
+    trans_id => $shipto_id,
+  );
+  $form->{"${prefix}shiptocvar_$_->{name}"} = $_->{value} for @{ $cvars };
+
   $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
@@ -583,6 +516,8 @@ sub get_webdav_folder {
     ($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") {
@@ -610,7 +545,7 @@ sub copy_file_to_webdav_folder {
   # 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"));
   }
 
@@ -618,11 +553,22 @@ sub copy_file_to_webdav_folder {
 
   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);