diff --git a/api/__pycache__/serializers.cpython-311.pyc b/api/__pycache__/serializers.cpython-311.pyc
index d662ba35..b4949161 100644
Binary files a/api/__pycache__/serializers.cpython-311.pyc and b/api/__pycache__/serializers.cpython-311.pyc differ
diff --git a/api/__pycache__/urls.cpython-311.pyc b/api/__pycache__/urls.cpython-311.pyc
index d965902f..2e159340 100644
Binary files a/api/__pycache__/urls.cpython-311.pyc and b/api/__pycache__/urls.cpython-311.pyc differ
diff --git a/api/__pycache__/views.cpython-311.pyc b/api/__pycache__/views.cpython-311.pyc
index 38bd7efa..670f4d26 100644
Binary files a/api/__pycache__/views.cpython-311.pyc and b/api/__pycache__/views.cpython-311.pyc differ
diff --git a/inventory/__pycache__/forms.cpython-311.pyc b/inventory/__pycache__/forms.cpython-311.pyc
index bf9df5b5..ec71d055 100644
Binary files a/inventory/__pycache__/forms.cpython-311.pyc and b/inventory/__pycache__/forms.cpython-311.pyc differ
diff --git a/inventory/__pycache__/models.cpython-311.pyc b/inventory/__pycache__/models.cpython-311.pyc
index ea4656a4..40997027 100644
Binary files a/inventory/__pycache__/models.cpython-311.pyc and b/inventory/__pycache__/models.cpython-311.pyc differ
diff --git a/inventory/__pycache__/urls.cpython-311.pyc b/inventory/__pycache__/urls.cpython-311.pyc
index e5a202ad..64723f40 100644
Binary files a/inventory/__pycache__/urls.cpython-311.pyc and b/inventory/__pycache__/urls.cpython-311.pyc differ
diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc
index e56b73c4..6defc2db 100644
Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ
diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html
index e7dd3f31..c22a7795 100644
--- a/templates/crm/opportunities/opportunity_detail.html
+++ b/templates/crm/opportunities/opportunity_detail.html
@@ -7,16 +7,16 @@
       <h2 class="mb-0">{{ _("Opportunity details")}}</h2>
     </div>
     <div class="col-12 col-md-auto d-flex">
-      <button class="btn btn-phoenix-secondary px-3 px-sm-5 me-2"><span class="fa-solid fa-edit me-sm-2"></span><span class="d-none d-sm-inline">Edit</span></button>
-      <button class="btn btn-phoenix-danger me-2"><span class="fa-solid fa-trash me-2"></span><span>Delete</span></button>
+      <button class="btn btn-phoenix-secondary px-3 px-sm-5 me-2"><span class="fa-solid fa-edit me-sm-2"></span><span class="d-none d-sm-inline">{{ _("Edit") }}</span></button>
+      <button class="btn btn-phoenix-danger me-2"><span class="fa-solid fa-trash me-2"></span><span>{{ _("Delete") }}</span></button>
       <div>
         <button class="btn px-3 btn-phoenix-secondary" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fa-solid fa-ellipsis"></span></button>
         <ul class="dropdown-menu dropdown-menu-end p-0" style="z-index: 9999;">
           <li>
             {% if opportunity.estimate %}
-              <a class="dropdown-item" href="{% url 'estimate_detail' opportunity.estimate.pk %}">View Estimate</a>
+              <a class="dropdown-item" href="{% url 'estimate_detail' opportunity.estimate.pk %}">{{ _("View Quotation")}}</a>
             {% else %}
-              <a class="dropdown-item" href="{% url 'estimate_create_from_opportunity' opportunity.pk %}">Create Estimate</a>
+              <a class="dropdown-item" href="{% url 'estimate_create_from_opportunity' opportunity.pk %}">{{ _("Create Quotation")}}</a>
             {% endif %}
           </li>
           <li><a class="dropdown-item" href="">Report</a></li>
