diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
index 7422d6ca..1a533294 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
@@ -67,7 +67,12 @@ class ApprovePurchaseOrderLogic extends AbstractControllerLogic
 
         $this->updatesTransactionStatus->execute($purchaseOrder, ApprovalStatus::APPROVED);
 
-        $this->createInvoiceTransactionProcessor->execute($booking);
+        $this->createInvoiceTransactionProcessor->execute($booking, "", null, [
+                'generateEInvoice' => false,
+                'generateEInvoiceWithNormalInvoiceTemplate' => false,
+                'generateEInvoiceRefund' => false,
+                'bookingOriginalStatus' => $booking->status
+            ]);
 
         return $this->response([]);
     }
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index fef78809..8486e645 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -100,6 +100,7 @@ class BookingResource extends JsonResource
                 })->latest()->get())
             ]),
             'einvoice' => $eInvoice,
+            'is_invoice_generated' => $this->is_invoice_generated,
         ];
     }
 }
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index d3670541..d372564e 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -21,7 +21,7 @@
                 <div class="col-md col-sm-12 m-b-20">
                     <div class="row" v-if="booking">
                         <div class="col" v-if="showDownloadPDFButtons">
-                            <div class="row m-b-50" v-if="booking.status === 3 || isBookingWithAFullRefund">
+                            <div class="row m-b-50" v-if="(booking.status === 3 || booking.is_invoice_generated) || isBookingWithAFullRefund">
                                 <div class="col no-padding">
                                     <div class="row">
                                         <div class="col">
@@ -137,7 +137,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row m-b-10" v-if="booking.status !== 3 && !isBookingWithAFullRefund">
+                            <div class="row m-b-10" v-if="booking.status !== 3 && !booking.is_invoice_generated && !isBookingWithAFullRefund">
                                 <div class="col">
                                     <div class="row text-center m-b-15">
                                         <div class="col">