Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop

Conflicts:
	app/views/dossiers/_infos_dossier.html.haml

app/controllers/carte_controller.rb

@@ -9,8 +9,8 @@ class CarteController < ApplicationController
 
   def save_ref_api_carto
     dossier = current_dossier
-    if dossier.ref_dossier.blank?
-      dossier.update_attributes(ref_dossier: params[:ref_dossier])
+    if dossier.ref_dossier_carto.blank?
+      dossier.update_attributes(ref_dossier_carto: params[:ref_dossier])
       redirect_to url_for(controller: :description, action: :show, dossier_id: params[:dossier_id])
     else
       commentaire_params = {

app/controllers/description_controller.rb

@@ -52,6 +52,6 @@ class DescriptionController < ApplicationController
   private
 
   def create_params
-    params.permit(:nom_projet, :description, :montant_projet, :montant_aide_demande, :date_previsionnelle, :lien_plus_infos, :mail_contact)
+    params.permit(:nom_projet, :description, :montant_projet, :montant_aide_demande, :date_previsionnelle)
   end
 end

app/controllers/recapitulatif_controller.rb

@@ -8,7 +8,8 @@ class RecapitulatifController < ApplicationController
 
     @commentaires = @commentaires.all.decorate
 
-    @commentaire_email = @dossier.mail_contact
+    #TODO load user email
+    @commentaire_email = 'user@email'
   rescue ActiveRecord::RecordNotFound
     redirect_to url_for(controller: :start, action: :error_dossier)
   end

app/controllers/start_controller.rb

@@ -11,7 +11,7 @@ class StartController < ApplicationController
   end
 
   def error_procedure
-    render :file => "#{Rails.root}/public/404.html",  :status => 404
+    render :file => "#{Rails.root}/public/404_procedure_not_found.html",  :status => 404
   end
 
   def error_siret