diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index cf5ed660a32..ba2a80cfa7d 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -528,7 +528,7 @@ if ($rowid) print ''.$langs->trans("UserTitle").''.$object->getCivilityLabel().' '; print ''; - // Name + // Lastname print ''.$langs->trans("Lastname").''.$object->lastname.' '; print ''; @@ -536,6 +536,9 @@ if ($rowid) print ''.$langs->trans("Firstname").''.$object->firstname.' '; print ''; + // EMail + print ''.$langs->trans("EMail").''.dol_print_email($object->email,0,$object->fk_soc,1).''; + // Status print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 8c714ab7c67..c4c62d8285f 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -829,6 +829,9 @@ else print ''.$langs->trans("Firstname").''; print ''; + // EMail + print ''.($conf->global->ADHERENT_MAIL_REQUIRED?'':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'':'').''; + // Password if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { @@ -882,9 +885,6 @@ else // Tel mobile print ''.$langs->trans("PhoneMobile").''; - // EMail - print ''.($conf->global->ADHERENT_MAIL_REQUIRED?'':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'':'').''; - // Birthday print "".$langs->trans("Birthday")."\n"; $form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc'); @@ -1076,6 +1076,9 @@ else print ''.$langs->trans("Firstname").'firstname).'">'; print ''; + // EMail + print ''.($conf->global->ADHERENT_MAIL_REQUIRED?'':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'':'').'email).'">'; + // Password if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { @@ -1118,9 +1121,6 @@ else // Tel mobile print ''.$langs->trans("PhoneMobile").'phone_mobile).'">'; - // EMail - print ''.($conf->global->ADHERENT_MAIL_REQUIRED?'':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'':'').'email).'">'; - // Birthday print "".$langs->trans("Birthday")."\n"; $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc'); @@ -1402,13 +1402,16 @@ else print ''.$langs->trans("UserTitle").''.$object->getCivilityLabel().' '; print ''; - // Name + // Lastname print ''.$langs->trans("Lastname").''.$object->lastname.' '; print ''; // Firstname print ''.$langs->trans("Firstname").''.$object->firstname.' '; + // EMail + print ''.$langs->trans("EMail").''.dol_print_email($object->email,0,$object->fk_soc,1).''; + // Password if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { @@ -1442,9 +1445,6 @@ else // Tel mobile print ''.$langs->trans("PhoneMobile").''.dol_print_phone($object->phone_mobile,$object->country_code,0,$object->fk_soc,1).''; - // EMail - print ''.$langs->trans("EMail").''.dol_print_email($object->email,0,$object->fk_soc,1).''; - // Birthday print ''.$langs->trans("Birthday").''.dol_print_date($object->birth,'day').'';