diff --git a/src/views/biz-license.vue b/src/views/biz-license.vue
index 4eae346..7213ee2 100644
--- a/src/views/biz-license.vue
+++ b/src/views/biz-license.vue
@@ -192,482 +192,786 @@
             </v-col>
           </template>
 
+          <!-- AyaNova 7 group -->
           <template v-if="obj.pGroup == 1">
-
-
-
-
-
-
-            <!-- WBI V7 LICENSE ITEM -->
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-row dense no-gutters>
-                <v-col cols="2">
-                  <v-checkbox
-                    ref="wbi"
-                    v-model="obj.wbi"
-                    dense
-                    :readonly="formState.readOnly"
-                    label="WBI"
-                    data-cy="wbi"
-                    :error-messages="form().serverErrors(this, 'wbi')"
-                    @change="fieldValueChanged('wbi')"
-                  ></v-checkbox>
-                </v-col>
-                <template v-if="obj.wbi">
-                  <template v-if="!formState.readOnly">
-                    <v-col cols="1">
-                      <v-menu offset-y>
-                        <template v-slot:activator="{ on, attrs }">
-                          <v-btn icon v-bind="attrs" v-on="on">
-                            <v-icon small>$sockiPlus</v-icon>
-                          </v-btn>
-                        </template>
-                        <v-list>
-                          <v-list-item @click="dtAddOneWeek('wbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One week</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneMonth('wbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One month</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneYear('wbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One year</v-list-item-title>
-                          </v-list-item>
-                        </v-list>
-                      </v-menu>
+            <v-row>
+              <!-- WBI V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="wbi"
+                      v-model="obj.wbi"
+                      dense
+                      :readonly="formState.readOnly"
+                      label="WBI"
+                      data-cy="wbi"
+                      :error-messages="form().serverErrors(this, 'wbi')"
+                      @change="fieldValueChanged('wbi')"
+                    ></v-checkbox>
+                  </v-col>
+                  <template v-if="obj.wbi">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item @click="dtAddOneWeek('wbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneMonth('wbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneYear('wbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="wbiExpires"
+                        v-model="obj.wbiExpires"
+                        :rules="[form().required(this, 'wbiExpires')]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'wbiExpires')
+                        "
+                        data-cy="wbiExpires"
+                        @input="fieldValueChanged('wbiExpires')"
+                      ></gz-date-picker>
                     </v-col>
                   </template>
-                  <v-col>
-                    <gz-date-picker
-                      ref="wbiExpires"
-                      v-model="obj.wbiExpires"
-                      :rules="[form().required(this, 'wbiExpires')]"
+                </v-row>
+              </v-col>
+              <!-- /wbi v7 license item -->
+
+              <!-- RI V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="ri"
+                      v-model="obj.ri"
+                      dense
                       :readonly="formState.readOnly"
-                      :error-messages="form().serverErrors(this, 'wbiExpires')"
-                      data-cy="wbiExpires"
-                      @input="fieldValueChanged('wbiExpires')"
-                    ></gz-date-picker>
+                      label="RI"
+                      data-cy="ri"
+                      :error-messages="form().serverErrors(this, 'ri')"
+                      @change="fieldValueChanged('ri')"
+                    ></v-checkbox>
                   </v-col>
-                </template>
-              </v-row>
-            </v-col>
-            <!-- /wbi v7 license item -->
-
-
-
-             <!-- RI V7 LICENSE ITEM -->
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-row dense no-gutters>
-                <v-col cols="2">
-                  <v-checkbox
-                    ref="ri"
-                    v-model="obj.ri"
-                    dense
-                    :readonly="formState.readOnly"
-                    label="RI"
-                    data-cy="ri"
-                    :error-messages="form().serverErrors(this, 'ri')"
-                    @change="fieldValueChanged('ri')"
-                  ></v-checkbox>
-                </v-col>
-                <template v-if="obj.ri">
-                  <template v-if="!formState.readOnly">
-                    <v-col cols="1">
-                      <v-menu offset-y>
-                        <template v-slot:activator="{ on, attrs }">
-                          <v-btn icon v-bind="attrs" v-on="on">
-                            <v-icon small>$sockiPlus</v-icon>
-                          </v-btn>
-                        </template>
-                        <v-list>
-                          <v-list-item @click="dtAddOneWeek('riExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One week</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneMonth('riExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One month</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneYear('riExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One year</v-list-item-title>
-                          </v-list-item>
-                        </v-list>
-                      </v-menu>
+                  <template v-if="obj.ri">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item @click="dtAddOneWeek('riExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneMonth('riExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneYear('riExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="riExpires"
+                        v-model="obj.riExpires"
+                        :rules="[form().required(this, 'riExpires')]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="form().serverErrors(this, 'riExpires')"
+                        data-cy="riExpires"
+                        @input="fieldValueChanged('riExpires')"
+                      ></gz-date-picker>
                     </v-col>
                   </template>
