diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 4f25ae3d..80199df9 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -42,7 +42,7 @@ class BookingResource extends JsonResource
                 'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
                 'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
                 'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
-                'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->first()),
+                'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
             ],
             'status' => $this->status,
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index 37fc1d67..3eb7576e 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -52,7 +52,7 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }}
                     {{ $addresses->street_two }} ,
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 4c3e28b6..581773fe 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -51,7 +51,7 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }}
                     {{ $addresses->street_two }} ,
diff --git a/resources/views/pages/pdfs/proforma_invoice.blade.php b/resources/views/pages/pdfs/proforma_invoice.blade.php
index 3615a2b7..7d2c77c7 100644
--- a/resources/views/pages/pdfs/proforma_invoice.blade.php
+++ b/resources/views/pages/pdfs/proforma_invoice.blade.php
@@ -51,7 +51,7 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }}
                     {{ $addresses->street_two }} ,
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php
index a925112c..d190f285 100644
--- a/resources/views/pages/pdfs/purchase_order.blade.php
+++ b/resources/views/pages/pdfs/purchase_order.blade.php
@@ -42,7 +42,7 @@
                 <br>
                 <span class="address">
                    @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }} 
                     {{ $addresses->street_two }}