From 78f1e75eda577fd01c56a068ac53cce976a19487 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Tue, 14 Dec 2021 13:00:24 -0500
Subject: [PATCH] Fix #216 Updated Currency codes everywhere not just in a few
 places

---
 accounts.php               |  2 +-
 client.php                 |  4 +--
 client_invoices.php        |  2 +-
 client_payments.php        |  4 +--
 client_quotes.php          |  2 +-
 client_recurring.php       |  2 +-
 clients.php                |  4 +--
 dashboard.php              |  4 +--
 expenses.php               |  2 +-
 guest_view_invoice.php     | 38 ++++++++++++++---------------
 guest_view_quote.php       | 26 ++++++++++----------
 invoice.php                | 32 ++++++++++++------------
 invoices.php               | 10 ++++----
 payments.php               |  2 +-
 products.php               |  2 +-
 quote.php                  | 24 +++++++++---------
 quotes.php                 |  2 +-
 recurring.php              |  2 +-
 recurring_invoice.php      | 14 +++++------
 report_expense_summary.php |  8 +++---
 report_income_summary.php  |  8 +++---
 report_profit_loss.php     | 50 +++++++++++++++++++-------------------
 report_tax_summary.php     | 20 +++++++--------
 revenues.php               |  2 +-
 transfers.php              |  2 +-
 25 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/accounts.php b/accounts.php
index d22cc0fa..4abed0ca 100644
--- a/accounts.php
+++ b/accounts.php
@@ -102,7 +102,7 @@
           <tr>
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editAccountModal<?php echo $account_id; ?>"><?php echo $account_name; ?></a></td>
             <td><?php echo $account_currency_code; ?></td>
-            <td class="text-right">$<?php echo number_format($balance,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($account_currency_code); ?> <?php echo number_format($balance,2); ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/client.php b/client.php
index dbe5fef3..938c2aa3 100644
--- a/client.php
+++ b/client.php
@@ -205,8 +205,8 @@ $location_phone = formatPhoneNumber($location_phone);
       <?php if($session_permission_level == 1 OR $session_permission_level > 3){ ?>
       <div class="col-md-3 border-left">
         <h4 class="text-secondary">Billing</h4>
-        <h6 class="ml-1 text-secondary">Paid <div class="text-dark float-right">$<?php echo number_format($amount_paid,2); ?></div></h6>
-        <h6 class="ml-1 text-secondary">Balance <div class="text-dark float-right">$<?php echo number_format($balance,2); ?></div></h6>
+        <h6 class="ml-1 text-secondary">Paid <div class="text-dark float-right"> <?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($amount_paid,2); ?></div></h6>
+        <h6 class="ml-1 text-secondary">Balance <div class="text-dark float-right"> <?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($balance,2); ?></div></h6>
         <h6 class="ml-1 text-secondary">Net Terms <div class="text-dark float-right"><?php echo $client_net_terms; ?> <small class="text-secondary">Days</small></div></h6>
       </div>
       <?php } ?>
diff --git a/client_invoices.php b/client_invoices.php
index 6dfaf316..8c243251 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -143,7 +143,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <tr>
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
             <td><?php echo $invoice_scope_display; ?></td>
-            <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($invoice_amount,2); ?></td>
             <td><?php echo $invoice_date; ?></td>
             <td><div class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></div></td>
             <td><?php echo $category_name; ?></td>
diff --git a/client_payments.php b/client_payments.php
index f4d4db8a..1a99a3d2 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -119,8 +119,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $payment_date; ?></td>
             <td><?php echo $invoice_date; ?></td>
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
-            <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
-            <td class="text-right">$<?php echo number_format($payment_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($invoice_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_amount,2); ?></td>
             <td><?php echo $payment_method; ?></td>
             <td><?php echo $payment_reference_display; ?></td>
             <td><?php echo $account_name; ?></td>
diff --git a/client_quotes.php b/client_quotes.php
index 0295fc14..4e9577fe 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -134,7 +134,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <tr>
             <td><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
             <td><?php echo $quote_scope_display; ?></td>
-            <td class="text-right">$<?php echo number_format($quote_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($quote_amount,2); ?></td>
             <td><?php echo $quote_date; ?></td>
             <td><?php echo $category_name; ?></td>
             <td>
diff --git a/client_recurring.php b/client_recurring.php
index 0e3eb77e..7a34adbe 100644
--- a/client_recurring.php
+++ b/client_recurring.php
@@ -129,7 +129,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 <td><a href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>"><?php echo "$recurring_prefix$recurring_number"; ?></a></td>
                 <td><?php echo $recurring_scope; ?></td>
                 <td><?php echo ucwords($recurring_frequency); ?>ly</td>
-                <td class="text-right">$<?php echo number_format($recurring_amount,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($recurring_amount,2); ?></td>
                 <td><?php echo $recurring_last_sent; ?></td>
                 <td><?php echo $recurring_next_date; ?></td>
                 <td><?php echo $category_name; ?></td>
diff --git a/clients.php b/clients.php
index 0121c5bd..e222a2f7 100644
--- a/clients.php
+++ b/clients.php
@@ -283,9 +283,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               ?>
             </td>
             <td class="text-right">
-              Balance: <span class="<?php echo $balance_text_color; ?>">$<?php echo number_format($balance,2); ?></span>
+              Balance: <span class="<?php echo $balance_text_color; ?>"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($balance,2); ?></span>
               <br>
-              Paid: $<?php echo number_format($amount_paid,2); ?>
+              Paid: <?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($amount_paid,2); ?>
             </td>
             <td>
               <div class="dropdown dropleft text-center">
diff --git a/dashboard.php b/dashboard.php
index 0a8d01a4..006a732d 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -122,8 +122,8 @@ $vendors_added = $row['vendors_added'];
     <!-- small box -->
     <a class="small-box bg-primary" href="payments.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
       <div class="inner">
-        <h3>$ <?php echo number_format($total_income,2); ?></h3>
-        <p>Revenue</p>
+        <h3><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_income,2); ?></h3>
+        <p>Income</p>
         <hr>
         <small>Receivables: <?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($receivables,2); ?></small>
       </div>
diff --git a/expenses.php b/expenses.php
index 7065e7ba..56cf37aa 100644
--- a/expenses.php
+++ b/expenses.php
@@ -181,7 +181,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <tr>
             <td><?php echo $receipt_attached; ?> <a class="text-dark" href="#" data-toggle="modal" data-target="#editExpenseModal<?php echo $expense_id; ?>"><?php echo $expense_date; ?></a></td>
-            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_amount,2); ?></td>
             <td><?php echo $vendor_name; ?></td>
             <td><?php echo truncate($expense_description,50); ?></td>
             <td><?php echo $category_name; ?></td>
diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index 6f2df91f..c64c2621 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -228,9 +228,9 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
                     <td><?php echo $item_name; ?></td>
                     <td><?php echo $item_description; ?></td>
                     <td class="text-center"><?php echo $item_quantity; ?></td>
-                    <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_price,2); ?></td>
-                    <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_tax,2); ?></td>
-                    <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_total,2); ?></td>  
+                    <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?></td>
+                    <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?></td>
+                    <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?></td>  
                   </tr>
 
                   <?php 
