Merge branch 'sales_1086963_FixDistrictInQuickEntry' into '2021.2.0'

Sales 1086963 fix district in quick entry

See merge request xrm/basic!1314

entity/Organisation_entity/Organisation_entity.aod

@@ -1425,6 +1425,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityParameter>
+      <name>IsQuickEntry_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Organisation_entity/afterSave.js

-import("system.logging");
 import("system.vars");
 import("District_lib");
 import("system.neon");
 
-if (vars.get("$local.recordstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$local.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$param.IsQuickEntry_param"))
 {
     //Assign this new organisation to all according districts with auto assignment is true
     //2nd parameter "undefined" means, that the current user is determined in the function

entity/QuickEntry_entity/QuickEntry_entity.aod

@@ -5,6 +5,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/QuickEntry_entity/documentation.adoc</documentation>
   <onValidation>%aditoprj%/entity/QuickEntry_entity/onValidation.js</onValidation>
+  <afterSave>%aditoprj%/entity/QuickEntry_entity/afterSave.js</afterSave>
   <iconId>VAADIN:BOLT</iconId>
   <recordContainer>jdito</recordContainer>
   <entityFields>

entity/QuickEntry_entity/afterSave.js

+import("District_lib");
+import("system.vars");
+
+var entityDate = vars.get("$local.entitydata");
+
+if(entityDate["ORGANISATION_NAME"])
+{
+    //Assign this new organisation to all according districts with auto assignment is true
+    //2nd parameter "undefined" means, that the current user is determined in the function
+    DistrictUtils.assignDistrictOnServer([], undefined, entityDate["#UID"])
+}
\ No newline at end of file

entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js

@@ -15,7 +15,8 @@ if (rowdata["ORGANISATION_NAME.value"])
 {
     let configOrg = entities.createConfigForAddingRows();
     organisationId = rowdata["ORGANISATION_ID.value"];
-    configOrg.entity("Organisation_entity");
+    configOrg.entity("Organisation_entity")
+             .addParameter("IsQuickEntry_param", true);
     configOrg.fieldValues({
         "ORGANISATIONID": organisationId,
         "ORGANISATION_ID": organisationId,