From 21477dc802b1357237c17cc09c225d2a26a6b2ee Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sun, 6 Jan 2019 23:18:16 +0100 Subject: [PATCH] suite --- app/controllers/admin/sheets_controller.rb | 2 +- app/views/admin/sheets/recus.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/sheets_controller.rb b/app/controllers/admin/sheets_controller.rb index bca06cb..4378581 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(2017, 1, 1).beginning_of_year + date = DateTime.new(2018, 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 38dc69d..123fbc1 100644 --- a/app/views/admin/sheets/recus.html.haml +++ b/app/views/admin/sheets/recus.html.haml @@ -15,7 +15,7 @@ %td{:style => "text-align:right;"} Numéro d'ordre du reçu %br - ="2017/"+("%04d" % i).to_s + ="2018/"+("%04d" % i).to_s %h2{:style => "text-align:center;"} Reçu dons aux œuvres @@ -170,7 +170,7 @@ %td{:style => "text-align:right;"} Numéro d'ordre du reçu %br - ="2017/"+("%04d" % i).to_s + ="2018/"+("%04d" % i).to_s %h2{:style => "text-align:center;"} Reçu dons aux œuvres