Merge pull request #972 from LProemer/develop

Fix: 'rights' instead of 'right'
Dolibarr · May 22, 2013 · a9fe9cf · a9fe9cf
2 parents 9943892 + f1d9a65
commit a9fe9cf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
@@ -60,15 +60,15 @@ function societe_prepare_head($object)
         $head[$h][2] = 'supplier';
         $h++;
     }
-    if (! empty($conf->agenda->enabled) && !empty($user->right->agenda->lire))
-    {
+    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+     {
     	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
     	$head[$h][1] = $langs->trans("Agenda");
     	$head[$h][2] = 'agenda';
     	$h++;
     }
     //show categorie tab
-    if (! empty($conf->categorie->enabled) && !empty($user->right->categorie->lire))
+    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
     {
         $type = 2;
         if ($object->fournisseur) $type = 1;