nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suite

Browse Source
This commit is contained in:
Nicolas Bally 2019-01-06 23:18:16 +01:00
parent f852473981
commit 21477dc802
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/sheets_controller.rb
View File

@ -19,7 +19,7 @@ class Admin::SheetsController < ApplicationController
def recus def recus
date = Date.today 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]) @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]) @donates = Donate.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year])

4
app/views/admin/sheets/recus.html.haml
View File

@ -15,7 +15,7 @@
%td{:style => "text-align:right;"} %td{:style => "text-align:right;"}
Numéro d'ordre du reçu Numéro d'ordre du reçu
%br %br
="2017/"+("%04d" % i).to_s ="2018/"+("%04d" % i).to_s
%h2{:style => "text-align:center;"} %h2{:style => "text-align:center;"}
Reçu dons aux œuvres Reçu dons aux œuvres
@ -170,7 +170,7 @@
%td{:style => "text-align:right;"} %td{:style => "text-align:right;"}
Numéro d'ordre du reçu Numéro d'ordre du reçu
%br %br
="2017/"+("%04d" % i).to_s ="2018/"+("%04d" % i).to_s
%h2{:style => "text-align:center;"} %h2{:style => "text-align:center;"}
Reçu dons aux œuvres Reçu dons aux œuvres