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

Merge pull request #18558 from FHenry/dev_more_inv_task_comment

Browse Source 
From #18530 display date and duration in invoice generation from task time spent
This commit is contained in:
Laurent Destailleur 2021-09-01 16:27:24 +02:00 committed by GitHub
commit 8dd4dae8f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/projects.lang
View File

@ -274,6 +274,7 @@ NewInter=New intervention
OneLinePerTask=One line per task
OneLinePerPeriod=One line per period
OneLinePerTimeSpentLine=One line for each time spent declaration
AddDetailDateAndDuration=With date and duration into line description
RefTaskParent=Ref. Parent Task
ProfitIsCalculatedWith=Profit is calculated using
AddPersonToTask=Add also to tasks

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

@ -449,6 +449,7 @@ if ($action == 'confirm_generateinvoice') {
}
} elseif ($generateinvoicemode == 'onelineperperiod') { // One line for each time spent line
$arrayoftasks = array();
$withdetail=GETPOST('detail_time_duration', 'alpha');
foreach ($toselect as $key => $value) {
// Get userid, timepent
$object->fetchTimeSpent($value);
@ -462,8 +463,13 @@ if ($action == 'confirm_generateinvoice') {
$arrayoftasks[$object->timespent_id]['timespent'] = $object->timespent_duration;
$arrayoftasks[$object->timespent_id]['totalvaluetodivideby3600'] = $object->timespent_duration * $object->timespent_thm;
$arrayoftasks[$object->timespent_id]['note'] = $ftask->ref.' - '.$ftask->label.' - '.$username.($object->timespent_note ? ' - '.$object->timespent_note : ''); // TODO Add user name in note
if (!empty($conf->global->PROJECT_TIME_SPENT_INTO_INVOICE_ADD_TIME_DT)) {
$arrayoftasks[$object->timespent_id]['note'] .= "\n";
if (!empty($withdetail)) {
if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) {
$arrayoftasks[$object->timespent_id]['note'] .= "<br/>";
} else {
$arrayoftasks[$object->timespent_id]['note'] .= "\n";
}
if (!empty($object->timespent_withhour)) {
$arrayoftasks[$object->timespent_id]['note'] .= $langs->trans("Date") . ': ' . dol_print_date($object->timespent_datehour);
} else {
@ -1103,6 +1109,25 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
'onelineperperiod'=>'OneLinePerTimeSpentLine',
);
print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
print "\n".'<script type="text/javascript">';
print '
$(document).ready(function () {
setDetailVisibility();
$("#generateinvoicemode").change(function() {
setDetailVisibility();
});
function setDetailVisibility() {
generateinvoicemode = $("#generateinvoicemode option:selected").val();
if (generateinvoicemode=="onelineperperiod") {
$("#detail_time_duration").show();
} else {
$("#detail_time_duration").hide();
}
}
});
';
print '</script>'."\n";
print '<span style="display:none" id="detail_time_duration"><input type="checkbox" value="detail" name="detail_time_duration"/>'.$langs->trans('AddDetailDateAndDuration').'</span>';
print '</td>';
print '</tr>';