@@ -259,23 +259,23 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
             <tbody>    
               <tr class="border-bottom">
                 <td>Subtotal</td>
-                <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($sub_total,2); ?></td>
+                <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?></td>
               </tr>
               <?php if($total_tax > 0){ ?>
               <tr class="border-bottom">
                 <td>Tax</td>
-                <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($total_tax,2); ?></td>        
+                <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?></td>        
               </tr>
               <?php } ?>
               <?php if($amount_paid > 0){ ?>
               <tr class="border-bottom">
                 <td><div class="text-success">Paid to Date</div></td>
-                <td class="text-right text-success"><?php echo $client_currency_symbol; ?><?php echo number_format($amount_paid,2); ?></td>
+                <td class="text-right text-success"><?php echo $client_currency_symbol; ?> <?php echo number_format($amount_paid,2); ?></td>
               </tr>
               <?php } ?>
               <tr class="border-bottom">
                 <td><strong>Balance Due</strong></td>
-                <td class="text-right"><strong><?php echo $client_currency_symbol; ?><?php echo number_format($balance,2); ?></strong></td>
+                <td class="text-right"><strong><?php echo $client_currency_symbol; ?> <?php echo number_format($balance,2); ?></strong></td>
               </tr>
             </tbody>
           </table>
@@ -474,15 +474,15 @@ var docDefinition = {
 		          style:'itemQty'
 		        }, 
 		        {
-		        	text:'<?php echo $client_currency_symbol; ?><?php echo number_format($item_price,2); ?>',
+		        	text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?>',
 		         	style:'itemNumber'
 		        }, 
 		        {
-		          text:'<?php echo $client_currency_symbol; ?><?php echo number_format($item_tax,2); ?>',
+		          text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?>',
 		          style:'itemNumber'
 		        }, 
 		        {
-		          text: '<?php echo $client_currency_symbol; ?><?php echo number_format($item_total,2); ?>',
+		          text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?>',
 		          style:'itemNumber'
 		        } 
 		    	],
