diff --git a/htdocs/comm/adresse_livraison.class.php b/htdocs/comm/adresse_livraison.class.php index 9c8947fca78..ef43c71ab45 100644 --- a/htdocs/comm/adresse_livraison.class.php +++ b/htdocs/comm/adresse_livraison.class.php @@ -293,7 +293,7 @@ class AdresseLivraison $ligne->adresse_full = stripslashes($objp->address) . "\n". $objp->cp . ' '. stripslashes($objp->ville); $ligne->pays_id = $objp->fk_pays; $ligne->pays_code = $objp->fk_pays?$objp->pays_code:''; - $ligne->pays = $objp->fk_pays?($langs->trans('Country'.$objp->pays_code)!='Country'.$objp->pays_code?$langs->trans('Country'.$objp->pays_code):$objp->pays):''; + $ligne->pays = $objp->fk_pays?($langs->trans('Country'.$objp->pays_code)!='Country'.$objp->pays_code?strtoupper($langs->trans('Country'.$objp->pays_code)):$objp->pays):''; $ligne->note = $objp->note; $this->lignes[$i] = $ligne; diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php index 4d83f50cf4a..110db2172cb 100644 --- a/htdocs/societe.class.php +++ b/htdocs/societe.class.php @@ -541,7 +541,7 @@ class Societe $this->pays_id = $obj->fk_pays; $this->pays_code = $obj->fk_pays?$obj->pays_code:''; - $this->pays = $obj->fk_pays?($langs->trans('Country'.$obj->pays_code)!='Country'.$obj->pays_code?$langs->trans('Country'.$obj->pays_code):$obj->pays):''; + $this->pays = $obj->fk_pays?($langs->trans('Country'.$obj->pays_code)!='Country'.$obj->pays_code?strtoupper($langs->trans('Country'.$obj->pays_code)):$obj->pays):''; $this->departement_id = $obj->fk_departement; $this->departement= $obj->fk_departement?$obj->departement:'';