Skip to content
Snippets Groups Projects
Commit 16a716eb authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #4655 from defrance/patch-103

ODT generation : No segment defined in odt file is not an error
parents 952f88b7 83494463
No related branches found
No related tags found
No related merge requests found
...@@ -697,11 +697,16 @@ class doc_generic_project_odt extends ModelePDFProjects ...@@ -697,11 +697,16 @@ class doc_generic_project_odt extends ModelePDFProjects
$odfHandler->mergeSegment($listlines); $odfHandler->mergeSegment($listlines);
} }
catch(OdfException $e) catch(OdfException $e)
{
$ExceptionTrace=$e->getTrace();
// no segment defined on ODT is not an error
if($ExceptionTrace[0]['function'] != 'setSegment')
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($this->error, LOG_WARNING); dol_syslog($this->error, LOG_WARNING);
return -1; return -1;
} }
}
// Replace tags of project files // Replace tags of project files
try try
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment