diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 907ed389b38a46bff850093357780ea6ea397ba2..3a7c47f3acf5d7e5e315effad91ebba217eb872c 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -67,7 +67,7 @@ llxHeader('',$langs->trans("DefaultRights"));
 print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 
 print $langs->trans("DefaultRightsDesc");
-print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+print " ".$langs->trans("OnlyActiveElementsAreShown")."<br><br>\n";
 
 $db->begin();
 
@@ -115,16 +115,15 @@ foreach ($modulesdir as $dir)
 
 $db->commit();
 
-// Show warning about external users
-print info_admin(showModulesExludedForExternal($modules)).'<br>'."\n";
-print "<br>\n";
-
-
 $head=security_prepare_head();
 
 dol_fiche_head($head, 'default', $langs->trans("Security"));
 
 
+// Show warning about external users
+print info_admin(showModulesExludedForExternal($modules)).'<br>'."\n";
+
+
 print '<table class="noborder" width="100%">';
 
 // Affiche lignes des permissions
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 5f6c085831f2cd93fa4a3790f5dfbd8077fd9d00..bef752f595460939f50c6f8868195aeec7d46d4c 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2243,7 +2243,11 @@ if ($action == 'create' && $user->rights->commande->creer)
 				}
 
 				// Cancel order
-				if ($object->statut == 1 && $user->rights->commande->annuler) {
+				if ($object->statut == 1 && 
+				    ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->cloturer))
+			       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)))
+				) 
+				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=cancel">' . $langs->trans('Cancel') . '</a></div>';
 				}
 
diff --git a/htdocs/core/modules/modAskPriceSupplier.class.php b/htdocs/core/modules/modAskPriceSupplier.class.php
index d415d615756ed7f2f786a1c1ce08698dd905f4b9..4614b0b819d9f2fdd9b50ab82869077bc38bc06c 100644
--- a/htdocs/core/modules/modAskPriceSupplier.class.php
+++ b/htdocs/core/modules/modAskPriceSupplier.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
@@ -21,11 +21,11 @@
  */
 
 /**
- *	\defgroup   askpricesupplier     Module de demandes de prix fournisseurs
- *	\brief      Module pour gerer la tenue des demandes fournisseurs
+ *	\defgroup   askpricesupplier     Module to request supplier price proposals
+ *	\brief      Module to request supplier price proposals
  *	\file       htdocs/core/modules/modAskPriceSupplier.class.php
  *	\ingroup    askpricesupplier
- *	\brief      Fichier de description et activation du module AskPriceSupplier
+ *	\brief      File to describe and activate module AskPriceSupplier
  */
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index c7fb5cfa5871109635366e4c2ba0cc8fa8fa11ec..53584e419eb4b28fc8d6ebb38834e20bfa548770 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -151,8 +151,9 @@ class modCommande extends DolibarrModules
 		$this->rights[$r][1] = 'Annuler les commandes clients';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'annuler';
-
+		$this->rights[$r][4] = 'order_advance';
+		$this->rights[$r][5] = 'annuler';
+		
 		$r++;
 		$this->rights[$r][0] = 89;
 		$this->rights[$r][1] = 'Supprimer les commandes clients';
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 84e6385694d763338ecd24e8a15c2970f3d13b88..98986a045da6d648ed4b36b9bfc92821841bb21c 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -180,7 +180,7 @@ class modFournisseur extends DolibarrModules
             $r++;
             $this->rights[$r][0] = 1189;
             $this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
