From beb93e9245c661c41393d0fcdc926130ab556562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 8 Dec 2013 20:23:44 +0200
Subject: [PATCH] Resolved bug #1182: ODT company_country tag is htmlencoded

---
 ChangeLog                              | 1 +
 htdocs/societe/class/societe.class.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d6caeca60c3..2fcf861008b 100644
--- a/ChangeLog
+++ b/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
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 80b65229f68..f37d7c25fa0 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -768,7 +768,7 @@ class Societe extends CommonObject
 
                 $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;