@@ -57,8 +57,8 @@
                             <div class="card-body p-0">
                               <div class="mx-3">
                                 <div class="text-end">
-                                  <button class="btn btn-link text-danger" type="button">Cancel</button>
-                                  <button class="btn btn-sm btn-primary px-5" type="button">Save</button>
+                                  <button class="btn btn-link text-danger" type="button">{{ _("Cancel") }}</button>
+                                  <button class="btn btn-sm btn-primary px-5" type="button">{{ _("Save") }}</button>
                                 </div>
                               </div>
                             </div>
@@ -82,18 +82,20 @@
         </div>
         <div class="card">
           <div class="card-body">
-            <h4 class="mb-5">Others Information</h4>
+            <h4 class="mb-5">{{ _("Other Information")}}</h4>
             <div class="row g-3">
               <div class="col-12">
                 <div class="mb-4">
                   <div class="d-flex flex-wrap justify-content-between mb-2">
-                    <h5 class="mb-0 text-body-highlight me-2">Status</h5><a href="#" class="fw-bold fs-9" hx-on:click="htmx.find('#id_status').disabled = !htmx.find('#id_status').disabled;this.text = htmx.find('#id_status').disabled ? 'Update Status' : 'Cancel'">Update Status</a>
+                    <h5 class="mb-0 text-body-highlight me-2">{{ _("Status") }}</h5>
+                      <a href="#" class="fw-bold fs-9" hx-on:click="htmx.find('#id_status').disabled = !htmx.find('#id_status').disabled;this.text = htmx.find('#id_status').disabled ? 'Update Status' : 'Cancel'">{{ _("Update Status")}}</a>
                   </div>
                   {{status_form.status}}                  
                 </div>
                 <div class="mb-4">
                   <div class="d-flex flex-wrap justify-content-between mb-2">
-                    <h5 class="mb-0 text-body-highlight me-2">Stage</h5><a href="#" class="fw-bold fs-9" hx-on:click="htmx.find('#id_stage').disabled = !htmx.find('#id_stage').disabled;this.text = htmx.find('#id_stage').disabled ? 'Update Stage' : 'Cancel'">Update Stage</a>
+                    <h5 class="mb-0 text-body-highlight me-2">{{ _("Stage") }}</h5>
+                      <a href="#" class="fw-bold fs-9" hx-on:click="htmx.find('#id_stage').disabled = !htmx.find('#id_stage').disabled;this.text = htmx.find('#id_stage').disabled ? 'Update Stage' : 'Cancel'">{{ _("Update Stage")}}</a>
                   </div>
                   {{status_form.stage}}
                 </div>                                
@@ -111,10 +113,10 @@
               <div class="d-sm-block d-inline-flex d-md-flex flex-xl-column flex-xxl-row align-items-center align-items-xl-start align-items-xxl-center">
                 <div class="d-flex bg-success-subtle rounded flex-center me-3 mb-sm-3 mb-md-0 mb-xl-3 mb-xxl-0" style="width:32px; height:32px"><span class="text-success-dark" data-feather="dollar-sign" style="width:24px; height:24px"></span></div>
                 <div>
-                  <p class="fw-bold mb-1">{{ _("Estimated Amount") }}</p>
+                  <p class="fw-bold mb-1">{{ _("Quotation Amount") }}</p>
                   <h4 class="fw-bolder text-nowrap">
                     {% if opportunity.estimate %}
-                      {{ opportunity.estimate.get_cost_estimate }}
+                      {{ opportunity.estimate.get_invoiced_amount.invoice_amount_paid__sum }}
                     {% endif %}
                   </h4>
                 </div>
@@ -494,18 +496,7 @@
                         <img class="rounded-circle " src="../../assets/img/team/11.webp" alt="" />
 
                       </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/26.webp" alt="" />
 
