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

Conflicts:
	db/schema.rb

app/controllers/dossiers_controller.rb

@@ -9,10 +9,10 @@ class DossiersController < ApplicationController
   end
 
   def create
-
     @etablissement = Etablissement.new(SIADE::EtablissementAdapter.new(siret).to_params)
     @entreprise = Entreprise.new(SIADE::EntrepriseAdapter.new(siren).to_params)
     @dossier = Dossier.create
+    @dossier.draft!
 
     @dossier.procedure = Procedure.find(params['procedure_id'])
     @dossier.save

app/models/dossier.rb

@@ -1,4 +1,12 @@
 class Dossier < ActiveRecord::Base
+  enum state: { draft: 'draft',
+                submitted: 'submitted',
+                reply: 'reply',
+                updated: 'updated',
+                confirmed: 'confirmed',
+                filed: 'filed',
+                processed: 'processed' }
+
   has_one :etablissement
   has_one :entreprise
   has_one :cerfa
@@ -45,5 +53,4 @@ class Dossier < ActiveRecord::Base
     build_cerfa
     true
   end
-
 end