From d892a89f453e7a1be99d0a8fa3b620d8fa04c0bf Mon Sep 17 00:00:00 2001
From: altatof <christophe@altairis.fr>
Date: Fri, 7 Apr 2017 14:15:51 +0200
Subject: [PATCH] FIX: dont get empty "Incoterms : - " string if no incoterm

---
 htdocs/core/class/commonobject.class.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 018aef19519..60247186734 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3073,8 +3073,16 @@ abstract class CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$res = $this->db->fetch_object($resql);
-			return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
+			$num = $this->db->num_rows($resql);
+			if ($num > 0)
+			{
+				$res = $this->db->fetch_object($resql);
+				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
+			}
+			else
+			{
+				return '';
+			}
 		}
 		else
 		{