From 8efe79fb6679d99c511ff996eca7ecb246c4b9b2 Mon Sep 17 00:00:00 2001
From: Ty Reynolds <tyreynolds611@gamil.com>
Date: Thu, 15 Jan 2026 10:02:52 -0500
Subject: [PATCH] Invoice and Sales Order print format updated.

---
 .../sales_invoice_ns/sales_invoice_ns.html    | 73 ++++++-------------
 .../sales_invoice_ns/sales_order_ns.html      | 45 ++++--------
 2 files changed, 36 insertions(+), 82 deletions(-)

diff --git a/ns_app/print_formats/sales_invoice_ns/sales_invoice_ns.html b/ns_app/print_formats/sales_invoice_ns/sales_invoice_ns.html
index 80fbb99..9e4737a 100644
--- a/ns_app/print_formats/sales_invoice_ns/sales_invoice_ns.html
+++ b/ns_app/print_formats/sales_invoice_ns/sales_invoice_ns.html
@@ -1,5 +1,5 @@
 <style>
-/* Reserve space in PRINT/PDF so table does not overlap window address */
+/* 💡 Reserve space in PRINT/PDF so table does not overlap window address */
 @media print {
   .window-address-space {
     padding-top: 1in;
@@ -112,59 +112,30 @@
     </tbody>
   </table>
 
-  <!-- Totals (boxed, tight to items table) -->
-  <table style="width:40%; margin-left:auto; border-collapse:collapse; font-size:14px; margin-top:0;">
-    <tbody>
-
-      <tr>
-        <td style="width:220px; padding:6px 8px; text-align:right;">
-          <strong>Subtotal</strong>
-        </td>
-        <td style="padding:6px 12px; text-align:right; border:1px solid #ccc;">
-          {{ doc.total }}
-        </td>
-      </tr>
-
+  <!-- Totals  -->
+  <div style="font-family: Helvetica, Arial, sans-serif; font-size: 15px; color: #333; margin-top: 10px; width: 40%; margin-left: auto;">
+      <p style="display:flex; justify-content:space-between;">
+        <strong>Subtotal:</strong><span>{{ doc.total }}</span>
+      </p>
+    
       {% for tax in doc.taxes %}
-      <tr>
-        <td style="padding:6px 8px; text-align:right;">
-          <strong>{{ tax.account_head }} ({{ tax.rate }}%)</strong>
-        </td>
-        <td style="padding:6px 12px; text-align:right; border:1px solid #ccc;">
-          {{ tax.tax_amount }}
-        </td>
-      </tr>
+        <p style="display:flex; justify-content:space-between;">
+          <strong>{{ tax.account_head }} ({{ tax.rate }}%):</strong>
+          <span>{{ tax.tax_amount }}</span>
+        </p>
       {% endfor %}
+    
+      <p style="display:flex; justify-content:space-between;">
+        <strong>Total:</strong><span>{{ doc.grand_total }}</span>
+      </p>
+      <p style="display:flex; justify-content:space-between;">
+        <strong>Paid:</strong><span>{{ doc.total_advance }}</span>
+      </p>
+      <p style="display:flex; justify-content:space-between;">
+        <strong>Balance Due:</strong><span>{{ doc.outstanding_amount }}</span>
+      </p>
+ </div>
 
-      <tr>
-        <td style="padding:6px 8px; text-align:right;">
-          <strong>Total</strong>
-        </td>
-        <td style="padding:6px 12px; text-align:right; border:1px solid #ccc;">
-          {{ doc.grand_total }}
-        </td>
-      </tr>
-
-      <tr>
-        <td style="padding:6px 8px; text-align:right;">
-          <strong>Paid</strong>
-        </td>
-        <td style="padding:6px 12px; text-align:right; border:1px solid #ccc;">
-          {{ doc.total_advance }}
-        </td>
-      </tr>
-
-      <tr>
-        <td style="padding:6px 8px; text-align:right;">
-          <strong>Balance Due</strong>
-        </td>
-        <td style="padding:6px 12px; text-align:right; border:1px solid #ccc;">
-          {{ doc.outstanding_amount }}
-        </td>
-      </tr>
-
-    </tbody>
-  </table>
 
   </div> <!-- end print space wrapper -->
 
diff --git a/ns_app/print_formats/sales_invoice_ns/sales_order_ns.html b/ns_app/print_formats/sales_invoice_ns/sales_order_ns.html
index 571a92b..6833aa3 100644
--- a/ns_app/print_formats/sales_invoice_ns/sales_order_ns.html
+++ b/ns_app/print_formats/sales_invoice_ns/sales_order_ns.html
@@ -115,40 +115,23 @@
   </table>
 
   <!-- Totals -->
-  <table style="width:73%; margin-left:auto; border-collapse:collapse; font-size:14px; margin-top:0px;">
-    <tbody>
-
-      <tr>
-        <td style="padding:6px 8px; text-align:right;">
-          <strong>Subtotal</strong>
-        </td>
-        <td style="padding:6px 12px; text-align:right; border:1px solid #ccc;">
-          {{ doc.total }}
-        </td>
-      </tr>
-
+  <div style="font-family: Helvetica, Arial, sans-serif; font-size: 15px; color: #333; margin-top: 10px; width: 40%; margin-left: auto;">
+      <p style="display:flex; justify-content:space-between;">
+        <strong>Subtotal:</strong><span>{{ doc.total }}</span>
+      </p>
+    
       {% for tax in doc.taxes %}
-      <tr>
-        <td style="padding:6px 8px; text-align:right;">
-          <strong>{{ tax.account_head }} ({{ tax.rate }}%)</strong>
-        </td>
-        <td style="padding:6px 12px; text-align:right; border:1px solid #ccc;">
-          {{ tax.tax_amount }}
-        </td>
-      </tr>
+        <p style="display:flex; justify-content:space-between;">
+          <strong>{{ tax.account_head }} ({{ tax.rate }}%):</strong>
+          <span>{{ tax.tax_amount }}</span>
+        </p>
       {% endfor %}
+    
+      <p style="display:flex; justify-content:space-between;">
+        <strong>Total:</strong><span>{{ doc.grand_total }}</span>
+      </p>
+ </div>
 
-      <tr>
-        <td style="padding:6px 8px; text-align:right;">
-          <strong>Total</strong>
-        </td>
-        <td style="padding:6px 12px; text-align:right; border:1px solid #ccc;">
-          <strong>{{ doc.grand_total }}</strong>
-        </td>
-      </tr>
-
-    </tbody>
-  </table>
 
 
   </div>