-                  <v-col>
-                    <gz-date-picker
-                      ref="riExpires"
-                      v-model="obj.riExpires"
-                      :rules="[form().required(this, 'riExpires')]"
+                </v-row>
+              </v-col>
+              <!-- /ri v7 license item -->
+
+              <!-- MBI V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="mbi"
+                      v-model="obj.mbi"
+                      dense
                       :readonly="formState.readOnly"
-                      :error-messages="form().serverErrors(this, 'riExpires')"
-                      data-cy="riExpires"
-                      @input="fieldValueChanged('riExpires')"
-                    ></gz-date-picker>
+                      label="MBI"
+                      data-cy="mbi"
+                      :error-messages="form().serverErrors(this, 'mbi')"
+                      @change="fieldValueChanged('mbi')"
+                    ></v-checkbox>
                   </v-col>
-                </template>
-              </v-row>
-            </v-col>
-            <!-- /ri v7 license item -->
-
-
-            <!-- MBI V7 LICENSE ITEM -->
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-row dense no-gutters>
-                <v-col cols="2">
-                  <v-checkbox
-                    ref="mbi"
-                    v-model="obj.mbi"
-                    dense
-                    :readonly="formState.readOnly"
-                    label="MBI"
-                    data-cy="mbi"
-                    :error-messages="form().serverErrors(this, 'mbi')"
-                    @change="fieldValueChanged('mbi')"
-                  ></v-checkbox>
-                </v-col>
-                <template v-if="obj.mbi">
-                  <template v-if="!formState.readOnly">
-                    <v-col cols="1">
-                      <v-menu offset-y>
-                        <template v-slot:activator="{ on, attrs }">
-                          <v-btn icon v-bind="attrs" v-on="on">
-                            <v-icon small>$sockiPlus</v-icon>
-                          </v-btn>
-                        </template>
-                        <v-list>
-                          <v-list-item @click="dtAddOneWeek('mbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One week</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneMonth('mbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One month</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneYear('mbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One year</v-list-item-title>
-                          </v-list-item>
-                        </v-list>
-                      </v-menu>
+                  <template v-if="obj.mbi">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item @click="dtAddOneWeek('mbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneMonth('mbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneYear('mbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="mbiExpires"
+                        v-model="obj.mbiExpires"
+                        :rules="[form().required(this, 'mbiExpires')]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'mbiExpires')
+                        "
+                        data-cy="mbiExpires"
+                        @input="fieldValueChanged('mbiExpires')"
+                      ></gz-date-picker>
                     </v-col>
                   </template>
-                  <v-col>
-                    <gz-date-picker
-                      ref="mbiExpires"
-                      v-model="obj.mbiExpires"
-                      :rules="[form().required(this, 'mbiExpires')]"
-                      :readonly="formState.readOnly"
-                      :error-messages="form().serverErrors(this, 'mbiExpires')"
-                      data-cy="mbiExpires"
-                      @input="fieldValueChanged('mbiExpires')"
-                    ></gz-date-picker>
-                  </v-col>
-                </template>
-              </v-row>
-            </v-col>
-            <!-- /mbi v7 license item -->
+                </v-row>
+              </v-col>
+              <!-- /mbi v7 license item -->
 
