From 85d2f519c7dc6987a937259fb893ff412152321e Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Mon, 26 Sep 2011 08:25:38 +0000
Subject: [PATCH] // fix adminHome for Chart, js loading order in setMedia

---
 controllers/admin/AdminHomeController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php
index 6c88fe2e1..2563e0ece 100644
--- a/controllers/admin/AdminHomeController.php
+++ b/controllers/admin/AdminHomeController.php
@@ -147,10 +147,10 @@ class AdminHomeControllerCore extends AdminController
 	}
 	public function setMedia()
 	{
-		$this->addJS(_PS_JS_DIR_.'jquery/jquery.flot.min.js');
+		parent::setMedia();
 		if (strpos($_SERVER['HTTP_USER_AGENT'],'MSIE') !== false)
 			$this->addJS(_PS_JS_DIR_.'jquery/excanvas.min.js');
-		parent::setMedia();
+		$this->addJS(_PS_JS_DIR_.'jquery/jquery.flot.min.js');
 	}
 
 	protected function warnDomainName()
@@ -357,6 +357,7 @@ class AdminHomeControllerCore extends AdminController
 		$chart->setSize(580, 170);
 		$chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd');
 		$chart->getCurve(1)->setLabel($this->l('Sales +Tx').' ('.strtoupper($currency->iso_code).')');
+		
 		$this->content .= $chart->fetch();
 		$this->content .= '	</div>
 			</div>