diff --git a/application/views/partial/daterangepicker.php b/application/views/partial/daterangepicker.php
index 5a2e5291c..509acc89f 100644
--- a/application/views/partial/daterangepicker.php
+++ b/application/views/partial/daterangepicker.php
@@ -106,9 +106,8 @@
 	{
 ?>
 		$('#daterangepicker').css("width","305");
-		var start_date = "<?php echo date('Y-m-d H:i:s')?>";
-		var end_date = "<?php echo date('Y-m-d H:i:s')?>";
-
+		var start_date = "<?php echo date('Y-m-d H:i:s',mktime(0,0,0,date("m"),date("d"),date("Y")))?>";
+		var end_date = "<?php echo date('Y-m-d H:i:s',mktime(23,59,59,date("m"),date("d"),date("Y")))?>";
 		$('#daterangepicker').daterangepicker({
 			"ranges": {
 				"<?php echo $this->lang->line("datepicker_today"); ?>": [
@@ -198,9 +197,9 @@
 		    "timePickerSeconds": true,
 			"alwaysShowCalendars": true,
 			"startDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
-			"endDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>",
+			"endDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>",
 			"minDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,01,01,2010));?>",
-			"maxDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
+			"maxDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
 		}, function(start, end, label) {
 			start_date = start.format('YYYY-MM-DD HH:mm:ss');
 			end_date = end.format('YYYY-MM-DD HH:mm:ss');
diff --git a/database/2.4_to_3.0.sql b/database/2.4_to_3.0.sql
index fed929b14..36a4b8048 100644
--- a/database/2.4_to_3.0.sql
+++ b/database/2.4_to_3.0.sql
@@ -69,7 +69,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('theme', 'flatly'),
 ('statistics', '1'),
 ('language', 'english'),
-('language_code', 'en');
+('language_code', 'en'),
+('date_or_time_format','');
 
 
 -- add messages (SMS) module and permissions
diff --git a/database/database.sql b/database/database.sql
index fd846b05b..d734e8742 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -83,7 +83,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('theme', 'flatly'),
 ('statistics', '1'),
 ('language', 'english'),
-('language_code', 'en');
+('language_code', 'en'),
+('date_or_time_format','');
 
 
 -- --------------------------------------------------------