diff --git a/app/Models/Purchase/Bill.php b/app/Models/Purchase/Bill.php
index 931810c6d..aa342737f 100644
--- a/app/Models/Purchase/Bill.php
+++ b/app/Models/Purchase/Bill.php
@@ -101,4 +101,11 @@ class Bill extends DocumentModel
         $this->status = 'draft';
         $this->bill_number = $this->getNextBillNumber();
     }
+
+    public function getReceivedAtAttribute($value)
+    {
+        $received = $this->histories()->where('status', 'received')->first();
+
+        return ($received) ? $received->created_at : null;
+    }
 }
diff --git a/app/Models/Sale/Invoice.php b/app/Models/Sale/Invoice.php
index 75f628ce1..52973918b 100644
--- a/app/Models/Sale/Invoice.php
+++ b/app/Models/Sale/Invoice.php
@@ -108,4 +108,11 @@ class Invoice extends DocumentModel
         $this->status = 'draft';
         $this->invoice_number = $this->getNextInvoiceNumber();
     }
+
+    public function getSentAtAttribute($value)
+    {
+        $sent = $this->histories()->where('status', 'sent')->first();
+
+        return ($sent) ? $sent->created_at : null;
+    }
 }
diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php
index ec49b0428..050e70ebe 100644
--- a/resources/views/purchases/bills/show.blade.php
+++ b/resources/views/purchases/bills/show.blade.php
@@ -99,16 +99,16 @@
                                                 @stack('timeline_body_receive_bill_body_message_end')
 
                                                 <div class="mt-3">
-                                                    @stack('timeline_body_receive_bill_body_button_sent_start')
+                                                    @stack('timeline_body_receive_bill_body_button_received_start')
                                                         @permission('update-purchases-bills')
                                                             <a href="{{ route('bills.received', $bill->id) }}" class="btn btn-danger btn-sm btn-alone">{{ trans('bills.mark_received') }}</a>
                                                         @endpermission
-                                                    @stack('timeline_body_receive_bill_body_button_sent_end')
+                                                    @stack('timeline_body_receive_bill_body_button_received_end')
                                                 </div>
                                             @else
                                                 @stack('timeline_body_receive_bill_body_message_start')
                                                     <small>{{ trans_choice('general.statuses', 1) .  ':'  }}</small>
-                                                    <small>{{ trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small>
+                                                    <small>{{ trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->received_at)->format($date_format)]) }}</small>
                                                 @stack('timeline_body_receive_bill_body_message_end')
                                             @endif
                                         @stack('timeline_body_receive_bill_body_end')
diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php
index 6edf9edbb..fcbeb9f2b 100644
--- a/resources/views/sales/invoices/show.blade.php
+++ b/resources/views/sales/invoices/show.blade.php
@@ -129,7 +129,7 @@
                                             @else
                                                 @stack('timeline_body_send_invoice_body_message_start')
                                                     <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
-                                                    <small>{{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small>
+                                                    <small>{{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->sent_at)->format($date_format)]) }}</small>
                                                 @stack('timeline_body_send_invoice_body_message_end')
                                             @endif
                                         @stack('timeline_body_send_invoice_body_end')