-WBI
-            <!-- QBI V7 LICENSE ITEM -->
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-row dense no-gutters>
-                <v-col cols="2">
-                  <v-checkbox
-                    ref="qbi"
-                    v-model="obj.qbi"
-                    dense
-                    :readonly="formState.readOnly"
-                    label="QBI"
-                    data-cy="qbi"
-                    :error-messages="form().serverErrors(this, 'qbi')"
-                    @change="fieldValueChanged('qbi')"
-                  ></v-checkbox>
-                </v-col>
-                <template v-if="obj.qbi">
-                  <template v-if="!formState.readOnly">
-                    <v-col cols="1">
-                      <v-menu offset-y>
-                        <template v-slot:activator="{ on, attrs }">
-                          <v-btn icon v-bind="attrs" v-on="on">
-                            <v-icon small>$sockiPlus</v-icon>
-                          </v-btn>
-                        </template>
-                        <v-list>
-                          <v-list-item @click="dtAddOneWeek('qbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One week</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneMonth('qbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One month</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneYear('qbiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One year</v-list-item-title>
-                          </v-list-item>
-                        </v-list>
-                      </v-menu>
+              <!-- QBI V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="qbi"
+                      v-model="obj.qbi"
+                      dense
+                      :readonly="formState.readOnly"
+                      label="QBI"
+                      data-cy="qbi"
+                      :error-messages="form().serverErrors(this, 'qbi')"
+                      @change="fieldValueChanged('qbi')"
+                    ></v-checkbox>
+                  </v-col>
+                  <template v-if="obj.qbi">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item @click="dtAddOneWeek('qbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneMonth('qbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneYear('qbiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="qbiExpires"
+                        v-model="obj.qbiExpires"
+                        :rules="[form().required(this, 'qbiExpires')]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'qbiExpires')
+                        "
+                        data-cy="qbiExpires"
+                        @input="fieldValueChanged('qbiExpires')"
+                      ></gz-date-picker>
                     </v-col>
                   </template>
-                  <v-col>
-                    <gz-date-picker
-                      ref="qbiExpires"
-                      v-model="obj.qbiExpires"
-                      :rules="[form().required(this, 'qbiExpires')]"
+                </v-row>
+              </v-col>
+              <!-- /qbi v7 license item -->
+
+              <!-- Import Export CSV Duplicate V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="importExportCSVDuplicate"
+                      v-model="obj.importExportCSVDuplicate"
+                      dense
                       :readonly="formState.readOnly"
-                      :error-messages="form().serverErrors(this, 'qbiExpires')"
-                      data-cy="qbiExpires"
-                      @input="fieldValueChanged('qbiExpires')"
-                    ></gz-date-picker>
+                      label="Import Export CSV Duplicate"
+                      data-cy="importExportCSVDuplicate"
+                      :error-messages="
+                        form().serverErrors(this, 'importExportCSVDuplicate')
+                      "
+                      @change="fieldValueChanged('importExportCSVDuplicate')"
+                    ></v-checkbox>
                   </v-col>
-                </template>
-              </v-row>
-            </v-col>
-            <!-- /qbi v7 license item -->
-
-
-            <!-- QBOI V7 LICENSE ITEM -->
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-row dense no-gutters>
-                <v-col cols="2">
-                  <v-checkbox
-                    ref="qboi"
-                    v-model="obj.qboi"
-                    dense
-                    :readonly="formState.readOnly"
-                    label="QBOI"
-                    data-cy="qboi"
-                    :error-messages="form().serverErrors(this, 'qboi')"
-                    @change="fieldValueChanged('qboi')"
-                  ></v-checkbox>
-                </v-col>
-                <template v-if="obj.qboi">
-                  <template v-if="!formState.readOnly">
-                    <v-col cols="1">
-                      <v-menu offset-y>
-                        <template v-slot:activator="{ on, attrs }">
-                          <v-btn icon v-bind="attrs" v-on="on">
-                            <v-icon small>$sockiPlus</v-icon>
-                          </v-btn>
-                        </template>
-                        <v-list>
-                          <v-list-item @click="dtAddOneWeek('qboiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One week</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneMonth('qboiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One month</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneYear('qboiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One year</v-list-item-title>
-                          </v-list-item>
-                        </v-list>
-                      </v-menu>
+                  <template v-if="obj.importExportCSVDuplicate">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item
+                              @click="
+                                dtAddOneWeek('importExportCSVDuplicateExpires')
+                              "
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item
+                              @click="
+                                dtAddOneMonth('importExportCSVDuplicateExpires')
+                              "
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item
+                              @click="
+                                dtAddOneYear('importExportCSVDuplicateExpires')
+                              "
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="importExportCSVDuplicateExpires"
+                        v-model="obj.importExportCSVDuplicateExpires"
+                        :rules="[
+                          form().required(
+                            this,
+                            'importExportCSVDuplicateExpires'
+                          )
+                        ]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(
+                            this,
+                            'importExportCSVDuplicateExpires'
+                          )
+                        "
+                        data-cy="importExportCSVDuplicateExpires"
+                        @input="
+                          fieldValueChanged('importExportCSVDuplicateExpires')
+                        "
+                      ></gz-date-picker>
                     </v-col>
                   </template>