@@ -524,7 +524,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        }, 
 		        { 
-		         	text:'<?php echo $client_currency_symbol; ?><?php echo number_format($sub_total,2); ?>',
+		         	text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -535,7 +535,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        },
 		        {
-		         	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($total_tax,2); ?>',
+		         	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -546,7 +546,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        }, 
 		        {
-		         	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($invoice_amount,2); ?>',
+		         	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($invoice_amount,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -557,7 +557,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        },
 		        {
-		          text: '<?php echo $client_currency_symbol; ?><?php echo number_format($amount_paid,2); ?>',
+		          text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($amount_paid,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -568,7 +568,7 @@ var docDefinition = {
 		          style:'itemsFooterTotalTitle'
 		        },
 		        {
-		        	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($balance,2); ?>',
+		        	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($balance,2); ?>',
 		          
 		          style:'itemsFooterTotalTitle'
 		        }
@@ -757,7 +757,7 @@ var docDefinition = {
                 <th class="text-center"><a href="guest_view_invoice.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $invoice_url_key; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></th>
                 <td><?php echo $invoice_date; ?></td>
                 <td class="text-danger text-bold"><?php echo $invoice_due; ?> (<?php echo $days; ?> Days Late)</td>
-                <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo $invoice_amount; ?></td>
+                <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo $invoice_amount; ?></td>
               </tr>
 
             <?php 
@@ -816,7 +816,7 @@ var docDefinition = {
                 <th class="text-center"><a href="guest_view_invoice.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $invoice_url_key; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></th>
                 <td><?php echo $invoice_date; ?></td>
                 <td><?php echo $invoice_due; ?> (Due in <?php echo $days; ?> Days)</td>
-                <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo $invoice_amount; ?></td>
+                <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo $invoice_amount; ?></td>
               </tr>
 
             <?php 
@@ -874,7 +874,7 @@ var docDefinition = {
                 <th class="text-center"><a href="guest_view_invoice.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $invoice_url_key; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></th>
                 <td><?php echo $invoice_date; ?></td>
                 <td><?php echo $invoice_due; ?></td>
-                <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo $invoice_amount; ?></td>
+                <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo $invoice_amount; ?></td>
               </tr>
 
               <tr>
@@ -906,7 +906,7 @@ var docDefinition = {
               ?>
 
                 <tr>
-                  <td colspan="4"><?php echo $payment_date; ?> - <?php echo $client_currency_symbol; ?><?php echo $payment_amount; ?> - <?php echo $payment_method; ?> - <?php echo $payment_reference; ?> - <?php echo $days; ?> <?php echo $payment_note; ?></td>
+                  <td colspan="4"><?php echo $payment_date; ?> - <?php echo $client_currency_symbol; ?> <?php echo $payment_amount; ?> - <?php echo $payment_method; ?> - <?php echo $payment_reference; ?> - <?php echo $days; ?> <?php echo $payment_note; ?></td>
                 </tr>
               <?php
 
diff --git a/guest_view_quote.php b/guest_view_quote.php
index df19fed4..efb1c1e4 100644
--- a/guest_view_quote.php
+++ b/guest_view_quote.php
@@ -182,9 +182,9 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
 	                  <td><?php echo $item_name; ?></td>
 	                  <td><?php echo $item_description; ?></td>
 	                  <td class="text-center"><?php echo $item_quantity; ?></td>
-	                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_price,2); ?></td>
-	                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_tax,2); ?></td>
-	                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_total,2); ?></td>  
+	                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?></td>
+	                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?></td>
+	                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?></td>  
 	                </tr>
 
 	                <?php 
@@ -214,23 +214,23 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
             <tbody>    
               <tr class="border-bottom">
                 <td>Subtotal</td>
-                <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($sub_total,2); ?></td>
+                <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?></td>
               </tr>
               <?php if($discount > 0){ ?>
               <tr class="border-bottom">
                 <td>Discount</td>
-                <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($quote_discount,2); ?></td>          
+                <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($quote_discount,2); ?></td>          
               </tr>
               <?php } ?>
               <?php if($total_tax > 0){ ?>
               <tr class="border-bottom">
                 <td>Tax</td>
-                <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($total_tax,2); ?></td>        
+                <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?></td>        
               </tr>
               <?php } ?>
               <tr class="border-bottom">
                 <td><strong>Total</strong></td>
-                <td class="text-right"><strong><?php echo $client_currency_symbol; ?><?php echo number_format($quote_amount,2); ?></strong></td>
+                <td class="text-right"><strong><?php echo $client_currency_symbol; ?> <?php echo number_format($quote_amount,2); ?></strong></td>
               </tr>
             </tbody>
           </table>
@@ -418,15 +418,15 @@ var docDefinition = {
 		          style:'itemQty'
 		        }, 
 		        {
-		        	text:'<?php echo $client_currency_symbol; ?><?php echo number_format($item_price,2); ?>',
+		        	text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?>',
 		         	style:'itemNumber'
 		        }, 
 		        {
-		          text:'<?php echo $client_currency_symbol; ?><?php echo number_format($item_tax,2); ?>',
+		          text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?>',
 		          style:'itemNumber'
 		        }, 
 		        {
-		          text: '<?php echo $client_currency_symbol; ?><?php echo number_format($item_total,2); ?>',
+		          text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?>',
 		          style:'itemNumber'
 		        } 
 		    	],
@@ -468,7 +468,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        }, 
 		        { 
-		         	text:'<?php echo $client_currency_symbol; ?><?php echo number_format($sub_total,2); ?>',
+		         	text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -479,7 +479,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        },
 		        {
-		         	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($total_tax,2); ?>',
+		         	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -490,7 +490,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        }, 
 		        {
-		         	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($quote_amount,2); ?>',
+		         	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($quote_amount,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
diff --git a/invoice.php b/invoice.php
index 5e4d4e40..11e06d1e 100644
--- a/invoice.php
+++ b/invoice.php
@@ -270,9 +270,9 @@ if(isset($_GET['invoice_id'])){
                   <td><?php echo $item_name; ?></td>
                   <td><?php echo $item_description; ?></td>
                   <td class="text-center"><?php echo $item_quantity; ?></td>
-                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_price,2); ?></td>
-                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_tax,2); ?></td>
-                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_total,2); ?></td>  
+                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?></td>
+                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?></td>
+                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?></td>  
                 </tr>
 
                 <?php 
@@ -344,23 +344,23 @@ if(isset($_GET['invoice_id'])){
           <tbody>    
             <tr class="border-bottom">
               <td>Subtotal</td>
-              <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($sub_total,2); ?></td>
+              <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?></td>
             </tr>
             <?php if($total_tax > 0){ ?>
             <tr class="border-bottom">
               <td>Tax</td>
-              <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($total_tax,2); ?></td>        
+              <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?></td>        
             </tr>
             <?php } ?>
             <?php if($amount_paid > 0){ ?>
             <tr class="border-bottom">
               <td><div class="text-success">Paid to Date</div></td>
-              <td class="text-right text-success"><?php echo $client_currency_symbol; ?><?php echo number_format($amount_paid,2); ?></td>
+              <td class="text-right text-success"><?php echo $client_currency_symbol; ?> <?php echo number_format($amount_paid,2); ?></td>
             </tr>
             <?php } ?>
             <tr class="border-bottom">
               <td><strong>Balance Due</strong></td>
-              <td class="text-right"><strong><?php echo $client_currency_symbol; ?><?php echo number_format($balance,2); ?></strong></td>
+              <td class="text-right"><strong><?php echo $client_currency_symbol; ?> <?php echo number_format($balance,2); ?></strong></td>
             </tr>
           </tbody>
         </table>
@@ -457,7 +457,7 @@ if(isset($_GET['invoice_id'])){
               ?>
               <tr>
                 <td><?php echo $payment_date; ?></td>
-                <td class=" text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($payment_amount,2); ?></td>
+                <td class=" text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($payment_amount,2); ?></td>
                 <td><?php echo $payment_reference; ?></td>
                 <td><?php echo $account_name; ?></td>
                 <td class="text-center"><a class="btn btn-danger btn-sm" href="post.php?delete_payment=<?php echo $payment_id; ?>"><i class="fa fa-trash"></i></a></td>
@@ -674,15 +674,15 @@ var docDefinition = {
 		          style:'itemQty'
 		        }, 
 		        {
-		        	text:'<?php echo $client_currency_symbol; ?><?php echo number_format($item_price,2); ?>',
+		        	text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?>',
 		         	style:'itemNumber'
 		        }, 
 		        {
-		          text:'<?php echo $client_currency_symbol; ?><?php echo number_format($item_tax,2); ?>',
+		          text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?>',
 		          style:'itemNumber'
 		        }, 
 		        {
-		          text: '<?php echo $client_currency_symbol; ?><?php echo number_format($item_total,2); ?>',
+		          text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?>',
 		          style:'itemNumber'
 		        } 
 		    	],
@@ -724,7 +724,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        }, 
 		        { 
-		         	text:'<?php echo $client_currency_symbol; ?><?php echo number_format($sub_total,2); ?>',
+		         	text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -735,7 +735,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        },
 		        {
-		         	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($total_tax,2); ?>',
+		         	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -746,7 +746,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        }, 
 		        {
-		         	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($invoice_amount,2); ?>',
+		         	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($invoice_amount,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -757,7 +757,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        },
 		        {
-		          text: '<?php echo $client_currency_symbol; ?><?php echo number_format($amount_paid,2); ?>',
+		          text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($amount_paid,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -768,7 +768,7 @@ var docDefinition = {
 		          style:'itemsFooterTotalTitle'
 		        },
 		        {
-		        	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($balance,2); ?>',
+		        	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($balance,2); ?>',
 		          
 		          style:'itemsFooterTotalTitle'
 		        }
diff --git a/invoices.php b/invoices.php
index 96481d2d..e7a8fb51 100644
--- a/invoices.php
+++ b/invoices.php
@@ -140,7 +140,7 @@
     <!-- small box -->
     <a href="?q=Draft" class="small-box bg-secondary">
       <div class="inner">
-        <h3>$<?php echo number_format($total_draft,2); ?></h3>
+        <h3><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_draft,2); ?></h3>
         <p><?php echo $draft_count; ?> Draft</p>
       </div>
       <div class="icon">
@@ -154,7 +154,7 @@
     <!-- small box -->
     <a href="?q=Sent" class="small-box bg-warning">
       <div class="inner text-white">
-        <h3>$<?php echo number_format($total_sent,2); ?></h3>
+        <h3><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_sent,2); ?></h3>
         <p><?php echo $sent_count; ?> Sent</p>
       </div>
       <div class="icon">
@@ -168,7 +168,7 @@
     <!-- small box -->
     <a href="?q=Viewed" class="small-box bg-info">
       <div class="inner">
-        <h3>$<?php echo number_format($total_viewed,2); ?></h3>
+        <h3><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_viewed,2); ?></h3>
         <p><?php echo $viewed_count; ?> Viewed</p>
       </div>
       <div class="icon">
@@ -182,7 +182,7 @@
     <!-- small box -->
     <a href="?q=Partial" class="small-box bg-primary">
       <div class="inner">
-        <h3>$<?php echo number_format($total_partial,2); ?></h3>
+        <h3><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_partial,2); ?></h3>
         <p><?php echo $partial_count; ?> Partial</p>
       </div>
       <div class="icon">
@@ -322,7 +322,7 @@
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
             <td><?php echo $invoice_scope_display; ?></td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=invoices"><?php echo $client_name; ?></a></td>
-            <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($invoice_amount,2); ?></td>
             <td><?php echo $invoice_date; ?></td>
             <td class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></td>
             <td><?php echo $category_name; ?></td>
diff --git a/payments.php b/payments.php
index f13a5ff8..78aad296 100644
--- a/payments.php
+++ b/payments.php
@@ -181,7 +181,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $invoice_date; ?></td>
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=payments"><?php echo $client_name; ?></a></td>
-            <td class="text-right">$<?php echo number_format($payment_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_amount,2); ?></td>
             <td><?php echo $payment_method; ?></td>
             <td><?php echo $payment_reference_display; ?></td>
             <td><?php echo $account_name; ?></td>
diff --git a/products.php b/products.php
index c253e94d..83078b05 100644
--- a/products.php
+++ b/products.php
@@ -104,7 +104,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>"><?php echo $product_name; ?></a></td>
             <td><?php echo $category_name; ?></td>
             <td><?php echo $product_description_display; ?></td>
-            <td class="text-right">$<?php echo number_format($product_cost,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($product_cost,2); ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/quote.php b/quote.php
index b9218532..8373866a 100644
--- a/quote.php
+++ b/quote.php
@@ -235,9 +235,9 @@ if(isset($_GET['quote_id'])){
                   <td><?php echo $item_name; ?></td>
                   <td><?php echo $item_description; ?></td>
                   <td class="text-center"><?php echo $item_quantity; ?></td>
-                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_price,2); ?></td>
-                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_tax,2); ?></td>
-                  <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($item_total,2); ?></td>  
+                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?></td>
+                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?></td>
+                  <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?></td>  
                 </tr>
 
                 <?php
@@ -310,17 +310,17 @@ if(isset($_GET['quote_id'])){
           <tbody>    
             <tr class="border-bottom">
               <td>Subtotal</td>
-              <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($sub_total,2); ?></td>
+              <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?></td>
             </tr>
             <?php if($total_tax > 0){ ?>
             <tr class="border-bottom">
               <td>Tax</td>
-              <td class="text-right"><?php echo $client_currency_symbol; ?><?php echo number_format($total_tax,2); ?></td>        
+              <td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?></td>        
             </tr>
             <?php } ?>
             <tr class="border-bottom">
               <td><strong>Total</strong></td>
-              <td class="text-right"><strong><?php echo $client_currency_symbol; ?><?php echo number_format($quote_amount,2); ?></strong></td>
+              <td class="text-right"><strong><?php echo $client_currency_symbol; ?> <?php echo number_format($quote_amount,2); ?></strong></td>
             </tr>
           </tbody>
         </table>
@@ -569,15 +569,15 @@ var docDefinition = {
 		          style:'itemQty'
 		        }, 
 		        {
-		        	text:'<?php echo $client_currency_symbol; ?><?php echo number_format($item_price,2); ?>',
+		        	text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?>',
 		         	style:'itemNumber'
 		        }, 
 		        {
-		          text:'<?php echo $client_currency_symbol; ?><?php echo number_format($item_tax,2); ?>',
+		          text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?>',
 		          style:'itemNumber'
 		        }, 
 		        {
-		          text: '<?php echo $client_currency_symbol; ?><?php echo number_format($item_total,2); ?>',
+		          text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?>',
 		          style:'itemNumber'
 		        } 
 		    	],
@@ -619,7 +619,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        }, 
 		        { 
-		         	text:'<?php echo $client_currency_symbol; ?><?php echo number_format($sub_total,2); ?>',
+		         	text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -630,7 +630,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        },
 		        {
-		         	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($total_tax,2); ?>',
+		         	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
@@ -641,7 +641,7 @@ var docDefinition = {
 		          style:'itemsFooterSubTitle'
 		        }, 
 		        {
-		         	text: '<?php echo $client_currency_symbol; ?><?php echo number_format($quote_amount,2); ?>',
+		         	text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($quote_amount,2); ?>',
 		          style:'itemsFooterSubValue'
 		        }
 		      ],
