Lieferscheinbericht: Suchmöglichkeit nach Seriennummer

diff --git a/SL/DO.pm b/SL/DO.pm
index 15f1c8d0825c1f4b3ef97c5c4a806585c7f40179..7d3a5e61d902c7c16238a4b8b56b848d10cc0dfc 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -130,6 +130,11 @@ sub transactions {
     push @where, ($form->{delivered} ? "" : "NOT ") . "COALESCE(dord.delivered, FALSE)";
   }
 
     push @where, ($form->{delivered} ? "" : "NOT ") . "COALESCE(dord.delivered, FALSE)";
   }
 

+  if ($form->{serialnumber}) {
+    push @where, 'dord.id IN (SELECT doi.delivery_order_id FROM delivery_order_items doi WHERE doi.serialnumber LIKE ?)';
+    push @values, '%' . $form->{serialnumber} . '%';
+  }
+

   if($form->{transdatefrom}) {
     push @where,  qq|dord.transdate >= ?|;
     push @values, conv_date($form->{transdatefrom});
   if($form->{transdatefrom}) {
     push @where,  qq|dord.transdate >= ?|;
     push @values, conv_date($form->{transdatefrom});

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index ae804c8f6c500ef2f6c5b71b9b5a99f3bdfd3948..e40c6727c264e7ec6eda318cc3e59a66dd6cc3aa 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -507,7 +507,7 @@ sub orders {
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   my @hidden_variables = map { "l_${_}" } @columns;
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   my @hidden_variables = map { "l_${_}" } @columns;

-  push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber
+  push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber chargenumber

                                           transaction_description transdatefrom transdateto type vc employee_id salesman_id project_id);
 
   my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
                                           transaction_description transdatefrom transdateto type vc employee_id salesman_id project_id);
 
   my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);


@@ -565,6 +565,7 @@ sub orders {
   if ($form->{ordnumber}) {
     push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
   }
   if ($form->{ordnumber}) {
     push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
   }

+  push @options, $locale->text('Serial Number') . " : $form->{serialnumber}" if $form->{serialnumber};

   if ($form->{transaction_description}) {
     push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
   }
   if ($form->{transaction_description}) {
     push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
   }

diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
index 5bc2a192b771c766a56ca43ab81b4c3443f748cc..1f7dda684f776153a51ef1dc0c6acfe563e4d46f 100644 (file)
--- a/templates/webpages/do/search.html
+++ b/templates/webpages/do/search.html
@@ -98,6 +98,11 @@
      </td>
     </tr>
 
      </td>
     </tr>
 

+    <tr>
+     <th align="right">[% 'Serial Number' | $T8 %]</th>
+     <td colspan="3"><input name="serialnumber" class="fixed_width"></td>
+    </tr>
+

     <tr>
      <th align="right">[% 'From' | $T8 %]</th>
      <td>
     <tr>
      <th align="right">[% 'From' | $T8 %]</th>
      <td>