-                  <v-col>
-                    <gz-date-picker
-                      ref="qboiExpires"
-                      v-model="obj.qboiExpires"
-                      :rules="[form().required(this, 'qboiExpires')]"
+                </v-row>
+              </v-col>
+              <!-- /importExportCSVDuplicate v7 license item -->
+
+              <!-- Quick Notification V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="quickNotification"
+                      v-model="obj.quickNotification"
+                      dense
                       :readonly="formState.readOnly"
-                      :error-messages="form().serverErrors(this, 'qboiExpires')"
-                      data-cy="qboiExpires"
-                      @input="fieldValueChanged('qboiExpires')"
-                    ></gz-date-picker>
+                      label="Quick Notification"
+                      data-cy="quickNotification"
+                      :error-messages="
+                        form().serverErrors(this, 'quickNotification')
+                      "
+                      @change="fieldValueChanged('quickNotification')"
+                    ></v-checkbox>
                   </v-col>
-                </template>
-              </v-row>
-            </v-col>
-            <!-- /qboi v7 license item -->
-
-
-            <!-- PTI V7 LICENSE ITEM -->
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-row dense no-gutters>
-                <v-col cols="2">
-                  <v-checkbox
-                    ref="pti"
-                    v-model="obj.pti"
-                    dense
-                    :readonly="formState.readOnly"
-                    label="PTI"
-                    data-cy="pti"
-                    :error-messages="form().serverErrors(this, 'pti')"
-                    @change="fieldValueChanged('pti')"
-                  ></v-checkbox>
-                </v-col>
-                <template v-if="obj.pti">
-                  <template v-if="!formState.readOnly">
-                    <v-col cols="1">
-                      <v-menu offset-y>
-                        <template v-slot:activator="{ on, attrs }">
-                          <v-btn icon v-bind="attrs" v-on="on">
-                            <v-icon small>$sockiPlus</v-icon>
-                          </v-btn>
-                        </template>
-                        <v-list>
-                          <v-list-item @click="dtAddOneWeek('ptiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One week</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneMonth('ptiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One month</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneYear('ptiExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One year</v-list-item-title>
-                          </v-list-item>
-                        </v-list>
-                      </v-menu>
+                  <template v-if="obj.quickNotification">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item
+                              @click="dtAddOneWeek('quickNotificationExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item
+                              @click="dtAddOneMonth('quickNotificationExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item
+                              @click="dtAddOneYear('quickNotificationExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="quickNotificationExpires"
+                        v-model="obj.quickNotificationExpires"
+                        :rules="[
+                          form().required(this, 'quickNotificationExpires')
+                        ]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'quickNotificationExpires')
+                        "
+                        data-cy="quickNotificationExpires"
+                        @input="fieldValueChanged('quickNotificationExpires')"
+                      ></gz-date-picker>
                     </v-col>
                   </template>
-                  <v-col>
-                    <gz-date-picker
-                      ref="ptiExpires"
-                      v-model="obj.ptiExpires"
-                      :rules="[form().required(this, 'ptiExpires')]"
+                </v-row>
+              </v-col>
+              <!-- /quickNotification v7 license item -->
+
+              <!-- Export to XLS V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="exportToXLS"
+                      v-model="obj.exportToXLS"
+                      dense
                       :readonly="formState.readOnly"
-                      :error-messages="form().serverErrors(this, 'ptiExpires')"
-                      data-cy="ptiExpires"
-                      @input="fieldValueChanged('ptiExpires')"
-                    ></gz-date-picker>
+                      label="Export to XLS"
+                      data-cy="exportToXLS"
+                      :error-messages="form().serverErrors(this, 'exportToXLS')"
+                      @change="fieldValueChanged('exportToXLS')"
+                    ></v-checkbox>
                   </v-col>
