From 97bf91cc5d86dd06691f75a624c2197d30e03185 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 Apr 2016 14:09:00 +0200
Subject: [PATCH] Show both currency symbol and code

---
 htdocs/admin/company.php              | 4 +++-
 htdocs/core/class/translate.class.php | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index c9e07677512..ee6cbac057f 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -731,7 +731,9 @@ else
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyCurrency").'</td><td>';
 	print currency_name($conf->currency,1);
-	print ' ('.$langs->getCurrencySymbol($conf->currency).')';
+	print ' ('.$conf->currency;
+	print ($conf->currency != $langs->getCurrencySymbol($conf->currency) ? ' - '.$langs->getCurrencySymbol($conf->currency) : '');
+	print ')';
 	print '</td></tr>';
 
 	$var=!$var;
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 866b746362b..34858bc3234 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -908,7 +908,8 @@ class Translate
 	}
 
 	/**
-	 *	Return a currency code into its symbol
+	 *	Return a currency code into its symbol. 
+	 *  If mb_convert_encoding is not available, return currency code.
 	 *
 	 *  @param	string	$currency_code		Currency code
 	 *  @param	integer	$forceloadall		1=Force to load all currencies into cache. We know we need to use all of them. By default read and cache only required currency.