Merge branch 'r-1902001-01' into foodcourt

2020-05-29 13:32:16 +06:30
parent d037802a43 8bae89eeac
commit 7c2dd165fc
23 changed files with 724 additions and 508 deletions
--- a/app/controllers/reports/receipt_no_detail_controller.rb
+++ b/app/controllers/reports/receipt_no_detail_controller.rb
@@ -40,7 +40,6 @@ authorize_resource :class => false
 	        @shift_data = sh
 	      end
 	    end
-
 		respond_to do |format|
 	      format.html
 	      format.xls