-
-
- <%= render :partial=>'shift_sale_report_filter',
- :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %>
-
-
-
-
-
-
-
-
-
-
| <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> |
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index faad445d..28c3be5c 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -190,19 +190,19 @@
<% @sale_taxes.each do |tax| %>
-
+
<% end %>
| |
Net Amount |
- <%= grand_total.to_f + total_tax.to_f%> |
+ <%= grand_total.to_f - @discount_data.to_f%> |
- <%= render :partial=>'shift_sale_report_filter',
- :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_shiftsale_index_path} %>
-
-
-
-
-
-
-
-
-
- <%= render :partial=>'shift_sale_report_filter',
- :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %>
-
-
-
-
-
-
-
-
-
<% if @sale_data.count > 0 %>