-            $this->rights[$r][2] = 'd';
+            $this->rights[$r][2] = 'w';
             $this->rights[$r][3] = 0;
             $this->rights[$r][4] = 'commande_advance';
             $this->rights[$r][5] = 'check';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e701db321068f5798c9b7947e70ad471992932f4..b8590a1fc384c5c32adaab10d06326cefed34688 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -500,6 +500,8 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense Report
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b63b3e65ffc62f6921b3aa5dd071bb715dbbddbb..a01b5ffa7ab77ae3ba388de35e494a99bc3cd0c5 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -1,24 +1,24 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+* Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+* Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+* Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+* Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 
 /**
  *       \file       htdocs/user/perms.php
@@ -74,10 +74,10 @@ if ($user->id <> $id && ! $canreaduser) accessforbidden();
 
 if ($action == 'addrights' && $caneditperms)
 {
-    $edituser = new User($db);
+	$edituser = new User($db);
 	$edituser->fetch($id);
-    //$edituser->addrights($rights, $module, '', $entity); // TODO unused for the moment
-    $edituser->addrights($rights, $module);
+	//$edituser->addrights($rights, $module, '', $entity); // TODO unused for the moment
+	$edituser->addrights($rights, $module);
 
 	// Si on a touche a ses propres droits, on recharge
 	if ($id == $user->id)
@@ -90,10 +90,10 @@ if ($action == 'addrights' && $caneditperms)
 
 if ($action == 'delrights' && $caneditperms)
 {
-    $edituser = new User($db);
+	$edituser = new User($db);
 	$edituser->fetch($id);
-    //$edituser->delrights($rights, $module, '', $entity); // TODO unused for the moment
-    $edituser->delrights($rights, $module);
+	//$edituser->delrights($rights, $module, '', $entity); // TODO unused for the moment
+	$edituser->delrights($rights, $module);
 
 	// Si on a touche a ses propres droits, on recharge
 	if ($id == $user->id)
@@ -133,39 +133,39 @@ $modulesdir = dolGetModulesDirs();
 foreach($modulesdir as $dir)
 {
 	$handle=@opendir(dol_osencode($dir));
-    if (is_resource($handle))
-    {
-    	while (($file = readdir($handle))!==false)
-    	{
-    	    if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
-    	    {
-    	        $modName = substr($file, 0, dol_strlen($file) - 10);
-
-    	        if ($modName)
-    	        {
-    	            include_once $dir.$file;
-    	            $objMod = new $modName($db);
-
-    	            // Load all lang files of module
-    	            if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-    	            {
-    	            	foreach($objMod->langfiles as $domain)
-    	            	{
-    	            		$langs->load($domain);
-    	            	}
-    	            }
-    	            // Load all permissions
-    	            if ($objMod->rights_class)
-    	            {
-    	            	$forceEntity=((! empty($conf->multicompany->enabled) && ! empty($fuser->entity)) ? $fuser->entity : null);
-    	                $ret=$objMod->insert_permissions(0, $forceEntity);
-    	                $modules[$objMod->rights_class]=$objMod;
-    	                //print "modules[".$objMod->rights_class."]=$objMod;";
-    	            }
-    	        }
-    	    }
-    	}
-    }
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle))!==false)
+		{
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
+			{
+				$modName = substr($file, 0, dol_strlen($file) - 10);
+
+				if ($modName)
+				{
+					include_once $dir.$file;
+					$objMod = new $modName($db);
+
+					// Load all lang files of module
+					if (isset($objMod->langfiles) && is_array($objMod->langfiles))
+					{
+						foreach($objMod->langfiles as $domain)
+						{
+							$langs->load($domain);
+						}
+					}
+					// Load all permissions
+					if ($objMod->rights_class)
+					{
+						$forceEntity=((! empty($conf->multicompany->enabled) && ! empty($fuser->entity)) ? $fuser->entity : null);
+						$ret=$objMod->insert_permissions(0, $forceEntity);
+						$modules[$objMod->rights_class]=$objMod;
+						//print "modules[".$objMod->rights_class."]=$objMod;";
+					}
+				}
+			}
+		}
+	}
 }
 
 $db->commit();
@@ -195,19 +195,19 @@ dol_syslog("get user perms", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
-        array_push($permsuser,$obj->id);
-        $i++;
-    }
-    $db->free($result);
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
+		array_push($permsuser,$obj->id);
+		$i++;
+	}
+	$db->free($result);
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // Lecture des droits groupes
@@ -231,27 +231,27 @@ dol_syslog("get user perms", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
-        if (! isset($permsgroupbyentity[$obj->entity]))
-        	$permsgroupbyentity[$obj->entity] = array();
-        array_push($permsgroupbyentity[$obj->entity], $obj->id);
-        $i++;
-    }
-    $db->free($result);
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
+		if (! isset($permsgroupbyentity[$obj->entity]))
+			$permsgroupbyentity[$obj->entity] = array();
+		array_push($permsgroupbyentity[$obj->entity], $obj->id);
+		$i++;
+	}
+	$db->free($result);
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
 /*
  * Ecran ajout/suppression permission
- */
+*/
 
 print '<table class="border" width="100%">';
 
@@ -274,9 +274,9 @@ print '</tr>'."\n";
 
 print '</table><br>';
 
-if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"), 0, 1).'<br>';
+if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
 // Show warning about external users
-if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules)).'<br><br>'."\n";
+if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules))."\n";
 
 // For multicompany transversal mode
 // TODO Place a hook here
@@ -310,115 +310,115 @@ $sql.= " ORDER BY r.module, r.id";
 $result=$db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $var = True;
