diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index a04dc980484..9cb154ad5c9 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -58,6 +58,7 @@ if ($_GET["action"] == 'setvalue' && $user->admin) if (! dolibarr_set_const($db, 'LDAP_FIELD_COMPANY',$_POST["fieldcompany"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',$_POST["fieldmail"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',$_POST["fieldphone"])) $error++; + if (! dolibarr_set_const($db, 'LDAP_FIELD_HOMEPHONE',$_POST["fieldhomephone"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',$_POST["fieldmobile"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',$_POST["fieldfax"])) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_ADDRESS',$_POST["fieldaddress"])) $error++; @@ -175,7 +176,7 @@ print ''.$langs->trans("LDAPFieldMailExample").''; print 'global->LDAP_KEY_CONTACTS==$conf->global->LDAP_FIELD_MAIL?' checked="true"':'').">"; print ''; -// Phone +// Phone pro $var=!$var; print ''.$langs->trans("LDAPFieldPhone").''; print ''; @@ -183,6 +184,14 @@ print ''.$langs->trans("LDAPFieldPhoneExample").''; print 'global->LDAP_KEY_CONTACTS==$conf->global->LDAP_FIELD_PHONE?' checked="true"':'').">"; print ''; +// Phone home +$var=!$var; +print ''.$langs->trans("LDAPFieldHomePhone").''; +print ''; +print ''.$langs->trans("LDAPFieldHomePhoneExample").''; +print 'global->LDAP_KEY_CONTACTS==$conf->global->LDAP_FIELD_HOMEPHONE?' checked="true"':'').">"; +print ''; + // Mobile $var=!$var; print ''.$langs->trans("LDAPFieldMobile").''; diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php index 3e55186bb66..8dd19a8a36b 100644 --- a/htdocs/contact.class.php +++ b/htdocs/contact.class.php @@ -257,7 +257,7 @@ class Contact if ($this->ville && $conf->global->LDAP_FIELD_TOWN) $info[$conf->global->LDAP_FIELD_TOWN] = $this->ville; if ($this->pays && $conf->global->LDAP_FIELD_COUNTRY) $info[$conf->global->LDAP_FIELD_COUNTRY] = $this->pays; if ($this->phone_pro && $conf->global->LDAP_FIELD_PHONE) $info[$conf->global->LDAP_FIELD_PHONE] = $this->phone_pro; - if ($this->phone_perso && $conf->global->LDAP_FIELD_PHONE_PERSO) $info[$conf->global->LDAP_FIELD_PHONE_PERSO] = $this->phone_perso; + if ($this->phone_perso && $conf->global->LDAP_FIELD_HOMEPHONE) $info[$conf->global->LDAP_FIELD_HOMEPHONE] = $this->phone_perso; if ($this->phone_mobile && $conf->global->LDAP_FIELD_MOBILE) $info[$conf->global->LDAP_FIELD_MOBILE] = $this->phone_mobile; if ($this->fax && $conf->global->LDAP_FIELD_FAX) $info[$conf->global->LDAP_FIELD_FAX] = $this->fax; if ($this->note && $conf->global->LDAP_FIELD_DESCRIPTION) $info[$conf->global->LDAP_FIELD_DESCRIPTION] = $this->note; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index aa9785d8c8f..70eb8f6fc05 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -622,8 +622,8 @@ LDAPFieldMail=Email address LDAPFieldMailExample=Example : mail LDAPFieldPhone=Professional phone number LDAPFieldPhoneExample=Example : telephonenumber -LDAPFieldPhonePerso=Personal phone number -LDAPFieldPhonePersoExample=Example : homephone +LDAPFieldHomePhone=Personal phone number +LDAPFieldHomePhoneExample=Example : homephone LDAPFieldMobile=Cellular phone LDAPFieldMobileExample=Example : mobile LDAPFieldFax=Fax number diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 4e95bee6a7d..7afb8e0ca28 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -629,8 +629,8 @@ LDAPFieldMail=Email LDAPFieldMailExample=Exemple : mail LDAPFieldPhone=Téléphone professionnel LDAPFieldPhoneExample=Exemple : telephonenumber -LDAPFieldPhonePerso=Téléphone perso -LDAPFieldPhonePersoExample=Exemple : homephone +LDAPFieldHomePhone=Téléphone perso +LDAPFieldHomePhoneExample=Exemple : homephone LDAPFieldMobile=Téléphone portable LDAPFieldMobileExample=Exemple : mobile LDAPFieldFax=Fax