diff --git a/quotes.php b/quotes.php
index 3eb54e21..b2103220 100644
--- a/quotes.php
+++ b/quotes.php
@@ -204,7 +204,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
             <td><?php echo $quote_scope_display; ?></td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=quotes"><?php echo $client_name; ?></a></td>
-            <td class="text-right">$<?php echo number_format($quote_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($quote_amount,2); ?></td>
             <td><?php echo $quote_date; ?></td>
             <td><?php echo $category_name; ?></td>
             <td>
diff --git a/recurring.php b/recurring.php
index 913bbe00..8040e949 100644
--- a/recurring.php
+++ b/recurring.php
@@ -195,7 +195,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $recurring_scope; ?></td>
             <td><?php echo ucwords($recurring_frequency); ?>ly</td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=recurring"><?php echo $client_name; ?></a></td>
-            <td class="text-right">$<?php echo number_format($recurring_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($recurring_amount,2); ?></td>
             <td><?php echo $recurring_last_sent; ?></td>
             <td><?php echo $category_name; ?></td>
             <td>
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 1b6223c9..c7915ecf 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -208,9 +208,9 @@ if(isset($_GET['recurring_id'])){
                   <td><?php echo $item_name; ?></td>
                   <td><?php echo $item_description; ?></td>
                   <td class="text-center"><?php echo $item_quantity; ?></td>
-                  <td class="text-right">$<?php echo number_format($item_price,2); ?></td>
-                  <td class="text-right">$<?php echo number_format($item_tax,2); ?></td>
-                  <td class="text-right">$<?php echo number_format($item_total,2); ?></td>  
+                  <td class="text-right"><?php echo get_currency_symbol($client_currency_code); ?> <?php echo number_format($item_price,2); ?></td>
+                  <td class="text-right"><?php echo get_currency_symbol($client_currency_code); ?> <?php echo number_format($item_tax,2); ?></td>
+                  <td class="text-right"><?php echo get_currency_symbol($client_currency_code); ?> <?php echo number_format($item_total,2); ?></td>  
                 </tr>
 
                 <?php
@@ -282,17 +282,17 @@ if(isset($_GET['recurring_id'])){
           <tbody>    
             <tr class="border-bottom">
               <td>Subtotal</td>
-              <td class="text-right">$<?php echo number_format($sub_total,2); ?></td>
+              <td class="text-right"><?php echo get_currency_symbol($client_currency_code); ?> <?php echo number_format($sub_total,2); ?></td>
             </tr>
             <?php if($total_tax > 0){ ?>
             <tr class="border-bottom">
               <td>Tax</td>
-              <td class="text-right">$<?php echo number_format($total_tax,2); ?></td>        
+              <td class="text-right"><?php echo get_currency_symbol($client_currency_code); ?> <?php echo number_format($total_tax,2); ?></td>        
             </tr>
             <?php } ?>
             <tr class="border-bottom">
               <td><strong>Amount</strong></td>
-              <td class="text-right"><strong>$<?php echo number_format($recurring_amount,2); ?></strong></td>
+              <td class="text-right"><strong><?php echo get_currency_symbol($client_currency_code); ?> <?php echo number_format($recurring_amount,2); ?></strong></td>
             </tr>
           </tbody>
         </table>
@@ -357,4 +357,4 @@ if(isset($_GET['recurring_id'])){
 
 include("footer.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/report_expense_summary.php b/report_expense_summary.php
index 0b4c0154..1160b96b 100644
--- a/report_expense_summary.php
+++ b/report_expense_summary.php
@@ -77,7 +77,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
 
               
               ?>
-                <td class="text-right"><a class="text-dark" href="expenses.php?q=<?php echo $category_name; ?>&dtf=<?php echo "$year-$month"; ?>-01&dtt=<?php echo "$year-$month"; ?>-31">$<?php echo number_format($expense_amount_for_month,2); ?></a></td>
+                <td class="text-right"><a class="text-dark" href="expenses.php?q=<?php echo $category_name; ?>&dtf=<?php echo "$year-$month"; ?>-01&dtt=<?php echo "$year-$month"; ?>-31"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_amount_for_month,2); ?></a></td>
               
               <?php
               
@@ -85,7 +85,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
               
               ?>
               
-              <th class="text-right"><a class="text-dark" href="expenses.php?q=<?php echo $category_name; ?>&dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">$<?php echo number_format($total_expense_for_all_months,2); ?></a></th>
+              <th class="text-right"><a class="text-dark" href="expenses.php?q=<?php echo $category_name; ?>&dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_expense_for_all_months,2); ?></a></th>
             </tr>
           
           <?php 
@@ -107,14 +107,14 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
             
             ?>
 
-              <th class="text-right"><a class="text-dark" href="expenses.php?dtf=<?php echo "$year-$month"; ?>-01&dtt=<?php echo "$year-$month"; ?>-31">$<?php echo number_format($expense_total_amount_for_month,2); ?></a></th>
+              <th class="text-right"><a class="text-dark" href="expenses.php?dtf=<?php echo "$year-$month"; ?>-01&dtt=<?php echo "$year-$month"; ?>-31"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_month,2); ?></a></th>
             <?php
 
             }
 
             ?>
 
-            <th class="text-right"><a class="text-dark" href="expenses.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">$<?php echo number_format($total_expense_for_all_months,2); ?></th>
+            <th class="text-right"><a class="text-dark" href="expenses.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_expense_for_all_months,2); ?></th>
           </tr>
         </tbody>
       </table>
diff --git a/report_income_summary.php b/report_income_summary.php
index e9725bb8..97d40ff9 100644
--- a/report_income_summary.php
+++ b/report_income_summary.php
@@ -87,7 +87,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
 
               
               ?>
-                <td class="text-right">$<?php echo number_format($payment_amount_for_month,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_amount_for_month,2); ?></td>
               
               <?php
               
@@ -95,7 +95,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
               
               ?>
               
-              <td class="text-right text-bold">$<?php echo number_format($total_payment_for_all_months,2); ?></td>
+              <td class="text-right text-bold"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_payment_for_all_months,2); ?></td>
             </tr>
           
           <?php 
@@ -124,14 +124,14 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
               
             ?>
 
-            <th class="text-right">$<?php echo number_format($payment_total_amount_for_month,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_total_amount_for_month,2); ?></th>
             <?php
 
             }
 
             ?>
 
-            <th class="text-right">$<?php echo number_format($total_payment_for_all_months,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_payment_for_all_months,2); ?></th>
           </tr>
         </tbody>
       </table>
diff --git a/report_profit_loss.php b/report_profit_loss.php
index e0eea3fc..973564a6 100644
--- a/report_profit_loss.php
+++ b/report_profit_loss.php
@@ -87,7 +87,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
               
               ?>
                 
-                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_amount_for_quarter_one,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_amount_for_quarter_one,2); ?></td>
 
               <?php
 
