diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_district_1066187.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_district_1066187.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d0b0bdd3c9f37e715838f7f30970b079298e70cf
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/alter_district_1066187.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="Gerhard Bachmaier" id="3a1bb059-c040-435b-8978-bfddb1a6e2d4">
+        <addColumn tableName="DISTRICT">
+            <column name="DISTRICT_AUTOADD"    type="SMALLINT(5)" />
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
index 0da4b818b701679e7f1c71fe2e4e8cc4dd19210f..b4929b550cd68568758acdcba8add6ec74a32675 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -9,4 +9,5 @@
     <include relativeToChangelogFile="true" file="insert_KeywordsDistrictOrigin.xml"/>
     <include relativeToChangelogFile="true" file="alter_districtResponsibleDatatypes.xml"/>
     <include relativeToChangelogFile="true" file="insert_KeywordsAdviserRoles.xml"/>
+    <include relativeToChangelogFile="true" file="alter_district_1066187.xml"/>
 </databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index aa3002b1df535108316233d4b0a0ff3873471758..d8a14d3d038ff715840573d334eb8ec5a57bf187 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -15576,6 +15576,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_AUTOADD</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index af933bec89499843a6e3be6df85e45e57328d026..659e44b7f874f1d637273ff55d506a446d860841 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -251,6 +251,13 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityField>
+      <name>DISTRICT_AUTOADD</name>
+      <title>Auto assignment</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/District_entity/entityfields/district_autoadd/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_autoadd/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -355,6 +362,11 @@
           <name>totalTurnover.value</name>
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_AUTOADD.value</name>
+          <recordfield>DISTRICT.DISTRICT_AUTOADD</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/District_entity/entityfields/district_autoadd/dropDownProcess.js b/entity/District_entity/entityfields/district_autoadd/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e212979b8e77ec7c357dfbc0104882c01fcb7215
--- /dev/null
+++ b/entity/District_entity/entityfields/district_autoadd/dropDownProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+    ["1", translate.text("Yes")]
+    ,["0", translate.text("No")]
+    ]);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_autoadd/valueProcess.js b/entity/District_entity/entityfields/district_autoadd/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4808df1d6a5fb9f87a6b95f7f507520fab3111cb
--- /dev/null
+++ b/entity/District_entity/entityfields/district_autoadd/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string("0");
\ No newline at end of file
diff --git a/neonView/DistrictEdit_view/DistrictEdit_view.aod b/neonView/DistrictEdit_view/DistrictEdit_view.aod
index e3d68b0179b10b0ffc3bf9ab51937f1a27468cdb..3918362c4570a747d655ad0f052b233228678fce 100644
--- a/neonView/DistrictEdit_view/DistrictEdit_view.aod
+++ b/neonView/DistrictEdit_view/DistrictEdit_view.aod
@@ -34,6 +34,10 @@
           <name>941cb436-8b93-427d-ae2d-3731e55dd040</name>
           <entityField>DISTRICT_STATUS</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>b7e851f6-0492-4298-98dd-87abb5d01255</name>
+          <entityField>DISTRICT_AUTOADD</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>f77428c6-eaff-4554-aedb-cf56d4c573d6</name>
           <entityField>PARENTDISTRICT_DISTRICTID</entityField>
diff --git a/neonView/DistrictFilter_view/DistrictFilter_view.aod b/neonView/DistrictFilter_view/DistrictFilter_view.aod
index 0ae033d2346776a6bb816ef83e21f016045031e5..336fe50e56e4434e8bd00034d3dd3277034c7fad 100644
--- a/neonView/DistrictFilter_view/DistrictFilter_view.aod
+++ b/neonView/DistrictFilter_view/DistrictFilter_view.aod
@@ -44,6 +44,10 @@
           <name>87184bb1-4d44-4872-bae7-9be903f71354</name>
           <entityField>DISTRICT_STATUS</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>07781cf0-39f7-4338-8776-a936e2ac9f6e</name>
+          <entityField>DISTRICT_AUTOADD</entityField>
+        </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
   </children>
diff --git a/neonView/DistrictPreview_view/DistrictPreview_view.aod b/neonView/DistrictPreview_view/DistrictPreview_view.aod
index d2274329dc826ecda496d64241c89b3f4b7d0da3..23a26f94c9743dff16cfc5ed95df13942eef8982 100644
--- a/neonView/DistrictPreview_view/DistrictPreview_view.aod
+++ b/neonView/DistrictPreview_view/DistrictPreview_view.aod
@@ -39,6 +39,10 @@
           <name>98be594e-6209-4046-b0e9-07200c8c294e</name>
           <entityField>DISTRICT_STATUS</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>82a03e53-5373-485c-b0e7-9ec72d7bece5</name>
+          <entityField>DISTRICT_AUTOADD</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <scoreCardViewTemplate>