diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index c32c7f6de61..c1ce5c2c294 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -57,6 +57,7 @@ if (! $sortorder) { $sortorder="DESC"; } if (! $sortfield) { $sortfield="d.lastname"; } $label=GETPOST("label","alpha"); +$statut=GETPOST("statut","int"); $subscription=GETPOST("subscription","int"); $vote=GETPOST("vote","int"); $comment=GETPOST("comment",'alphanohtml'); @@ -104,7 +105,8 @@ if ($cancel) { if ($action == 'add' && $user->rights->adherent->configurer) { $object->label = trim($label); - $object->subscription = (int) trim($subscription); + $object->statut = trim($statut); + $object->subscription = (int) trim($subscription); $object->note = trim($comment); $object->mail_valid = trim($mail_valid); $object->vote = (boolean) trim($vote); @@ -157,7 +159,8 @@ if ($action == 'update' && $user->rights->adherent->configurer) $object->oldcopy = clone $object; $object->label = trim($label); - $object->subscription = (int) trim($subscription); + $object->statut = trim($statut); + $object->subscription = (int) trim($subscription); $object->note = trim($comment); $object->mail_valid = trim($mail_valid); $object->vote = (boolean) trim($vote); @@ -214,7 +217,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') { //dol_fiche_head(''); - $sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote"; + $sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote, d.statut"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as d"; $sql.= " WHERE d.entity IN (".getEntity('member_type').")"; @@ -242,7 +245,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ''; print ''; print ''; - print ''; + print ''; print ''; print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); @@ -257,6 +260,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ''.$langs->trans("Label").''; print ''.$langs->trans("SubscriptionRequired").''; print ''.$langs->trans("VoteAllowed").''; + print ''.$langs->trans("Status").''; print ' '; print "\n"; @@ -278,6 +282,10 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ''.dol_escape_htmltag($objp->label).''; print ''.yn($objp->subscription).''; print ''.yn($objp->vote).''; + print ''; +if ( !empty($objp->statut) ) print img_picto($langs->trans("InActivity"),'statut4'); +else print img_picto($langs->trans("ActivityCeased"),'statut5'); + print ''; if ($user->rights->adherent->configurer) print 'rowid.'">'.img_edit().''; else @@ -319,7 +327,11 @@ if ($action == 'create') print ''.$langs->trans("Label").''; - print ''.$langs->trans("SubscriptionRequired").''; + print ''.$langs->trans("Status").''; + print $form->selectarray('statut', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),1); + print ''; + + print ''.$langs->trans("SubscriptionRequired").''; print $form->selectyesno("subscription",1,1); print ''; @@ -339,7 +351,7 @@ if ($action == 'create') // Other attributes $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; + print $hookmanager->resPrint; if (empty($reshook)) { print $object->showOptionals($extrafields,'edit'); @@ -392,6 +404,11 @@ if ($rowid > 0) print ''; + print ''; + print ''; @@ -427,7 +444,12 @@ if ($rowid > 0) } // Add - print '
'.$langs->trans("AddMember").'
'; + if ( $user->rights->adherent->configurer && !empty($object->statut) ) + { + print '
'.$langs->trans("AddMember").'
'; + } else { + print '
'.$langs->trans("AddMember").'
'; + } // Delete if ($user->rights->adherent->configurer) @@ -576,8 +598,8 @@ if ($rowid > 0) print ''; print "\n"; @@ -723,7 +745,11 @@ if ($rowid > 0) print ''; - print ''; + + print ''; @@ -743,7 +769,7 @@ if ($rowid > 0) // Other attributes $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; + print $hookmanager->resPrint; if (empty($reshook)) { print $object->showOptionals($extrafields,'edit');
'.$langs->trans("Status").''; + if ( !empty($object->statut) ) print img_picto($langs->trans('TypeStatusActive'),'statut4').' '.$langs->trans("InActivity"); + else print img_picto($langs->trans('TypeStatusInactive'),'statut5').' '.$langs->trans("ActivityCeased"); + print '
'.$langs->trans("SubscriptionRequired").''; print yn($object->subscription); print '
'; print ''; - print '  '; - print ''; + print '  '; + print ''; print '
'.$langs->trans("Label").'
'.$langs->trans("SubscriptionRequired").''; + print '
'.$langs->trans("Status").''; + print $form->selectarray('statut', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')), $object->statut); + print '
'.$langs->trans("SubscriptionRequired").''; print $form->selectyesno("subscription",$object->subscription,1); print '