merge with staging

2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -52,3 +52,5 @@ function export_to(path)
  var form_params = $("#frm_report").serialize();
  window.location = path+"?"+ form_params;
 }
+
+