From 8c6da40329649dd3015da8364e831e0e47155694 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@lx-office-hosting.de>
Date: Tue, 28 Dec 2010 11:54:21 +0100
Subject: [PATCH] =?utf8?q?Fix=20f=C3=BCr=20Bug=201395:=20Die=20bei=20der?=
 =?utf8?q?=20Einlagerung=20von=20Artikeln=20aus=20Lieferscheinen=20zum=20j?=
 =?utf8?q?eweiligen=20Artikel=20voreingestellten=20Einheiten=20entsprechen?=
 =?utf8?q?=20nicht=20den=20Standardeinheiten=20der=20Artikel,=20wenn=20die?=
 =?utf8?q?=20Einheiten=20auf=20einander=20aufbauen.=20--=20Entsprechend=20?=
 =?utf8?q?mit=20default-Werten=20f=C3=BCr=20Bereich=20Lager=20und=20Liefer?=
 =?utf8?q?schein=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/do.pl                        | 3 ++-
 bin/mozilla/wh.pl                        | 3 ++-
 templates/webpages/do/stock_in_form.html | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 0d5941cb0..bf76cdd8b 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -1043,7 +1043,8 @@ sub display_stock_in_form {
   my $part_info  = IC->get_basic_part_info('id' => $form->{parts_id});
 
   my $units      = AM->retrieve_units(\%myconfig, $form);
-  my $units_data = AM->unit_select_data($units, undef, undef, $part_info->{unit});
+  # der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor
+  my $units_data = AM->unit_select_data($units, $form->{do_unit}, undef, $part_info->{unit});
 
   $form->get_lists('warehouses' => { 'key'    => 'WAREHOUSES',
                                      'bins'   => 'BINS' });
diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index a55bf70c6..aa22c51d5 100644
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -85,7 +85,8 @@ sub transfer_warehouse_selection {
   show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} });
 
   my $units      = AM->retrieve_units(\%myconfig, $form);
-  $form->{UNITS} = AM->unit_select_data($units, $form->{unit}, 0, $form->{partunit});
+  # der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor
+  $form->{UNITS} = AM->unit_select_data($units, $form->{partunit}, 0, $form->{partunit});
 
   if (scalar @{ $form->{WAREHOUSES} }) {
     $form->{warehouse_id} ||= $form->{WAREHOUSES}->[0]->{id};
diff --git a/templates/webpages/do/stock_in_form.html b/templates/webpages/do/stock_in_form.html
index 238747ef6..0d5ea684f 100644
--- a/templates/webpages/do/stock_in_form.html
+++ b/templates/webpages/do/stock_in_form.html
@@ -138,7 +138,7 @@
      <td>
       <select name="unit_[% loop.count %]">
        [%- FOREACH unit = UNITS %]
-       <option[% IF unit.name == row.unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
+       <option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
        [%- END %]
       </select>
      </td>
-- 
2.20.1