Bugfix: Auftragssuche: Bei niedrigen vclimit muss nach projectNUMMER und nicht nach...

Fix für Bug 1108

diff --git a/SL/OE.pm b/SL/OE.pm
index df634afb2115f32ee72880cda65d458de4a6b47c..f5f439fce4f37b31e5440d6e5ca1da8059408107 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -111,7 +111,18 @@ sub transactions {
       qq|AND ((globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM orderitems oi | .
       qq|   WHERE oi.project_id = ? AND oi.trans_id = o.id))|;
       qq|AND ((globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM orderitems oi | .
       qq|   WHERE oi.project_id = ? AND oi.trans_id = o.id))|;

-    push(@values, $form->{"project_id"}, $form->{"project_id"});
+    push(@values, conv_i($form->{"project_id"}), conv_i($form->{"project_id"}));
+  }
+
+  if ($form->{"projectnumber"}) {
+    $query .= <<SQL;
+      AND (pr.projectnumber ILIKE ?) OR EXISTS (
+        SELECT * FROM orderitems oi
+        LEFT JOIN project proi ON proi.id = oi.project_id
+        WHERE proi.projectnumber ILIKE ? AND oi.trans_id = o.id
+      )
+SQL
+    push @values, "%" . $form->{"projectnumber"} . "%", "%" . $form->{"projectnumber"} . "%" ;

   }
 
   if ($form->{"${vc}_id"}) {
   }
 
   if ($form->{"${vc}_id"}) {

diff --git a/templates/webpages/oe/search_de.html b/templates/webpages/oe/search_de.html
index 946e678a6fe0e083b0ee4055d043252afb701bed..0358b0b011c0a6ade59d62c5fcb9918aac27abf4 100644 (file)
--- a/templates/webpages/oe/search_de.html
+++ b/templates/webpages/oe/search_de.html
@@ -87,7 +87,7 @@
      <th align="right">Projektnummer</th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
      <th align="right">Projektnummer</th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'

-                 name          = 'project_id',
+                 name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',

                  style         = "width: 250px",
                  DATA          =  ALL_PROJECTS,
                  id_key        = 'id',
                  style         = "width: 250px",
                  DATA          =  ALL_PROJECTS,
                  id_key        = 'id',

diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
index 705bf71cdc483a596f7b631cc4d19472a711afa9..32d766f7418727f1f2174626abca59e672cdcb5e 100644 (file)
--- a/templates/webpages/oe/search_master.html
+++ b/templates/webpages/oe/search_master.html
@@ -87,7 +87,7 @@
      <th align="right"><translate>Project Number</translate></th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
      <th align="right"><translate>Project Number</translate></th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'

-                 name          = 'project_id',
+                 name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',

                  style         = "width: 250px",
                  DATA          =  ALL_PROJECTS,
                  id_key        = 'id',
                  style         = "width: 250px",
                  DATA          =  ALL_PROJECTS,
                  id_key        = 'id',