2. Teil fuer die Umsetzung fuer bug 865, EAN auch in der Berichtsmaske zur besseren...

diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 178de9f131aad03c1cc64bb6d8191b94aac1d291..de2d63034a1a092aec32daeb61d0697ad24c99e0 100644 (file)
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -150,7 +150,7 @@ sub transfer_or_removal_prepare_contents {
 
   $form->show_generic_error($locale->text("The source warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
 
 
   $form->show_generic_error($locale->text("The source warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
 

-  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber partunit);
+  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber partunit ean);

 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id},
 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id},

diff --git a/templates/webpages/wh/transfer_parts_selection_master.html b/templates/webpages/wh/transfer_parts_selection_master.html
index a8da1a2c0def0776daf6589ffa080b99e07d4bda..c69572fa8e5e57992552bde59f0fb494f4001e00 100644 (file)
--- a/templates/webpages/wh/transfer_parts_selection_master.html
+++ b/templates/webpages/wh/transfer_parts_selection_master.html
@@ -66,6 +66,7 @@
      <th class="listheading"><translate>Part Number</translate></th>
      <th class="listheading"><translate>Part Description</translate></th>
      <th class="listheading"><translate>Charge Number</translate></th>
      <th class="listheading"><translate>Part Number</translate></th>
      <th class="listheading"><translate>Part Description</translate></th>
      <th class="listheading"><translate>Charge Number</translate></th>

+     <th class="listheading"><translate>EAN</translate></th>

      <th class="listheading"><translate>Available qty</translate></th>
      <th class="listheading" colspan="2"><translate>Transfer qty</translate></th>
      <th class="listheading" colspan="2"><translate>Destination warehouse and bin</translate></th>
      <th class="listheading"><translate>Available qty</translate></th>
      <th class="listheading" colspan="2"><translate>Transfer qty</translate></th>
      <th class="listheading" colspan="2"><translate>Destination warehouse and bin</translate></th>


@@ -78,10 +79,12 @@
      <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
      <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
      <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
      <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
      <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
      <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">

+     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">

      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>

+     <td>[% HTML.escape(row.ean) %]</td>

      <td>[% HTML.escape(row.qty) %]</td>
      <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>
      <td>
      <td>[% HTML.escape(row.qty) %]</td>
      <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>
      <td>