This commit is contained in:
Laurent Destailleur 2017-11-16 23:11:49 +01:00
parent f708450276
commit ba372bfc5c
3 changed files with 6 additions and 5 deletions

View File

@ -96,7 +96,8 @@ ActivityOnProjectYesterday=Activity on project yesterday
ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month ActivityOnProjectThisMonth=Activity on project this month
ActivityOnProjectThisYear=Activity on project this year ActivityOnProjectThisYear=Activity on project this year
ChildOfTask=Child of project/task ChildOfProjectTask=Child of project/task
ChildOfTask=Child of task
NotOwnerOfProject=Not owner of this private project NotOwnerOfProject=Not owner of this private project
AffectedTo=Allocated to AffectedTo=Allocated to
CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab. CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.

View File

@ -116,7 +116,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
} }
else if (empty($_POST['task_parent'])) else if (empty($_POST['task_parent']))
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfTask")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfProjectTask")), null, 'errors');
$action='create'; $action='create';
$error++; $error++;
} }
@ -370,7 +370,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print '</td></tr>'; print '</td></tr>';
// List of projects // List of projects
print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfTask").'</td><td>'; print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
print $formother->selectProjectTasks(GETPOST('task_parent'),$projectid?$projectid:$object->id, 'task_parent', 0, 0, 1, 1); print $formother->selectProjectTasks(GETPOST('task_parent'),$projectid?$projectid:$object->id, 'task_parent', 0, 0, 1, 1);
print '</td></tr>'; print '</td></tr>';

View File

@ -194,7 +194,7 @@ if ($action == 'remove_file' && $user->rights->projet->creer)
/* /*
* View * View
*/ */
llxHeader('', $langs->trans("Task")); llxHeader('', $langs->trans("Task"));
@ -376,7 +376,7 @@ if ($id > 0 || ! empty($ref))
} }
// Task parent // Task parent
print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>'; print '<tr><td>'.$langs->trans("ChildOfProjectTask").'</td><td>';
print $formother->selectProjectTasks($object->fk_task_parent, $projectstatic->id, 'task_parent', ($user->admin?0:1), 0, 0, 0, $object->id); print $formother->selectProjectTasks($object->fk_task_parent, $projectstatic->id, 'task_parent', ($user->admin?0:1), 0, 0, 0, $object->id);
print '</td></tr>'; print '</td></tr>';