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

travis

Browse Source
This commit is contained in:
florian HENRY 2020-04-23 16:18:31 +02:00
parent 7a206df96f
commit 32385b75e1
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commondocgenerator.class.php
View File

@ -228,7 +228,6 @@ abstract class CommonDocGenerator
$object->fetch_optionals(); $object->fetch_optionals();
$array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs); $array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);
} }
return $array_thirdparty; return $array_thirdparty;
} }
@ -292,7 +291,6 @@ abstract class CommonDocGenerator
$object->fetch_optionals(); $object->fetch_optionals();
$array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs); $array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);
} }
return $array_contact; return $array_contact;
} }
@ -509,7 +507,6 @@ abstract class CommonDocGenerator
$object->fetch_optionals(); $object->fetch_optionals();
$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs); $resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
} }
return $resarray; return $resarray;
@ -688,7 +685,6 @@ abstract class CommonDocGenerator
$object->fetch_optionals(); $object->fetch_optionals();
$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs); $array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
} }
return $array_shipment; return $array_shipment;

5
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -153,7 +153,6 @@ class doc_generic_task_odt extends ModelePDFTask
$object->fetch_optionals(); $object->fetch_optionals();
$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs); $resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
} }
return $resarray; return $resarray;
@ -181,8 +180,8 @@ class doc_generic_task_odt extends ModelePDFTask
'task_label'=>$task->label, 'task_label'=>$task->label,
'task_description'=>$task->description, 'task_description'=>$task->description,
'task_fk_parent'=>$task->fk_parent, 'task_fk_parent'=>$task->fk_parent,
'task_duration'=>convertSecondToTime($task->duration_effective,'allhourmin'), 'task_duration'=>convertSecondToTime($task->duration_effective, 'allhourmin'),
'task_planned_workload'=>convertSecondToTime($task->planned_workload,'allhourmin'), 'task_planned_workload'=>convertSecondToTime($task->planned_workload, 'allhourmin'),
'task_progress'=>$task->progress, 'task_progress'=>$task->progress,
'task_public'=>$task->public, 'task_public'=>$task->public,
'task_date_start'=>dol_print_date($task->date_start, 'day'), 'task_date_start'=>dol_print_date($task->date_start, 'day'),