@@ -109,7 +109,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
               
               ?>
 
-                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_amount_for_quarter_two,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_amount_for_quarter_two,2); ?></td>
 
               <?php
 
@@ -130,7 +130,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
               
               ?>
 
-                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_amount_for_quarter_three,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_amount_for_quarter_three,2); ?></td>
 
               <?php
 
@@ -153,9 +153,9 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
 
               ?>
 
-              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_amount_for_quarter_four,2); ?></td>        
+              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_amount_for_quarter_four,2); ?></td>        
               
-              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($total_payments_for_all_four_quarters,2); ?></td>
+              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_payments_for_all_four_quarters,2); ?></td>
             </tr>
           
           <?php 
@@ -188,7 +188,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
             
             ?>  
             
-              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_total_amount_for_quarter_one,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_total_amount_for_quarter_one,2); ?></th>
 
             <?php
 
@@ -210,7 +210,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
             
             ?>  
             
-              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_total_amount_for_quarter_two,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_total_amount_for_quarter_two,2); ?></th>
 
             <?php
 
@@ -232,7 +232,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
             
             ?>  
             
-              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_total_amount_for_quarter_three,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_total_amount_for_quarter_three,2); ?></th>
 
             <?php
 
@@ -256,9 +256,9 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
 
             ?>  
             
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_total_amount_for_quarter_four,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($payment_total_amount_for_quarter_four,2); ?></th>
 
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($total_payments_for_all_four_quarters,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_payments_for_all_four_quarters,2); ?></th>
           </tr>
          
           <tr>
