lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6659 from altatof/fix_incoterm

Browse Source 
FIX: dont get empty "Incoterms : - " string if no incoterm
This commit is contained in:
Laurent Destailleur 2017-04-11 11:08:17 +02:00 committed by GitHub
commit d4de81ed6d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/commonobject.class.php
View File

@ -3072,11 +3072,19 @@ abstract class CommonObject
$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms; $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{
$num = $this->db->num_rows($resql);
if ($num > 0)
{ {
$res = $this->db->fetch_object($resql); $res = $this->db->fetch_object($resql);
return 'Incoterm : '.$res->code.' - '.$this->location_incoterms; return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
} }
else else
{
return '';
}
}
else
{ {
$this->errors[] = $this->db->lasterror(); $this->errors[] = $this->db->lasterror();
return false; return false;