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

Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop

Browse Source
This commit is contained in:
Guillaume Matheron 2020-01-02 15:18:26 +01:00
commit 9efdec6c6e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,7 +412,7 @@ if ($action == 'confirm_generateinvoice')
$username = $fuser->getFullName($langs); $username = $fuser->getFullName($langs);
// Define qty per hour // Define qty per hour
$qtyhour = round($value['timespent'] / 3600, 2); $qtyhour = $value['timespent'] / 3600;
$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY); $qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
// If no unit price known // If no unit price known
@ -422,7 +422,7 @@ if ($action == 'confirm_generateinvoice')
} }
// Add lines // Add lines
$lineid = $tmpinvoice->addline($langs->trans("TimeSpentForInvoice", $username).' : '.$qtyhourtext, $pu_ht, $qtyhour/$prodDurationHours, $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0)); $lineid = $tmpinvoice->addline($langs->trans("TimeSpentForInvoice", $username).' : '.$qtyhourtext, $pu_ht, round($qtyhour/$prodDurationHours,2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
// Update lineid into line of timespent // Update lineid into line of timespent
$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id; $sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
@ -456,7 +456,7 @@ if ($action == 'confirm_generateinvoice')
$username = $fuser->getFullName($langs); $username = $fuser->getFullName($langs);
// Define qty per hour // Define qty per hour
$qtyhour = round($value['timespent'] / 3600, 2); $qtyhour = $value['timespent'] / 3600;
$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY); $qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
// If no unit price known // If no unit price known
@ -466,7 +466,7 @@ if ($action == 'confirm_generateinvoice')
} }
// Add lines // Add lines
$lineid = $tmpinvoice->addline($value['note'], $pu_ht, $qtyhour/$prodDurationHours, $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0)); $lineid = $tmpinvoice->addline($value['note'], $pu_ht, round($qtyhour/$prodDurationHours,2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
// Update lineid into line of timespent // Update lineid into line of timespent
$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id; $sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
@ -496,7 +496,7 @@ if ($action == 'confirm_generateinvoice')
$ftask = new Task($db); $ftask = new Task($db);
$ftask->fetch($task_id); $ftask->fetch($task_id);
// Define qty per hour // Define qty per hour
$qtyhour = round($value['timespent'] / 3600, 2); $qtyhour = $value['timespent'] / 3600;
$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY); $qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
// If no unit price known // If no unit price known
@ -507,7 +507,7 @@ if ($action == 'confirm_generateinvoice')
// Add lines // Add lines
$lineName = $ftask->ref.' - '.$ftask->label; $lineName = $ftask->ref.' - '.$ftask->label;
$lineid = $tmpinvoice->addline($lineName, $pu_ht, $qtyhour/$prodDurationHours, $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0)); $lineid = $tmpinvoice->addline($lineName, $pu_ht, round($qtyhour/$prodDurationHours,2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
// Update lineid into line of timespent // Update lineid into line of timespent
$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id; $sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
@ -972,8 +972,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
print $langs->trans('InvoiceToUse'); print $langs->trans('InvoiceToUse');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
$form->selectInvoice('invoice', '', 'invoiceid',24,0,$langs->trans('NewInvoice'), $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'),
1,0,0,'maxwidth500','','all'); 1, 0, 0, 'maxwidth500', '', 'all');
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
/*print '<tr>'; /*print '<tr>';