mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-06 00:53:00 +01:00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
@@ -91,6 +91,8 @@ trait CommonIncoterm
|
||||
*/
|
||||
public function getIncotermsForPDF()
|
||||
{
|
||||
global $langs;
|
||||
|
||||
$sql = "SELECT code FROM ".$this->db->prefix()."c_incoterms WHERE rowid = ".(int) $this->fk_incoterms;
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
@@ -98,7 +100,7 @@ trait CommonIncoterm
|
||||
if ($num > 0) {
|
||||
$res = $this->db->fetch_object($resql);
|
||||
if ($res) {
|
||||
return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
|
||||
return $langs->trans("IncotermLabel").': '.$res->code.' - '.$this->location_incoterms;
|
||||
} else {
|
||||
return $res;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user