2 files changed, 27 insertions, 7 deletions
diff --git a/archaeological_files/migrations/0110_auto_20230127_1503.py b/archaeological_files/migrations/0110_auto_20230127_1503.py
new file mode 100644
index 000000000..6747a4117
--- /dev/null
+++ b/archaeological_files/migrations/0110_auto_20230127_1503.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.24 on 2023-01-27 15:03
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_files', '0109_auto_20220711_1024'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='equipmentservicecost',
+            name='price_agreement',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='equipment_service_costs', to='archaeological_files.PriceAgreement', verbose_name='Price agreement'),
+        ),
+        migrations.AlterField(
+            model_name='job',
+            name='price_agreement',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='jobs', to='archaeological_files.PriceAgreement', verbose_name='Price agreement'),
+        ),
+    ]
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index bb31c1c24..529e3e0e6 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -719,13 +719,6 @@ class File(
         Document, related_name="files", verbose_name=_("Documents"), blank=True
     )
 
-    cached_label = models.TextField(
-        _("Cached name"),
-        blank=True,
-        default="",
-        db_index=True,
-        help_text=_("Generated automatically - do not edit"),
-    )
     imported_line = models.TextField(_("Imported line"), blank=True, default="")
     history = HistoricalRecords(bases=[HistoryModel])
 
@@ -1009,6 +1002,9 @@ class File(
         return self.external_id or ""
 
     def _generate_cached_label(self):
+        label = self._profile_generate_cached_label()
+        if label:
+            return label
         items = [self.get_town_label(), self.reference]
         items += [
             str(getattr(self, k))