Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 26ba876e

Von Moritz Bunkus vor mehr als 16 Jahren hinzugefügt

  • ID 26ba876e4863567ba21fddd5ec8f909aacfbdfde
  • Vorgänger dd3457e4
  • Nachfolger 2868feee

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

Unterschiede anzeigen:

SL/CT.pm
155 155

  
156 156
  # get shipto address
157 157
  $query =
158
    qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | .
159
    qq|FROM shipto WHERE (trans_id = ?) AND (module = 'CT')|;
158
    qq|SELECT shipto_id, shiptoname, shiptodepartment_1, shiptostreet, shiptocity
159
       FROM shipto
160
       WHERE (trans_id = ?) AND (module = 'CT')|;
160 161
  $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id});
161 162

  
162 163
  # get contacts
bin/mozilla/ct.pl
273 273
  $form->{is_admin}       = $myconfig{role} eq 'admin';
274 274
  $form->{is_customer}    = $form->{db}     eq 'customer';
275 275
  $form->{salesman_label} = sub { $_[0]->{name} ne "" ? $_[0]->{name} : $_[0]->{login} };
276
  $form->{shipto_label}   = sub { "$_[0]->{shiptoname} $_[0]->{shiptodepartment_1}" };
276
  $form->{shipto_label}   = sub { my $s = shift(@_); join('; ', grep { $_ } map { $s->{"shipto$_"} } qw(name department_1 street city)) || ' ' };
277 277
  $form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} };
278 278
  $form->{taxzone_id}     = 0                                                               if !$form->{id};
279 279
  $form->{jsscript}       = 1;

Auch abrufbar als: Unified diff