Mathieu Magnin
a24980145c
Block dossier initiation if procedure is archived
2017-03-06 14:29:01 +01:00
Mathieu Magnin
d03016db9c
Merge branch 'develop' into list_dossiers_archived
2017-03-02 16:22:59 +01:00
Mathieu Magnin
4d60aecb6d
Merge branch 'develop' into try_to_use_sqlite
2017-03-01 14:59:17 +01:00
Mathieu Magnin
87865fcf1b
Merge branch 'develop' into list_dossiers_archived
2017-03-01 10:35:20 +01:00
Simon Lehericey
6865231a27
Tests: france_connect initializer if not test
2017-02-28 17:01:58 +01:00
Simon Lehericey
15d27f6a7d
Tests: adapt database.yml to allow parallele sqlite
2017-02-28 17:01:58 +01:00
Simon Lehericey
8bccf375e1
Tests: adapt migration to sqlite
...
Add sqlite
Remove scenic from tests
2017-02-28 17:01:58 +01:00
LeSim
0da239c657
Merge branch 'develop' into simplify_dossier_workflow
2017-02-28 15:23:25 +01:00
Simon Lehericey
870d3719e1
Dossier: add method to allow gestionnaire to reopen dossier
2017-02-28 15:14:27 +01:00
Mathieu Magnin
67daaa033c
Merge pull request #28 from sgmap/simplify_dossier_workflow
...
Simplify dossier workflow
2017-02-28 14:56:57 +01:00
Mathieu Magnin
fa884f3ed0
Unarchive button & tests
2017-02-28 14:33:05 +01:00
Mathieu Magnin
10add61bd1
Clean some tests after removing :validated & :submitted states
2017-02-23 17:54:11 +01:00
Mathieu Magnin
3fcf9bf350
Landing is no longer a symlink on prod/staging env, new call to action on landing is a mailto
2017-02-22 16:07:06 +01:00
Simon Lehericey
254c2319e9
Remove Rails Deprecation
...
ActiveRecord::Base.raise_in_transactional_callbacks= is deprecated, has no effect and will be removed without replacement
2017-02-21 10:53:09 +01:00
Mathieu Magnin
62152e0b6e
After environment.rb updated this should work
2017-02-20 14:11:12 +01:00
Xavier J
5d733c11fd
Delete references @opensimplif
2017-02-13 15:46:28 +01:00
Xavier Julien
3c6ae2d005
Merge pull request #14 from sgmap/customizable-emails
...
Customizable emails
2017-02-13 15:20:04 +01:00
Mathieu Magnin
5613b896b1
Gestionnaire can archive dossier
2017-02-08 17:35:28 +01:00
Xavier J
7cd08ec3f9
Merge branch 'develop' into print_css_for_dossier_show
...
# Conflicts:
# app/views/dossiers/_messagerie.html.haml
2017-02-07 17:38:02 +01:00
Mathieu Magnin
e99746639b
Merge branch 'send_user_notification_when_invite_send_a_message' into develop
2017-02-01 17:01:34 +01:00
Mathieu Magnin
34d05e4d9e
Improve the print css for the dossier/show
2017-02-01 14:24:24 +01:00
Mathieu Magnin
aea1816da1
add mailcatcher config in dev
2017-01-31 17:22:03 +01:00
Mathieu Magnin
83945b3366
add mailcatcher comment
2017-01-30 15:21:47 +01:00
Mathieu Magnin
c7934b2f97
Send a mail to usager if somebody else wrote a new commentaire on his dossier
2017-01-30 15:17:45 +01:00
Mathieu Magnin
b40193e7b5
New customizable mail : mail_validated, new balise --lien_dossier--
2017-01-26 12:12:52 +01:00
Mathieu Magnin
2bc5ee88f7
Change controller name according to model name, add simple_form
2017-01-24 15:53:42 +01:00
Mathieu Magnin
29de9b0b55
Simplify mailers development with mailcatcher and previews
2017-01-23 15:41:09 +01:00
Xavier J
bc71754e87
Add tool change dossier state
2017-01-10 17:29:38 +01:00
Xavier J
489b533941
Fix deploy
2017-01-09 21:45:08 +01:00
Xavier J
23df8a2348
- Ajust TPS for OpenSimplif
...
- Create /simplifcations routes for OpenSimplifController
2017-01-09 17:12:11 +01:00
Xavier J
ccde8fdb86
Change status libelle
2017-01-04 18:09:35 +01:00
Xavier J
cbb5737fdf
new demo link on home page
2017-01-03 10:40:09 +01:00
Xavier J
4a1a23d1d7
Add per page link for smart listing User, Admin and Accompagnateur for follow files
2017-01-02 10:48:47 +01:00
Xavier J
35827a2e25
Add staging for redis cable
2017-01-02 10:22:43 +01:00
Xavier J
c01132c788
Delete old attr in database
2016-12-27 11:57:34 +01:00
Xavier J
f98bb90f08
Bootstrap Action Cable and Unicorn
2016-12-22 21:49:31 +01:00
Xavier J
2fccbbf4f0
Delete un-use code
2016-12-19 15:08:00 +01:00
Xavier J
e85cb4c24b
Delete features unified_login
2016-12-16 14:39:17 +01:00
Hugo Lepetit
03bfbb1462
Boyscout initializers
2016-12-14 13:56:56 +01:00
JC
5c93920f74
Mutualize all informations in dossier_show partial, now work on css
2016-12-07 13:58:00 +01:00
JC
94373094fa
Adding default welcome message, default opening messages body while no commentaires
2016-12-05 16:01:13 +01:00
JC
c03de66137
Extract dynamics involved constant to fit with utils in fr/en
2016-12-05 15:30:21 +01:00
JC
271ce62476
Adding logout information for sign_out hover, changing colors for links
2016-12-05 14:45:00 +01:00
Xavier J
dd46485f2e
Fix TPS v2 rails env in deploy.rb
2016-12-01 18:38:21 +01:00
Xavier J
c682387a39
First change connexion navbar
2016-12-01 10:54:25 +01:00
JC
4a5c053ae5
Continue on dossier#show
2016-11-28 18:34:31 +01:00
JC
fda8cac51c
Finished navbar for dossiers#show, need body: construct dossier
2016-11-28 15:56:38 +01:00
Xavier J
e17c592ab4
Merge branch 'develop' into develop_v2
2016-11-25 12:48:14 +01:00
Xavier J
f4078124a4
Change local libellé
2016-11-25 12:20:44 +01:00
Xavier J
58df3c3a75
- Continue development Tableau de bord
...
- Optimize toggle block
2016-11-24 19:33:34 +01:00
Xavier J
d09a47ae23
First iteration navbar tableau de bord
2016-11-23 15:21:42 +01:00
Xavier J
647eaa4ba8
Merge branch 'develop' into develop_v2
...
# Conflicts:
# Gemfile.lock
# db/schema.rb
2016-11-17 16:55:41 +01:00
Xavier J
d75a53ffae
Fix deploy task
2016-11-17 12:35:05 +01:00
Xavier J
b4b2dafc7b
Add reply_to for invite mailer
2016-11-17 12:17:59 +01:00
Xavier J
06f353968f
Local open simplif
2016-11-17 11:37:00 +01:00
Julien Portalier
96ca5113f7
Flux de commentaires par champs
2016-11-15 18:36:20 +01:00
JC
23b928f160
Adding limit (200) for dossier exportation
2016-11-15 17:06:40 +01:00
Xavier J
c734c1c960
Update deploy.rb with new staging_v2 branch
2016-11-15 11:19:18 +01:00
JC
0ac3c5fc86
Merging develop branch updated
2016-11-15 10:46:33 +01:00
Xavier J
90cfd3eccb
Fix Test spec/controllers/api/*.rb
2016-11-15 09:54:17 +01:00
Xavier J
d7fdf22abb
First fixed
2016-11-14 17:33:45 +01:00
Xavier J
a72709b6da
Fix bug Cerfa on « Modifier document » recap page
2016-11-10 17:26:00 +01:00
JC
23ee1cb21c
Adding style for download link as dropdown menu, changing locales
2016-11-08 15:28:39 +01:00
Xavier J
40a792bd13
dynamic CGU page
2016-11-08 11:54:16 +01:00
JC
8dda0d3fb1
Okay... Add some conversion method to catch .ods write of number and boolean values -> as strings, passing on initial test for as_csv method
2016-11-08 11:48:36 +01:00
Xavier J
eb64e04aba
Dynamic Page title
2016-11-08 10:57:15 +01:00
JC
fa767ad56f
Config using default Serializers to generate both CSV and XLSX files from Dossier records, problem with ODS in gem -> github issue openned
2016-11-07 17:23:58 +01:00
Xavier J
e10c218d3a
Add dynamic logo (opensimplif)
2016-11-03 17:20:56 +01:00
Xavier J
68951c3a53
Add locales dynamics (opensimplif)
2016-11-03 16:46:26 +01:00
Xavier J
dd0e746997
Add wording for bad token on reset password
2016-11-02 10:58:28 +01:00
Xavier J
8fb76d1a6e
Add type de champ Engagement
2016-10-27 13:43:10 +02:00
JC
c6f5a8b62d
Adding button, method in controller, testing call
2016-10-25 17:39:53 +02:00
Xavier J
e6c28fc9b2
Add tps_v2 deploy function
2016-10-25 12:03:25 +02:00
Xavier J
740b3650aa
Restore select procedure for gestionnaire (opensimplif)
2016-10-24 16:00:03 +02:00
Xavier J
32d70bd909
Fix features flip on user connection for unified_login
2016-10-20 11:48:40 +02:00
Xavier J
f1515616ff
Add 3 new type de champs : Pays, Régions et Départements
2016-10-12 17:22:56 +02:00
Xavier J
02000eeb41
Add the new TPS instance OpenSimplif on deploy task
2016-10-10 18:21:46 +02:00
Xavier J
8160d4d0df
User can be add siret when is procedure at the attribut individual and individual_with_siret
2016-10-05 14:28:10 +02:00
Xavier J
52249f92b5
Add filter on gestionnaire dossier list
2016-10-04 19:19:03 +02:00
Xavier J
b3d454a53b
Smart listing sorting is saved on dossier list
2016-09-27 17:26:49 +02:00
Xavier J
1f1b235283
Fix bug Chrome datepicker
2016-09-22 11:31:24 +02:00
Xavier J
ccd9c0898d
Fix test with cloud storage enabled
2016-09-16 15:40:30 +02:00
Xavier J
0ac23f6d96
User can invite other User
2016-09-13 12:17:56 +02:00
Xavier J
e9d4685aef
Force use https for generate route
2016-09-12 17:30:25 +02:00
Xavier J
4a336b8af7
Config devise session timeout
2016-09-09 17:44:00 +02:00
Xavier J
d5ad256919
create route and controller to filter dossier view by procedure
2016-09-06 11:07:26 +02:00
Xavier J
1c5cd471cd
Externalize in config file SIADE API URL.
2016-09-01 12:09:44 +02:00
Xavier J
a48299353e
Fix html interpretation in ReceivedMail
2016-09-01 11:00:06 +02:00
Xavier J
12ebab66cc
Administrateur can be param the acknowledgement of delivery mail object and body.
2016-08-31 16:07:11 +02:00
Xavier J
a69433e8de
User can be begin without SIRET
2016-08-30 11:18:43 +02:00
Xavier J
0eb2acb959
CGU
2016-08-29 11:02:02 +02:00
Guillaume Lazzara
09236f32aa
Add 'refuser' and 'classer sans suite' buttons
2016-08-25 17:46:26 +02:00
Guillaume Lazzara
0120ce2a32
Add an action to set a dossier as 'recu'.
2016-08-25 15:22:08 +02:00
Xavier J
e4cf25b677
Download all gestionnaire dossier with a button
2016-08-25 12:30:15 +02:00
Guillaume Lazzara
39df032c8c
Translate type de champ values
2016-08-24 17:07:13 +02:00
Xavier J
5b0e01f117
delete filter procedure for gestionnaire
2016-08-22 16:36:25 +02:00
Xavier J
1a92382259
- Add new status for a dossier : received, refused and without_continuation
...
- Add new and rename tabs on gestionnaire all dossiers view
/!\ WARNING : One test does not pasted. He will be corrected in the next commit
2016-08-11 15:27:35 +02:00
Xavier J
480431ea01
Add on gestionnaire dossier view the private form
2016-08-08 12:52:30 +02:00
Xavier J
116dd0d94f
Administrateur can be define private champs => same as typical champs
2016-08-03 18:19:56 +02:00
Xavier J
a37320bae9
Add lateral panel to configure dossier list in back office
2016-08-01 18:10:32 +02:00
Xavier J
2ad816b6b3
Admin can be transfer a clone of a procédure at an other admin
2016-07-22 11:34:34 +02:00
Xavier J
7d0bcfc35f
Delete utilisation of "nom_projet" attribut (no delete in database)
2016-07-19 16:10:50 +02:00
Xavier J
d26ae9539d
An accompagnateur can be mark a dossier follow by us
2016-07-18 18:24:29 +02:00
Xavier J
382c8d8700
Add minim preparation for dossier uniq page
2016-07-18 09:37:22 +02:00
Guillaume Lazzara
aebc673cdc
Set STORAGE_URL during initialization
2016-07-05 11:50:45 +02:00
Guillaume Lazzara
4f02e18f4a
Fix cloud storage migration task
2016-07-04 16:53:38 +02:00
Guillaume Lazzara
71d51ebb59
Add link to features.yml in deployment
2016-07-01 14:45:50 +02:00
Xavier J
575cbaa3e1
Fix route commencer and adapt feature test
2016-06-29 17:35:34 +02:00
Guillaume Lazzara
e5002dbb11
Introduce permanent and customizable procedure url
2016-06-24 16:41:44 +02:00
Xavier J
86e26e520c
Merge branches 'develop' and 'develop' of github.com:sgmap/tps into develop
2016-06-20 13:59:31 +02:00
Xavier J
cc8d2ef4ee
New UI and UX for the dossier initialization
2016-06-20 13:57:57 +02:00
Guillaume Lazzara
7af7859334
Implement procedure cloning
2016-06-15 11:34:05 +02:00
Guillaume Lazzara
f58f9d27d9
Enable password reset for Gestionnaires
2016-06-14 15:36:37 +02:00
Guillaume Lazzara
2791988da2
Add draft/publish status for procedure.
2016-06-09 17:49:48 +02:00
Xavier J
b987b86bd8
Add address input on carte view
2016-06-09 16:28:44 +02:00
Xavier J
e72487bb28
Merge branch 'develop' of github.com:sgmap/tps into develop
2016-06-09 12:08:25 +02:00
Xavier J
23ab25396f
Add type champs "Address" plug at the BAN
2016-06-09 12:08:18 +02:00
Guillaume Lazzara
1551b7ce21
Add ordering feature on piece justificative view
2016-06-08 16:45:37 +02:00
Guillaume Lazzara
32870e8128
Link fog credentials file during deployment
2016-06-07 10:33:22 +02:00
Xavier J
e6b5698008
Add previsualization formulaire page for administrateur
2016-06-06 17:40:32 +02:00
Guillaume Lazzara
16ca407542
Add ping route
2016-06-01 15:07:34 +02:00
Xavier J
4d1cb9ecfe
Connexion page is contextualized with procedure title and description when is access with link.
2016-05-26 15:59:50 +02:00
Xavier J
e973286766
Merge branch 'assign_to_procedure' into develop
...
# Conflicts:
# db/schema.rb
2016-05-24 17:19:32 +02:00
Xavier J
1fcb33104d
Administrateur can be assign accompagnateur on each of his procedure.
2016-05-24 16:39:39 +02:00
Guillaume Lazzara
9aca554eb2
Fix uploaded file permissions
2016-05-24 14:25:40 +02:00
Guillaume Lazzara
d6a3884c81
Make use of fog_credentials.test.yml for testing.
2016-05-20 16:34:57 +02:00
Xavier J
1923f2aec1
Migrate Admin / Gestionnaire / Procédure gestion in database
2016-05-20 15:39:17 +02:00
Xavier J
fe4d921997
Add accompagnateur tab on all procedure navbar
2016-05-20 15:36:38 +02:00
Xavier J
143a683303
Change management navbar procedure admin
2016-05-19 10:57:18 +02:00
Guillaume Lazzara
6fdc2c77f2
Add feature file
2016-05-17 16:22:35 +02:00
Guillaume Lazzara
833d7790c2
Add support for remote OVH cloud storage
2016-05-13 16:08:51 +02:00
Xavier J
b15c2bbb2b
New feature : User, Guest and Gestionnaire can be upload a document with theirs comments
2016-04-20 16:51:57 +02:00
Xavier J
6d5a3e6256
User and Guest can be upload new documents on our recapitulative dossier page.
2016-03-22 17:36:36 +01:00
Xavier J
a612dc6021
Add features filter procedure for gestionnaire (not active on dossier list for now)
2016-03-14 14:23:09 +01:00
Guillaume Lazzara
8758075456
Add custom field 'type' in logstash logs.
2016-03-03 18:33:59 +01:00
Xavier J
9c1268fdd5
Add statistiques API for dashboard
2016-02-29 15:15:44 +01:00
Xavier J
c971849312
Merge branch 'api-pie' into develop
2016-02-26 14:00:29 +01:00
Xavier J
e1d1e356e5
fix deploy rake process
2016-02-24 11:12:18 +01:00
Xavier J
774ad95cc6
Add shared link for super_admin initializers
2016-02-24 10:51:23 +01:00
Xavier J
36954c595e
Add UI SuperAdmin
2016-02-23 16:51:24 +01:00
Xavier J
2a6da54320
add gem api-pie
...
Error : stack level too deep
2016-02-22 19:42:47 +01:00
Xavier J
913905001e
Revert swagger docs
2016-02-22 17:53:00 +01:00
Guillaume Lazzara
973d6693e0
Demo sign-in page for administrateur
2016-02-19 17:27:14 +01:00
Xavier J
c3410c104b
Swagger docs
2016-02-18 18:02:07 +01:00
Guillaume Lazzara
a643f34621
Handle upload file size limit in UI
2016-02-18 15:47:14 +01:00
Xavier J
419f74948a
Demo sign_in page for users and gestionnaires
2016-02-15 17:13:16 +01:00
Xavier J
a4b67ec1be
test 2
2016-02-12 13:57:25 +01:00
Guillaume Lazzara
6b7d3e0ac1
Add gestionnaire deletion feature
2016-02-09 12:24:05 +01:00
Guillaume Lazzara
2a2aef34db
Add gestionnaire administration panel.
2016-02-09 11:01:10 +01:00
Xavier J
5bb98a2863
Activation : reset user password
2016-02-08 19:32:18 +01:00
Xavier J
e2a896d0b0
Gestionnaire can invite an email contact to participate at a dossier
2016-02-08 18:16:18 +01:00
Xavier J
30438df244
Add swagger-docs gem to generate ison swagger files
2016-02-02 18:11:44 +01:00
Xavier J
01be1fff76
add routes path /users
2016-02-01 18:18:55 +01:00
Tanguy PATTE
dc5ac9807d
start api to display dossier
...
missing pj, fields, exercices
2016-01-25 16:08:10 +01:00
Tanguy PATTE
f75f0e26d6
Merge branch 'develop' of github.com:sgmap/tps into develop
...
Conflicts:
db/schema.rb
2016-01-20 15:50:13 +01:00
Tanguy PATTE
78bd982f97
Add API index on Dossier.
2016-01-20 15:48:46 +01:00
Xavier J
a738128f4a
Suppression de FCEntreprise
2016-01-19 17:40:45 +01:00
Xavier J
2ce8e4734b
Add get_cadastre on TPS carte page and display on leaflet map
2016-01-15 11:53:00 +01:00
Xavier J
4dcf0d4bb1
Translation missing for new registration user
2016-01-12 15:03:30 +01:00
Xavier J
5540a786db
Disable FC Enterprise
2016-01-11 17:19:25 +01:00
Xavier J
0d2bd17a9e
Admin procedure sort list
2016-01-07 15:29:29 +01:00
Xavier J
e7570564f8
Add downloader for upload files outwards of public folder
2016-01-05 15:53:01 +01:00
Xavier J
4961f39a71
Add check password to connect with france connect particulier whereas a TPS account have the same email adresse
2016-01-05 12:18:00 +01:00
Xavier J
2d6e0d2864
Fix bug config mailjet
2016-01-04 12:23:53 +01:00
Xavier J
39b15e8b3d
Refactor dossier decorators
2015-12-24 16:12:16 +01:00
Xavier J
de0acc0a22
Change URL for not found procedure
2015-12-24 15:22:30 +01:00
Xavier J
1a3aebe6ab
Merge branch 'develop' of github.com:sgmap/tps into develop
2015-12-24 10:12:52 +01:00
Xavier J
2099095c34
New routes and schema for FranceConnect Particulier
2015-12-24 10:03:06 +01:00
Xavier J
aee0d928ca
Add mailjet to deploy
2015-12-24 09:13:24 +01:00
Tanguy PATTE
3ea381413f
Merge branch 'develop' of github.com:sgmap/tps into develop
2015-12-21 17:52:00 +01:00
Tanguy PATTE
4782ceef71
add api v1 procedures routes
2015-12-21 17:50:34 +01:00
Xavier J
506ce2dee4
add parallels tests
2015-12-21 10:45:50 +01:00
Xavier J
229973f14c
Rename FranceConnect to FranceConnect::Entreprise
2015-12-18 12:01:26 +01:00
Xavier J
4aedf72631
Send email when user create new account
2015-12-15 15:17:12 +01:00
Xavier J
25937b2635
NotificationMailer : new answer
2015-12-15 11:02:07 +01:00
Xavier J
1652a747a1
Merge branch 'develop' of github.com:sgmap/tps into develop
2015-12-15 11:01:28 +01:00
Tanguy PATTE
9040d9407d
add empty profile page
2015-12-14 17:25:35 +01:00
Xavier J
83871fc22f
Reset password mail
2015-12-14 16:29:35 +01:00
Xavier J
a65f271a60
Add mailer Welcome
2015-12-14 16:09:20 +01:00
Xavier J
704e491cd0
Add lib RNA connect to apientreprise
2015-12-11 10:36:16 +01:00
Xavier J
11596ade65
- QP not research if module_api_carto have not activated quartiers_prioritaires
...
- Carte page is not accessible if module_api_cart have not activated use_api_carto
2015-12-08 11:18:49 +01:00
Xavier J
92d57db91d
- migrate page show to edit for procedure admin
...
- create new page show for procedure admin
2015-12-04 16:17:35 +01:00
Xavier J
2b6aba16ac
- valid siren on create file
2015-12-03 15:02:22 +01:00
Xavier J
afaa6a5ac9
- delete route '/users/siret'
...
- delete route 'users/procedure'
- create route 'users/dossiers/new?procedure_id=:procedure_id'
- delete a part of unused code
- adapt demo page with new procedure URL
2015-12-03 12:00:22 +01:00
Xavier J
3e55d7ba3b
- Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user
...
- Add routes 'uses/dossiers/?liste=xxx' to reach at file lists for user
2015-12-02 18:03:52 +01:00
Xavier J
5cebb5b621
- Code review
...
- Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user
- Add routes 'uses/dossiers/?liste=xxx' to reach at file lists for user
2015-12-02 16:52:09 +01:00
Xavier J
141e23a381
Code review
2015-11-30 17:03:36 +01:00
Xavier J
da49c633dc
Add tabs on view list file for users
2015-11-30 14:48:37 +01:00
Xavier J
3eb990a611
Administrator can unarchived a procedure
2015-11-27 17:13:06 +01:00
Xavier J
7c3f322d6e
Add tabs for administrateur procedures list
2015-11-27 16:23:02 +01:00
Xavier J
658262f1de
Delete lost password demand
2015-11-27 15:55:18 +01:00
Xavier J
a79ecbba6d
Add archive button on recapitulative page user dossier
2015-11-27 13:56:54 +01:00
Xavier J
833752161f
Add button archive on procedure
2015-11-26 18:41:41 +01:00
Xavier J
37ea69ec51
Add pagination for gestionnaire dossier
...
Fix test for user pagination
2015-11-26 15:47:31 +01:00
Xavier J
2eb01bdf42
Add paginate for user dossiers
2015-11-26 12:29:34 +01:00
Xavier J
eb5985efc4
- Save QP on database
...
- Display on all Map (User and Gestionnaire)
2015-11-25 17:05:14 +01:00
Xavier J
f4e63d40b0
Add QP on user carte
2015-11-25 10:26:55 +01:00
Xavier J
db346fb66f
- create route /users/procedure/:procedure_id to replace /users/siret/?procedure_id=
...
- /users/siret/ redirect to /users/procedure/
- siren can be past on the URL /users/siret and /users/procedure
2015-11-20 18:14:52 +01:00
Tanguy PATTE
d6e4a76bf9
Merge branch 'develop' into refactor_type_de_xxx
...
Conflicts:
db/schema.rb
2015-11-20 17:16:45 +01:00
Tanguy PATTE
17ca244a2f
end delete type de piece justificative
2015-11-20 15:12:47 +01:00
