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

fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0

Browse Source
This commit is contained in:
florian HENRY 2018-12-01 15:42:07 +01:00
parent faf7ea345f
commit b9046b9174
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -164,27 +164,27 @@ class doc_generic_project_odt extends ModelePDFProjects
* @param Translate $outputlangs Lang object to use for output * @param Translate $outputlangs Lang object to use for output
* @return array Return a substitution array * @return array Return a substitution array
*/ */
function get_substitutionarray_tasks($task,$outputlangs) function get_substitutionarray_tasks(Task $task,$outputlangs)
{ {
// phpcs:enable // phpcs:enable
global $conf; global $conf;
$resarray = array( $resarray = array(
'task_ref'=>$task->ref, 'task_ref'=>$task->ref,
'task_fk_project'=>$task->fk_project, 'task_fk_project'=>$task->fk_project,
'task_projectref'=>$task->projectref, 'task_projectref'=>$task->projectref,
'task_projectlabel'=>$task->projectlabel, 'task_projectlabel'=>$task->projectlabel,
'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'=>$task->duration, 'task_duration'=>$task->duration,
'task_duration_hour'=>convertSecondToTime($task->duration,'all'), 'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
'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'),
'task_date_end'=>dol_print_date($task->date_end,'day'), 'task_date_end'=>dol_print_date($task->date_end,'day'),
'task_note_private'=>$task->note_private, 'task_note_private'=>$task->note_private,
'task_note_public'=>$task->note_public 'task_note_public'=>$task->note_public
); );
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@ -750,6 +750,7 @@ class doc_generic_project_odt extends ModelePDFProjects
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
$tasks = array(); $tasks = array();
$row=array();
$listlinestasktime = $listlines->__get('taskstimes'); $listlinestasktime = $listlines->__get('taskstimes');
if (empty($num)) { if (empty($num)) {
$row['rowid']=''; $row['rowid']='';
@ -1064,7 +1065,7 @@ class doc_generic_project_odt extends ModelePDFProjects
'title' => "ListSocialContributionAssociatedProject", 'title' => "ListSocialContributionAssociatedProject",
'class' => 'ChargeSociales', 'class' => 'ChargeSociales',
'table' => 'chargesociales', 'table' => 'chargesociales',
'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id, 'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $object->id,
'test' => $conf->tax->enabled && $user->rights->tax->charges->lire 'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
), ),
'stock_mouvement' => array( 'stock_mouvement' => array(