Merge pull request #75 from openimis/release/25.04

MERGING release/25.04 into develop

Author: delcroip

payroll/migrations/0022_alter_csvreconciliationupload_user_created_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 4.2.20 on 2025-04-04 10:02
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("payroll", "0021_auto_20240715_0855"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="csvreconciliationupload",
+            name="user_created",
+            field=models.ForeignKey(
+                db_column="UserCreatedUUID",
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="%(class)s_user_created",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="csvreconciliationupload",
+            name="user_updated",
+            field=models.ForeignKey(
+                db_column="UserUpdatedUUID",
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="%(class)s_user_updated",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

payroll/views.py

@@ -6,7 +6,7 @@
 from rest_framework.response import Response
 
 from core.utils import DefaultStorageFileHandler
-from im_export.views import check_user_rights
+from core.views import check_user_rights
 from payroll.apps import PayrollConfig
 from payroll.models import Payroll, CsvReconciliationUpload
 from payroll.payments_registry import PaymentMethodStorage