diff --git a/admin-dev/themes/default/js/date-range-picker.js b/admin-dev/themes/default/js/date-range-picker.js
index 6afa17146..8785fae66 100644
--- a/admin-dev/themes/default/js/date-range-picker.js
+++ b/admin-dev/themes/default/js/date-range-picker.js
@@ -22,7 +22,7 @@
 	var click, switched, val, start, end, over, compare, startCompare, endCompare;
 
 	// Picker object
-	var Datepicker = function(element, options){
+	var DateRangePicker = function(element, options){
 		this.element = $(element);
 		compare = false;
 
@@ -100,8 +100,8 @@
 		this.showMode();
 	};
 
-	Datepicker.prototype = {
-		constructor: Datepicker,
+	DateRangePicker.prototype = {
+		constructor: DateRangePicker,
 
 		show: function(e) {
 			this.picker.show();
@@ -112,7 +112,7 @@
 			}
 			var that = this;
 			$(document).on('mousedown', function(ev){
-				if ($(ev.target).closest('.datepicker').length === 0) {
+				if ($(ev.target).closest('.daterangepicker').length === 0) {
 					that.hide();
 				}
 			});
@@ -199,7 +199,7 @@
 				html += '<th class="dow">'+DPGlobal.dates.daysMin[(dowCnt++)%7]+'</th>';
 			}
 			html += '</tr>';
-			this.picker.find('.datepicker-days thead').append(html);
+			this.picker.find('.daterangepicker-days thead').append(html);
 		},
 
 		fillMonths: function(){
@@ -208,7 +208,7 @@
 			while (i < 12) {
 				html += '<span class="month">'+DPGlobal.dates.monthsShort[i++]+'</span>';
 			}
-			this.picker.find('.datepicker-months td').append(html);
+			this.picker.find('.daterangepicker-months td').append(html);
 		},
 
 		fill: function() {
@@ -216,7 +216,7 @@
 				year = d.getFullYear(),
 				month = d.getMonth(),
 				currentDate = this.date.valueOf();
-			this.picker.find('.datepicker-days th:eq(1)')
+			this.picker.find('.daterangepicker-days th:eq(1)')
 						.text(year+' / '+DPGlobal.dates.months[month]);
 			var prevMonth = new Date(year, month-1, 28,0,0,0,0),
 				day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth());
@@ -250,10 +250,10 @@
 				}
 				prevMonth.setDate(prevMonth.getDate()+1);
 			}
-			this.picker.find('.datepicker-days tbody').empty().append(html.join(''));
+			this.picker.find('.daterangepicker-days tbody').empty().append(html.join(''));
 			var currentYear = this.date.getFullYear();
 
-			var months = this.picker.find('.datepicker-months')
+			var months = this.picker.find('.daterangepicker-months')
 						.find('th:eq(1)')
 							.text(year)
 							.end()
@@ -264,7 +264,7 @@
 
 			html = '';
 			year = parseInt(year/10, 10) * 10;
-			var yearCont = this.picker.find('.datepicker-years')
+			var yearCont = this.picker.find('.daterangepicker-years')
 								.find('th:eq(1)')
 									.text(year + '-' + (year + 9))
 									.end()
@@ -617,28 +617,28 @@
 			if (dir)
 				this.viewMode = Math.max(this.minViewMode, Math.min(2, this.viewMode + dir));
 
-			this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
+			this.picker.find('>div').hide().filter('.daterangepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
 		}
 	};
 
