Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
	htdocs/comm/action/fiche.php

htdocs/comm/action/contact.php

@@ -43,23 +43,24 @@ $confirm = GETPOST('confirm');
 $lineid  = GETPOST('lineid','int');
 
 // Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
 if ($user->societe_id > 0)
 {
 	unset($_GET["action"]);
 	$action='';
-	$socid = $user->societe_id;
 }
+$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions&allactions', 'fk_soc', 'id');
+
 
 $object = new ActionComm($db);
 
-/*
- * Actions
- */
 
 /*
- * Ajout d'un nouveau contact
+ * Actions
  */
 
+// Add new nouveau contact
 if ($action == 'addcontact')
 {
 	$result = $object->fetch($id);

htdocs/comm/action/document.php

@@ -44,14 +44,14 @@ $objectid = GETPOST('id','int');
 $action=GETPOST('action','alpha');
 
 // Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
 if ($user->societe_id > 0)
 {
 	unset($_GET["action"]);
 	$action='';
-	$socid = $user->societe_id;
 }
-
-$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions&allactions', '', 'id');
+$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions&allactions', 'fk_soc', 'id');
 
 $act = new ActionComm($db);
 

htdocs/comm/action/info.php

@@ -40,7 +40,7 @@ if ($user->societe_id > 0)
   $socid = $user->societe_id;
 }
 
-$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', '', 'id');
+$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', 'fk_soc', 'id');
 
 
 /*

htdocs/core/boxes/box_members.php

@@ -79,7 +79,7 @@ class box_members extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers",$max));
 
-		if ($user->rights->societe->lire)
+		if ($user->rights->adherent->lire)
 		{
 			$sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
 			$sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";