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

Fix: visible task into area "time" for "My task" must limit task to

Browse Source 
tasks i am assigned to.
This commit is contained in:
Laurent Destailleur 2014-08-07 12:05:42 +02:00
parent 48fc945648
commit d0c3a7913f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -15,7 +15,9 @@ Fix: [ bug #1528 ] Leopard Services numeration module description is not transla
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas
Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances
Fix: Update impayees.php Fix: Update impayees.php
Fix: Fix Link product, In list view and label product Fix: Link product, In list view and label product
Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to.
Fix: When disabled, all fields to add time into task line must be disabled.
***** ChangeLog for 3.5.4 compared to 3.5.3 ***** ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
Fix: Hide title of event when agenda module disabled. Fix: Hide title of event when agenda module disabled.

11
htdocs/projet/tasks/time.php
View File

@ -65,7 +65,8 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
} }
if (empty($_POST["userid"])) if (empty($_POST["userid"]))
{ {
setEventMessage($langs->trans('ErrorUserNotAffectedToTask'),'errors'); $langs->load("errors");
setEventMessage($langs->trans('ErrorUserNotAssignedToTask'),'errors');
$error++; $error++;
} }
@ -327,9 +328,13 @@ if ($id > 0 || ! empty($ref))
// Contributor // Contributor
print '<td class="nowrap">'; print '<td class="nowrap">';
$contactoftask=$object->getListContactId('internal'); $restrictaddtimetocontactoftask=0;
if (empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS))
{
$restrictaddtimetocontactoftask=$object->getListContactId('internal');
}
print img_object('','user'); print img_object('','user');
print $form->select_dolusers($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$contactoftask); print $form->select_dolusers($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$restrictaddtimetocontactoftask); // Note: If user is not allowed it will be disabled into combo list and userid not posted
print '</td>'; print '</td>';
// Note // Note