From 4e711d4e305f13968a4f1f9f0abf4a28bd8e3a6a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 5 Oct 2020 15:15:15 +0200
Subject: [PATCH 1/3] fix bad test syntax

---
 htdocs/fourn/commande/dispatch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 7a11d22aa53..ae29dd35ff2 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1290,7 +1290,7 @@ if ($id > 0 || !empty($ref)) {
 					print '</td>';
 				}
 
-				if ($action != 'editline' ||  && $lineid != $objp->dispatchlineid)
+				if ($action != 'editline' && $lineid != $objp->dispatchlineid)
 				{
 					print '<td class="linecoledit center">';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid=' . $objp->dispatchlineid .'#line_'. $objp->dispatchlineid . '">';

From d789aaad7fd6643709108c29d079ac3f8248fbff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Hahn?= <ruediger@hahnsworld.net>
Date: Fri, 9 Oct 2020 11:29:39 +0200
Subject: [PATCH 2/3] Fix for #14239

Message: Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before
---
 htdocs/commande/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 5de377930d7..3ee5b89e01a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1863,6 +1863,7 @@ if ($action == 'create' && $usercancreate)
 		$author = new User($db);
 		$author->fetch($object->user_author_id);
 
+		$object->fetch_thirdparty();
 		$res = $object->fetch_optionals();
 
 		$head = commande_prepare_head($object);

From bbdf304f1e17c992ea0796ab26a49a80c920f203 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 9 Oct 2020 12:20:20 +0200
Subject: [PATCH 3/3] fix

---
 htdocs/fourn/commande/dispatch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index ae29dd35ff2..03297d9f8fc 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1290,7 +1290,7 @@ if ($id > 0 || !empty($ref)) {
 					print '</td>';
 				}
 
-				if ($action != 'editline' && $lineid != $objp->dispatchlineid)
+				if ($action != 'editline' || $lineid != $objp->dispatchlineid)
 				{
 					print '<td class="linecoledit center">';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid=' . $objp->dispatchlineid .'#line_'. $objp->dispatchlineid . '">';