diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index d01463b7..996393ac 100644 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -24,11 +24,9 @@
| Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>) | +Sale (<%= from rescue '-' %> - <%= to rescue '-'%>) | ||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Sr.no | Date | diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index aa117624..cf04c5aa 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -61,9 +61,7 @@ <% total_nett = 0 %> <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <% - if @sale_data!=nil - @sale_data.each do |result| %> + <% @sale_data.each do |result| %> <% grand_total = grand_total.to_f + result.grand_total.to_f %> <% total_tax += result.total_tax.to_f %> @@ -85,10 +83,7 @@<%= result.grand_total_after_rounding() rescue '-'%> | |||||||||||||||||||||||||||||||
| <%= total_sum rescue '-'%> | |||||||||||||||||||||||||||||||||