@@ -286,7 +286,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
               
               ?>
                 
-                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount_for_quarter_one,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_amount_for_quarter_one,2); ?></td>
 
               <?php
 
@@ -300,7 +300,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
               
               ?>
 
-                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount_for_quarter_two,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_amount_for_quarter_two,2); ?></td>
 
               <?php
 
@@ -314,7 +314,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
               
               ?>
 
-                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount_for_quarter_three,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_amount_for_quarter_three,2); ?></td>
 
               <?php
               
@@ -330,9 +330,9 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
 
               ?>
 
-              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount_for_quarter_four,2); ?></td>        
+              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_amount_for_quarter_four,2); ?></td>        
               
-              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($total_expenses_for_all_four_quarters,2); ?></td>
+              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_expenses_for_all_four_quarters,2); ?></td>
             </tr>
           
           <?php 
@@ -357,7 +357,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
             
             ?>  
             
-              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_total_amount_for_quarter_one,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_quarter_one,2); ?></th>
 
             <?php
 
@@ -371,7 +371,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
             
             ?>  
             
-              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_total_amount_for_quarter_two,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_quarter_two,2); ?></th>
 
             <?php
 
@@ -385,7 +385,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
             
             ?>  
             
-              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_total_amount_for_quarter_three,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_quarter_three,2); ?></th>
 
             <?php
 
