From 72a09457510cbf778d506a98b987e312ae72ccc1 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 5 Jan 2017 16:41:07 +0100 Subject: [PATCH] recus --- app/controllers/admin/sheets_controller.rb | 2 +- app/views/admin/sheets/recus.html.haml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/sheets_controller.rb b/app/controllers/admin/sheets_controller.rb index d7162a7..c17d898 100644 --- a/app/controllers/admin/sheets_controller.rb +++ b/app/controllers/admin/sheets_controller.rb @@ -19,7 +19,7 @@ class Admin::SheetsController < ApplicationController def recus date = Date.today - date = DateTime.new(2015, 1, 1).beginning_of_year + date = DateTime.new(2016, 1, 1).beginning_of_year @sheet_years = SheetYear.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year]) @donates = Donate.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year]) diff --git a/app/views/admin/sheets/recus.html.haml b/app/views/admin/sheets/recus.html.haml index 27c6824..4fe4718 100644 --- a/app/views/admin/sheets/recus.html.haml +++ b/app/views/admin/sheets/recus.html.haml @@ -1,6 +1,6 @@ -price_list = {} --i = 0 +-i = 4 -@sheet_years.each do |sheet_year| -price_list[sheet_year.amount.to_s] = true -i += 1 @@ -15,7 +15,7 @@ %td{:style => "text-align:right;"} Numéro d'ordre du reçu %br - ="2015/"+("%04d" % i).to_s + ="2016/"+("%04d" % i).to_s %h2{:style => "text-align:center;"} Reçu dons aux œuvres @@ -172,7 +172,7 @@ %td{:style => "text-align:right;"} Numéro d'ordre du reçu %br - ="2015/"+("%04d" % i).to_s + ="2016/"+("%04d" % i).to_s %h2{:style => "text-align:center;"} Reçu dons aux œuvres