From 8daf34cff9aa8b6ced2d606291b376d788c3fafe Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Sun, 5 Jan 2020 15:22:57 +0100
Subject: [PATCH] =?UTF-8?q?re=C3=A7us=202019?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin/sheets_controller.rb |  2 +-
 app/views/admin/sheets/index.xls.erb       | 10 +++++-----
 app/views/admin/sheets/recus.html.haml     |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/admin/sheets_controller.rb b/app/controllers/admin/sheets_controller.rb
index 782cbf9..895cca3 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(2018, 1, 1).beginning_of_year
+		date = DateTime.new(2019, 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/index.xls.erb b/app/views/admin/sheets/index.xls.erb
index bb6610c..6ce95bc 100644
--- a/app/views/admin/sheets/index.xls.erb
+++ b/app/views/admin/sheets/index.xls.erb
@@ -27,9 +27,9 @@
 		   <Cell><Data ss:Type="String"> Dernier renouvellement </Data></Cell>
 		   <Cell><Data ss:Type="String"> Création de la fiche </Data></Cell>
 		    <Cell><Data ss:Type="String"> mise à jour</Data></Cell>
-        <Cell><Data ss:Type="String"> Paiement pour 2018</Data></Cell>
-        <Cell><Data ss:Type="String"> Type d'adhésion pour 2018</Data></Cell>
-        <Cell><Data ss:Type="String"> Pouvoirs pour 2018</Data></Cell>
+        <Cell><Data ss:Type="String"> Paiement pour 2019</Data></Cell>
+        <Cell><Data ss:Type="String"> Type d'adhésion pour 2019</Data></Cell>
+        <Cell><Data ss:Type="String"> Pouvoirs pour 2019</Data></Cell>
 		  
 		
 
@@ -68,8 +68,8 @@
 		  <Cell><Data ss:Type="String"><%= sheet.last_year %></Data></Cell>
 		  <Cell><Data ss:Type="String"><%= l sheet.created_at %></Data></Cell>
 		  <Cell><Data ss:Type="String"><%= l sheet.updated_at %></Data></Cell>
-      <% if sheet.sheet_years.where(:year => 2018).first %>
-      <% sy = sheet.sheet_years.where(:year => 2018).first %>
+      <% if sheet.sheet_years.where(:year => 2019).first %>
+      <% sy = sheet.sheet_years.where(:year => 2019).first %>
       
 		  <Cell><Data ss:Type="String"><%= l(sy.paid_at) if sy.paid_at %></Data></Cell>
 		  <Cell><Data ss:Type="String"><%= SheetYear::JOIN_TYPE[sy.join_type] %></Data></Cell>
diff --git a/app/views/admin/sheets/recus.html.haml b/app/views/admin/sheets/recus.html.haml
index 123fbc1..9e7e3bb 100644
--- a/app/views/admin/sheets/recus.html.haml
+++ b/app/views/admin/sheets/recus.html.haml
@@ -1,6 +1,6 @@
 -price_list = {}
 
--i = 2
+-i = 9
 -@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
-        ="2018/"+("%04d" % i).to_s
+        ="2019/"+("%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
-        ="2018/"+("%04d" % i).to_s
+        ="2019/"+("%04d" % i).to_s
 
   %h2{:style => "text-align:center;"}
     Reçu dons aux œuvres