X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=fe2196df1cf8a681bc6af88aad48483006005483;hb=6bb6ba1b037fb61f1628b976738ecc244e6d9bad;hp=43b9aaab7e5c1f550e67b03d3c402b40a8aaffbe;hpb=900dff5fd67e8ffd81beef6c2c83d155682c17fd;p=kivitendo-erp.git

diff --git a/SL/Common.pm b/SL/Common.pm
index 43b9aaab7..fe2196df1 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -29,6 +29,7 @@ use vars qw(@db_encodings %db_encoding_to_charset);
 );
 
 %db_encoding_to_charset = map { $_->{dbencoding}, $_->{charset} } @db_encodings;
+%charset_to_db_encoding = map { $_->{charset}, $_->{dbencoding} } @db_encodings;
 
 use constant DEFAULT_CHARSET => 'ISO-8859-15';
 
@@ -49,14 +50,28 @@ sub retrieve_parts {
   my $dbh = $form->dbconnect($myconfig);
 
   my (@filter_values, $filter);
-  if ($form->{"partnumber"}) {
-    $filter .= qq| AND (partnumber ILIKE ?)|;
-    push(@filter_values, '%' . $form->{"partnumber"} . '%');
+
+  foreach (qw(partnumber description)) {
+    next unless $form->{$_};
+
+    $filter .= qq| AND ($_ ILIKE ?)|;
+    push @filter_values, '%' . $form->{$_} . '%';
   }
-  if ($form->{"description"}) {
-    $filter .= qq| AND (description ILIKE ?)|;
-    push(@filter_values, '%' . $form->{"description"} . '%');
+
+  if ($form->{no_assemblies}) {
+    $filter .= qq| AND (NOT COALESCE(assembly, 'f'))|;
   }
+  if ($form->{assemblies}) {
+    $filter .= qq| AND assembly='t'|;		# alles was assembly ist rausgeben erweiterung für bin/mozilla/wh.pl -> transfer_assembly_update_part 
+# eigentlich möchte ich diesen filter abbilden: 
+# select distinct partnumber  from parts inner join assembly on (parts.id = assembly.id) where assembly='t';
+# und so common ist die anweisung gar nicht. wie wäre es mit auslagern in WH.pm? -> get_all_working_assemblies? jb 21.2.2009
+  }
+
+  if ($form->{no_services}) {
+    $filter .= qq| AND (COALESCE(inventory_accno_id, 0) > 0)|;
+  }
+
   substr($filter, 1, 3) = "WHERE" if ($filter);
 
   $order_by =~ s/[^a-zA-Z_]//g;
@@ -154,6 +169,69 @@ sub retrieve_employees {
   return $employees;
 }
 
+sub retrieve_customers_or_vendors {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $order_by, $order_dir, $is_vendor, $allow_both) = @_;
+
+  my $dbh = $form->dbconnect($myconfig);
+
+  my (@filter_values, $filter);
+  if ($form->{"name"}) {
+    $filter .= " AND (TABLE.name ILIKE ?)";
+    push(@filter_values, '%' . $form->{"name"} . '%');
+  }
+  if (!$form->{"obsolete"}) {
+    $filter .= " AND NOT TABLE.obsolete";
+  }
+  substr($filter, 1, 3) = "WHERE" if ($filter);
+
+  $order_by =~ s/[^a-zA-Z_]//g;
+  $order_dir = $order_dir ? "ASC" : "DESC";
+
+  my (@queries, @query_parameters);
+
+  if ($allow_both || !$is_vendor) {
+    my $c_filter = $filter;
+    $c_filter =~ s/TABLE/c/g;
+    push(@queries, qq|SELECT
+                        c.id, c.name, 0 AS customer_is_vendor,
+                        c.street, c.zipcode, c.city,
+                        ct.cp_greeting, ct.cp_title, ct.cp_givenname, ct.cp_name
+                      FROM customer c
+                      LEFT JOIN contacts ct ON (c.id = ct.cp_cv_id)
+                      $c_filter|);
+    push(@query_parameters, @filter_values);
+  }
+
+  if ($allow_both || $is_vendor) {
+    my $v_filter = $filter;
+    $v_filter =~ s/TABLE/v/g;
+    push(@queries, qq|SELECT
+                        v.id, v.name, 1 AS customer_is_vendor,
+                        v.street, v.zipcode, v.city,
+                        ct.cp_greeting, ct.cp_title, ct.cp_givenname, ct.cp_name
+                      FROM vendor v
+                      LEFT JOIN contacts ct ON (v.id = ct.cp_cv_id)
+                      $v_filter|);
+    push(@query_parameters, @filter_values);
+  }
+
+  my $query = join(" UNION ", @queries) . " ORDER BY $order_by $order_dir";
+  my $sth = $dbh->prepare($query);
+  $sth->execute(@query_parameters) || $form->dberror($query . " (" . join(", ", @query_parameters) . ")");
+  my $customers = [];
+  while (my $ref = $sth->fetchrow_hashref()) {
+    push(@{$customers}, $ref);
+  }
+  $sth->finish();
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+
+  return $customers;
+}
+
 sub retrieve_delivery_customer {
   $main::lxdebug->enter_sub();
 
@@ -291,8 +369,8 @@ sub webdav_folder {
     my $base_path = substr($ENV{'SCRIPT_NAME'}, 1);
     $base_path =~ s|[^/]+$||;
     $base_path =~ s|/$||;
-
-    if (opendir $dir, $path) {
+    # wo kommt der wert für dir her? es wird doch gar nichts übergeben? fix für strict my $dir jb 21.2.
+    if (opendir my $dir, $path) {
       foreach my $file (sort { lc $a cmp lc $b } readdir $dir) {
         next if (($file eq '.') || ($file eq '..'));
 
@@ -439,9 +517,48 @@ sub check_params {
   my $params = shift;
 
   foreach my $key (@_) {
-    if (!defined $params->{$key}) {
+    if ((ref $key eq '') && !defined $params->{$key}) {
+      my $subroutine = (caller(1))[3];
+      $main::form->error($main::locale->text("Missing parameter #1 in call to sub #2.", $key, $subroutine));
+
+    } elsif (ref $key eq 'ARRAY') {
+      my $found = 0;
+      foreach my $subkey (@{ $key }) {
+        if (defined $params->{$subkey}) {
+          $found = 1;
+          last;
+        }
+      }
+
+      if (!$found) {
+        my $subroutine = (caller(1))[3];
+        $main::form->error($main::locale->text("Missing parameter (at least one of #1) in call to sub #2.", join(', ', @{ $key }), $subroutine));
+      }
+    }
+  }
+}
+
+sub check_params_x {
+  my $params = shift;
+
+  foreach my $key (@_) {
+    if ((ref $key eq '') && !exists $params->{$key}) {
       my $subroutine = (caller(1))[3];
       $main::form->error($main::locale->text("Missing parameter #1 in call to sub #2.", $key, $subroutine));
+
+    } elsif (ref $key eq 'ARRAY') {
+      my $found = 0;
+      foreach my $subkey (@{ $key }) {
+        if (exists $params->{$subkey}) {
+          $found = 1;
+          last;
+        }
+      }
+
+      if (!$found) {
+        my $subroutine = (caller(1))[3];
+        $main::form->error($main::locale->text("Missing parameter (at least one of #1) in call to sub #2.", join(', ', @{ $key }), $subroutine));
+      }
     }
   }
 }