Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0

This commit is contained in:
Laurent Destailleur (aka Eldy)
2025-01-06 17:43:35 +01:00
2 changed files with 7 additions and 5 deletions

View File

@@ -785,11 +785,13 @@ class Reception extends CommonObject
$this->fetch_origin();
if ($this->origin_object instanceof CommonObject && empty($this->origin_object->lines)) {
$res = $this->origin_object->fetch_lines();
if ($this->origin_object instanceof CommandeFournisseur) {
$this->commandeFournisseur = $this->origin_object; // deprecated
} else {
$this->commandeFournisseur = null; // deprecated
$this->commandeFournisseur = null; // deprecated
if ($res < 0) {
return $res;
}
} elseif ($this->origin_object instanceof CommandeFournisseur && empty($this->origin_object->lines)) {
$res = $this->origin_object->fetch_lines();
$this->commandeFournisseur = $this->origin_object; // deprecated
if ($res < 0) {
return $res;
}