-                </template>
-              </v-row>
-            </v-col>
-            <!-- /pti v7 license item -->
-
-
-            <!-- Quick Notification V7 LICENSE ITEM -->
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-row dense no-gutters>
-                <v-col cols="2">
-                  <v-checkbox
-                    ref="quickNotification"
-                    v-model="obj.quickNotification"
-                    dense
-                    :readonly="formState.readOnly"
-                    label="Quick Notification"
-                    data-cy="quickNotification"
-                    :error-messages="form().serverErrors(this, 'quickNotification')"
-                    @change="fieldValueChanged('quickNotification')"
-                  ></v-checkbox>
-                </v-col>
-                <template v-if="obj.quickNotification">
-                  <template v-if="!formState.readOnly">
-                    <v-col cols="1">
-                      <v-menu offset-y>
-                        <template v-slot:activator="{ on, attrs }">
-                          <v-btn icon v-bind="attrs" v-on="on">
-                            <v-icon small>$sockiPlus</v-icon>
-                          </v-btn>
-                        </template>
-                        <v-list>
-                          <v-list-item @click="dtAddOneWeek('quickNotificationExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One week</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneMonth('quickNotificationExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One month</v-list-item-title>
-                          </v-list-item>
-                          <v-list-item @click="dtAddOneYear('quickNotificationExpires')">
-                            <v-list-item-icon>
-                              <v-icon>$sockiPlus</v-icon>
-                            </v-list-item-icon>
-                            <v-list-item-title>One year</v-list-item-title>
-                          </v-list-item>
-                        </v-list>
-                      </v-menu>
+                  <template v-if="obj.exportToXLS">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item
+                              @click="dtAddOneWeek('exportToXLSExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item
+                              @click="dtAddOneMonth('exportToXLSExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item
+                              @click="dtAddOneYear('exportToXLSExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="exportToXLSExpires"
+                        v-model="obj.exportToXLSExpires"
+                        :rules="[form().required(this, 'exportToXLSExpires')]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'exportToXLSExpires')
+                        "
+                        data-cy="exportToXLSExpires"
+                        @input="fieldValueChanged('exportToXLSExpires')"
+                      ></gz-date-picker>
                     </v-col>
                   </template>
-                  <v-col>
-                    <gz-date-picker
-                      ref="quickNotificationExpires"
-                      v-model="obj.quickNotificationExpires"
-                      :rules="[form().required(this, 'quickNotificationExpires')]"
+                </v-row>
+              </v-col>
+              <!-- /exportToXLS v7 license item -->
+
+              <!-- Outlook schedule V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="outlookSchedule"
+                      v-model="obj.outlookSchedule"
+                      dense
                       :readonly="formState.readOnly"
-                      :error-messages="form().serverErrors(this, 'quickNotificationExpires')"
-                      data-cy="quickNotificationExpires"
-                      @input="fieldValueChanged('quickNotificationExpires')"
-                    ></gz-date-picker>
+                      label="Outlook schedule"
+                      data-cy="outlookSchedule"
+                      :error-messages="
+                        form().serverErrors(this, 'outlookSchedule')
+                      "
+                      @change="fieldValueChanged('outlookSchedule')"
+                    ></v-checkbox>
                   </v-col>
-                </template>
-              </v-row>
-            </v-col>
-            <!-- /quickNotification v7 license item -->
+                  <template v-if="obj.outlookSchedule">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item
+                              @click="dtAddOneWeek('outlookScheduleExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item
+                              @click="dtAddOneMonth('outlookScheduleExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item
+                              @click="dtAddOneYear('outlookScheduleExpires')"
+                            >
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="outlookScheduleExpires"
+                        v-model="obj.outlookScheduleExpires"
+                        :rules="[
+                          form().required(this, 'outlookScheduleExpires')
+                        ]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'outlookScheduleExpires')
+                        "
+                        data-cy="outlookScheduleExpires"
+                        @input="fieldValueChanged('outlookScheduleExpires')"
+                      ></gz-date-picker>
+                    </v-col>
+                  </template>
+                </v-row>
+              </v-col>
+              <!-- /outlookSchedule v7 license item -->
 
+              <!-- QBOI V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="qboi"
+                      v-model="obj.qboi"
+                      dense
+                      :readonly="formState.readOnly"
+                      label="QBOI"
+                      data-cy="qboi"
+                      :error-messages="form().serverErrors(this, 'qboi')"
+                      @change="fieldValueChanged('qboi')"
+                    ></v-checkbox>
+                  </v-col>
+                  <template v-if="obj.qboi">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item @click="dtAddOneWeek('qboiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneMonth('qboiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneYear('qboiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="qboiExpires"
+                        v-model="obj.qboiExpires"
+                        :rules="[form().required(this, 'qboiExpires')]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'qboiExpires')
+                        "
+                        data-cy="qboiExpires"
+                        @input="fieldValueChanged('qboiExpires')"
+                      ></gz-date-picker>
+                    </v-col>
+                  </template>
+                </v-row>
+              </v-col>
+              <!-- /qboi v7 license item -->
 
