diff --git a/htdocs/multicompany/templates/admin-entity.tpl b/htdocs/multicompany/templates/admin-entity.tpl index b549d525e71..ce231150d76 100644 --- a/htdocs/multicompany/templates/admin-entity.tpl +++ b/htdocs/multicompany/templates/admin-entity.tpl @@ -22,8 +22,9 @@
| {$langs->trans('Name')} | +{$langs->trans('Label')} | {$langs->trans('Description')} | +{$langs->trans('Name')} | {$langs->trans('Town')} | {$langs->trans('Country')} | {$langs->trans('Currency')} | @@ -36,6 +37,7 @@
| {$entities[mc].label} | {$entities[mc].description} | +{$entities[mc].details.MAIN_INFO_SOCIETE_NOM} | {$entities[mc].details.MAIN_INFO_SOCIETE_VILLE} | {$entities[mc].details.MAIN_INFO_SOCIETE_PAYS} | {$entities[mc].details.MAIN_MONNAIE} | diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index 648d7c4b00b..ec9d2c14547 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -196,9 +196,24 @@ else dol_fiche_head($head, $tab, $langs->trans("Project"),0,'project'); $param=($_REQUEST["mode"]=='mine'?'&mode=mine':''); - - print ''; + print ''; /* @@ -259,7 +271,7 @@ else if ($user->rights->projet->creer) { - if (empty($project->user_resp_id) || $project->user_resp_id == -1 || $project->user_resp_id == $user->id) + if ($userAccess) { print ''.$langs->trans('AddTask').''; }