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

Conflicts:
	db/schema.rb
This commit is contained in:
Tanguy PATTE 2015-09-22 11:57:04 +02:00
commit 9da4a33e62
6 changed files with 37 additions and 30 deletions

View file

@ -14,7 +14,8 @@ class DossiersController < ApplicationController
@entreprise = Entreprise.new(SIADE::EntrepriseAdapter.new(siren).to_params)
@dossier = Dossier.create
@dossier.procedure_id
@dossier.procedure = Procedure.find(params['procedure_id'])
@dossier.save
@entreprise.dossier = @dossier
@entreprise.save