@@ -401,9 +401,9 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
 
             ?>  
             
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_total_amount_for_quarter_four,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_quarter_four,2); ?></th>
 
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($total_expenses_for_all_four_quarters,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_expenses_for_all_four_quarters,2); ?></th>
           </tr>
           <tr>
             <?php
@@ -415,11 +415,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
             ?>
 
             <th>Net Profit</th>
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_quarter_one,2); ?></th>
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_quarter_two,2); ?></th>
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_quarter_three,2); ?></th>
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_quarter_four,2); ?></th>
-            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_year,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($net_profit_quarter_one,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($net_profit_quarter_two,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($net_profit_quarter_three,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($net_profit_quarter_four,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($net_profit_year,2); ?></th>
           </tr>
         </tbody>
       </table>
diff --git a/report_tax_summary.php b/report_tax_summary.php
index a11ef007..8fa9c67c 100644
--- a/report_tax_summary.php
+++ b/report_tax_summary.php
@@ -81,7 +81,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session
               
               ?>
                 
-                <td class="text-right">$<?php echo number_format($tax_collected_quarter_one,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($tax_collected_quarter_one,2); ?></td>
 
               <?php
 
@@ -104,7 +104,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session
               
               ?>
                 
-                <td class="text-right">$<?php echo number_format($tax_collected_quarter_two,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($tax_collected_quarter_two,2); ?></td>
 
               <?php
 
@@ -127,7 +127,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session
               
               ?>
                 
-                <td class="text-right">$<?php echo number_format($tax_collected_quarter_three,2); ?></td>
+                <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($tax_collected_quarter_three,2); ?></td>
 
               <?php
 
@@ -152,9 +152,9 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session
 
               ?>
 
-              <td class="text-right">$<?php echo number_format($tax_collected_quarter_four,2); ?></td>        
+              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($tax_collected_quarter_four,2); ?></td>        
               
-              <td class="text-right">$<?php echo number_format($total_tax_collected_four_quarters,2); ?></td>
+              <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_tax_collected_four_quarters,2); ?></td>
             </tr>
           
           <?php 
@@ -177,7 +177,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session
             
             ?>  
             
-              <th class="text-right">$<?php echo number_format($expense_total_amount_for_quarter_one,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_quarter_one,2); ?></th>
 
             <?php
 
@@ -191,7 +191,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session
             
             ?>  
             
-              <th class="text-right">$<?php echo number_format($expense_total_amount_for_quarter_two,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_quarter_two,2); ?></th>
 
             <?php
 
@@ -205,7 +205,7 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session
             
             ?>  
             
-              <th class="text-right">$<?php echo number_format($expense_total_amount_for_quarter_three,2); ?></th>
+              <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_quarter_three,2); ?></th>
 
             <?php
 
@@ -221,9 +221,9 @@ $sql_tax = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session
 
             ?>  
             
-            <th class="text-right">$<?php echo number_format($expense_total_amount_for_quarter_four,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($expense_total_amount_for_quarter_four,2); ?></th>
 
-            <th class="text-right">$<?php echo number_format($total_expenses_for_all_four_quarters,2); ?></th>
+            <th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($total_expenses_for_all_four_quarters,2); ?></th>
           </tr>
         </tbody>
       </table>
diff --git a/revenues.php b/revenues.php
index 8ad93969..f58446ec 100644
--- a/revenues.php
+++ b/revenues.php
@@ -179,7 +179,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <tr>
             <td><a href="#" data-toggle="modal" data-target="#editRevenueModal<?php echo $revenue_id; ?>"><?php echo $revenue_date; ?></a></td>
             <td><?php echo $category_name; ?></td>
-            <td class="text-right">$<?php echo number_format($revenue_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($revenue_amount,2); ?></td>
             <td><?php echo $revenue_payment_method; ?></td>
             <td><?php echo $revenue_reference_display; ?></td>
             <td><?php echo $account_name; ?></td>
diff --git a/transfers.php b/transfers.php
index 0fe893c2..745d862b 100644
--- a/transfers.php
+++ b/transfers.php
@@ -180,7 +180,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editTransferModal<?php echo $transfer_id; ?>"><?php echo $transfer_date; ?></a></td>
             <td><?php echo $account_name_from; ?></td>
             <td><?php echo $account_name_to; ?></td>
-            <td class="text-right">$<?php echo number_format($transfer_amount,2); ?></td>
+            <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($transfer_amount,2); ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">