diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index 93a71baf..1c1ea488 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -246,7 +246,7 @@
 
               <template v-slot:top>
                 <v-col cols="12">
-                  <v-menu offset-y v-if="rights.change">
+                  <v-menu offset-y v-if="rights.change && obj.hasUnreceived">
                     <template v-slot:activator="{ on, attrs }">
                       <span class="text-h6">
                         {{ $ay.t("PurchaseOrderItemList") }}</span
@@ -338,7 +338,7 @@
     <!-- ########################## PURCHASE ORDER ITEM EDIT FORM  ###############################-->
     <template v-if="obj.items.length">
       <v-row justify="center">
-        <v-dialog v-model="editPoItemDialog" persistent>
+        <v-dialog v-model="editPoItemDialog">
           <v-card>
             <v-card-title>
               <!-- <span class="headline">{{
@@ -498,10 +498,14 @@
                 color="blue darken-1"
                 text
                 @click="editPoItemDialog = false"
-                >{{ $ay.t("Cancel") }}</v-btn
+                >{{ $ay.t("Close") }}</v-btn
               >
               <v-spacer></v-spacer>
               <v-btn
+                v-if="
+                  obj.items[editPoItemIndex].quantityReceived <
+                    obj.items[editPoItemIndex].quantityOrdered
+                "
                 color="blue darken-1"
                 text
                 @click="receive(obj.items[editPoItemIndex])"
@@ -1110,7 +1114,7 @@ function receiveItem(item, vm) {
     item.quantityReceived = item.quantityOrdered;
     item.receivedDate = window.$gz.locale.nowUTC8601String();
     vm.obj.hasReceipt = true;
-    vm.formState.dirty=true;
+    vm.formState.dirty = true;
   }
 }