Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad object name

Browse Source
This commit is contained in:
Laurent Destailleur
2024-03-24 06:56:50 +01:00
parent 946de96912
commit 57c75a7dec
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@@ -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]);

7
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@@ -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]);

6
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@@ -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]);

8
htdocs/core/modules/reception/doc/pdf_squille.modules.php
View File

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