From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 17 Mar 2021 11:55:23 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.4.3~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9a909b6da2dd77b95abc0f456eafd5f65d396458;p=teleforma.git

Merge branch 'dev' of git.parisson.com:git/teleforma into dev
---

9a909b6da2dd77b95abc0f456eafd5f65d396458
diff --cc teleforma/views/crfpa.py
index 2377e5d9,f424eca9..5618e78d
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@@ -427,7 -427,7 +427,7 @@@ class UserXLSBook(object)
          users = User.objects.filter(first_name=first_name, last_name=last_name, email=email)
  
          if not users:
-             print(last_name + ' creating')
 -            print(last_name.encode('utf8'))
++            print(last_name.encode('utf8') + ' : creating')
              username = get_unique_username(first_name, last_name)
              user = User(first_name=first_name, last_name=last_name, email=email, username=username)
              user.save()
@@@ -478,20 -474,13 +478,20 @@@
  
              student.save()
  
 -            i = 24
 -            for month in months_choices:
 -                amount = row[i]
 -                payment_type = row[i+1]
 +        else:
-             print(last_name + ' updating')
++            print(last_name.encode('utf8') + ' : updating')
 +            user = users[0]
 +            student = user.student.get()
 +
 +        i = 24
 +        for month in months_choices:
 +            amount = row[i]
 +            payment_type = row[i+1]
 +            payments = Payment.objects.filter(student=student, month=month[0])
 +            if not payments and amount:
                  payment = Payment(student=student, value=float(amount), month=month[0], type=payment_type)
                  payment.save()
 -                i += 2
 +            i += 2
  
  
      def read(self, path, period):