remove conflict data

2018-02-27 14:35:21 +06:30
parent 3e0943275f 4d556cff43
commit adefd8c034
49 changed files with 1989 additions and 363 deletions
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -124,6 +124,9 @@
 					<li>
 						<a href="<%= reports_saleitem_index_path %>">Sale Items</a>
 					</li>
+					<li>
+						<a href="<%= reports_product_sale_index_path %>">Product Sale</a>
+					</li>
 					<li>
 						<a href="<%= reports_receipt_no_index_path %>">Receipt</a>
 					</li>