diff --git a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingWithStorageComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingWithStorageComponent.vue
index a37cb68c..362f73bf 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingWithStorageComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingWithStorageComponent.vue
@@ -183,7 +183,7 @@
                                 <div class="col-auto d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
                                     <div class="btn btn-sm btn block all-caps b-rad-none btn-danger pointer requestModal m-l-20" :data-type="'regenerateStorageInvoice-' + item.id" v-if="item.type === 16 && item.status === 3">Regenerate Storage Invoice PDF</div>
 
-                                    <div class="btn btn-sm btn block all-caps b-rad-none btn-danger pointer requestModal m-l-20" :data-type="'regenerateShippingInvoice-' + item.id" v-if="item.type === 1">Regenerate Shipping Invoice PDF</div>
+                                    <div class="btn btn-sm btn block all-caps b-rad-none btn-danger pointer requestModal m-l-20" :data-type="'regenerateShippingInvoice-' + item.id" v-if="item.type === 1 && !isEinvoiceApplicable">Regenerate Shipping Invoice PDF</div>
 
                                     <!-- <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" style="min-width:15px;" v-if="item.type === 16 && item.status !== 3">
                                         <i class="fa fa-ban"></i>
diff --git a/resources/views/pages/pdfs/packing_list_measurement_v2.blade.php b/resources/views/pages/pdfs/packing_list_measurement_v2.blade.php
index f1ce980b..c8b86dd3 100644
--- a/resources/views/pages/pdfs/packing_list_measurement_v2.blade.php
+++ b/resources/views/pages/pdfs/packing_list_measurement_v2.blade.php
@@ -57,6 +57,9 @@
             <div class="address">
                 @php
                     $addresses = $companyModule->addresses()->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
+                    if ($companyModule->company->e_invoice === 1){
+                        $addresses = $companyModule->addresses()->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::E_INVOICE)->latest()->first();
+                    }
                 @endphp
                 @if($addresses)
                     {{ $addresses->street_one }}