diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc
index b9c2ef37..e19a2f9c 100644
Binary files a/car_inventory/__pycache__/settings.cpython-311.pyc and b/car_inventory/__pycache__/settings.cpython-311.pyc differ
diff --git a/static/images/.DS_Store b/static/images/.DS_Store
index f18dfd41..9d90f072 100644
Binary files a/static/images/.DS_Store and b/static/images/.DS_Store differ
diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html
index b6b53fa5..1eccd8f6 100644
--- a/templates/sales/estimates/estimate_detail.html
+++ b/templates/sales/estimates/estimate_detail.html
@@ -212,27 +212,27 @@
                       <tr class="bg-body-secondary total-sum">
                         <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|floatformat}}</span>
+                        <span id="grand-total">+ {{data.total_vat_amount|floatformat}}<span class="currency"> {{ CURRENCY }}</span></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|floatformat}}</span>
+                        <span id="grand-total">- {{data.total_discount|floatformat}}<span class="currency"> {{ CURRENCY }}</span></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_|floatformat}}</span></small><br>
+                            <small><span class="fw-semibold">+ {{service.name}} - {{service.price_|floatformat}}<span class="currency"> {{ CURRENCY }}</span></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|floatformat}}</span>
+                        <span id="grand-total">{{data.grand_total|floatformat}}<span class="currency"> {{ CURRENCY }}</span></span>
                         </td>                        
                       </tr>                                                                  
                     </tbody>
diff --git a/templates/sales/invoices/invoice_detail.html b/templates/sales/invoices/invoice_detail.html
index 31f0a1bb..66a8dccd 100644
--- a/templates/sales/invoices/invoice_detail.html
+++ b/templates/sales/invoices/invoice_detail.html
@@ -158,9 +158,9 @@
                       <div>
                         <p class="fw-bold mb-1">{% trans 'Due Amount' %}</p>
                         {% if invoice.is_paid %}
-                          <s><h4 class="fw-bolder text-nowrap">{{invoice.amount_due}}&nbsp;<span class="currency">{{ CURRENCY }}</span></h4></s>
+                          <s><h4 class="fw-bolder text-nowrap">{{invoice.amount_due|floatformat}}&nbsp;<span class="currency">{{ CURRENCY }}</span></h4></s>
                         {% else %}
-                          <h4 class="fw-bolder text-nowrap">{{invoice.amount_due}}&nbsp;<span class="currency">{{ CURRENCY }}</span></h4>
+                          <h4 class="fw-bolder text-nowrap">{{invoice.amount_due|floatformat}}&nbsp;<span class="currency">{{ CURRENCY }}</span></h4>
                         {% endif %}
                       </div>
                     </div>
@@ -260,27 +260,27 @@
                       <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 fw-semibold">                            
-                        <span id="grand-total">- {{data.total_discount}}</span>       
+                        <span id="grand-total">- {{data.total_discount|floatformat}}<span class="currency"> {{ CURRENCY }}</span></span>
                         </td>                        
                       </tr>                                                                  
                       <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 text-start fw-semibold">                            
-                        <span id="grand-total">+ {{data.total_vat_amount}}</span>                            
+                        <span id="grand-total">+ {{data.total_vat_amount|floatformat}}<span class="currency"> {{ CURRENCY }}</span></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-bold">                            
                           {% for service in data.additionals %}
-                            <small><span class="fw-bold">+ {{service.name}} - {{service.price_}}</span></small><br>
+                            <small><span class="fw-bold">+ {{service.name}} - {{service.price_|floatformat}}<span class="currency"> {{ CURRENCY }}</span></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 class="currency"> {{ CURRENCY }}</span></span>
                         </td>                        
                       </tr>                                                                  
                     </tbody>
diff --git a/templates/sales/invoices/invoice_preview.html b/templates/sales/invoices/invoice_preview.html
index 2ff17de8..29b905ec 100644
--- a/templates/sales/invoices/invoice_preview.html
+++ b/templates/sales/invoices/invoice_preview.html
@@ -195,16 +195,16 @@
                         <td class="ps-1 fs-10 align-content-center" colspan="3">{{ item.make }} - {{ item.model }} - {{ item.trim }}</td>
                         <td class="text-center fs-10 align-content-center">{{ item.year }}</td>
                         <td class="ps-1 fs-10 align-content-center">{{ item.vin }}</td>
-                        <td class="text-center fs-10 align-content-center">{{ item.quantity|floatformat:-1 }}</td>
-                        <td class="text-center fs-10 align-content-center">{{ item.unit_price|floatformat:2 }}</td>
-                        <td class="text-center fs-10 align-content-center">{{ item.total_vat|floatformat:2 }}</td>
+                        <td class="text-center fs-10 align-content-center">{{ item.quantity|floatformat }}</td>
+                        <td class="text-center fs-10 align-content-center">{{ item.unit_price|floatformat }}</td>
+                        <td class="text-center fs-10 align-content-center">{{ item.total_vat|floatformat }}</td>
                     </tr>
                     {% endfor %}
                     <tr>
                         <td class="ps-1 fs-10 align-content-center" colspan="5"></td>
-                        <td class="text-center fs-10 align-content-center">{{ data.quantity|floatformat:-1 }}</td>
-                        <td class="text-center fs-10 align-content-center">{{ data.total_price|floatformat:2 }}</td>
-                        <td class="text-center fs-10 align-content-center">{{ data.total_vat|floatformat:2 }}</td>
+                        <td class="text-center fs-10 align-content-center">{{ data.quantity|floatformat }}</td>
+                        <td class="text-center fs-10 align-content-center">{{ data.total_price|floatformat }}</td>
+                        <td class="text-center fs-10 align-content-center">{{ data.total_vat|floatformat }}</td>
                     </tr>
                 </tbody>
             </table>
@@ -229,8 +229,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>
@@ -242,12 +242,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>
diff --git a/templates/sales/orders/purchase_order.html b/templates/sales/orders/purchase_order.html
index a7353cbc..f0a9b386 100644
--- a/templates/sales/orders/purchase_order.html
+++ b/templates/sales/orders/purchase_order.html
@@ -1,3 +1,4 @@
+{% load i18n custom_filters %}
 {% block customCSS %}
   <style>
     .invoice {
@@ -62,7 +63,7 @@
                   {% for item in data.cars %}
                     <tr>
                       <td>{{ item.make }}</td>
-                      <td class="text-end">{{ item.unit_price }}</td>
+                      <td class="text-end">{{ item.unit_price|floatformat }}</td>
                     </tr>
                   {% endfor %}
                   <tr class="b-top">
@@ -71,7 +72,7 @@
                   {% for service in data.additionals %}
                     <tr>
                       <td>{{ service.name }}</td>
-                      <td class="text-end">{{ service.price_ }}</td>
+                      <td class="text-end">{{ service.price_|floatformat }}</td>
                     </tr>
                   {% endfor %}
                 </tbody>
@@ -89,7 +90,7 @@
               <tbody>
                 <tr class="total">
                   <td class="text-end" width="80%"></td>
-                  <td class="text-end">{{ data.grand_total }}</td>
+                  <td class="text-end">{{ data.grand_total|floatformat }}<span class="currency">{{ CURRENCY }}</span></td>
                 </tr>
               </tbody>
             </table>