Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/

Browse Source
This commit is contained in:
Laurent Destailleur
2015-03-06 01:53:02 +01:00
parent 1660c1c05b
commit 049174b76f
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -888,7 +888,7 @@ abstract class CommonObject
if (! $this->table_element)
{
dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined", LOG_ERR);
dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
return -1;
}
@@ -2389,8 +2389,8 @@ abstract class CommonObject
return 1;
}
}
/**
* Return incoterms informations
*
@@ -2409,13 +2409,13 @@ abstract class CommonObject
$res = $this->db->fetch_object($result);
$out .= $res->code;
}
}
}
$out .= ' - '.$this->location_incoterms;
return $out;
}
/**
* Return incoterms informations for pdf display
*
@@ -2430,12 +2430,12 @@ abstract class CommonObject
$res = $this->db->fetch_object($resql);
return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
}
else
else
{
return false;
return false;
}
}
/**
* Define incoterms values of current object
*
@@ -2457,14 +2457,14 @@ abstract class CommonObject
{
$this->fk_incoterms = $id_incoterm;
$this->location_incoterms = $location;
$sql = 'SELECT libelle FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
$res = $this->db->query($sql);
if ($res)
{
$obj = $this->db->fetch_object($res);
$this->libelle_incoterms = $obj->libelle;
}
}
return 1;
}
else