diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index 8c33e1a3..9aca7d87 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -7,8 +7,8 @@ class Transactions::SalesController < ApplicationController
   def index
     
     receipt_no = params[:receipt_no]
-    from   = params[:from]
-    to     = params[:to]
+    from       = params[:from]
+    to         = params[:to]
 
     if receipt_no.nil? && from.nil? && to.nil?
         @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) 
diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb
index 0633f8e8..f5d59cd4 100755
--- a/app/views/transactions/orders/index.html.erb
+++ b/app/views/transactions/orders/index.html.erb
@@ -28,11 +28,11 @@
             </div> -->
             <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> 
                 <label class="form-control-label"><%= t("views.right_panel.detail.from") %></label>
-             <input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date">
+             <input class="form-control datepicker" name="from" id="date from" type="text" placeholder="From date">
             </div>
             <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
               <label class="form-control-label"><%= t("views.right_panel.detail.to") %></label>
-              <input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date">
+              <input class="form-control datepicker" name="to" id="date to" type="text" placeholder="To date">
             </div>
             
             <div class="form-group col-lg-1 col-md-1 col-sm-1 col-xs-1">
@@ -83,6 +83,14 @@
   </div>
 </div>
 
+<script type="text/javascript">
+$(function(){
+  $("#from").val("<%=params[:from] rescue '-'%>");
+  $("#to").val("<%=params[:to] rescue '-'%>");
+});
+
+</script>
+
 <!-- <style type="text/css">
   
 
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
index d5a39ace..476b9c3c 100755
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -23,11 +23,11 @@
                        </div>
                        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3"> 
                          <label class=""><%= t("views.right_panel.detail.from") %></label>
-                         <input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date">
+                         <input class="form-control datepicker" name="from" id="from date" type="text" placeholder="From date">
                       </div>
                       <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
                         <label class=""><%= t("views.right_panel.detail.to") %></label>
-                        <input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date">
+                        <input class="form-control datepicker" name="to" id="to date" type="text" placeholder="To date">
                       </div>
                       
                       <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
@@ -90,18 +90,13 @@
   </div>
 </div>
 
+
 <script type="text/javascript">
-  $(function () {
+$(function(){
+  $("#from").val("<%=params[:from] rescue '-'%>");
+  $("#to").val("<%=params[:to] rescue '-'%>");
+});
 
-            $('.datepicker').datepicker({
-               format : 'dd-mm-yyyy',
-               autoclose: true
-            });
-            $('.datepicker').attr('ReadOnly','true');
-            $('.datepicker').css('cursor','pointer');
-
-     
-  });
 </script>