fix concat and CI 🔧 (#31469)

* fix concat

* fix overwrite

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
Frédéric FRANCE 2024-10-20 00:20:48 +02:00 committed by GitHub
parent 28ee30dfd2
commit bc06268df6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions

View file

@ -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'];
}

View file

@ -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) {

View file

@ -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;
}
}