lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #972 from LProemer/develop

Browse Source 
Fix: 'rights' instead of 'right'
This commit is contained in:
Laurent Destailleur 2013-05-22 07:28:26 -07:00
commit a9fe9cf0b2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/company.lib.php
View File

@ -60,15 +60,15 @@ function societe_prepare_head($object)
$head[$h][2] = 'supplier'; $head[$h][2] = 'supplier';
$h++; $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][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Agenda"); $head[$h][1] = $langs->trans("Agenda");
$head[$h][2] = 'agenda'; $head[$h][2] = 'agenda';
$h++; $h++;
} }
//show categorie tab //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; $type = 2;
if ($object->fournisseur) $type = 1; if ($object->fournisseur) $type = 1;