diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index f516efdd819..c91915f7bdb 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -289,6 +289,9 @@ if (!$rowid && $action != 'create' && $action != 'edit') { print '
| '; + } print ' | '.$langs->trans("Ref").' | '; print ''.$langs->trans("Label").' | '; print ''.$langs->trans("MembersNature").' | '; @@ -297,7 +300,9 @@ if (!$rowid && $action != 'create' && $action != 'edit') { print ''.$langs->trans("CanEditAmountShort").' | '; print ''.$langs->trans("VoteAllowed").' | '; print ''.$langs->trans("Status").' | '; - print ''; + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ' | '; + } print " | |
|---|---|---|---|---|---|---|---|---|---|
| rowid.'">'.img_edit().' | '; + } else { + print ''; + } + } print ' | '; print $membertype->getNomUrl(1); //rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.' @@ -352,10 +364,12 @@ if (!$rowid && $action != 'create' && $action != 'edit') { print ' | '.yn($objp->caneditamount).' | '; print ''.yn($objp->vote).' | '; print ''.$membertype->getLibStatut(5).' | '; - if ($user->rights->adherent->configurer) { - print 'rowid.'">'.img_edit().' | '; - } else { - print ''; + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + if ($user->rights->adherent->configurer) { + print ' | rowid.'">'.img_edit().' | '; + } else { + print ''; + } } print " |
| '; + if ($user->hasRight('adherent', 'creer')) { + print 'id).'">'.img_edit().''; + } + if ($user->hasRight('adherent', 'supprimer')) { + print ''.img_picto($langs->trans("Resiliate"), 'disable.png').''; + } + print " | "; + } // Lastname if ($objp->company != '') { print ''.img_object($langs->trans("ShowMember"), "user", 'class="paddingright"').$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->company, 12).' | '."\n"; @@ -785,15 +814,16 @@ if ($rowid > 0) { } // Actions - print ''; - if ($user->hasRight('adherent', 'creer')) { - print 'id).'">'.img_edit().''; + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ' | '; + if ($user->hasRight('adherent', 'creer')) { + print 'id).'">'.img_edit().''; + } + if ($user->hasRight('adherent', 'supprimer')) { + print ''.img_picto($langs->trans("Resiliate"), 'disable.png').''; + } + print " | "; } - if ($user->hasRight('adherent', 'supprimer')) { - print ''.img_picto($langs->trans("Resiliate"), 'disable.png').''; - } - print ""; - print "