Merge branch 'develop' of github.com:sgmap/tps into develop

app/views/dossiers/_pieces_justificatives.html.haml

@@ -28,10 +28,5 @@
             %a{ href: "#{piece_justificative.content}", target: '_blank' } Consulter
           - else
             = 'Pièce non fournie'
-    - if  gestionnaire_signed_in? || (user_signed_in? && current_user.loged_in_with_france_connect)
-      %tr
-        %th.col-lg-6
-          Attestation fiscale
-        %td.col-lg-6.col-md-6
-          %a{ href: "/attestation_fiscale_octo.pdf", target: '_blank'} Consulter
+
 

app/views/users/description/show.html.haml

@@ -72,15 +72,6 @@
                 %span.btn.btn-sm.btn-file.btn-success
                   Modifier
                   = file_field_tag "piece_justificative_#{piece_justificative.type}", accept: '.pdf'
-
-      - if (user_signed_in? && current_user.loged_in_with_france_connect) || gestionnaire_signed_in?
-        %tr
-          %th.col-lg-6
-            Attestation fiscale
-          %td.col-lg-6.col-md-6
-            %a{ href: "/attestation_fiscale_octo.pdf", target: '_blank'} Nous l'avons récupéré pour vous.
-    //END
-
     %div{style: 'text-align:right'}
       %h6 Tous les champs portant un * sont obligatoires.
 

db/schema.rb

@@ -109,7 +109,7 @@ ActiveRecord::Schema.define(version: 20151127103412) do
   create_table "exercices", force: :cascade do |t|
     t.string   "ca"
     t.datetime "dateFinExercice"
-    t.datetime "date_fin_exercice_timestamp"
+    t.integer  "date_fin_exercice_timestamp"
     t.integer  "etablissement_id"
   end