Merge pull request #6659 from altatof/fix_incoterm

FIX: dont get empty "Incoterms : - " string if no incoterm

htdocs/core/class/commonobject.class.php

@@ -3072,11 +3072,19 @@ abstract class CommonObject
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
 		$resql = $this->db->query($sql);
 		if ($resql)
+		{
+			$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
 		{
             $this->errors[] = $this->db->lasterror();
 			return false;