From 03d9bf13763fb688e42812e85693ea1b958fcd3a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Feb 2018 12:35:36 +0100 Subject: [PATCH] Restore deprecated var --- .../modules/contract/doc/doc_generic_contract_odt.modules.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php index cec54709479..62eade74dfa 100644 --- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php +++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php @@ -296,13 +296,11 @@ class doc_generic_contract_odt extends ModelePDFContract // Define substitution array $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); - /* deprecated $substitutionarray['__FROM_NAME__'] = $this->emetteur->name; $substitutionarray['__FROM_EMAIL__'] = $this->emetteur->email; $substitutionarray['__TOTAL_TTC__'] = $object->total_ttc; $substitutionarray['__TOTAL_HT__'] = $object->total_ht; $substitutionarray['__TOTAL_VAT__'] = $object->total_vat; - */ // Make substitutions into ODT $array_contract=$this->get_substitutionarray_each_var_object($object, $outputlangs); @@ -319,7 +317,7 @@ class doc_generic_contract_odt extends ModelePDFContract complete_substitutions_array($substitutionarray, $outputlangs, $object); $tmparray = $substitutionarray; - + // Call the ODTSubstitution hook $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray); $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks