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

Work on invoicing time spent

Browse Source
This commit is contained in:
Laurent Destailleur 2019-01-15 20:59:56 +01:00
parent f8ca44e42c
commit adc6c1d2d1
1 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,10 +278,16 @@ if (! empty($project_ref) && ! empty($withproject))
// To show all time lines for project // To show all time lines for project
$projectidforalltimes=0; $projectidforalltimes=0;
if (GETPOST('projectid','none')) if (GETPOST('projectid','int'))
{ {
$projectidforalltimes=GETPOST('projectid','int'); $projectidforalltimes=GETPOST('projectid','int');
} }
elseif (GETPOST('project_ref','alpha'))
{
$projectstatic->fetch(0, GETPOST('project_ref','alpha'));
$projectidforalltimes=$projectstatic->id;
$withproject=1;
}
/* /*
@ -544,7 +550,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
else print '0 %'; else print '0 %';
} }
else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>'; else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
print '</td></tr>'; print '</td>';
print '</tr>';
print '</table>'; print '</table>';
@ -665,7 +673,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$arrayfields['t.note']=array('label'=>$langs->trans("Note"), 'checked'=>1); $arrayfields['t.note']=array('label'=>$langs->trans("Note"), 'checked'=>1);
$arrayfields['t.task_duration']=array('label'=>$langs->trans("Duration"), 'checked'=>1); $arrayfields['t.task_duration']=array('label'=>$langs->trans("Duration"), 'checked'=>1);
$arrayfields['value'] =array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled)?0:1)); $arrayfields['value'] =array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled)?0:1));
$arrayfields['valuebilled'] =array('label'=>$langs->trans("AmountInvoiced"), 'checked'=>1, 'enabled'=>((! empty($conf->global->PROJECT_HIDE_TASKS) || empty($conf->global->PROJECT_BILL_TIME_SPENT))?0:1)); $arrayfields['valuebilled'] =array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>((! empty($conf->global->PROJECT_HIDE_TASKS) || empty($conf->global->PROJECT_BILL_TIME_SPENT))?0:1));
// Extra fields // Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{ {
@ -763,6 +771,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
print '<td>'.$langs->trans("Note").'</td>'; print '<td>'.$langs->trans("Note").'</td>';
print '<td>'.$langs->trans("NewTimeSpent").'</td>'; print '<td>'.$langs->trans("NewTimeSpent").'</td>';
print '<td>'.$langs->trans("ProgressDeclared").'</td>'; print '<td>'.$langs->trans("ProgressDeclared").'</td>';
if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
{
print '<td></td>';
}
print '<td></td>'; print '<td></td>';
print "</tr>\n"; print "</tr>\n";
@ -812,6 +824,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress, 'progress', 0, 5, 0, 100, 1); print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress, 'progress', 0, 5, 0, 100, 1);
print '</td>'; print '</td>';
// Invoiced
if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
{
print '<td></td>';
}
print '<td align="center">'; print '<td align="center">';
print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'">'; print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'">';
print ' &nbsp; '; print ' &nbsp; ';
@ -1102,10 +1120,27 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Value billed // Value billed
if (! empty($arrayfields['valuebilled']['checked'])) if (! empty($arrayfields['valuebilled']['checked']))
{ {
print '<td align="right">'; print '<td align="right">'; // invoice_id and invoice_line_id
$valuebilled = price2num($task_time->total_ht); if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency); {
print '</td>'; if ($projectstatic->bill_time)
{
if ($task_time->invoice_id)
{
$tmpinvoice->fetch($task_time->invoice_id);
print $tmpinvoice->getNomUrl(1);
}
else
{
print $langs->trans("No");
}
}
else
{
print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
}
}
print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalvaluebilledfield']=$totalarray['nbfield']; if (! $i) $totalarray['totalvaluebilledfield']=$totalarray['nbfield'];
$totalarray['totalvaluebilled'] += $valuebilled; $totalarray['totalvaluebilled'] += $valuebilled;