Bei Lieferanschrift-Drop-Down auch die Straße und den Ort anzeigen.

diff --git a/SL/CT.pm b/SL/CT.pm
index a82620d223f1f5c3af808d0464b396b89f1069ae..3252fe8a0eef5446c4ebc09035fcc510173ba802 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -155,8 +155,9 @@ sub populate_drop_down_boxes {
 
   # get shipto address
   $query =
 
   # get shipto address
   $query =

-    qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | .
-    qq|FROM shipto WHERE (trans_id = ?) AND (module = 'CT')|;
+    qq|SELECT shipto_id, shiptoname, shiptodepartment_1, shiptostreet, shiptocity
+       FROM shipto
+       WHERE (trans_id = ?) AND (module = 'CT')|;

   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id});
 
   # get contacts
   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id});
 
   # get contacts

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 3b8a459b0d871fc662cd3fae6d3e6d9e955199fd..928a6efc86f1eaa089cd1cffa96041eeb846ece4 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -273,7 +273,7 @@ sub form_header {
   $form->{is_admin}       = $myconfig{role} eq 'admin';
   $form->{is_customer}    = $form->{db}     eq 'customer';
   $form->{salesman_label} = sub { $_[0]->{name} ne "" ? $_[0]->{name} : $_[0]->{login} };
   $form->{is_admin}       = $myconfig{role} eq 'admin';
   $form->{is_customer}    = $form->{db}     eq 'customer';
   $form->{salesman_label} = sub { $_[0]->{name} ne "" ? $_[0]->{name} : $_[0]->{login} };

-  $form->{shipto_label}   = sub { "$_[0]->{shiptoname} $_[0]->{shiptodepartment_1}" };
+  $form->{shipto_label}   = sub { my $s = shift(@_); join('; ', grep { $_ } map { $s->{"shipto$_"} } qw(name department_1 street city)) || ' ' };

   $form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} };
   $form->{taxzone_id}     = 0                                                               if !$form->{id};
   $form->{jsscript}       = 1;
   $form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} };
   $form->{taxzone_id}     = 0                                                               if !$form->{id};
   $form->{jsscript}       = 1;