From 18fc169cd073b4441c7e8ba27e50ed443601fba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Hahn?= Date: Fri, 5 Mar 2021 11:32:03 +0100 Subject: [PATCH] Don't discard previously collected data For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one. --- .../modules/expedition/doc/doc_generic_shipment_odt.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index 82d61a41943..797530a6c13 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -449,7 +449,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition } // Replace tags of object + external modules - $tmparray = $this->get_substitutionarray_shipment($object, $outputlangs); + $tmparray = array_merge($tmparray, $this->get_substitutionarray_shipment($object, $outputlangs)); complete_substitutions_array($tmparray, $outputlangs, $object); // Call the ODTSubstitution hook