diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index 679c37dc..98a60c4e 100755
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -24,6 +24,8 @@ class Inventory::InventoryController < BaseInventoryController
     inventory = InventoryDefinition.find(inventory_definition_id)
 
     @stock_journals = StockJournal.where(item_code: inventory.item_code)
+    @stock_journals  = Kaminari.paginate_array(@stock_journals).page(params[:page]).per(20)
+    
     respond_to do |format|
       format.html
       format.xls
diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb
index 921c382a..a333dc7a 100755
--- a/app/views/inventory/inventory/_inventory_list.html.erb
+++ b/app/views/inventory/inventory/_inventory_list.html.erb
@@ -28,7 +28,13 @@
       </td>
       <td><%= item.min_order_level %></td>
       <td><%= item.max_stock_level %></td>
-      <td><%= item.balance rescue '0' %></td>
+      <td>
+        <% if item.balance.nil? %>
+          0
+        <% else %>
+          <%= item.balance rescue 0 %>
+        <% end %>
+      </td>
       <td>
         <button type="button" data-value="<%= item.id %>" class="btn bg-blue waves-effect btn-link show_track"><%= t("views.btn.show") %> <%= t("views.right_panel.detail.stock_check") %></button>
       </td>
diff --git a/app/views/inventory/inventory/show.html.erb b/app/views/inventory/inventory/show.html.erb
index 0176928b..a08110e8 100644
--- a/app/views/inventory/inventory/show.html.erb
+++ b/app/views/inventory/inventory/show.html.erb
@@ -66,5 +66,9 @@
         <% end %>
       </tbody>
     </table>
+    <br>
+    <% if !@stock_journals.nil? && !@stock_journals.empty? %>
+       <%= paginate @stock_journals %>
+   <% end %>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index 23480521..b5dce43d 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -109,6 +109,7 @@
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
 							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
 							<th> <%= t :payment_method %></th>
+							<th> <%= t :customer %></th>
 							<th> <%= t("views.right_panel.detail.amount") %> </th>
 							<th><%= t("views.right_panel.detail.grand_total") %></th>
 						</tr>
@@ -129,8 +130,8 @@
 								<% end %>
 								<td><%= payment.receipt_no rescue '-' %></td>
 								<td><%= payment.cashier_name rescue '-' %></td>
-								<!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
 								<td><%= payment.payment_method rescue '-' %></td>
+								<td><%= payment.sale.customer.name rescue '-' %></td>
 								<% if payment.payment_method === 'cash' %>
 								<td><%= number_with_precision(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%else%>
@@ -143,7 +144,7 @@
 						<% end %>
 						<%if total>0%>
 							<tr>
-							   <td colspan="4" style="text-align: right;"><strong >Total </strong></td>
+							   <td colspan="5" style="text-align: right;"><strong >Total </strong></td>
 					    	 	<td colspan="2"><strong><%=number_with_precision(total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></strong></td>
 						    </tr>
 					    <%end%>
diff --git a/app/views/reports/payment_method/index.xls.erb b/app/views/reports/payment_method/index.xls.erb
index 9e42b9f3..ab966b7d 100755
--- a/app/views/reports/payment_method/index.xls.erb
+++ b/app/views/reports/payment_method/index.xls.erb
@@ -96,6 +96,7 @@
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
 							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
 							<th> <%= t :payment_method %></th>
+							<th> <%= t :customer %></th>
 							<th> <%= t("views.right_panel.detail.amount") %> </th>
 							<th><%= t("views.right_panel.detail.grand_total") %></th>
 						</tr>
@@ -116,8 +117,8 @@
 								<% end %>
 								<td><%= payment.receipt_no rescue '-' %></td>
 								<td><%= payment.cashier_name rescue '-' %></td>
-								<!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
 								<td><%= payment.payment_method rescue '-' %></td>
+								<td><%= payment.sale.customer.name rescue '-' %></td>
 								<% if payment.payment_method === 'cash' %>
 								<td><%= number_with_precision(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%else%>
diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb
index a1351221..fc688d8c 100755
--- a/app/views/reports/stock_check/index.html.erb
+++ b/app/views/reports/stock_check/index.html.erb
@@ -53,6 +53,7 @@
               <th><%= t("views.right_panel.detail.remark") %></th>
               <th><%= t("views.right_panel.detail.checked_by") %></th>
               <th><%= t("views.right_panel.detail.stock_check") %> <%= t("views.right_panel.detail.reason") %></th>
+              <th><%= t :date_time %></th>
             </tr>
           </thead>
           <tbody>
@@ -87,6 +88,7 @@
               <td><%= result.remark rescue '-' %></td>
               <td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
               <td><%= result.stock_check.reason rescue '-' %></td>
+              <td><%= result.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
             </tr>
             <% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
             <% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>
diff --git a/app/views/reports/stock_check/index.xls.erb b/app/views/reports/stock_check/index.xls.erb
index ea90c8af..8fa98977 100755
--- a/app/views/reports/stock_check/index.xls.erb
+++ b/app/views/reports/stock_check/index.xls.erb
@@ -21,6 +21,7 @@
               <th><%= t("views.right_panel.detail.remark") %></th>
               <th><%= t("views.right_panel.detail.checked_by") %></th>
               <th><%= t("views.right_panel.detail.stock_check") %> <%= t("views.right_panel.detail.reason") %></th>
+              <th><%= t :date_time %></th>
         </tr>
         </thead>
         <tbody>
@@ -55,6 +56,7 @@
             <td><%= result.remark rescue '-' %></td>
             <td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
             <td><%= result.stock_check.reason rescue '-' %></td>
+            <td><%= result.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
           </tr>
           <% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
           <% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>