From 57c75a7dec31f4e68f2b3ce4000505ff323d8fa5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 24 Mar 2024 06:56:50 +0100 Subject: [PATCH] Fix bad object name --- .../core/modules/expedition/doc/pdf_espadon.modules.php | 6 +++--- htdocs/core/modules/expedition/doc/pdf_merou.modules.php | 7 ++++--- htdocs/core/modules/expedition/doc/pdf_rouget.modules.php | 6 +++--- htdocs/core/modules/reception/doc/pdf_squille.modules.php | 8 ++++---- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php index 05c38232c6d..63ab2d8ee57 100644 --- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php @@ -1083,8 +1083,8 @@ class pdf_espadon extends ModelePdfExpedition $carac_emetteur = ''; // Add internal contact of origin element if defined $arrayidcontact = array(); - if (!empty($origin) && is_object($object->object_origin)) { - $arrayidcontact = $object->object_origin->getIdContact('internal', 'SALESREPFOLL'); + if (!empty($origin) && is_object($object->origin_object)) { + $arrayidcontact = $object->origin_object->getIdContact('internal', 'SALESREPFOLL'); } if (is_array($arrayidcontact) && count($arrayidcontact) > 0) { $object->fetch_user(reset($arrayidcontact)); @@ -1139,7 +1139,7 @@ class pdf_espadon extends ModelePdfExpedition // If SHIPPING contact defined, we use it $usecontact = false; - $arrayidcontact = $object->object_origin->getIdContact('external', 'SHIPPING'); + $arrayidcontact = $object->origin_object->getIdContact('external', 'SHIPPING'); if (count($arrayidcontact) > 0) { $usecontact = true; $result = $object->fetch_contact($arrayidcontact[0]); diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index 4037f8352ab..a7509f562ae 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -149,14 +149,15 @@ class pdf_merou extends ModelePdfExpedition $this->expediteur = $mysoc; //Create recipient - $idcontact = $object->object_origin->getIdContact('external', 'SHIPPING'); + var_dump($object->origin); + $idcontact = $object->origin_object->getIdContact('external', 'SHIPPING'); $this->destinataire = new Contact($this->db); if (!empty($idcontact[0])) { $this->destinataire->fetch($idcontact[0]); } //Create deliverer - $idcontact = $object->object_origin->getIdContact('internal', 'LIVREUR'); + $idcontact = $object->origin_object->getIdContact('internal', 'LIVREUR'); $this->livreur = new User($this->db); if (!empty($idcontact[0])) { $this->livreur->fetch($idcontact[0]); @@ -636,7 +637,7 @@ class pdf_merou extends ModelePdfExpedition // If SHIPPING contact defined on order, we use it $usecontact = false; - $arrayidcontact = $object->object_origin->getIdContact('external', 'SHIPPING'); + $arrayidcontact = $object->origin_object->getIdContact('external', 'SHIPPING'); if (count($arrayidcontact) > 0) { $usecontact = true; $result = $object->fetch_contact($arrayidcontact[0]); diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index 0fae9cc54b4..38073c5adb4 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -996,8 +996,8 @@ class pdf_rouget extends ModelePdfExpedition $carac_emetteur = ''; // Add internal contact of origin element if defined $arrayidcontact = array(); - if (!empty($origin) && is_object($object->object_origin)) { - $arrayidcontact = $object->object_origin->getIdContact('internal', 'SALESREPFOLL'); + if (!empty($origin) && is_object($object->origin_object)) { + $arrayidcontact = $object->origin_object->getIdContact('internal', 'SALESREPFOLL'); } if (count($arrayidcontact) > 0) { $object->fetch_user(reset($arrayidcontact)); @@ -1052,7 +1052,7 @@ class pdf_rouget extends ModelePdfExpedition // If SHIPPING contact defined, we use it $usecontact = false; - $arrayidcontact = $object->object_origin->getIdContact('external', 'SHIPPING'); + $arrayidcontact = $object->origin_object->getIdContact('external', 'SHIPPING'); if (count($arrayidcontact) > 0) { $usecontact = true; $result = $object->fetch_contact($arrayidcontact[0]); diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php index 98aff1851b9..f96a96bac8c 100644 --- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php +++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php @@ -986,11 +986,11 @@ class pdf_squille extends ModelePdfReception $carac_emetteur = ''; // Add internal contact of origin element if defined $arrayidcontact = array(); - if (!empty($origin) && is_object($object->object_origin)) { - $arrayidcontact = $object->object_origin->getIdContact('internal', 'SALESREPFOLL'); + if (!empty($origin) && is_object($object->origin_object)) { + $arrayidcontact = $object->origin_object->getIdContact('internal', 'SALESREPFOLL'); } if (empty($arrayidcontact)) { - $arrayidcontact = $object->object_origin->getIdContact('internal', 'SHIPPING'); + $arrayidcontact = $object->origin_object->getIdContact('internal', 'SHIPPING'); } if (count($arrayidcontact) > 0) { $object->fetch_user(reset($arrayidcontact)); @@ -1029,7 +1029,7 @@ class pdf_squille extends ModelePdfReception // If RECEPTION contact defined, we use it $usecontact = false; - $arrayidcontact = $object->object_origin->getIdContact('external', 'SHIPPING'); + $arrayidcontact = $object->origin_object->getIdContact('external', 'SHIPPING'); if (count($arrayidcontact) > 0) { $usecontact = true;