From bc06268df6d6fda7242f3c340db101d16ac97903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 20 Oct 2024 00:20:48 +0200 Subject: [PATCH] fix concat and CI :wrench: (#31469) * fix concat * fix overwrite --------- Co-authored-by: Laurent Destailleur --- htdocs/commande/list.php | 1 + htdocs/commande/list_det.php | 2 +- htdocs/core/lib/functions.lib.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index c2fc44797dc..e0aa0a4803d 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -2748,6 +2748,7 @@ while ($i < $imaxinloop) { $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique; } else { $generic_product->stock_reel = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel']; + // @phan-suppress-next-line PhanTypeInvalidDimOffset $generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel']; } diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 251f5cce126..04285cb126d 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -2112,7 +2112,7 @@ if ($resql) { $productstat_cachevirtual[$obj->fk_product]['stock_reel'] = $generic_product->stock_theorique; } else { $generic_product->stock_reel = $productstat_cache[$obj->fk_product]['stock_reel']; - $generic_product->stock_theorique = $productstat_cachevirtual[$obj->fk_product]['stock_reel'] = $generic_product->stock_theorique; + $generic_product->stock_theorique = $productstat_cachevirtual[$obj->fk_product]['stock_reel']; } if ($reliquat > $generic_product->stock_reel) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index db81317057d..8774edfe176 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -13303,7 +13303,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '', $us return $objecttmp; // returned an object without fetch } } else { - dol_syslog($element_prop['classname'].' doesn not exists in /'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php'); + dol_syslog($element_prop['classname'].' doesn\'t exists in /'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php'); return -1; } }