+              <!-- PTI V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="pti"
+                      v-model="obj.pti"
+                      dense
+                      :readonly="formState.readOnly"
+                      label="PTI"
+                      data-cy="pti"
+                      :error-messages="form().serverErrors(this, 'pti')"
+                      @change="fieldValueChanged('pti')"
+                    ></v-checkbox>
+                  </v-col>
+                  <template v-if="obj.pti">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item @click="dtAddOneWeek('ptiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneMonth('ptiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneYear('ptiExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="ptiExpires"
+                        v-model="obj.ptiExpires"
+                        :rules="[form().required(this, 'ptiExpires')]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'ptiExpires')
+                        "
+                        data-cy="ptiExpires"
+                        @input="fieldValueChanged('ptiExpires')"
+                      ></gz-date-picker>
+                    </v-col>
+                  </template>
+                </v-row>
+              </v-col>
+              <!-- /pti v7 license item -->
 
-
-
-
-            <!-- ayanova 7 group items -->
+              <!-- OLI V7 LICENSE ITEM -->
+              <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-row dense no-gutters>
+                  <v-col cols="6">
+                    <v-checkbox
+                      ref="oli"
+                      v-model="obj.oli"
+                      dense
+                      :readonly="formState.readOnly"
+                      label="OLI"
+                      data-cy="oli"
+                      :error-messages="form().serverErrors(this, 'oli')"
+                      @change="fieldValueChanged('oli')"
+                    ></v-checkbox>
+                  </v-col>
+                  <template v-if="obj.oli">
+                    <template v-if="!formState.readOnly">
+                      <v-col cols="1">
+                        <v-menu offset-y>
+                          <template v-slot:activator="{ on, attrs }">
+                            <v-btn icon v-bind="attrs" v-on="on">
+                              <v-icon small>$sockiPlus</v-icon>
+                            </v-btn>
+                          </template>
+                          <v-list>
+                            <v-list-item @click="dtAddOneWeek('oliExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One week</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneMonth('oliExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One month</v-list-item-title>
+                            </v-list-item>
+                            <v-list-item @click="dtAddOneYear('oliExpires')">
+                              <v-list-item-icon>
+                                <v-icon>$sockiPlus</v-icon>
+                              </v-list-item-icon>
+                              <v-list-item-title>One year</v-list-item-title>
+                            </v-list-item>
+                          </v-list>
+                        </v-menu>
+                      </v-col>
+                    </template>
+                    <v-col>
+                      <gz-date-picker
+                        ref="oliExpires"
+                        v-model="obj.oliExpires"
+                        :rules="[form().required(this, 'oliExpires')]"
+                        label="Expires"
+                        :readonly="formState.readOnly"
+                        :error-messages="
+                          form().serverErrors(this, 'oliExpires')
+                        "
+                        data-cy="oliExpires"
+                        @input="fieldValueChanged('oliExpires')"
+                      ></gz-date-picker>
+                    </v-col>
+                  </template>
+                </v-row>
+              </v-col>
+              <!-- /oli v7 license item -->
+            </v-row>
+            <!-- /ayanova 7 group items -->
           </template>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
           <template v-if="obj.pGroup == 2">
             <v-col cols="12" sm="6" lg="4" xl="3">
               <v-text-field
@@ -828,7 +1132,8 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-      sockType: window.$gz.type.License
+      sockType: window.$gz.type.License,
+      timeZoneName: window.$gz.locale.getResolvedTimeZoneName()
     };
   },
   watch: {
@@ -977,6 +1282,60 @@ export default {
         years: 1
       });
     },
