diff --git a/ayanova/src/components/work-order-address.vue b/ayanova/src/components/work-order-address.vue
index 4e00f360..b4f286a3 100644
--- a/ayanova/src/components/work-order-address.vue
+++ b/ayanova/src/components/work-order-address.vue
@@ -10,9 +10,305 @@
           <v-icon>$ayiEdit</v-icon>
         </v-btn>
 
-        <span class="xtext-captionx">{{ displayServiceAddress }}</span>
+        <span>{{ displayServiceAddress }}</span>
       </div>
     </template>
+    <v-row justify="center">
+      <v-dialog v-model="openDialog">
+        <v-card>
+          <v-card-title>
+            <span class="headline">{{ $ay.t("Address") }}</span>
+          </v-card-title>
+          <v-card-text>
+            <v-row>
+              <v-col cols="12">
+                <v-menu offset-y v-if="!formState.readOnly">
+                  <template v-slot:activator="{ on, attrs }">
+                    <span class="text-h6">
+                      {{ $ay.t("AddressTypePhysical") }}</span
+                    ><v-btn icon v-bind="attrs" v-on="on">
+                      <v-icon small>$ayiEllipsisV</v-icon>
+                    </v-btn>
+                  </template>
+                  <v-list>
+                    <v-list-item @click="AddressCopyPhysicalToClipBoard()">
+                      <v-list-item-icon>
+                        <v-icon>$ayiCopy</v-icon>
+                      </v-list-item-icon>
+                      <v-list-item-title>{{
+                        $ay.t("CopyToClipboard")
+                      }}</v-list-item-title>
+                    </v-list-item>
+                    <v-list-item @click="AddressCopyToPostal">
+                      <v-list-item-icon>
+                        <v-icon>$ayiClone</v-icon>
+                      </v-list-item-icon>
+                      <v-list-item-title>{{
+                        $ay.t("AddressCopyToPostal")
+                      }}</v-list-item-title>
+                    </v-list-item>
+                    <v-list-item @click="GeoCapture">
+                      <v-list-item-icon>
+                        <v-icon>$ayiMapMarker</v-icon>
+                      </v-list-item-icon>
+                      <v-list-item-title>{{
+                        $ay.t("GeoCapture")
+                      }}</v-list-item-title>
+                    </v-list-item>
+                  </v-list>
+                </v-menu>
+                <span class="text-h6" v-else>
+                  {{ $ay.t("AddressTypePhysical") }}</span
+                >
+              </v-col>
+              <v-col
+                v-if="form().showMe(this, 'Address')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.address"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressDeliveryAddress')"
+                  ref="address"
+                  data-cy="address"
+                  :error-messages="form().serverErrors(this, 'address')"
+                  @input="fieldValueChanged('address')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'City')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.city"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressCity')"
+                  ref="city"
+                  data-cy="city"
+                  :error-messages="form().serverErrors(this, 'city')"
+                  @input="fieldValueChanged('city')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'Region')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.region"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressStateProv')"
+                  ref="region"
+                  data-cy="region"
+                  :error-messages="form().serverErrors(this, 'region')"
+                  @input="fieldValueChanged('region')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'Country')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.country"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressCountry')"
+                  ref="country"
+                  data-cy="country"
+                  :error-messages="form().serverErrors(this, 'country')"
+                  @input="fieldValueChanged('country')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'Latitude')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <gz-decimal
+                  v-model="value.latitude"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressLatitude')"
+                  ref="latitude"
+                  data-cy="latitude"
+                  :rules="[form().decimalValid(this, 'latitude')]"
+                  :error-messages="form().serverErrors(this, 'latitude')"
+                  @input="fieldValueChanged('latitude')"
+                  :precision="6"
+                ></gz-decimal>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'Longitude')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <gz-decimal
+                  v-model="value.longitude"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressLongitude')"
+                  ref="longitude"
+                  data-cy="longitude"
+                  :rules="[form().decimalValid(this, 'longitude')]"
+                  :error-messages="form().serverErrors(this, 'longitude')"
+                  @input="fieldValueChanged('longitude')"
+                  :precision="6"
+                ></gz-decimal>
+              </v-col>
+
+              <v-col cols="12">
+                <v-menu offset-y v-if="formState.readOnly">
+                  <template v-slot:activator="{ on, attrs }">
+                    <span class="text-h6">
+                      {{ $ay.t("AddressTypePostal") }}</span
+                    ><v-btn icon v-bind="attrs" v-on="on">
+                      <v-icon small>$ayiEllipsisV</v-icon>
+                    </v-btn>
+                  </template>
+                  <v-list>
+                    <v-list-item @click="AddressCopyPostalToClipBoard()">
+                      <v-list-item-icon>
+                        <v-icon>$ayiCopy</v-icon>
+                      </v-list-item-icon>
+                      <v-list-item-title>{{
+                        $ay.t("CopyToClipboard")
+                      }}</v-list-item-title>
+                    </v-list-item>
+                    <v-list-item @click="AddressCopyToPhysical">
+                      <v-list-item-icon>
+                        <v-icon>$ayiClone</v-icon>
+                      </v-list-item-icon>
+                      <v-list-item-title>{{
+                        $ay.t("AddressCopyToPostal")
+                      }}</v-list-item-title>
+                    </v-list-item>
+                  </v-list>
+                </v-menu>
+                <span class="text-h6" v-else>
+                  {{ $ay.t("AddressTypePhysical") }}</span
+                >
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'PostAddress')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.postAddress"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressPostalDeliveryAddress')"
+                  ref="postAddress"
+                  data-cy="postAddress"
+                  :error-messages="form().serverErrors(this, 'postAddress')"
+                  @input="fieldValueChanged('postAddress')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'PostCity')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.postCity"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressPostalCity')"
+                  ref="postCity"
+                  data-cy="postCity"
+                  :error-messages="form().serverErrors(this, 'postCity')"
+                  @input="fieldValueChanged('postCity')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'PostRegion')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.postRegion"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressPostalStateProv')"
+                  ref="postRegion"
+                  data-cy="postRegion"
+                  :error-messages="form().serverErrors(this, 'postRegion')"
+                  @input="fieldValueChanged('postRegion')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'PostCountry')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.postCountry"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressPostalCountry')"
+                  ref="postCountry"
+                  data-cy="postCountry"
+                  :error-messages="form().serverErrors(this, 'postCountry')"
+                  @input="fieldValueChanged('postCountry')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col
+                v-if="form().showMe(this, 'PostCode')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  v-model="value.postCode"
+                  :readonly="formState.readOnly"
+                  :label="$ay.t('AddressPostalPostal')"
+                  ref="postCode"
+                  data-cy="postCode"
+                  :error-messages="form().serverErrors(this, 'postCode')"
+                  @input="fieldValueChanged('postCode')"
+                ></v-text-field>
+              </v-col>
+            </v-row>
+          </v-card-text>
+          <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn color="blue darken-1" text @click="cancelDialog()">{{
+              $ay.t("Cancel")
+            }}</v-btn>
+            <v-btn color="blue darken-1" text @click="save()">{{
+              $ay.t("OK")
+            }}</v-btn>
+          </v-card-actions>
+        </v-card>
+      </v-dialog>
+    </v-row>
   </div>
 </template>
 <script>
