diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index 568445e8..df93a8a8 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -6,32 +6,26 @@
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
       <v-form ref="form">
         <v-row>
-          <v-col cols="12" sm="6" lg="4" xl="3" v-if="obj.serial != 0">
-            <template v-if="canEditSerial">
-              <v-text-field
-                v-model="obj.serial"
-                :readonly="formState.readOnly"
-                :label="$ay.t('PurchaseOrderPONumber')"
-                ref="serial"
-                data-cy="serial"
-                :rules="[
-                  form().integerValid(this, 'serial'),
-                  form().required(this, 'serial')
-                ]"
-                :error-messages="form().serverErrors(this, 'serial')"
-                @input="fieldValueChanged('serial')"
-              ></v-text-field>
-            </template>
-            <template v-else>
-              <div>
-                <span class="text-caption">
-                  {{ $ay.t("PurchaseOrderPONumber") }}</span
-                >
-              </div>
-              <div>
-                <span class="text-h5">{{ obj.serial }}</span>
-              </div>
-            </template>
+          <v-col
+            cols="12"
+            sm="6"
+            lg="4"
+            xl="3"
+            v-if="obj.serial != 0 && canEditSerial"
+          >
+            <v-text-field
+              v-model="obj.serial"
+              :readonly="formState.readOnly"
+              :label="$ay.t('PurchaseOrderPONumber')"
+              ref="serial"
+              data-cy="serial"
+              :rules="[
+                form().integerValid(this, 'serial'),
+                form().required(this, 'serial')
+              ]"
+              :error-messages="form().serverErrors(this, 'serial')"
+              @input="fieldValueChanged('serial')"
+            ></v-text-field>
           </v-col>
           <v-col cols="12" sm="6" lg="4" xl="3">
             <gz-pick-list
@@ -1687,7 +1681,7 @@ function generateMenu(vm) {
       ayaType: window.$gz.type.PurchaseOrder,
       recordId: vm.$route.params.recordid,
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      recordName: vm.obj.serial.toString()
+      recordName: vm.obj.serial == 0 ? null : vm.obj.serial.toString()
     },
     menuItems: []
   };
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 2e9fe4d6..85217f9e 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -979,7 +979,7 @@ function generateMenu(vm) {
       ayaType: window.$gz.type.WorkOrder,
       recordId: vm.$route.params.recordid,
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      recordName: vm.obj.serial.toString()
+      recordName: vm.obj.serial == 0 ? null : vm.obj.serial.toString()
     },
     menuItems: []
   };