From ea4dabf3a3ff81fdfdbf082ec0d099d45c4408b8 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 1 Dec 2021 10:43:52 +0100
Subject: [PATCH] update conditions

---
 lib/pdfannotator                              |  2 +-
 .../commands/teleforma-copy-students.py       | 35 ++++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/lib/pdfannotator b/lib/pdfannotator
index ce69eca1..c6b95327 160000
--- a/lib/pdfannotator
+++ b/lib/pdfannotator
@@ -1 +1 @@
-Subproject commit ce69eca18a6f5b8774215725fd6b42534f13412f
+Subproject commit c6b953270e4e8a7d97853d7a784f8e6df9ed9c53
diff --git a/teleforma/management/commands/teleforma-copy-students.py b/teleforma/management/commands/teleforma-copy-students.py
index 44f2fd0e..2016fd39 100644
--- a/teleforma/management/commands/teleforma-copy-students.py
+++ b/teleforma/management/commands/teleforma-copy-students.py
@@ -88,23 +88,26 @@ class Command(BaseCommand):
                 date_paid = deepcopy(payment.date_paid)
                 month = deepcopy(payment.month)
                 payments_to = Payment.objects.using(self.db_to).filter(student=student, month=month)
-                if payments_to:
-                    payment_to = payments_to[0]
-                    payment_to.value = payment.value
-                    payment_to.type = payment.type
-                    payment_to.scheduled = payment.scheduled
-                    payment_to.online_paid = payment.online_paid
-                    payement_to.date_paid = payment.date_paid
-                elif date_paid:
+                if date_paid:
                     if date_paid >= self.date_limit:
-                        payment.pk = None
-                        payment.save(using=self.db_to)
-                        payment.student = student
-                        payment.save(using=self.db_to)
-                        self.logger.logger.info('payment added: ' + student.user.username + \
-                         ', date created:' + str(date_created) + \
-                         ', date paid:' + str(date_paid) + \
-                         ', value: ' + str(payment.value))
+                        if payments_to:
+                            payment_to = payments_to[0]
+                            if not payment_to.date_paid:
+                                payment_to.value = payment.value
+                                payment_to.type = payment.type
+                                payment_to.scheduled = payment.scheduled
+                                payment_to.online_paid = payment.online_paid
+                                payement_to.date_paid = payment.date_paid
+                        else:
+                            if date_paid >= self.date_limit:
+                                payment.pk = None
+                                payment.save(using=self.db_to)
+                                payment.student = student
+                                payment.save(using=self.db_to)
+                                self.logger.logger.info('payment added: ' + student.user.username + \
+                                 ', date created:' + str(date_created) + \
+                                 ', date paid:' + str(date_paid) + \
+                                 ', value: ' + str(payment.value))
 
             if new:
                 for discount in discounts:
-- 
2.39.5