From d00085955f66cadd217c7d6638af4c211c6fd165 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 25 Feb 2019 14:57:06 +0100
Subject: [PATCH] Tweak prospartner data transfer

---
 .../management/commands/transfer_prospartner_data.py      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/organizations/management/commands/transfer_prospartner_data.py b/organizations/management/commands/transfer_prospartner_data.py
index 46d8d18e4..348ad0476 100644
--- a/organizations/management/commands/transfer_prospartner_data.py
+++ b/organizations/management/commands/transfer_prospartner_data.py
@@ -2,6 +2,7 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
+from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
 
 from partners.models import ProspectivePartner
@@ -27,13 +28,18 @@ class Command(BaseCommand):
                     role=proscontact.role)
                 contact.save()
                 proscontact.delete()
+            oldman = User.objects.get(email='J.S.Caux@uva.nl')
             for prosevent in prospartner.prospectivepartnerevent_set.all():
+                if prosevent.noted_by:
+                    noted_by = prosevent.noted_by.user
+                else:
+                    noted_by = oldman
                 event = OrganizationEvent(
                     organization=prospartner.organization,
                     event=prosevent.event,
                     comments=prosevent.comments,
                     noted_on=prosevent.noted_on,
-                    noted_by=prosevent.noted_by.user)
+                    noted_by=noted_by)
                 event.save()
                 prosevent.delete()
             prospartner.delete()
-- 
GitLab