-                      </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/33.webp" alt="" />
-
-                      </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/30.webp" alt="" />
-
-                      </div>
                       <div class="avatar avatar-s  rounded-circle">
                         <div class="avatar-name rounded-circle "><span>+1</span></div>
                       </div>
@@ -530,18 +521,6 @@
                       <div class="avatar avatar-s  rounded-circle">
                         <div class="avatar-name rounded-circle"><span>R</span></div>
                       </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/12.webp" alt="" />
-
-                      </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/28.webp" alt="" />
-
-                      </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/22.webp" alt="" />
-
-                      </div>
                       <div class="avatar avatar-s  rounded-circle">
                         <div class="avatar-name rounded-circle "><span>+2</span></div>
                       </div>
@@ -564,23 +543,7 @@
                     </div>
                     <div class="avatar-group avatar-group-dense">
                       <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/13.webp" alt="" />
-
-                      </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/24.webp" alt="" />
-
-                      </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/62.webp" alt="" />
-
-                      </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <img class="rounded-circle " src="../../assets/img/team/34.webp" alt="" />
-
-                      </div>
-                      <div class="avatar avatar-s  rounded-circle">
-                        <div class="avatar-name rounded-circle "><span>+4</span></div>
+                        <img class="rounded-circle " src="{% static 'images/team/13.webp' %}" alt="" />
                       </div>
                     </div>
                   </div>
@@ -830,7 +793,7 @@
                       </div>
                     </td>
                     <td class="name align-middle white-space-nowrap py-2 ps-0"><a class="d-flex align-items-center text-body-highlight" href="#!">
-                        <div class="avatar avatar-m me-3 status-online"><img class="rounded-circle" src="../../assets/img/team/35.webp" alt="" />
+                        <div class="avatar avatar-m me-3 status-online"><img class="rounded-circle" src="{% static 'images/team/35.webp' %}" alt="" />
                         </div>
                         <h6 class="mb-0 text-body-highlight fw-bold">Ansolo Lazinatov</h6>
                       </a></td>
@@ -849,136 +812,7 @@
                       </div>
                     </td>
                   </tr>
