oe.pl: Schnellsuche analog zu all:substr:multi::ilike

diff --git a/SL/OE.pm b/SL/OE.pm
index 4599443180abe803a66267c31c07d0bd20eab84c..1c812e24f57548c934478f9bd7f80893fa84caf3 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -50,6 +50,7 @@ use SL::DBUtils;
 use SL::HTML::Restrict;
 use SL::IC;
 use SL::TransNumber;
 use SL::HTML::Restrict;
 use SL::IC;
 use SL::TransNumber;

+use Text::ParseWords;

 
 use strict;
 
 
 use strict;
 


@@ -285,6 +286,18 @@ SQL
     push @values, conv_date($form->{expected_billing_date_to});
   }
 
     push @values, conv_date($form->{expected_billing_date_to});
   }
 

+  if ($form->{all}) {
+    my @tokens = parse_line('\s+', 0, $form->{all});
+    # ordnumber quonumber customer.name vendor.name transaction_description
+    $query .= qq| AND (
+      o.ordnumber ILIKE ? OR
+      o.quonumber ILIKE ? OR
+      ct.name     ILIKE ? OR
+      o.transaction_description ILIKE ?
+    )| for @tokens;
+    push @values, ("%$_%")x4 for @tokens;
+  }
+

   my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'CT',
                                                             'trans_id_field' => 'ct.id',
                                                             'filter'         => $form,
   my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'CT',
                                                             'trans_id_field' => 'ct.id',
                                                             'filter'         => $form,

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 4c29292aacad229d1966e9ccaf04d197d4de57d7..ed13848c29ca163e426c27bc138bd8a10ff1eb9c 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -984,6 +984,7 @@ sub orders {
   push @options, $locale->text('Customer Order Number')   . " : $form->{cusordnumber}"                    if $form->{cusordnumber};
   push @options, $locale->text('Notes')                   . " : $form->{notes}"                           if $form->{notes};
   push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"         if $form->{transaction_description};
   push @options, $locale->text('Customer Order Number')   . " : $form->{cusordnumber}"                    if $form->{cusordnumber};
   push @options, $locale->text('Notes')                   . " : $form->{notes}"                           if $form->{notes};
   push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"         if $form->{transaction_description};

+  push @options, $locale->text('Quick Search')            . " : $form->{all}"                             if $form->{all};

   push @options, $locale->text('Shipping Point')          . " : $form->{shippingpoint}"                   if $form->{shippingpoint};
   if ( $form->{transdatefrom} or $form->{transdateto} ) {
     push @options, $locale->text('Order Date');
   push @options, $locale->text('Shipping Point')          . " : $form->{shippingpoint}"                   if $form->{shippingpoint};
   if ( $form->{transdatefrom} or $form->{transdateto} ) {
     push @options, $locale->text('Order Date');

diff --git a/locale/de/all b/locale/de/all
index de2c7f2e3a3bb86da6b40478202e429b3e802855..93374b3a95dd87561621f07a776482b3b243711f 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2187,6 +2187,7 @@ $self->{texts} = {
   'Quarterly'                   => 'quartalsweise',
   'Query Type'                  => 'Art der Abfrage',
   'Queue'                       => 'Warteschlange',
   'Quarterly'                   => 'quartalsweise',
   'Query Type'                  => 'Art der Abfrage',
   'Queue'                       => 'Warteschlange',

+  'Quick Search'                => 'Schnellsuche',

   'Quick Searches that will be shown in the header in this client' => 'Schnellsuchen, die in der Kopfzeile in diesem Mandanten gezeigt werden sollen',
   'Quotation'                   => 'Angebot',
   'Quotation Date'              => 'Angebotsdatum',
   'Quick Searches that will be shown in the header in this client' => 'Schnellsuchen, die in der Kopfzeile in diesem Mandanten gezeigt werden sollen',
   'Quotation'                   => 'Angebot',
   'Quotation Date'              => 'Angebotsdatum',