From dab9b4ae13824990fb8eaa4fcbf428e42b68e7e2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Jul 2024 14:53:40 +0200 Subject: [PATCH] Debug v20 --- htdocs/adherents/type.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index c8807066da6..9e0259d11ab 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -362,16 +362,20 @@ if (!$rowid && $action != 'create' && $action != 'edit') { } } else { print ''; + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { if ($user->hasRight('adherent', 'configurer')) { print 'rowid.'">'.img_edit().''; } } + print ''; print $membertype->getNomUrl(1); //'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.' print ''; + print ''.dol_escape_htmltag($objp->label).''; + print ''; if ($objp->morphy == 'phy') { print $langs->trans("Physical"); @@ -381,6 +385,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') { print $langs->trans("MorAndPhy"); } print ''; + print ''; if ($objp->duration) { $duration_value = intval($objp->duration); @@ -393,11 +398,17 @@ if (!$rowid && $action != 'create' && $action != 'edit') { print max(1, $duration_value).' '.$dur[$unit]; } print ''; + print ''.yn($objp->subscription).''; + print ''.(is_null($objp->amount) || $objp->amount === '' ? '' : price($objp->amount)).''; + print ''.yn($objp->caneditamount).''; + print ''.yn($objp->vote).''; + print ''.$membertype->getLibStatut(5).''; + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { if ($user->hasRight('adherent', 'configurer')) { print 'rowid.'">'.img_edit().''; @@ -563,7 +574,7 @@ if ($rowid > 0) { print ''; print ''.$langs->trans("Description").''; - print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private)); + print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_public)); print ""; print ''.$langs->trans("WelcomeEMail").'';