diff --git a/ChangeLog b/ChangeLog index 983afc70aa3..895ee955d53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ Fix: Avoid home project page to hung when too many tasks opened. Fix: bug #1295: Error when creating an agenda extrafield with a number as reference Fix: Translation of number for pt_PT. Fix: Error on ajax_constantonoff function. +Fix: [ bug #1323 ] problème pour générer un odt depuis les taches dans projet. ***** ChangeLog for 3.5.1 compared to 3.5.0 ***** diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php index 86a5c6b3be4..f9d10f90534 100644 --- a/htdocs/core/modules/project/task/modules_task.php +++ b/htdocs/core/modules/project/task/modules_task.php @@ -111,7 +111,7 @@ abstract class ModeleNumRefTask /** * Renvoi prochaine valeur attribuee - * + * * @param Societe $objsoc Object third party * @param Project $project Object project * @return string Valeur @@ -171,7 +171,7 @@ function task_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $h } else { - $modele='baleine'; + $modele='nodefault'; } } @@ -194,7 +194,7 @@ function task_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $h $file = $prefix."_".$modele.".modules.php"; // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/project/pdf/".$file,0); + $file=dol_buildpath($reldir."core/modules/project/task/pdf/".$file,0); if (file_exists($file)) { $filefound=1; diff --git a/htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php index fd63ae5a404..f3ccc773681 100644 --- a/htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php @@ -340,7 +340,7 @@ class doc_generic_task_odt extends ModelePDFTask $texte.= '