Authentifizierung: Unterstützung für HTTP Basic Authentication RFC 7617

[mfinanz.git] / SL / DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index 3dde867c24d51f53d418f137d9153215c0a66e24..6a9195332db9b08b8896837dde5908690da09211 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -36,6 +36,7 @@ package DO;
 
 use Carp;
 use List::Util qw(max);
+use Text::ParseWords;
 use YAML;
 
 use SL::AM;
@@ -211,6 +212,17 @@ SQL
     push @values, like($form->{parts_description});
   }
 
+  if ($form->{all}) {
+    my @tokens = parse_line('\s+', 0, $form->{all});
+    # ordnumber quonumber customer.name vendor.name transaction_description
+    push @where, <<SQL for @tokens;
+      (   (dord.donumber                ILIKE ?)
+       OR (ct.name                      ILIKE ?)
+       OR (dord.transaction_description ILIKE ?))
+SQL
+    push @values, (like($_))x3 for @tokens;
+  }
+
   if (@where) {
     $query .= " WHERE " . join(" AND ", map { "($_)" } @where);
   }
@@ -1011,7 +1023,7 @@ sub order_details {
       push @{ $form->{TEMPLATE_ARRAYS}{si_unit}[$si_position-1] },          $si->{unit};
     }
 
-    if ($form->{"assembly_$i"}) {
+    if ($form->{"part_type_$i"} eq 'assembly') {
       $sameitem = "";
 
       # get parts and push them onto the stack
@@ -1073,21 +1085,6 @@ sub order_details {
   $main::lxdebug->leave_sub();
 }
 
-sub project_description {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $dbh, $id) = @_;
-
-  my $form     =  $main::form;
-
-  my $query = qq|SELECT description FROM project WHERE id = ?|;
-  my ($value) = selectrow_query($form, $dbh, $query, $id);
-
-  $main::lxdebug->leave_sub();
-
-  return $value;
-}
-
 sub unpack_stock_information {
   $main::lxdebug->enter_sub();