Merge branch 'develop' into refactor_type_de_xxx

Conflicts:
	db/schema.rb

config/deploy.rb

@@ -20,7 +20,7 @@ print "Deploy to #{ENV['to']} environment branch #{branch}\n"
 
 # set :domain, '5.135.190.60'
 set :domain, ENV['domain']
-set :repository, 'ssh://git@37.187.249.111:2200/opt/git/tps.git'
+set :repository,'https://github.com/sgmap/tps.git'
 set :port, 2200
 
 set :deploy_to, '/var/www/tps_dev'

config/locales/fr.yml

@@ -20,6 +20,14 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 fr:
+  number:
+      currency:
+        format:
+          unit: '€'
+          delimiter: ' '
+          separator: ','
+          precision: 2
+          format: '%n %u'
   devise:
     confirmations:
       confirmed: 'Votre compte a été confirmé avec succès.'

config/routes.rb

@@ -17,6 +17,8 @@ Rails.application.routes.draw do
   get 'france_connect' => 'france_connect#login'
   get 'france_connect/callback' => 'france_connect#callback'
 
+  get 'demo' => 'demo#index'
+
   namespace :users do
     get 'siret' => 'siret#index'
 
@@ -57,6 +59,11 @@ Rails.application.routes.draw do
   namespace :backoffice do
     get 'sign_in' => '/gestionnaires/sessions#new'
 
+    get 'dossiers/a_traiter' => 'dossiers#a_traiter'
+    get 'dossiers/en_attente' => 'dossiers#en_attente'
+    get 'dossiers/termine' => 'dossiers#termine'
+    post 'dossiers/search' => 'dossiers#search'
+
     resources :dossiers do
       post 'valid' => 'dossiers#valid'
       post 'close' => 'dossiers#close'