Merge pull request #1341 from marcosgdf/bug-1182

Resolved bug #1182: ODT company_country tag is htmlencoded

ChangeLog

@@ -20,6 +20,7 @@ Fix: [ bug #1161 ] Search on product label
 Fix: [ bug #1075 ] POS module doesn't decrement stock of products in delayed payment mode.
 Fix: [ bug #1171 ] Documents lost in interventions after validating
 Fix: fix unsubscribe URL into mailing when sending manually (not by script)
+Fix: [ bug #1182 ] ODT company_country tag is htmlencoded
 
 ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
 Fix: Display buying price on line edit when no supplier price is defined

htdocs/societe/class/societe.class.php

@@ -768,7 +768,7 @@ function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='
 
                 $this->country_id   = $obj->country_id;
                 $this->country_code = $obj->country_id?$obj->country_code:'';
-                $this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->trans('Country'.$obj->country_code):$obj->country):'';
+                $this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
 
                 $this->state_id     = $obj->fk_departement;
                 $this->state_code   = $obj->state_code;