Merge branch 'stable'

1 files changed, 11 insertions, 2 deletions

diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 59eb1d554..c7c375a49 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -112,9 +112,18 @@ class OperationWizard(Wizard):
 
     def get_available_parcels(self, file):
         parcels = []
+        current_parcels = []
+        operation = self.get_current_object()
+        for parcel in operation.parcels.all():
+            current_parcels.append((parcel.town, parcel.section,
+                                    parcel.parcel_number))
+            parcels.append((parcel.pk, parcel.short_label))
         try:
-            parcels = [(parcel.pk, parcel.short_label)
-                        for parcel in file.parcels.all()]
+            for parcel in file.parcels.all():
+                if (parcel.town, parcel.section, parcel.parcel_number) \
+                   in current_parcels:
+                    continue
+                parcels.append((parcel.pk, parcel.short_label))
         except (ValueError, ObjectDoesNotExist):
             pass
         return sorted(parcels, key=lambda x:x[1])