diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 4bc57878..e27fdaf5 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -40,7 +40,7 @@ class OrderItemPdf < Prawn::Document
 
     text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     stroke_horizontal_rule
-    move_down 5
+    move_down 3
 
     #order_info
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
@@ -56,13 +56,13 @@ class OrderItemPdf < Prawn::Document
         text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
     end
 
-    move_down 5
+    move_down 2
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
         text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
     end
 
-    move_down 5
+    move_down 2
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
         text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index dfd67d89..ede3fb26 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -4,7 +4,7 @@ class ReceiptBillPdf < Prawn::Document
   def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.margin = 5
+    self.margin = 0
     self.price_width = 40
     self.qty_width = 20
     self.total_width = 40
@@ -20,7 +20,7 @@ class ReceiptBillPdf < Prawn::Document
     # @double = @qty_width * 1.3
     # @half_qty = @qty_width / 2
     #setting page margin and width
-    super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    super(:margin => [20, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
     # db font setup
     if printer_settings.font != ""
@@ -74,7 +74,7 @@ class ReceiptBillPdf < Prawn::Document
   end
 
   def header (shop_details)
-    move_down 7
+    move_down 5
     text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
     move_down 5
     text "#{shop_details.address}", :size => self.item_font_size,:align => :center
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 9037f03b..7c520fe3 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -123,7 +123,10 @@
 		
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			
 			var str = '';
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index 2407e50a..0c48fe22 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -189,7 +189,10 @@
 			var shift = $('#shift_name');
 			
 			shift.empty();
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			var str = '';
 			var param_shift = '';	   
 			var param_shift = '<%= params[:shift_name] rescue '-'%>';
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 00622069..e82c3e3c 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -196,7 +196,10 @@
 			var str = '';
 			var param_shift = '';	   
 			var param_shift = '<%= params[:shift_name] rescue '-'%>';
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			url = '<%= reports_get_shift_by_date_path %>';
 			
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 97ba9c3f..d0def563 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -297,12 +297,15 @@
 
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			var selected = '';
 			var str = '';
 			var param_shift = '<%= params[:shift_name]%>';
-
+			
 			url = '<%= reports_get_shift_by_date_path %>';
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 				console.log(data)
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 2aeac1e5..8138007d 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -191,7 +191,10 @@
 		
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			
 			var str = '';
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb
index 3bc48410..045df74d 100755
--- a/app/views/reports/void_sale/index.html.erb
+++ b/app/views/reports/void_sale/index.html.erb
@@ -144,7 +144,10 @@
 
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 
 			var str = '';