fixed conflict after merge with dev branch for report query updated

2019-11-27 14:09:16 +06:30
parent 98b74af6cf 47c12c6faa
commit a0b7557f06
75 changed files with 1509 additions and 1940 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,6 @@
 module ApplicationHelper
+	include NumberFormattable
+
 	def flash_class(level)
 		case level
 			when :notice then "alert alert-info fade-in"
@@ -6,5 +8,6 @@ module ApplicationHelper
 			when :error then "alert alert-error fade-in"
 			when :alert then "alert alert-error fade-in"
 		end
-	end	
+	end
+
 end