Pull from master

2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
--- a/app/views/reports/product_sale/index.xls.erb
+++ b/app/views/reports/product_sale/index.xls.erb
@@ -1,3 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+	<meta http-equiv="Content-type" content="application/vnd.ms-excel; charset=UTF-8">
+</head>
+<body>
 <div class="row">
 	<div class="col-md-12">
 		<div class="margin-top-20">
@@ -81,4 +88,6 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>
+</body>
+</html>