Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur
2025-06-30 15:14:31 +02:00
8 changed files with 27 additions and 28 deletions

View File

@@ -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;
}