-                  <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                    <td class="fs-9 align-middle px-0 py-3">
-                      <div class="form-check mb-0 fs-8">
-                        <input class="form-check-input" type="checkbox" data-bulk-select-row='{"Name":{"avatar":"/team/9.webp","name":"Jackson Pollock","status":"offline"},"description":"Based on emails sent rate, the top 10 users","date":"Mar 27, 2021","creatBy":"Jackson Pollock","lastActivity":{"iconColor":"text-body-quaternary","label":"6 hours ago"}}' />
-                      </div>
-                    </td>
-                    <td class="name align-middle white-space-nowrap py-2 ps-0"><a class="d-flex align-items-center text-body-highlight" href="#!">
-                        <div class="avatar avatar-m me-3 status-offline"><img class="rounded-circle" src="../../assets/img/team/9.webp" alt="" />
-                        </div>
-                        <h6 class="mb-0 text-body-highlight fw-bold">Jackson Pollock</h6>
-                      </a></td>
-                    <td class="description align-middle white-space-nowrap text-start fw-bold text-body-tertiary py-2 pe-6">Based on emails sent rate, the top 10 users</td>
-                    <td class="create_date text-end align-middle white-space-nowrap text-body py-2">Mar 27, 2021</td>
-                    <td class="create_by align-middle white-space-nowrap fw-semibold text-body-highlight">Jackson Pollock</td>
-                    <td class="last_activity align-middle text-center py-2">
-                      <div class="d-flex align-items-center flex-1"><span class="fa-solid fa-clock me-1 text-body-quaternary" data-fa-transform="shrink-2 up-1"></span><span class="fw-bold fs-9 text-body">6 hours ago</span></div>
-                    </td>
-                    <td class="align-middle text-end white-space-nowrap pe-0 action py-2">
-                      <div class="btn-reveal-trigger position-static">
-                        <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
-                        <div class="dropdown-menu dropdown-menu-end py-2"><a class="dropdown-item" href="#!">View</a><a class="dropdown-item" href="#!">Export</a>
-                          <div class="dropdown-divider"></div><a class="dropdown-item text-danger" href="#!">Remove</a>
-                        </div>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                    <td class="fs-9 align-middle px-0 py-3">
-                      <div class="form-check mb-0 fs-8">
-                        <input class="form-check-input" type="checkbox" data-bulk-select-row='{"Name":{"avatar":"/team/35.webp","name":"Ansolo Lazinatov","status":"online"},"description":"Based on the percentage of recipients","date":"Jun 24, 2021","creatBy":"Ansolo Lazinarov","lastActivity":{"iconColor":"text-success","label":"Active"}}' />
-                      </div>
-                    </td>
-                    <td class="name align-middle white-space-nowrap py-2 ps-0"><a class="d-flex align-items-center text-body-highlight" href="#!">
-                        <div class="avatar avatar-m me-3 status-online"><img class="rounded-circle" src="../../assets/img/team/35.webp" alt="" />
-                        </div>
-                        <h6 class="mb-0 text-body-highlight fw-bold">Ansolo Lazinatov</h6>
-                      </a></td>
-                    <td class="description align-middle white-space-nowrap text-start fw-bold text-body-tertiary py-2 pe-6">Based on the percentage of recipients</td>
-                    <td class="create_date text-end align-middle white-space-nowrap text-body py-2">Jun 24, 2021</td>
-                    <td class="create_by align-middle white-space-nowrap fw-semibold text-body-highlight">Ansolo Lazinarov</td>
-                    <td class="last_activity align-middle text-center py-2">
-                      <div class="d-flex align-items-center flex-1"><span class="fa-solid fa-clock me-1 text-success" data-fa-transform="shrink-2 up-1"></span><span class="fw-bold fs-9 text-body">Active</span></div>
-                    </td>
-                    <td class="align-middle text-end white-space-nowrap pe-0 action py-2">
-                      <div class="btn-reveal-trigger position-static">
-                        <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
-                        <div class="dropdown-menu dropdown-menu-end py-2"><a class="dropdown-item" href="#!">View</a><a class="dropdown-item" href="#!">Export</a>
-                          <div class="dropdown-divider"></div><a class="dropdown-item text-danger" href="#!">Remove</a>
-                        </div>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                    <td class="fs-9 align-middle px-0 py-3">
-                      <div class="form-check mb-0 fs-8">
-                        <input class="form-check-input" type="checkbox" data-bulk-select-row='{"Name":{"avatar":"/team/9.webp","name":"Jackson Pollock","status":"offline"},"description":"Obtaining leads today","date":"May 19, 2024","creatBy":"Jackson Pollock","lastActivity":{"iconColor":"text-body-quaternary","label":"6 hours ago"}}' />
-                      </div>
-                    </td>
-                    <td class="name align-middle white-space-nowrap py-2 ps-0"><a class="d-flex align-items-center text-body-highlight" href="#!">
-                        <div class="avatar avatar-m me-3 status-offline"><img class="rounded-circle" src="../../assets/img/team/9.webp" alt="" />
-                        </div>
-                        <h6 class="mb-0 text-body-highlight fw-bold">Jackson Pollock</h6>
-                      </a></td>
-                    <td class="description align-middle white-space-nowrap text-start fw-bold text-body-tertiary py-2 pe-6">Obtaining leads today</td>
-                    <td class="create_date text-end align-middle white-space-nowrap text-body py-2">May 19, 2024</td>
-                    <td class="create_by align-middle white-space-nowrap fw-semibold text-body-highlight">Jackson Pollock</td>
-                    <td class="last_activity align-middle text-center py-2">
-                      <div class="d-flex align-items-center flex-1"><span class="fa-solid fa-clock me-1 text-body-quaternary" data-fa-transform="shrink-2 up-1"></span><span class="fw-bold fs-9 text-body">6 hours ago</span></div>
-                    </td>
-                    <td class="align-middle text-end white-space-nowrap pe-0 action py-2">
-                      <div class="btn-reveal-trigger position-static">
-                        <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
-                        <div class="dropdown-menu dropdown-menu-end py-2"><a class="dropdown-item" href="#!">View</a><a class="dropdown-item" href="#!">Export</a>
-                          <div class="dropdown-divider"></div><a class="dropdown-item text-danger" href="#!">Remove</a>
-                        </div>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                    <td class="fs-9 align-middle px-0 py-3">
-                      <div class="form-check mb-0 fs-8">
-                        <input class="form-check-input" type="checkbox" data-bulk-select-row='{"Name":{"avatar":"/team/35.webp","name":"Ansolo Lazinatov","status":"online"},"description":"Sums up the many phases of new and existing businesses.","date":"Aug 19, 2024","creatBy":"Ansolo Lazinarov","lastActivity":{"iconColor":"text-success","label":"Active"}}' />
-                      </div>
-                    </td>
-                    <td class="name align-middle white-space-nowrap py-2 ps-0"><a class="d-flex align-items-center text-body-highlight" href="#!">
-                        <div class="avatar avatar-m me-3 status-online"><img class="rounded-circle" src="../../assets/img/team/35.webp" alt="" />
-                        </div>
-                        <h6 class="mb-0 text-body-highlight fw-bold">Ansolo Lazinatov</h6>
-                      </a></td>
-                    <td class="description align-middle white-space-nowrap text-start fw-bold text-body-tertiary py-2 pe-6">Sums up the many phases of new and existing businesses.</td>
-                    <td class="create_date text-end align-middle white-space-nowrap text-body py-2">Aug 19, 2024</td>
-                    <td class="create_by align-middle white-space-nowrap fw-semibold text-body-highlight">Ansolo Lazinarov</td>
-                    <td class="last_activity align-middle text-center py-2">
-                      <div class="d-flex align-items-center flex-1"><span class="fa-solid fa-clock me-1 text-success" data-fa-transform="shrink-2 up-1"></span><span class="fw-bold fs-9 text-body">Active</span></div>
-                    </td>
-                    <td class="align-middle text-end white-space-nowrap pe-0 action py-2">
-                      <div class="btn-reveal-trigger position-static">
-                        <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
-                        <div class="dropdown-menu dropdown-menu-end py-2"><a class="dropdown-item" href="#!">View</a><a class="dropdown-item" href="#!">Export</a>
-                          <div class="dropdown-divider"></div><a class="dropdown-item text-danger" href="#!">Remove</a>
-                        </div>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                    <td class="fs-9 align-middle px-0 py-3">
-                      <div class="form-check mb-0 fs-8">
-                        <input class="form-check-input" type="checkbox" data-bulk-select-row='{"Name":{"avatar":"/team/35.webp","name":"Ansolo Lazinatov","status":"online"},"description":"Purchasing-Related Vendors","date":"Aug 19, 2024","creatBy":"Ansolo Lazinarov","lastActivity":{"iconColor":"text-success","label":"Active"}}' />
-                      </div>
-                    </td>
-                    <td class="name align-middle white-space-nowrap py-2 ps-0"><a class="d-flex align-items-center text-body-highlight" href="#!">
-                        <div class="avatar avatar-m me-3 status-online"><img class="rounded-circle" src="../../assets/img/team/35.webp" alt="" />
-                        </div>
-                        <h6 class="mb-0 text-body-highlight fw-bold">Ansolo Lazinatov</h6>
-                      </a></td>
-                    <td class="description align-middle white-space-nowrap text-start fw-bold text-body-tertiary py-2 pe-6">Purchasing-Related Vendors</td>
-                    <td class="create_date text-end align-middle white-space-nowrap text-body py-2">Aug 19, 2024</td>
-                    <td class="create_by align-middle white-space-nowrap fw-semibold text-body-highlight">Ansolo Lazinarov</td>
-                    <td class="last_activity align-middle text-center py-2">
-                      <div class="d-flex align-items-center flex-1"><span class="fa-solid fa-clock me-1 text-success" data-fa-transform="shrink-2 up-1"></span><span class="fw-bold fs-9 text-body">Active</span></div>
-                    </td>
-                    <td class="align-middle text-end white-space-nowrap pe-0 action py-2">
-                      <div class="btn-reveal-trigger position-static">
-                        <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
-                        <div class="dropdown-menu dropdown-menu-end py-2"><a class="dropdown-item" href="#!">View</a><a class="dropdown-item" href="#!">Export</a>
-                          <div class="dropdown-divider"></div><a class="dropdown-item text-danger" href="#!">Remove</a>
-                        </div>
-                      </div>
-                    </td>
-                  </tr>
+
                 </tbody>
               </table>
             </div>
