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

FIX #11325 FIX #5249

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-16 22:17:04 +02:00
parent f833dc1176
commit dd5e42e325
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,7 +467,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$object->project = clone $projectstatic; $object->project = clone $projectstatic;
} }
$userWrite = $projectstatic->restrictedProjectArea($user, 'write'); $userRead = $projectstatic->restrictedProjectArea($user, 'read');
$linktocreatetime = ''; $linktocreatetime = '';
if ($projectstatic->id > 0) if ($projectstatic->id > 0)
@ -582,9 +582,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$linktocreatetimeBtnStatus = 0; $linktocreatetimeBtnStatus = 0;
$linktocreatetimeUrl = ''; $linktocreatetimeUrl = '';
$linktocreatetimeHelpText = ''; $linktocreatetimeHelpText = '';
if ($user->rights->projet->all->creer || $user->rights->projet->creer) if ($user->rights->projet->all->lire || $user->rights->projet->lire) // To enter time, read permission is enough
{ {
if ($projectstatic->public || $userWrite > 0) if ($projectstatic->public || $userRead > 0)
{ {
$linktocreatetimeBtnStatus = 1; $linktocreatetimeBtnStatus = 1;
@ -1017,7 +1017,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Duration - Time spent // Duration - Time spent
print '<td>'; print '<td>';
print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text'); $durationtouse = ($_POST['timespent_duration']?$_POST['timespent_duration']:'');
if (GETPOSTISSET('timespent_durationhour') || GETPOSTISSET('timespent_durationmin'))
{
$durationtouse = (GETPOST('timespent_durationhour') * 3600 + GETPOST('timespent_durationmin') * 60);
}
print $form->select_duration('timespent_duration', $durationtouse, 0, 'text');
print '</td>'; print '</td>';
// Progress declared // Progress declared