@@ -41,6 +337,10 @@ export default {
   },
 
   methods: {
+    cancelDialog() {
+      this.openDialog = false;
+    },
+    save() {},
     form() {
       return window.$gz.form;
     },
@@ -48,9 +348,101 @@ export default {
       if (!this.pvm.formState.loading && !this.pvm.formState.readonly) {
         window.$gz.form.fieldValueChanged(this.pvm, ref);
       }
+    },
+    AddressCopyToPostal() {
+      this.value.postAddress = this.value.address;
+      this.value.postCity = this.value.city;
+      this.value.postRegion = this.value.region;
+      this.value.postCountry = this.value.country;
+    },
+    AddressCopyToPhysical() {
+      this.value.address = this.value.postAddress;
+      this.value.city = this.value.postCity;
+      this.value.region = this.value.postRegion;
+      this.value.country = this.value.postCountry;
+    },
+    AddressCopyPhysicalToClipBoard() {
+      let ret = "";
+      if (this.value.name) {
+        ret += this.value.name + "\n";
+      }
+      if (this.value.address) {
+        ret += this.value.address + "\n";
+      }
+
+      if (this.value.city) {
+        ret += this.value.city + " ";
+      }
+
+      if (this.value.region) {
+        ret += this.value.region + " ";
+      }
+
+      if (this.value.country) {
+        ret += this.value.country + "\n";
+      }
+      window.$gz.util.copyToClipboard(ret);
+      /* todo maybe down the road if asked for?
+
+				if(mAddressType==AddressTypes.Physical)
+				{
+					if(mLatitude!=0 || mLongitude!=0)
+					{
+						sb.Append(" \r\n");
+						sb.Append(LongitudeToString(mLongitude));
+						sb.Append("   ");
+						sb.Append(LatitudeToString(mLatitude));
+						sb.Append(" \r\n");
+					}
+				} */
+    },
+    AddressCopyPostalToClipBoard() {
+      let ret = "";
+      if (this.value.name) {
+        ret += this.value.name + "\n";
+      }
+      if (this.value.postAddress) {
+        ret += this.value.postAddress + "\n";
+      }
+
+      if (this.value.postCity) {
+        ret += this.value.postCity + " ";
+      }
+
+      if (this.value.postRegion) {
+        ret += this.value.postRegion + " ";
+      }
+
+      if (this.value.postCode) {
+        //Postal codes should have two spaces before them according to regs.
+        ret += "  " + this.value.postCode + "\n";
+      }
+
+      if (this.value.postCountry) {
+        ret += this.value.postCountry + "\n";
+      }
+      window.$gz.util.copyToClipboard(ret);
+    },
+    async GeoCapture() {
+      try {
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+        let loc = await window.$gz.util.getGeoLocation();
+        this.value.latitude = loc.latitude;
+        vm.fieldValueChanged("latitude");
+        this.value.longitude = loc.longitude;
+        vm.fieldValueChanged("longitude");
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      }
     }
   },
   computed: {
+    formState: function() {
+      return this.pvm.formState;
+    },
+    formCustomTemplateKey: function() {
+      return this.pvm.formCustomTemplateKey;
+    },
     displayServiceAddress() {
       //Address as displayed on workorder form
       //as compact as possible