@@ -1353,7 +1187,7 @@
                 <div class="dropdown-menu dropdown-menu-end py-2"><a class="dropdown-item" href="#!">Edit</a><a class="dropdown-item text-danger" href="#!">Delete</a><a class="dropdown-item" href="#!">Download</a><a class="dropdown-item" href="#!">Report abuse</a></div>
               </div>
             </div>
-            <p class="fs-9 text-body-tertiary mb-3"><span>768kB</span><span class="text-body-quaternary mx-1">| </span><a href="#!">Shantinan Mekalan </a><span class="text-body-quaternary mx-1">| </span><span class="text-nowrap">21st Dec, 12:56 PM</span></p><img class="rounded-2" src="../../assets/img/generic/40.png" alt="" />
+            <p class="fs-9 text-body-tertiary mb-3"><span>768kB</span><span class="text-body-quaternary mx-1">| </span><a href="#!">Shantinan Mekalan </a><span class="text-body-quaternary mx-1">| </span><span class="text-nowrap">21st Dec, 12:56 PM</span></p><img class="rounded-2" src="{% static 'images/generic/40.png' %}" alt="" />
           </div>
           <div class="border-top border-dashed py-4">
             <div class="d-flex flex-between-center">
diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html
index b5a9a3e4..125b9a13 100644
--- a/templates/sales/estimates/estimate_detail.html
+++ b/templates/sales/estimates/estimate_detail.html
@@ -6,23 +6,25 @@
 {% block content %}
 <div class="modal fade" id="confirmModal" tabindex="-1" aria-labelledby="confirmModalLabel" aria-hidden="true">
   <div class="modal-dialog modal-sm">
