diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index f8f82d34c1a..19d89c6799b 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -346,7 +346,7 @@ function project_admin_prepare_head() * @param int $projectidfortotallink 0 or Id of project to use on total line (link to see all time consumed for project) * @param string $filterprogresscalc filter text * @param string $showbilltime Add the column 'TimeToBill' and 'TimeBilled' - * @return void + * @return int Nb of tasks shown */ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0, $filterprogresscalc = '', $showbilltime = 0) { diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 4e4d514380e..166fb0b15fb 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -216,7 +216,7 @@ if ($id > 0 || ! empty($ref)) else print $langs->trans('PrivateProject'); print ''; - if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $object->oopp_status) + if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $object->opp_status) { // Opportunity status print ''.$langs->trans("OpportunityStatus").''; diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index 2ecac789bc3..adc7fb51c3e 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -157,21 +157,21 @@ if ($id > 0 || ! empty($ref)) print ''; if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { - print 'usage_opportunity ? ' checked="checked"' : '')).'"> '; + print 'usage_opportunity ? ' checked="checked"' : '')).'"> '; $htmltext = $langs->trans("ProjectFollowOpportunity"); print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext); print '
'; } if (empty($conf->global->PROJECT_HIDE_TASKS)) { - print 'usage_task ? ' checked="checked"' : '')).'"> '; + print 'usage_task ? ' checked="checked"' : '')).'"> '; $htmltext = $langs->trans("ProjectFollowTasks"); print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext); print '
'; } if (! empty($conf->global->PROJECT_BILL_TIME_SPENT)) { - print 'usage_bill_time ? ' checked="checked"' : '')).'"> '; + print 'usage_bill_time ? ' checked="checked"' : '')).'"> '; $htmltext = $langs->trans("ProjectBillTimeDescription"); print $form->textwithpicto($langs->trans("BillTime"), $htmltext); print '
';