From 7f78e009c62eaa838bcab550effe10a02ea5f497 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Thu, 6 Feb 2025 11:39:56 +0100 Subject: [PATCH] FIX line_date_xxx into ODF was not loaded --- htdocs/core/class/commondocgenerator.class.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index f37bfc340856f..36d7a5919b215 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -933,8 +933,9 @@ public function get_substitutionarray_lines($line, $outputlangs, $linenumber = 0 array('line_date_end_rfc', 'date_end', 'dayrfc', 'auto', null) ); foreach ($date_specs as $date_spec) { - if (property_exists($line, $date_spec[1])) { - $resarray[$date_spec[0]] = dol_print_date($line->${$date_spec[1]}, $date_spec[2], $date_spec[3], $date_spec[4]); + $propertyname = $date_spec[1]; + if (property_exists($line, $propertyname)) { + $resarray[$date_spec[0]] = dol_print_date($line->$propertyname, $date_spec[2], $date_spec[3], $date_spec[4]); } } @@ -1126,9 +1127,9 @@ public function get_substitutionarray_shipment($object, $outputlangs, $array_key * Define array with couple substitution key => substitution value * * @param array $object Dolibarr Object - * @param Translate $outputlangs Language object for output - * @param boolean|int $recursive Want to fetch child array or child object. - * @return array Array of substitution key->code + * @param Translate $outputlangs Language object for output + * @param boolean|int $recursive Want to fetch child array or child object. + * @return array Array of substitution key->code */ public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = 1) {