-    <div class="modal-content">
-        <div class="modal-header bg-primary">
-          <h5 class="modal-title text-light" id="confirmModalLabel">{% trans 'Confirm' %}</h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+    <div class="modal-content ">
+        <div class="modal-header justify-content-between align-items-start gap-5 px-4 pt-4 pb-3 border-0">
+          <h5 class="mmb-0 me-2 text-warning-dark" id="confirmModalLabel">
+              <i class="fas fa-exclamation-circle text-warning-dark ms-2"></i>
+              {% trans 'Confirm' %}</h5>
+            <button class="btn p-0 text-body-quaternary fs-6" data-bs-dismiss="modal" aria-label="Close">
+                <span class="fas fa-times"></span>
+            </button>
         </div>
       <div class="modal-body">
           {% trans 'Are you sure' %}
-            <div class="modal-footer">
-              <button type="button"
-                      class="btn btn-sm btn-danger"
-                      data-bs-dismiss="modal">
-                  {% trans 'No' %}
-              </button>
-              <form id="confirmForm" method="POST" action="{% url 'estimate_mark_as' estimate.pk %}?mark=approved" class="d-inline">
+            <div class="modal-footer flex justify-content-center border-top-0">
+              <form id="confirmForm" method="POST" action="{% url 'estimate_mark_as' estimate.pk %}?mark=approved" class="form">
                 {% csrf_token %}
