Pull from master

2018-03-29 18:17:10 +06:30
parent c54441c391 1c13b04697
commit 3ced0f2590
122 changed files with 4008 additions and 1115 deletions
--- a/7
+++ b/7
@@ -47,9 +47,11 @@ gem 'jquery-fileupload-rails'
 gem 'cups'
 gem 'prawn'
 gem 'prawn-table'
-gem 'spreadsheet'
 gem 'to_xls-rails'
-
+gem 'rubyzip', '= 1.0.0'
+gem 'axlsx', '= 2.0.1'
+gem 'axlsx_rails'
+gem 'roo'
 #Reporting gem
 #gem 'compendium'
 #gem "cancan"
@@ -82,7 +84,6 @@ gem 'kaminari', '~> 1.0.1'
 gem 'filterrific'

 gem 'cancancan', '~> 1.10'
-
 #pageless no need for current
 # gem 'will_paginate'
 # gem 'pageless-rails', github: 'rorlab/pageless-rails'