diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index f9d6edfd4e5..896dddd55e3 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1542,12 +1542,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; print ''; - // Gender - print ''.$langs->trans("Gender").''; - print ''; - if ($object->gender) { - print $langs->trans("Gender".$object->gender); - } print ''; // Company diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 9815b824cc5..b48328a17e8 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -493,12 +493,6 @@ if ($rowid > 0) { print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; print ''; - // Gender - print ''.$langs->trans("Gender").''; - print ''; - if ($object->gender) print $langs->trans("Gender".$object->gender); - print ''; - // Company print ''.$langs->trans("Company").''.$object->company.''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8324e500c3c..3d208d80eb2 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7895,6 +7895,23 @@ class Form $fieldref = 'ref'; } + // Preparing gender's display if there is one + $addgendertxt = ''; + if ($object->gender) { + $addgendertxt = ' '; + switch ($object->gender) { + case 'man': + $addgendertxt .= ''; + break; + case 'woman': + $addgendertxt .= ''; + break; + case 'other': + $addgendertxt .= ''; + break; + } + } + // Add where from hooks if (is_object($hookmanager)) { $parameters = array(); @@ -8021,12 +8038,12 @@ class Form $ret .= $object->ref.'
'; $fullname = $object->getFullName($langs); if ($object->morphy == 'mor' && $object->societe) { - $ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).')' : ''); + $ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).$addgendertxt.')' : ''); } else { - $ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : ''); + $ret .= dol_htmlentities($fullname).$addgendertxt.((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : ''); } } elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) { - $ret .= dol_htmlentities($object->getFullName($langs)); + $ret .= dol_htmlentities($object->getFullName($langs)).$addgendertxt; } elseif (in_array($object->element, array('action', 'agenda'))) { $ret .= $object->ref.'
'.$object->label; } elseif (in_array($object->element, array('adherent_type'))) { diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 45da6f2d6d0..4496178fe67 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1466,14 +1466,6 @@ if ($action == 'create' || $action == 'adduserldap') { print ''."\n"; } - // Gender - print ''.$langs->trans("Gender").''; - print ''; - if ($object->gender) { - print $langs->trans("Gender".$object->gender); - } - print ''; - // Employee print ''.$langs->trans("Employee").''; print yn($object->employee);