Merge pull request #1099 from xzzy/master2

Fix sync script for staff numbers clearing legitimate numbers

ledger/accounts/management/commands/sync_ad_users.py

@@ -66,8 +66,8 @@ def handle(self, *args, **options):
                                          u.first_name = first_name
                                          u.last_name = last_name
                                          u.is_staff = True
-                                         u.phone_number = phone
-                                         u.mobile_number = mobile
+                                         u.staff_phone_number = phone
+                                         u.staff_mobile_number = mobile
                                          u.position_title = position_title
                                          u.manager_name = manager_name
                                          u.manager_email = manager_email

ledger/accounts/migrations/0039_auto_20241021_1023.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-10-21 02:23
+from __future__ import unicode_literals
+
+import django.core.files.storage
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0038_auto_20240716_1530'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emailuser',
+            name='staff_mobile_number',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='staff mobile number'),
+        ),
+        migrations.AddField(
+            model_name='emailuser',
+            name='staff_phone_number',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='staff phone number'),
+        ),
+    ]

ledger/accounts/models.py

@@ -321,6 +321,10 @@ class EmailUser(AbstractBaseUser, PermissionsMixin):
                                     verbose_name="position title", help_text='Automatically synced from AD,  please contact service desk to update.')
     mobile_number = models.CharField(max_length=50, null=True, blank=True,
                                      verbose_name="mobile number", help_text='')
+    staff_phone_number = models.CharField(max_length=50, null=True, blank=True,
+                                    verbose_name="staff phone number", help_text='')
+    staff_mobile_number = models.CharField(max_length=50, null=True, blank=True,
+                                     verbose_name="staff mobile number", help_text='')                                     
     fax_number = models.CharField(max_length=50, null=True, blank=True,
                                   verbose_name="fax number", help_text='')
     organisation = models.CharField(max_length=300, null=True, blank=True,