+    dtAddToAll: function(span) {
+      //iterate all the dates, if there is a value entered then add on to it's existing value time period
+      //if no date entered then add on it now plus time period
+      /*
+      
+          Misc = 0,
+        AyaNova7 = 1,
+        RavenPerpetual = 2,
+        RavenSubscription = 3
+      */
+      if (this.pGroup == 3) {
+        // RavenSubscription = 3
+        addToDate(this, "licenseExpire", span);
+      }
+      //all pgroups have maint expire valid
+      addToDate(this, "maintenanceExpire", span);
+
+      if (this.pGroup == 1) {
+        //AyaNova7 = 1,
+        if (this.obj.wbi) {
+          addToDate(this, "wbiExpires", span);
+        }
+        if (this.obj.mbi) {
+          addToDate(this, "mbiExpires", span);
+        }
+        if (this.obj.ri) {
+          addToDate(this, "riExpires", span);
+        }
+        if (this.obj.qbi) {
+          addToDate(this, "qbiExpires", span);
+        }
+        if (this.obj.qboi) {
+          addToDate(this, "qboiExpires", span);
+        }
+        if (this.obj.pti) {
+          addToDate(this, "ptiExpires", span);
+        }
+        if (this.obj.quickNotification) {
+          addToDate(this, "quickNotificationExpires", span);
+        }
+        if (this.obj.exportToXLS) {
+          addToDate(this, "exportToXLSExpires", span);
+        }
+        if (this.obj.outlookSchedule) {
+          addToDate(this, "outlookScheduleExpires", span);
+        }
+        if (this.obj.oli) {
+          addToDate(this, "oliExpires", span);
+        }
+        if (this.obj.importExportCSVDuplicate) {
+          addToDate(this, "importExportCSVDuplicateExpires", span);
+        }
+      }
+    },
     async getDataFromApi(recordId) {
       const vm = this;
       window.$gz.form.setFormState({
@@ -1137,6 +1496,21 @@ async function clickHandler(menuItem) {
           window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
+      case "plus-one-week":
+        {
+          m.vm.dtAddToAll({ days: 7 });
+        }
+        break;
+      case "plus-one-month":
+        {
+          m.vm.dtAddToAll({ months: 1 });
+        }
+        break;
+      case "plus-one-year":
+        {
+          m.vm.dtAddToAll({ years: 1 });
+        }
+        break;
 
       default:
         window.$gz.eventBus.$emit(
@@ -1195,12 +1569,27 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({ divider: true, inset: false });
 
-  // menuOptions.menuItems.push({
-  //   title: "OpenTerminal",
-  //   icon: "$sockiTerminal",
-  //   key: FORM_KEY + ":terminal",
-  //   vm: vm
-  // });
+  menuOptions.menuItems.push({
+    title: "One week all",
+    notrans: true,
+    icon: "$sockiPlus",
+    key: FORM_KEY + ":plus-one-week",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "One month all",
+    notrans: true,
+    icon: "$sockiPlus",
+    key: FORM_KEY + ":plus-one-month",
+    vm: vm
+  });
+  menuOptions.menuItems.push({
+    title: "One year all",
+    notrans: true,
+    icon: "$sockiPlus",
+    key: FORM_KEY + ":plus-one-year",
+    vm: vm
+  });
 
   //   menuOptions.menuItems.push({
   //     title: "QuoteList",
@@ -1257,6 +1646,23 @@ async function populateSelectionLists(vm) {
   await window.$gz.enums.fetchEnumList("productgroup");
   vm.selectLists.pGroups = window.$gz.enums.getSelectionList("productgroup");
 }
+
+//////////////////////
+//
+//
+function addToDate(vm, propName, span) {
+  if (vm.obj[propName] == null) {
+    vm.obj[propName] = window.$gz.locale.addDurationToUTC8601String(
+      window.$gz.locale.nowUTC8601String(vm.timeZoneName),
+      span
+    );
+  } else {
+    vm.obj[propName] = window.$gz.locale.addDurationToUTC8601String(
+      vm.obj[propName],
+      span
+    );
+  }
+}
 /*
 "CREATE TABLE alicense (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, created TIMESTAMPTZ NOT NULL, active BOOL NOT NULL DEFAULT false,  "
                                   + "customerid BIGINT REFERENCES acustomer(id), pgroup INTEGER NOT NULL DEFAULT 0, regto TEXT NOT NULL, key TEXT NOT NULL, fetchcode TEXT, fetchemail TEXT, "
diff --git a/src/views/biz-subscription-server.vue b/src/views/biz-subscription-server.vue
index c8014dc..5fb54dc 100644
--- a/src/views/biz-subscription-server.vue
+++ b/src/views/biz-subscription-server.vue
@@ -984,6 +984,7 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
+      timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
       sockType: window.$gz.type.SubscriptionServer
     };
   },