-    $oldmod='';
-
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
-
-        // Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
-        if (empty($modules[$obj->module]))
-        {
-            $i++;
-            continue;
-        }
-
-        if (isset($obj->module) && ($oldmod <> $obj->module))
-        {
-        	$oldmod = $obj->module;
-        	$var = !$var;
-
-        	// Rupture detectee, on recupere objMod
-        	$objMod=$modules[$obj->module];
-        	$picto=($objMod->picto?$objMod->picto:'generic');
-
-        	if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($fuser->admin)))
-        	{
-        		// On affiche ligne pour modifier droits
-        		print '<tr '. $bc[$var].'>';
-        		print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
-        		print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
-        		print '<td align="center" class="nowrap">';
-        		print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
-        		print '/';
-        		print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
-        		print '</td>';
-        		print '<td colspan="2">&nbsp;</td>';
-        		print '</tr>'."\n";
-        	}
-        }
-
-        print '<tr '. $bc[$var].'>';
-
-        // Picto and label of permission
-        print '<td>'.img_object('',$picto).' '.$objMod->getName().'</td>';
-
-        // Permission and tick
-        if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
-        	}
-        	print '<td align="center" class="nowrap">';
-        	print img_picto($langs->trans("Active"),'tick');
-        	print '</td>';
-        }
-        else if (in_array($obj->id, $permsuser))					// Permission own by user
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-        	}
-        	print '<td align="center" class="nowrap">';
-        	print img_picto($langs->trans("Active"),'tick');
-        	print '</td>';
-        }
-
-        else if (is_array($permsgroupbyentity[$entity]))
-        {
-	        if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission own by group
-	        {
-	        	if ($caneditperms)
-	        	{
-	        		print '<td align="center">';
-	        		print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup"));
-	        		print '</td>';
-	        	}
-	        	print '<td align="center" class="nowrap">';
-	        	print img_picto($langs->trans("Active"),'tick');
-	        	print '</td>';
-	        }
-	        else
-	        {
-	        	// Do not own permission
-	        	if ($caneditperms)
-	        	{
-	        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-	        	}
-	        	print '<td>&nbsp</td>';
-	        }
-        }
-        else
-        {
-        	// Do not own permission
-        	if ($caneditperms)
-        	{
-        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-        	}
-        	print '<td>&nbsp</td>';
-        }
-
-        $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
-        print '<td>'.$perm_libelle. '</td>';
-
-        print '</tr>'."\n";
-
-        $i++;
-    }
+	$num = $db->num_rows($result);
+	$i = 0;
+	$var = True;
+	$oldmod='';
+
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
+
+		// Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
+		if (empty($modules[$obj->module]))
+		{
+			$i++;
+			continue;
+		}
+
+		if (isset($obj->module) && ($oldmod <> $obj->module))
+		{
+			$oldmod = $obj->module;
+			$var = !$var;
+
+			// Rupture detectee, on recupere objMod
+			$objMod=$modules[$obj->module];
+			$picto=($objMod->picto?$objMod->picto:'generic');
+
+			if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($fuser->admin)))
+			{
+				// On affiche ligne pour modifier droits
+				print '<tr '. $bc[$var].'>';
+				print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
+				print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
+				print '<td align="center" class="nowrap">';
+				print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+				print '/';
+				print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+				print '</td>';
+				print '<td colspan="2">&nbsp;</td>';
+				print '</tr>'."\n";
+			}
+		}
+
+		print '<tr '. $bc[$var].'>';
+
+		// Picto and label of permission
+		print '<td>'.img_object('',$picto).' '.$objMod->getName().'</td>';
+
+		// Permission and tick
+		if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin
+		{
+			if ($caneditperms)
+			{
+				print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
+			}
+			print '<td align="center" class="nowrap">';
+			print img_picto($langs->trans("Active"),'tick');
+			print '</td>';
+		}
+		else if (in_array($obj->id, $permsuser))					// Permission own by user
+		{
+			if ($caneditperms)
+			{
+				print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+			}
+			print '<td align="center" class="nowrap">';
+			print img_picto($langs->trans("Active"),'tick');
+			print '</td>';
+		}
+
+		else if (is_array($permsgroupbyentity[$entity]))
+		{
+			if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission own by group
+			{
+				if ($caneditperms)
+				{
+					print '<td align="center">';
+					print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup"));
+					print '</td>';
+				}
+				print '<td align="center" class="nowrap">';
+				print img_picto($langs->trans("Active"),'tick');
+				print '</td>';
+			}
+			else
+			{
+				// Do not own permission
+				if ($caneditperms)
+				{
+					print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+				}
+				print '<td>&nbsp</td>';
+			}
+		}
+		else
+		{
+			// Do not own permission
+			if ($caneditperms)
+			{
+				print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+			}
+			print '<td>&nbsp</td>';
+		}
+
+		$perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
+		print '<td>'.$perm_libelle. '</td>';
+
+		print '</tr>'."\n";
+
+		$i++;
+	}
 }
 else dol_print_error($db);
 print '</table>';