-	$.fn.datepicker = function ( option, val ) {
+	$.fn.daterangepicker = function ( option, val ) {
 		return this.each(function () {
 			var $this = $(this),
-				data = $this.data('datepicker'),
+				data = $this.data('daterangepicker'),
 				options = typeof option === 'object' && option;
 			if (!data) {
-				$this.data('datepicker', (data = new Datepicker(this, $.extend({}, $.fn.datepicker.defaults,options))));
+				$this.data('daterangepicker', (data = new DateRangePicker(this, $.extend({}, $.fn.daterangepicker.defaults,options))));
 			}
 			if (typeof option === 'string') { data[option](val);}
 		});
 	};
 
-	$.fn.datepicker.defaults = {
+	$.fn.daterangepicker.defaults = {
 		onRender: function() {
 			return '';
 		}
 	};
-	$.fn.datepicker.Constructor = Datepicker;
+	$.fn.daterangepicker.Constructor = DateRangePicker;
 
 	var DPGlobal = {
 		modes: [
@@ -743,20 +743,20 @@
 						'</thead>',
 		contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>'
 	};
-	DPGlobal.template = '<div class="datepicker">'+
-							'<div class="datepicker-days">'+
+	DPGlobal.template = '<div class="daterangepicker">'+
+							'<div class="daterangepicker-days">'+
 								'<table class=" table-condensed">'+
 									DPGlobal.headTemplate+
 									'<tbody></tbody>'+
 								'</table>'+
 							'</div>'+
-							'<div class="datepicker-months">'+
+							'<div class="daterangepicker-months">'+
 								'<table class="table-condensed">'+
 									DPGlobal.headTemplate+
 									DPGlobal.contTemplate+
 								'</table>'+
 							'</div>'+
-							'<div class="datepicker-years">'+
+							'<div class="daterangepicker-years">'+
 								'<table class="table-condensed">'+
 									DPGlobal.headTemplate+
 									DPGlobal.contTemplate+
diff --git a/admin-dev/themes/default/template/form_date_range_picker.tpl b/admin-dev/themes/default/template/form_date_range_picker.tpl
index 04ae2fa32..47d129064 100644
--- a/admin-dev/themes/default/template/form_date_range_picker.tpl
+++ b/admin-dev/themes/default/template/form_date_range_picker.tpl
@@ -18,13 +18,13 @@
 							<div class="col-xs-6">
 								<div class="input-group">
 									<label class="input-group-addon">{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</label>
-									<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control datepicker">
+									<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control">
 								</div>
 							</div>
 							<div class="col-xs-6">
 								<div class="input-group">
 									<label class="input-group-addon">{if isset($translations.To)}{$translations.To}{else}{l s='From:'}{/if}</label>
-									<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker form-control">
+									<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control">
 								</div>
 							</div>
 						</div>
diff --git a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
index 4a9607e77..8e14825f0 100644
--- a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+++ b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
@@ -1,4 +1,4 @@
-<div id="datepicker" class="datepicker-days">
+<div id="datepicker" class="daterangepicker-days">
 	<div class="row">	
 		{if $is_rtl}
 		<div class="col-sm-6 col-lg-4">
@@ -180,7 +180,7 @@
 		};
 
 	{literal}
-		var datepickerStart = $('.datepicker1').datepicker({
+		var datepickerStart = $('.datepicker1').daterangepicker({
 			"dates": translated_dates,
 			"weekStart": 1,
 			"start": $("#date-start").val(),
@@ -189,9 +189,9 @@
 			if (ev.date.valueOf() >= datepickerEnd.date.valueOf()){
 				datepickerEnd.setValue(ev.date.setMonth(ev.date.getMonth()+1));
 			}
-		}).data('datepicker');
+		}).data('daterangepicker');
 
-		var datepickerEnd = $('.datepicker2').datepicker({
+		var datepickerEnd = $('.datepicker2').daterangepicker({
 			"dates": translated_dates,
 			"weekStart": 1,
 			"start": $("#date-start").val(),
@@ -200,7 +200,7 @@
 			if (ev.date.valueOf() <= datepickerStart.date.valueOf()){
 				datepickerStart.setValue(ev.date.setMonth(ev.date.getMonth()-1));
 			}
-		}).data('datepicker');
+		}).data('daterangepicker');
 
 		$("#date-start").focus(function() {
 			datepickerStart.setCompare(false);
diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php
index db72a5ddc..3487aea1d 100644
--- a/controllers/admin/AdminDashboardController.php
+++ b/controllers/admin/AdminDashboardController.php
@@ -42,7 +42,7 @@ class AdminDashboardControllerCore extends AdminController
 		$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
 		$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
 		parent::setMedia();
-		//$this->addJqueryUI('ui.datepicker');
+		$this->addJqueryUI('ui.datepicker');
 		$this->addJS(array(
 			_PS_JS_DIR_.'/vendor/d3.js',
 			__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/nv.d3.min.js',