-            <button type="submit" class="btn btn-success btn-sm">{% trans "Yes" %}</button>
-          </form>              
+                  <div class="container-fluid m-0 p-0">
+                      <button type="button" class="btn btn-danger btn-sm w-100" data-bs-dismiss="modal">{% trans 'No' %}</button>
+                      <button type="submit" class="btn btn-success btn-sm w-100">{% trans "Yes" %}</button>
+                  </div>
+          </form>
           </div>
       </div>
       </div>
@@ -34,10 +36,10 @@
         <section class="pt-5 pb-9 bg-body-emphasis dark__bg-gray-1200 border-top">
             <div class="row-small mt-3">
               <div class="d-flex justify-content-between align-items-end mb-4 mx-3">
-                <h2 class="mb-0">{% trans 'Estimate' %}</h2>
+                <h2 class="mb-0">{% trans 'Quotation' %}</h2>
                 <div class="d-flex align-items-center gap-2">
                   {% if estimate.status == 'draft' %}
-                      <a href="{% url 'send_email' estimate.pk %}" class="btn btn-phoenix-primary me-2"><span class="fa-regular fa-paper-plane me-sm-2"></span><span class="d-none d-sm-inline-block">{% trans 'Send Estimate' %}</span></a>
+                      <a href="{% url 'send_email' estimate.pk %}" class="btn btn-phoenix-primary me-2"><span class="fa-regular fa-paper-plane me-sm-2"></span><span class="d-none d-sm-inline-block">{% trans 'Send Quotation' %}</span></a>
                       <button id="mark_as_sent_estimate" class="btn btn-phoenix-secondary" onclick="setFormAction('review')" data-bs-toggle="modal" data-bs-target="#confirmModal"><span class="d-none d-sm-inline-block">{% trans 'Mark As Sent' %}</span></button>                                      
                     {% elif estimate.status == 'in_review' %}
                       <button id="accept_estimate" onclick="setFormAction('approved')" class="btn btn-phoenix-secondary" data-bs-toggle="modal" data-bs-target="#confirmModal"><span class="d-none d-sm-inline-block">{% trans 'Mark As Accept' %}</span></button>                                                          
@@ -60,7 +62,7 @@
                       <div class="col-12 col-sm-6 col-lg-12">
                         <div class="row align-items-center g-0">
                           <div class="col-auto col-lg-6 col-xl-5">
-                            <h6 class="mb-0 me-3">{% trans 'Estimate Number' %} :</h6>
+                            <h6 class="mb-0 me-3">{% trans 'Quotation Number' %} :</h6>
                           </div>
                           <div class="col-auto col-lg-6 col-xl-7">
                             <p class="fs-9 text-body-secondary fw-semibold mb-0">#{{estimate.estimate_number}}</p>
@@ -70,7 +72,7 @@
                       <div class="col-12 col-sm-6 col-lg-12">
                         <div class="row align-items-center g-0">
                           <div class="col-auto col-lg-6 col-xl-5">
-                            <h6 class="me-3">{% trans 'Estimate Date' %} :</h6>
+                            <h6 class="me-3">{% trans 'Quotation Date' %} :</h6>
                           </div>
                           <div class="col-auto col-lg-6 col-xl-7">
                             <p class="fs-9 text-body-secondary fw-semibold mb-0">{{estimate.created}}</p>
@@ -94,7 +96,7 @@
                    <div class="col-12 col-sm-6 col-lg-4">
                     <div class="row g-4">
                       <div class="col-12 col-lg-6">
-                        <h6 class="mb-2"> {% trans "Estimate Status" %} :</h6>
+                        <h6 class="mb-2"> {% trans "Quotation Status" %} :</h6>
                         <div class="fs-9 text-body-secondary fw-semibold mb-0">
                           {% if estimate.status == 'draft' %}
                             <span class="badge text-bg-warning">{% trans "Draft" %}</span>