Bugfix zu Bug 789: Ansprechpartner zeigen jetzt auch den Vornamen an

diff --git a/SL/CT.pm b/SL/CT.pm
index 7ccccadcc41425e8c5f79c783ee9ec8b87d962c8..e25e41cd9092fc76810e6e7aecc01bfe32b0a37a 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -160,7 +160,7 @@ sub populate_drop_down_boxes {
   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id});
 
   # get contacts
   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id});
 
   # get contacts

-  $query  = qq|SELECT cp_id, cp_name FROM contacts WHERE cp_cv_id = ?|;
+  $query  = qq|SELECT cp_id, cp_name, cp_givenname FROM contacts WHERE cp_cv_id = ?|;

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

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index bc4f42829d9a83a1845c74986aa6257964f6595d..76d9fb71fc48ada95340d57717283d69041871a6 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -267,6 +267,7 @@ sub form_header {
   $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->{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->{contacts_label} = sub { "$_[0]->{cp_givenname} $_[0]->{cp_name}" };

   $form->{taxzone_id}     = 0                                                               if !$form->{id};
   $form->{jsscript}       = 1;
   $form->{fokus}          = "ct.greeting";
   $form->{taxzone_id}     = 0                                                               if !$form->{id};
   $form->{jsscript}       = 1;
   $form->{fokus}          = "ct.greeting";

diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html
index 99cc45520fc63da59f2236095343b54b45d75fda..d622913c4426a46a3e833ac05f7edf90450e4039 100644 (file)
--- a/templates/webpages/ct/form_header_de.html
+++ b/templates/webpages/ct/form_header_de.html
@@ -317,7 +317,7 @@
              DATA       = CONTACTS,
              onChange   = "get_contact(['cp_id__' + this.value], ['cp_name', 'cp_greeting', 'cp_title', 'cp_givenname', 'cp_phone1', 'cp_phone2', 'cp_email', 'cp_abteilung', 'cp_fax', 'cp_mobile1', 'cp_mobile2', 'cp_satphone', 'cp_satfax', 'cp_project', 'cp_privatphone', 'cp_privatemail', 'cp_birthday'])",
              id_key     = 'cp_id',
              DATA       = CONTACTS,
              onChange   = "get_contact(['cp_id__' + this.value], ['cp_name', 'cp_greeting', 'cp_title', 'cp_givenname', 'cp_phone1', 'cp_phone2', 'cp_email', 'cp_abteilung', 'cp_fax', 'cp_mobile1', 'cp_mobile2', 'cp_satphone', 'cp_satfax', 'cp_project', 'cp_privatphone', 'cp_privatemail', 'cp_birthday'])",
              id_key     = 'cp_id',

-             label_key  = 'cp_name',
+             label_sub  = 'contacts_label',

        -%]
       </td>
      </tr>
        -%]
       </td>
      </tr>

diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html
index ea2fbc37f39e71e540949847fcf4418b5a9e8768..fdb122bbf9504e152b10f24a06869ee50a8e8d9e 100644 (file)
--- a/templates/webpages/ct/form_header_master.html
+++ b/templates/webpages/ct/form_header_master.html
@@ -317,7 +317,7 @@
              DATA       = CONTACTS,
              onChange   = "get_contact(['cp_id__' + this.value], ['cp_name', 'cp_greeting', 'cp_title', 'cp_givenname', 'cp_phone1', 'cp_phone2', 'cp_email', 'cp_abteilung', 'cp_fax', 'cp_mobile1', 'cp_mobile2', 'cp_satphone', 'cp_satfax', 'cp_project', 'cp_privatphone', 'cp_privatemail', 'cp_birthday'])",
              id_key     = 'cp_id',
              DATA       = CONTACTS,
              onChange   = "get_contact(['cp_id__' + this.value], ['cp_name', 'cp_greeting', 'cp_title', 'cp_givenname', 'cp_phone1', 'cp_phone2', 'cp_email', 'cp_abteilung', 'cp_fax', 'cp_mobile1', 'cp_mobile2', 'cp_satphone', 'cp_satfax', 'cp_project', 'cp_privatphone', 'cp_privatemail', 'cp_birthday'])",
              id_key     = 'cp_id',

-             label_key  = 'cp_name',
+             label_sub  = 'contacts_label',

        -%]
       </td>
      </tr>
        -%]
       </td>
      </tr>