diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html
index cccc682c..b6b53fa5 100644
--- a/templates/sales/estimates/estimate_detail.html
+++ b/templates/sales/estimates/estimate_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n custom_filters%}
 
 {% block title %}{{ _("View Quotation") }}{% endblock title %}
 
@@ -210,29 +210,29 @@
                             </tr>
                       {% endfor %}
                       <tr class="bg-body-secondary total-sum">
-                        <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Vat" %} ({{data.vat}}%)</td>                                                                                                
+                        <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Vat" %} ({{data.vat|percentage}})</td>
                         <td class="align-middle text-start fw-semibold">                            
-                        <span id="grand-total">+ {{data.total_vat_amount}}</span>                            
+                        <span id="grand-total">+ {{data.total_vat_amount|floatformat}}</span>
                         </td>                        
                       </tr>                                                                  
                       <tr class="bg-body-secondary total-sum">
                         <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Discount Amount" %}</td>                                                                                                
                         <td class="align-middle text-start text-danger fw-semibold ">                            
-                        <span id="grand-total">- {{data.total_discount}}</span>
+                        <span id="grand-total">- {{data.total_discount|floatformat}}</span>
                         </td>                        
                       </tr>                                                                  
                       <tr class="bg-body-secondary total-sum">
                         <td class="align-middle ps-4 fw-semibold text-body-highlight" colspan="7">{% trans "Additional Services" %}</td>
                         <td class="align-middle text-start fw-semibold">
                           {% for service in data.additionals %}
-                            <small><span class="fw-semibold">+ {{service.name}} - {{service.price_}}</span></small><br>
+                            <small><span class="fw-semibold">+ {{service.name}} - {{service.price_|floatformat}}</span></small><br>
                           {% endfor %}
                         </td>
                       </tr>                                                                  
                       <tr class="bg-body-secondary total-sum">
                         <td class="align-middle ps-4 fw-bolder text-body-highlight" colspan="7">{% trans "Grand Total" %}</td>                                                                                                
                         <td class="align-middle text-start fw-bolder">
-                        <span id="grand-total">{{data.grand_total}}</span>
+                        <span id="grand-total">{{data.grand_total|floatformat}}</span>
                         </td>                        
                       </tr>                                                                  
                     </tbody>
diff --git a/templates/sales/estimates/estimate_preview.html b/templates/sales/estimates/estimate_preview.html
index eb6f77e9..ee292e97 100644
--- a/templates/sales/estimates/estimate_preview.html
+++ b/templates/sales/estimates/estimate_preview.html
@@ -216,8 +216,8 @@
                     {% for item in data.additionals %}
                     <tr>
                         <td class="ps-1 text-start fs-10 align-content-center">{{ item.name }}</td>
-                        <td class="ps-1 text-center fs-10 align-content-center">{{ item.price|floatformat:2 }}</td>
-                        <td class="ps-1 text-center fs-10 align-content-center">{{ item.price_|floatformat:2 }}</td>
+                        <td class="ps-1 text-center fs-10 align-content-center">{{ item.price|floatformat }}</td>
+                        <td class="ps-1 text-center fs-10 align-content-center">{{ item.price_|floatformat }}</td>
                     </tr>
                     {% endfor %}
                 </tbody>
@@ -229,12 +229,12 @@
             <table class="table table-sm table-responsive">
                 <tr>
                     <td class="text-start ps-1"><strong class="fs-9">VAT</strong></td>
-                    <td class="text-center"><span class="fs-9">{{ data.total_vat_amount|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></span></td>
+                    <td class="text-center"><span class="fs-9">{{ data.total_vat_amount|floatformat }} <span class="currency">{{ CURRENCY }}</span></span></td>
                     <td class="text-end"><strong class="fs-9">ضريبة&nbsp;القيمة&nbsp;المضافة</strong></td>
                 </tr>
                 <tr>
                     <td class="text-start ps-1"><strong class="fs-9">Total</strong></td>
-                    <td class="text-center"><span class="fs-9">{{ data.grand_total|floatformat:2 }}&nbsp;<span class="currency">{{ CURRENCY }}</span></span></td>
+                    <td class="text-center"><span class="fs-9">{{ data.grand_total|floatformat }}&nbsp;<span class="currency">{{ CURRENCY }}</span></span></td>
                     <td class="text-end"><strong class="fs-9">الإجمالي</strong></td>
                 </tr>
                 <tr>