diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 48bea0dda78..e3b9bcf2b53 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -126,12 +126,12 @@ $extrafields->fetch_name_optionals_label($objectorder->table_element_line); // Load object. Make an object->fetch include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' -if (empty($origin) && !empty($object->origin_type)) { +if (empty($origin) && !empty($object->origin_type) && $object->origin_id > 0) { $origin = $object->origin_type; -} elseif (empty($origin) && !empty($object->origin)) { - $origin = (string) $object->origin; // Cast to string because origin is type hinted as object too. +} elseif (empty($origin) && is_string($object->origin) && $object->origin !== '' && $object->origin_id > 0) { + $origin = $object->origin; } -if (empty($origin_id) && !empty($object->origin_id)) { +if (empty($origin_id) && $object->origin_id > 0) { $origin_id = $object->origin_id; } $origin_type = is_string($origin) ? $origin : '';