diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
index fd6cf765..027b4f76 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
@@ -162,9 +162,8 @@ class CreateInvoiceTransactionV2Processor
         $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00'));
         $bookingCreatedDate = Carbon::parse($booking->created_at);
         $eInvoiceRequestedDate = Carbon::parse($supplier->e_invoice_requested_at);
-        
-        // if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $supplier->e_invoice === 1)
-        if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60 && $supplier->e_invoice === 1) {
+
+        if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && ($bookingCreatedDate->isAfter($eInvoiceRequestedDate) || $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60) && $supplier->e_invoice === 1) {
             $eInvoice = true;
         }
         $kvp = $booking->attributesKVP()->where('key', KVPKey::BOOKING_EINVOICE_ELIGIBLE)->first();
diff --git a/app/Http/Resources/AutocountSalesInvoiceBookingResource.php b/app/Http/Resources/AutocountSalesInvoiceBookingResource.php
index 83f41170..25ff5d6f 100644
--- a/app/Http/Resources/AutocountSalesInvoiceBookingResource.php
+++ b/app/Http/Resources/AutocountSalesInvoiceBookingResource.php
@@ -141,7 +141,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource
                 'DebtorCode' => $company->debtor,
                 'Ref' => $invoiceTransaction ? $invoiceTransaction->bill_no : '',
                 'ShipInfo' => $this->marking,
-                'AccNo' => $category === 'Compensation Voucher' ? '1000-000' : '949-2000',
+                'AccNo' => $category === 'Compensation Voucher' ? '920-0000' : '949-2000',
                 'DetailDescription' => 'PRODUCT NAME :',
                 'FurtherDescription' => $voucher->code,
                 'Classification' => '022',
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index ec6089f5..340ee964 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -32,7 +32,7 @@ class BookingResource extends JsonResource
         $eInvoiceRequestedDate = Carbon::parse($this->company->e_invoice_requested_at);
 
         // if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $this->company->e_invoice === 1) {
-        if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60 && $this->company->e_invoice === 1) {
+        if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && ($bookingCreatedDate->isAfter($eInvoiceRequestedDate) || $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60) && $this->company->e_invoice === 1) {
             $eInvoice = true;
         }