From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 22 Jan 2018 16:12:43 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.2~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4d695ec54903117206a5e1e4d8307795e19cfa40;p=teleforma.git

Merge branch 'master' into dev
---

4d695ec54903117206a5e1e4d8307795e19cfa40
diff --cc teleforma/views/crfpa.py
index 4c4a1bfe,9bd7bcfd..90ea5bd5
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@@ -242,8 -242,8 +242,8 @@@ class UserXLSBook(object)
                  student = Student.objects.get(user=user)
                  if profile:
                      profile = Profile.objects.get(user=user)
-                     row.write(10, profile.address_detail)
--                    row.write(11, profile.address)
 -                    row.write(10, profile.address_detail)
++                    row.write(10, profile.address)
++                    row.write(11, profile.address_detail)
                      row.write(12, profile.postal_code)
                      row.write(13, profile.city)
                      row.write(14, profile.telephone)