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

on going

Browse Source
This commit is contained in:
Florian HENRY 2022-04-15 10:57:16 +02:00
parent 5a8e5c4780
commit 7e1079c65c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,7 +276,6 @@ NewInter=New intervention
OneLinePerTask=One line per task OneLinePerTask=One line per task
OneLinePerPeriod=One line per period OneLinePerPeriod=One line per period
OneLinePerTimeSpentLine=One line for each time spent declaration OneLinePerTimeSpentLine=One line for each time spent declaration
OneLinePerTimeSpentLineProduct=One line for each time spent declaration with product defined
AddDetailDateAndDuration=With date and duration into line description AddDetailDateAndDuration=With date and duration into line description
RefTaskParent=Ref. Parent Task RefTaskParent=Ref. Parent Task
ProfitIsCalculatedWith=Profit is calculated using ProfitIsCalculatedWith=Profit is calculated using

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

@ -475,7 +475,7 @@ if ($action == 'confirm_generateinvoice') {
} }
} }
} }
} elseif ($generateinvoicemode == 'onelineperperiod' || $generateinvoicemode == 'onelineperperiodproduct') { // One line for each time spent line } elseif ($generateinvoicemode == 'onelineperperiod') { // One line for each time spent line
$arrayoftasks = array(); $arrayoftasks = array();
$withdetail=GETPOST('detail_time_duration', 'alpha'); $withdetail=GETPOST('detail_time_duration', 'alpha');
@ -531,7 +531,7 @@ if ($action == 'confirm_generateinvoice') {
$localtax2line = $localtax2; $localtax2line = $localtax2;
if ($generateinvoicemode == 'onelineperperiodproduct' && !empty($value['fk_product']) && $value['fk_product']!==$idprod) { if (!empty($value['fk_product']) && $value['fk_product']!==$idprod) {
if (!array_key_exists($value['fk_product'], $product_data_cache)) { if (!array_key_exists($value['fk_product'], $product_data_cache)) {
$result = $tmpproduct->fetch($value['fk_product']); $result = $tmpproduct->fetch($value['fk_product']);
if ($result < 0) { if ($result < 0) {
@ -1210,7 +1210,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
'onelineperuser'=>'OneLinePerUser', 'onelineperuser'=>'OneLinePerUser',
'onelinepertask'=>'OneLinePerTask', 'onelinepertask'=>'OneLinePerTask',
'onelineperperiod'=>'OneLinePerTimeSpentLine', 'onelineperperiod'=>'OneLinePerTimeSpentLine',
'onelineperperiodproduct'=>'OneLinePerTimeSpentLineProduct',
); );
print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1); print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
print "\n".'<script type="text/javascript">'; print "\n".'<script type="text/javascript">';