From a89628703cd7c8a8a5afc6063c52cda403718f24 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 15 Sep 2007 07:15:39 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20doublon=20de=20traduction=20d=E9placemen?=
 =?UTF-8?q?t=20des=20traductions=20des=20monnaies=20dans=20le=20fichier=20?=
 =?UTF-8?q?dict.lang?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/exports/export.php | 6 +++---
 htdocs/main.inc.php       | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 9f02928db50..286584a64a8 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -621,10 +621,10 @@ if ($step == 4 && $datatoexport)
     
     // test d'affichage du tableau excel et csv
     
-    //print '<table width="100%"><tr><td>';
-    //viewExcelFileContent($conf->export->dir_temp.'/1/export_commande_1.xls',5,3);
+    print '<table width="100%"><tr><td>';
+    viewExcelFileContent($conf->export->dir_temp.'/1/export_commande_1.xls',5,3);
     //viewCsvFileContent($conf->export->dir_temp.'/1/export_commande_1.csv',5);
-    //print '</td></tr></table>';
+    print '</td></tr></table>';
     
 }
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f2fae0c320b..bb4cecb1168 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -626,6 +626,8 @@ else
 function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0) 
 {
     global $user, $conf, $langs, $db, $micro_start_time;
+    
+    $langs->load("dict");
 
 	// Pour le tuning optionnel. Activer si la variable d'environnement DOL_TUNING
 	// est positionne A appeler avant tout.