From 991315859c7b0f25da49baad4822492510b6b3bb Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 14 May 2007 14:02:08 +0000
Subject: [PATCH] =?utf8?q?Anzeige=20von=20weiteren=20Details=20in=20den=20?=
 =?utf8?q?Lieferadressendropdownboxen:=20Name,=20Abteilung,=20Stra=C3=9Fe,?=
 =?utf8?q?=20Ort.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/is.pl | 3 +--
 bin/mozilla/oe.pl | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 77ae22c8b..7d3be25c3 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -392,8 +392,7 @@ sub form_header {
   @values = ("");
   foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
     push(@values, $item->{"shipto_id"});
-    $labels{$item->{"shipto_id"}} =
-      $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
+    $labels{$item->{"shipto_id"}} = join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city);
   }
 
   my $shipto;
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index cfbb216ad..ce468b511 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -463,8 +463,7 @@ sub form_header {
   @values = ("");
   foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
     push(@values, $item->{"shipto_id"});
-    $labels{$item->{"shipto_id"}} =
-      $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
+    $labels{$item->{"shipto_id"}} = join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city);
   }
 
   my $shipto;
-- 
2.20.1