Geometry race condition fix

* fixes race condition for geometry conflict and parcel calculation
* harmonizes empty geometries from None/MultiPolygonEmpty to MultiPolygonEmpty

compensation/forms/eco_account.py

@@ -94,8 +94,6 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
 
             # Create log entry
             action = UserActionLogEntry.get_created_action(user)
-            # Process the geometry form
-            geometry = geom_form.save(action)
 
             handler = Handler.objects.create(
                 type=handler_type,
@@ -119,7 +117,6 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
                 responsible=responsible,
                 deductable_surface=surface,
                 created=action,
-                geometry=geometry,
                 comment=comment,
                 is_pik=is_pik,
                 legal=legal
@@ -129,6 +126,10 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
             # Add the log entry to the main objects log list
             acc.log.add(action)
 
+        # Process the geometry form
+        geometry = geom_form.save(action)
+        acc.geometry = geometry
+        acc.save()
         acc.update_deductable_rest()
         return acc
 
@@ -185,9 +186,6 @@ class EditEcoAccountForm(NewEcoAccountForm):
             # Create log entry
             action = UserActionLogEntry.get_edited_action(user)
 
-            # Process the geometry form
-            geometry = geom_form.save(action)
-
             # Update responsible data
             self.instance.responsible.handler.type = handler_type
             self.instance.responsible.handler.detail = handler_detail
@@ -204,7 +202,6 @@ class EditEcoAccountForm(NewEcoAccountForm):
             self.instance.identifier = identifier
             self.instance.title = title
             self.instance.deductable_surface = surface
-            self.instance.geometry = geometry
             self.instance.comment = comment
             self.instance.is_pik = is_pik
             self.instance.modified = action
@@ -213,6 +210,10 @@ class EditEcoAccountForm(NewEcoAccountForm):
             # Add the log entry to the main objects log list
             self.instance.log.add(action)
 
+        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
+        geometry = geom_form.save(action)
+        self.instance.geometry = geometry
+        self.instance.save()
         self.instance.update_deductable_rest()
         return self.instance