diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 05c1358ddee..73f207abe91 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1211,15 +1211,6 @@ else
print "";
}
- // Other attributes
- $parameters=array();
- $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- if (empty($reshook) && ! empty($extrafields->attribute_label))
- {
- print $object->showOptionals($extrafields,'edit',$parameters);
- }
-
// Third party Dolibarr
if (! empty($conf->societe->enabled))
{
@@ -1246,6 +1237,15 @@ else
else print $langs->trans("NoDolibarrAccess");
print '';
+ // Other attributes
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ if (empty($reshook) && ! empty($extrafields->attribute_label))
+ {
+ print $object->showOptionals($extrafields,'edit',$parameters);
+ }
+
print '';
dol_fiche_end();
@@ -1487,55 +1487,29 @@ else
print '';
}
- print '';
-
- print '';
- print '
';
-
- print '
';
- print '
';
-
- // Birthday
- print '| '.$langs->trans("Birthday").' | '.dol_print_date($object->birth,'day').' |
';
-
- // Public
- print '| '.$langs->trans("Public").' | '.yn($object->public).' |
';
-
- // Categories
- if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
+ // Date end subscription
+ print '| '.$langs->trans("SubscriptionEndDate").' | ';
+ if ($object->datefin)
{
- print ' |
| ' . $langs->trans("Categories") . ' | ';
- print '';
- print $form->showCategories($object->id, 'member', 1);
- print ' |
';
+ print dol_print_date($object->datefin,'day');
+ if ($object->hasDelay()) {
+ print " ".img_warning($langs->trans("Late"));
+ }
}
-
- // Other attributes
- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
- // Date end subscription
- print '| '.$langs->trans("SubscriptionEndDate").' | ';
- if ($object->datefin)
- {
- print dol_print_date($object->datefin,'day');
- if ($object->hasDelay()) {
- print " ".img_warning($langs->trans("Late"));
- }
- }
- else
- {
- if (! $adht->subscription)
- {
- print $langs->trans("SubscriptionNotRecorded");
- if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
- }
- else
- {
- print $langs->trans("SubscriptionNotReceived");
- if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
- }
- }
- print ' |
';
+ else
+ {
+ if (! $adht->subscription)
+ {
+ print $langs->trans("SubscriptionNotRecorded");
+ if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
+ }
+ else
+ {
+ print $langs->trans("SubscriptionNotReceived");
+ if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
+ }
+ }
+ print '';
// Third party Dolibarr
if (! empty($conf->societe->enabled))
@@ -1607,6 +1581,32 @@ else
}
print '';
+ print '
';
+
+ print '
';
+ print '
';
+
+ print '
';
+ print '
';
+
+ // Birthday
+ print '| '.$langs->trans("Birthday").' | '.dol_print_date($object->birth,'day').' |
';
+
+ // Public
+ print '| '.$langs->trans("Public").' | '.yn($object->public).' |
';
+
+ // Categories
+ if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
+ {
+ print '| ' . $langs->trans("Categories") . ' | ';
+ print '';
+ print $form->showCategories($object->id, 'member', 1);
+ print ' |
';
+ }
+
+ // Other attributes
+ include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
print "
\n";
print "
\n";