Merge pull request #408 from dimagi/hy/fixed-migration-conflict

Resolved Migration conflict
dimagi · Oct 7, 2024 · bc41636 · bc41636
2 parents fa5c938 + f145006
commit bc41636
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/...ations/0059_completedwork_payment_date.py → ...ations/0060_completedwork_payment_date.py b/...ations/0059_completedwork_payment_date.py → ...ations/0060_completedwork_payment_date.py
@@ -1,10 +1,9 @@
-# Generated by Django 4.2.5 on 2024-10-03 02:33
+# Generated by Django 4.2.5 on 2024-10-07 08:54
 
-from django.db import migrations, models
-from django.db import transaction
+from django.db import migrations, models, transaction
 
 from commcare_connect.opportunity.models import OpportunityAccess
-from commcare_connect.opportunity.visit_import import update_work_payment_date
+from commcare_connect.opportunity.utils.completed_work import update_work_payment_date
 
 
 @transaction.atomic
@@ -16,7 +15,7 @@ def update_paid_date_from_payments(apps, schema_editor):
 
 class Migration(migrations.Migration):
  dependencies = [
- ("opportunity", "0058_paymentinvoice_payment_invoice"),
+ ("opportunity", "0059_payment_amount_usd"),
  ]
 
  operations = [