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

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

spec/factories/procedure.rb

@@ -7,10 +7,10 @@ FactoryGirl.define do
     trait :with_two_type_de_piece_justificative do
       after(:build) do |procedure, _evaluator|
         rib = create(:type_de_piece_justificative, :rib)
-        contrat = create(:type_de_piece_justificative, :contrat)
+        msa = create(:type_de_piece_justificative, :msa)
 
         procedure.types_de_piece_justificative << rib
-        procedure.types_de_piece_justificative << contrat
+        procedure.types_de_piece_justificative << msa
       end
     end
   end

spec/factories/type_de_piece_justificative.rb

@@ -2,10 +2,14 @@ FactoryGirl.define do
   factory :type_de_piece_justificative do
     trait :rib do
       libelle 'RIB'
+      description 'Releve identité bancaire'
+      api_entreprise false
     end
 
-    trait :contrat do
-      libelle 'Contrat'
+    trait :msa do
+      libelle 'Attestation MSA'
+      description 'recuperation automatique'
+      api_entreprise true
     end
   end
 end