Fix phpcs

This commit is contained in:
Laurent Destailleur 2021-10-06 18:40:32 +02:00
parent 144de734ce
commit 88a482c615

View File

@ -413,26 +413,26 @@ class doc_generic_reception_odt extends ModelePdfReception
dol_syslog($e->getMessage(), LOG_INFO); dol_syslog($e->getMessage(), LOG_INFO);
} }
if ($foundtagforlines) { if ($foundtagforlines) {
$linenumber = 0; $linenumber = 0;
foreach ($object->lines as $line) { foreach ($object->lines as $line) {
$linenumber++; $linenumber++;
$tmparray = $this->get_substitutionarray_reception_lines($line, $outputlangs); $tmparray = $this->get_substitutionarray_reception_lines($line, $outputlangs);
complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines"); complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
// Call the ODTSubstitutionLine hook // Call the ODTSubstitutionLine hook
$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line); $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
foreach ($tmparray as $key => $val) { foreach ($tmparray as $key => $val) {
try { try {
$listlines->setVars($key, $val, true, 'UTF-8'); $listlines->setVars($key, $val, true, 'UTF-8');
} catch (OdfException $e) { } catch (OdfException $e) {
dol_syslog($e->getMessage(), LOG_INFO); dol_syslog($e->getMessage(), LOG_INFO);
} catch (SegmentException $e) { } catch (SegmentException $e) {
dol_syslog($e->getMessage(), LOG_INFO); dol_syslog($e->getMessage(), LOG_INFO);
}
} }
$listlines->merge();
} }
$listlines->merge(); $odfHandler->mergeSegment($listlines);
}
$odfHandler->mergeSegment($listlines);
} }
} catch (OdfException $e) { } catch (OdfException $e) {
$this->error = $e->getMessage(); $this->error = $e->getMessage();