Warengruppe als Dropdown bei Stammdaten/Berichte/Waren

diff --git a/SL/IC.pm b/SL/IC.pm
index ee92278113ad60a171de30a2842fda31af3c0792..c07227f547654b405102dcce51c288c651920a2e 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -911,6 +911,12 @@ sub all_parts {
     }
   }
 
     }
   }
 

+  if ($form->{"partsgroup_id"}) {
+    $form->{"l_partsgroup"} = '1'; # show the column
+    push @where_tokens, "pg.id = ?";
+    push @bind_vars, $form->{"partsgroup_id"};
+  }
+

   foreach (@like_filters) {
     next unless $form->{$_};
     $form->{"l_$_"} = '1'; # show the column
   foreach (@like_filters) {
     next unless $form->{$_};
     $form->{"l_$_"} = '1'; # show the column

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 20a9206128a761d88dab17c22e0697190f5ce11b..2b35c70878e29324f4ba76bdc4059a63e15064d1 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -115,8 +115,10 @@ sub search {
 
   $form->header;
 
 
   $form->header;
 

+  $form->get_lists('partsgroup'    => 'ALL_PARTSGROUPS');

   print $form->parse_html_template('ic/search', { %is_xyz,
   print $form->parse_html_template('ic/search', { %is_xyz,

-                                                  dateformat => $myconfig{dateformat}, });
+                                                  dateformat => $myconfig{dateformat}, 
+                                                  limit => $myconfig{vclimit}, });

 
   $lxdebug->leave_sub();
 }    #end search()
 
   $lxdebug->leave_sub();
 }    #end search()


@@ -1103,6 +1105,13 @@ sub generate_report {
     no_sn_joins  => [ qw(bought sold) ],
   );
 
     no_sn_joins  => [ qw(bought sold) ],
   );
 

+  # get name of partsgroup if id is given
+  my $pg_name;
+  if ($form->{partsgroup_id}) {
+    my $pg = SL::DB::PartsGroup->new(id => $form->{partsgroup_id})->load;
+    $pg_name = $pg->{'partsgroup'};
+  }
+

   # these strings get displayed at the top of the results to indicate the user which switches were used
   my %optiontexts = (
     active        => $locale->text('Active'),
   # these strings get displayed at the top of the results to indicate the user which switches were used
   my %optiontexts = (
     active        => $locale->text('Active'),


@@ -1120,6 +1129,7 @@ sub generate_report {
     transdateto   => $locale->text('To (time)')  . " " . $locale->date(\%myconfig, $form->{transdateto}, 1),
     partnumber    => $locale->text('Part Number')      . ": '$form->{partnumber}'",
     partsgroup    => $locale->text('Group')            . ": '$form->{partsgroup}'",
     transdateto   => $locale->text('To (time)')  . " " . $locale->date(\%myconfig, $form->{transdateto}, 1),
     partnumber    => $locale->text('Part Number')      . ": '$form->{partnumber}'",
     partsgroup    => $locale->text('Group')            . ": '$form->{partsgroup}'",

+    partsgroup_id => $locale->text('Group')            . ": '$pg_name'",

     serialnumber  => $locale->text('Serial Number')    . ": '$form->{serialnumber}'",
     description   => $locale->text('Part Description') . ": '$form->{description}'",
     make          => $locale->text('Make')             . ": '$form->{make}'",
     serialnumber  => $locale->text('Serial Number')    . ": '$form->{serialnumber}'",
     description   => $locale->text('Part Description') . ": '$form->{description}'",
     make          => $locale->text('Make')             . ": '$form->{make}'",


@@ -1131,7 +1141,7 @@ sub generate_report {
   );
 
   my @itemstatus_keys = qw(active obsolete orphaned onhand short);
   );
 
   my @itemstatus_keys = qw(active obsolete orphaned onhand short);

-  my @callback_keys   = qw(onorder ordered rfq quoted bought sold partnumber partsgroup serialnumber description make model
+  my @callback_keys   = qw(onorder ordered rfq quoted bought sold partnumber partsgroup partsgroup_id serialnumber description make model

                            drawing microfiche l_soldtotal l_deliverydate transdatefrom transdateto ean);
 
   # calculate dependencies
                            drawing microfiche l_soldtotal l_deliverydate transdatefrom transdateto ean);
 
   # calculate dependencies

diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index cbdad1c1de9e4f03b47ad22d86907732fcca0cc8..1d94fe808abfcbd02b3d1b78d2d619d0c2fd694e 100644 (file)
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -37,7 +37,19 @@
 
       <tr>
        <th align="right" nowrap>[% 'Group' | $T8 %]</th>
 
       <tr>
        <th align="right" nowrap>[% 'Group' | $T8 %]</th>

-       <td><input name="partsgroup" size="20"></td>
+       <td>
+         [%- INCLUDE generic/multibox.html
+           name          = 'partsgroup',
+           select_name   = 'partsgroup_id',
+           DATA          = ALL_PARTSGROUPS,
+           show_empty    = 1,
+           id_key        = 'id',
+           label_key     = 'partsgroup',
+           style         = 'width:250px',
+           limit         = limit,
+           allow_textbox = 1
+         -%]
+       </td>

        <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th> <td><input name="serialnumber" size="20"></td>
       </tr>
 
        <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th> <td><input name="serialnumber" size="20"></td>
       </tr>