From 6a80d81d4a9e59bee3fdaff9687148a7a29601b8 Mon Sep 17 00:00:00 2001
From: BB2A Anthony Berton <bertonanthony@gmail.com>
Date: Mon, 27 Jun 2022 09:11:33 +0200
Subject: [PATCH] FIX

---
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/expedition/card.php               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4a95bb7d345..be7e8f2ec6e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4291,7 +4291,7 @@ abstract class CommonObject
 		if ($elementTable == 'commande_fournisseur_dispatch') {
 			$fieldstatus = "status";
 		}
-		if (is_array($this->fields) && array_key_exists('status', $this->fields)) {
+		if (isset($this->fields) && is_array($this->fields) && array_key_exists('status', $this->fields)) {
 			$fieldstatus = 'status';
 		}
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3c33c913384..384f2cdde3d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -429,10 +429,10 @@ if (empty($reshook)) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 					$newlang = GETPOST('lang_id', 'aZ09');
 				}
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
 				}
 				if (!empty($newlang)) {