diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 43b66dc1b64..503cf4cb6ff 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -137,13 +137,13 @@ if ($chid > 0)
if ($fac->paye == 0)
{
- print "
| Total payé: | ".price($totalpaye)." | ".$conf->monnaie." |
\n";
- print "| Réclamé : | ".price($cha->amount)." | ".MAIN_MONNAIE." |
\n";
+ print "| Total payé: | ".price($totalpaye)." | ".$langs->trans("Currency".$conf->monnaie)." |
\n";
+ print "| Réclamé : | ".price($cha->amount)." | ".$langs->trans("Currency".$conf->monnaie)." |
\n";
$resteapayer = $cha->amount - $totalpaye;
print "| ".$langs->trans("RemainderToPay")." : | ";
- print "".price($resteapayer)." | ".$conf->monnaie." |
\n";
+ print "".price($resteapayer)." | ".$langs->trans("Currency".$conf->monnaie)." | \n";
}
print "";
$db->free();
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index fb5f0ccda94..ef713447c09 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -441,6 +441,8 @@ class Form
*/
function select_produits($selected='',$htmlname='productid',$filtretype='',$limit=20)
{
+ global $langs,$conf;
+
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p ";
$sql.= " WHERE p.envente = 1";
@@ -459,7 +461,7 @@ class Form
while ($i < $num)
{
$objp = $this->db->fetch_object($result);
- $opt = "\n";
print $opt;
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 84597c7f5ac..22829d22308 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -245,6 +245,7 @@ CountryES=Spain
CountryDE=Germany
CountryCH=Switzerland
# Currencies
+Currencyeuros=Euros
CurrencyCHF=Swiss Francs
CurrencyEUR=Euros
CurrencyGBP=GB Pounds
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index d6898361638..db6e5cd5123 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -245,6 +245,7 @@ CountryES=Espagne
CountryDE=Allemagne
CountryCH=Suisse
# Currencies
+Currencyeuros=Euros
CurrencyCHF=Francs suisses
CurrencyEUR=Euros
CurrencyGBP=Livre sterling
diff --git a/mysql/data/data.sql b/mysql/data/data.sql
index b90a5079f88..7f40984370b 100644
--- a/mysql/data/data.sql
+++ b/mysql/data/data.sql
@@ -47,7 +47,7 @@ insert into llx_action_def (rowid,code,titre,description,objet_type) values (2,'
--
-- Constantes de configuration
--
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','euros','chaine','Monnaie',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0);
insert into llx_const (name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','1','chaine','Autorise l\'upload de document',1);
insert into llx_const (name, value, type, note, visible) values ('MAIN_NOT_INSTALLED','1','chaine','Test d\'installation',1);