diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index c984bd30ea5..b07b41c1b88 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -586,27 +586,27 @@ print ''; print "\n"; print ''; -if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("Project").''; -if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("ThirdParty").''; -print ''.$langs->trans("Task").''; +if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("Project").''; +if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("ThirdParty").''; +print ''.$langs->trans("Task").''; // TASK fields $extrafieldsobjectkey='projet_task'; $extrafieldsobjectprefix='efpt.'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; if (! empty($arrayfields['t.planned_workload']['checked'])) { - print ''.$langs->trans("PlannedWorkload").''; + print ''.$langs->trans("PlannedWorkload").''; } if (! empty($arrayfields['t.progress']['checked'])) { - print ''.$langs->trans("ProgressDeclared").''; + print ''.$langs->trans("ProgressDeclared").''; } /*print ''.$langs->trans("TimeSpent").''; if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").''; else print ''.$langs->trans("TimeSpentByUser").'';*/ -print ''.$langs->trans("TimeSpent").'
('.$langs->trans("Everybody").')'; -print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?'
('.dol_trunc($usertoprocess->firstname, 10).')':'').''; -print ''.$langs->trans("HourStart").''; +print ''.$langs->trans("TimeSpent").'
('.$langs->trans("Everybody").')'; +print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?'
('.dol_trunc($usertoprocess->firstname, 10).')':'').''; +print ''.$langs->trans("HourStart").''; // By default, we can edit only tasks we are assigned to $restrictviewformytask=((! isset($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)) ? 2 : $conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED); @@ -643,8 +643,8 @@ if (! $isavailable[$daytoparse]['morning'] && ! $isavailable[$daytoparse]['after elseif (! $isavailable[$daytoparse]['morning']) $cssonholiday.='onholidaymorning '; elseif (! $isavailable[$daytoparse]['afternoon']) $cssonholiday.='onholidayafternoon '; -print ''.$langs->trans("Duration").''; -print ''.$langs->trans("Note").''; +print ''.$langs->trans("Duration").''; +print ''.$langs->trans("Note").''; //print ''; print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index a037466d935..f5db207a42e 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -639,26 +639,26 @@ print ''; print "\n"; print ''; -if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("Project").''; -if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("ThirdParty").''; -print ''.$langs->trans("Task").''; +if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("Project").''; +if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("ThirdParty").''; +print ''.$langs->trans("Task").''; // TASK fields $extrafieldsobjectkey='projet_task'; $extrafieldsobjectprefix='efpt.'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; if (! empty($arrayfields['t.planned_workload']['checked'])) { - print ''.$langs->trans("PlannedWorkload").''; + print ''.$langs->trans("PlannedWorkload").''; } if (! empty($arrayfields['t.progress']['checked'])) { - print ''.$langs->trans("ProgressDeclared").''; + print ''.$langs->trans("ProgressDeclared").''; } /*print ''.$langs->trans("TimeSpent").''; if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").''; else print ''.$langs->trans("TimeSpentByUser").'';*/ -print ''.$langs->trans("TimeSpent").'
('.$langs->trans("Everybody").')'; -print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?'
('.dol_trunc($usertoprocess->firstname, 10).')':'').''; +print ''.$langs->trans("TimeSpent").'
('.$langs->trans("Everybody").')'; +print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?'
('.dol_trunc($usertoprocess->firstname, 10).')':'').''; for ($idw=0; $idw<7; $idw++) { @@ -678,7 +678,7 @@ for ($idw=0; $idw<7; $idw++) elseif (! $isavailable[$tmpday]['morning']) $cssonholiday.='onholidaymorning '; elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon '; - print ''.dol_print_date($dayinloopfromfirstdaytoshow, '%a').'
'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').''; + print ''.dol_print_date($dayinloopfromfirstdaytoshow, '%a').'
'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').''; } //print ''; print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');