From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 30 Sep 2020 10:30:22 +0000 (+0200)
Subject: Merge branch 'prodev' of git.parisson.com:git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~183^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9e9d1538cef4ca5accf422de7936faaa078bd101;p=teleforma.git

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

Conflicts:
	teleforma/management/commands/teleforma-copy-seminars.py
---

9e9d1538cef4ca5accf422de7936faaa078bd101
diff --cc teleforma/management/commands/teleforma-copy-seminars.py
index 3fed3de6,fb03eb67..4d50fdc8
--- a/teleforma/management/commands/teleforma-copy-seminars.py
+++ b/teleforma/management/commands/teleforma-copy-seminars.py
@@@ -50,13 -50,12 +50,12 @@@ class Command(BaseCommand)
              if seminar.expiry_date:
                  if seminar.period == from_period and not seminar.code in self.less:
                      clone = seminar.clone()
 -                    try:
 -                        clone.publish_date = seminar.publish_date.replace(year=to_year)
 -                    except ValueError:
 -                        # probably a 29th of february
 -                        clone.publish_date = seminar.publish_date.replace(day=28, year=to_year)
 -                    clone.expiry_date = seminar.expiry_date.replace(year=to_year)
 +                    clone.publish_date = seminar.publish_date.replace(year=to_year)
-                     print(seminar.expiry_date)
 +                    if seminar.expiry_date.month == 2 and seminar.expiry_date.day == 29:
 +                        clone.expiry_date = seminar.expiry_date.replace(day=28)
 +                        clone.expiry_date = clone.expiry_date.replace(year=to_year)
 +                    else:
 +                        clone.expiry_date = seminar.expiry_date.replace(year=to_year)
                      clone.date_forced = datetime.datetime(to_year, 1, 1)
                      clone.period = to_period
                      clone.status = 1