Implémentation permission adhérents

htdocs/adherents/card_subscriptions.php

@@ -220,11 +220,13 @@ print "</div>\n";
 print '<div class="tabsAction">';
 
 // Lien nouvelle cotisation si non brouillon et non rsili
+if ($user->rights->adherent->cotisation->creer)
+{
 	if ($action != 'addsubscription' && $adh->statut > 0)
 	{
 		print "<a class=\"butAction\" href=\"card_subscriptions.php?rowid=$rowid&action=addsubscription\">".$langs->trans("NewSubscription")."</a>";
 	}
-
+}
 print '</div>';
 print "<br>\n";
 

htdocs/adherents/fiche.php

@@ -978,41 +978,58 @@ if ($rowid && $action != 'edit')
      */
     print '<div class="tabsAction">';
     
-    
+    if ($user->rights->adherent->creer)
+	{
 		print "<a class=\"butAction\" href=\"fiche.php?rowid=$rowid&action=edit\">".$langs->trans("Edit")."</a>";
+    }
 	
+    if ($user->rights->adherent->creer)
+	{
 	    // Valider
 	    if ($adh->statut == -1)
 	    {
 	        print "<a class=\"butAction\" href=\"fiche.php?rowid=$rowid&action=valid\">".$langs->trans("Validate")."</a>\n";
 	    }
+	}
 	
+    if ($user->rights->adherent->creer)
+	{
 	    // Ractiver
 	    if ($adh->statut == 0)
 	    {
 	        print "<a class=\"butAction\" href=\"fiche.php?rowid=$rowid&action=valid\">".$langs->trans("Reenable")."</a>\n";
 	    }
+	}
 	
+    if ($user->rights->adherent->creer)
+	{
 	    // Envoi fiche par mail
 	    if ($adh->statut >= 1 && $adh->email)
 		{
 	    	print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=sendinfo\">".$langs->trans("SendCardByMail")."</a>\n";
 	    }
+	}
 		
+    if ($user->rights->adherent->supprimer)
+	{
 		// Rsilier
 	    if ($adh->statut == 1)
 	    {
 	        print "<a class=\"butAction\" href=\"fiche.php?rowid=$rowid&action=resign\">".$langs->trans("Resiliate")."</a>\n";
 	    }
+	}
 	
 	// Barre d'actions
+	if ($user->rights->user->user->creer)
+	{
 		if (! $user->societe_id)
 		{
-		if (! $adh->user_id && $user->rights->user->user->creer)
+			if (! $adh->user_id)
 			{
 				print '<a class="tabAction" href="fiche.php?rowid='.$adh->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a>';
 			}
 		}
+	}
     
     // Supprimer
     if ($user->rights->adherent->supprimer)

htdocs/html.form.class.php

@@ -819,12 +819,12 @@ class Form
     if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)
     {
 		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-		print '<td class="nobordernopadding" width="30" nowrap="nowrap">';
+		print '<td class="nobordernopadding" width="80" nowrap="nowrap">';
     	print $langs->trans("RefOrLabel").':</td>';
 		print '<td class="nobordernopadding" align="left" width="16">';
 		print ajax_updater_indicator($htmlname,'working');
 		print '</td>';
-		print '<td><input type="text" size="16" name="keysearch'.$htmlname.'" id="keysearch'.$htmlname.'">';
+		print '<td align="left"><input type="text" size="16" name="keysearch'.$htmlname.'" id="keysearch'.$htmlname.'"> ';
 		print '</td>';
 		print '</tr>';
 		print '<tr class="nocellnopadd">';

htdocs/lib/member.lib.php

@@ -30,7 +30,7 @@
 
 function member_prepare_head($member)
 {
-	global $langs, $conf;
+	global $langs, $conf, $user;
 	
 	$h = 0;
 	$head = array();
@@ -50,15 +50,18 @@ function member_prepare_head($member)
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$member->id;
-	$head[$h][1] = $langs->trans("Note");
-	$head[$h][2] = 'note';
-	$h++;
-
+    if ($user->rights->adherent->cotisation->lire)
+	{
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/card_subscriptions.php?rowid='.$member->id;
 		$head[$h][1] = $langs->trans("Subscriptions");
 		$head[$h][2] = 'subscription';
 		$h++;
+	}
+	
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$member->id;
+	$head[$h][1] = $langs->trans("Note");
+	$head[$h][2] = 'note';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/info.php?id='.$member->id;
 	$head[$h][1] = $langs->trans("Info");