Fixed Bug: Creation of an instruction failed if admin has responsibilities and he tries to create an instruction without Branch and GridTerritory
diff --git a/src/app/dialogs/entry/entry.component.html b/src/app/dialogs/entry/entry.component.html
index 1a64316..5c68ad2 100644
--- a/src/app/dialogs/entry/entry.component.html
+++ b/src/app/dialogs/entry/entry.component.html
@@ -49,8 +49,9 @@
               </td>
               <td class="text-left" style="width: 17%">
                 <div class="form-group">
-                  <select class="form-control" [(ngModel)]="notification.fkRefBranch" name="branchSelection" [required]="!isReadOnlyDialog && !isInstructionDialog">
-                    <option *ngIf="isInstructionDialog"></option>
+                  <select class="form-control" [(ngModel)]="notification.fkRefBranch"
+                  (ngModelChange)="notification.fkRefBranch = $event ? $event : null" name="branchSelection" [required]="!isReadOnlyDialog && !isInstructionDialog">
+                    <option *ngIf="isInstructionDialog" value=""></option>
                     <option *ngFor="let branch of branches" value="{{ branch.id }}">{{ branch.description }}</option>
                   </select>
                 </div>
@@ -61,8 +62,9 @@
               </td>
               <td class="text-left" style="width: 17%">
                 <div class="form-group">
-                  <select class="form-control" [(ngModel)]="notification.fkRefGridTerritory" name="gridTerritorySelection" [required]="!isReadOnlyDialog && !isInstructionDialog">
-                    <option *ngIf="isInstructionDialog"></option>
+                  <select class="form-control" [(ngModel)]="notification.fkRefGridTerritory" 
+                  (ngModelChange)="notification.fkRefGridTerritory = $event ? $event : null" name="gridTerritorySelection" [required]="!isReadOnlyDialog && !isInstructionDialog">
+                    <option *ngIf="isInstructionDialog" value=""></option>
                     <option *ngFor="let gridTerritory of gridTerritories" value="{{ gridTerritory.id }}">{{ gridTerritory.description }}</option>
                   </select>
                 </div>
diff --git a/src/app/dialogs/entry/entry.component.ts b/src/app/dialogs/entry/entry.component.ts
index 3733b3b..a6ca7c3 100644
--- a/src/app/dialogs/entry/entry.component.ts
+++ b/src/app/dialogs/entry/entry.component.ts
@@ -77,7 +77,7 @@
       this.notification.createUser = this.user.name;
     }
 
-    if (!this.notification.fkRefBranch) {
+    if (!this.notification.fkRefBranch && !this.isEditDialog) {
       this.defaultBranch = this.getUniqueBranchNameForUser(
         this.sessionContext.getfilterMatrix().responsibilityContainerMatrix,
         this.sessionContext.getCurrUser().username);
@@ -87,7 +87,7 @@
       }
     }
 
-    if (!this.notification.fkRefGridTerritory) {
+    if (!this.notification.fkRefGridTerritory && !this.isEditDialog) {
       this.defaultGridTerritory = this.getUniqueGridTerritoryNameForUser(
         this.sessionContext.getfilterMatrix().responsibilityContainerMatrix,
         this.sessionContext.getCurrUser().username);