diff --git a/client_invoices.php b/client_invoices.php
index 70a8cf09..ea9341a5 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -42,7 +42,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices, categories 
   WHERE invoices.client_id = $client_id 
   AND invoices.category_id = categories.category_id 
-  AND (invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%') 
+  AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
diff --git a/client_payments.php b/client_payments.php
index 77a30898..17f6e3fe 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -43,7 +43,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments, invoice
   WHERE invoices.client_id = $client_id
   AND payments.invoice_id = invoices.invoice_id
   AND payments.account_id = accounts.account_id
-  AND (invoice_number LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%') 
+  AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
diff --git a/client_print.php b/client_print.php
index 9dadf4ac..331ded0f 100644
--- a/client_print.php
+++ b/client_print.php
@@ -558,6 +558,7 @@ if(isset($_GET['client_id'])){
 
     while($row = mysqli_fetch_array($sql_invoices)){
       $invoice_id = $row['invoice_id'];
+      $invoice_prefix = $row['invoice_prefix'];
       $invoice_number = $row['invoice_number'];
       $invoice_status = $row['invoice_status'];
       $invoice_date = $row['invoice_date'];
@@ -567,8 +568,8 @@ if(isset($_GET['client_id'])){
     ?>
 
     <tr>
-      <td><?php echo $invoice_number; ?></td>
-      <td class="text-right text-monospace">$<?php echo number_format($invoice_amount,2); ?></td>
+      <td><?php echo "$invoice_prefix$invoice_number"; ?></td>
+      <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
       <td><?php echo $invoice_date; ?></td>
       <td><?php echo $invoice_due; ?></td>
       <td><?php echo $invoice_status; ?></td>
@@ -605,6 +606,7 @@ if(isset($_GET['client_id'])){
 
     while($row = mysqli_fetch_array($sql_payments)){
       $invoice_id = $row['invoice_id'];
+      $invoice_prefix = $row['invoice_prefix'];
       $invoice_number = $row['invoice_number'];
       $invoice_status = $row['invoice_status'];
       $invoice_amount = $row['invoice_amount'];
@@ -621,10 +623,10 @@ if(isset($_GET['client_id'])){
     <tr>
       <td><?php echo $payment_date; ?></td>
       <td><?php echo $invoice_due; ?></td>
-      <td><?php echo $invoice_number; ?></td>
-      <td class="text-right text-monospace">$<?php echo number_format($invoice_amount,2); ?></td>
-      <td class="text-right text-monospace">$<?php echo number_format($payment_amount,2); ?></td>
-      <td class="text-right text-monospace">$<?php echo number_format($invoice_balance,2); ?></td>
+      <td><?php echo "$invoice_prefix$invoice_number"; ?></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 number_format($invoice_balance,2); ?></td>
       <td><?php echo $payment_method; ?></td>
       <td><?php echo $payment_reference; ?></td>
     </tr>
@@ -656,6 +658,7 @@ if(isset($_GET['client_id'])){
 
     while($row = mysqli_fetch_array($sql_quotes)){
       $quote_id = $row['quote_id'];
+      $quote_prefix = $row['quote_prefix'];
       $quote_number = $row['quote_number'];
       $quote_status = $row['quote_status'];
       $quote_date = $row['quote_date'];
@@ -665,7 +668,7 @@ if(isset($_GET['client_id'])){
 
     <tr>
       <td><?php echo $quote_number; ?></td>
-      <td class="text-right text-monospace">$<?php echo number_format($quote_amount,2); ?></td>
+      <td class="text-right">$<?php echo number_format($quote_amount,2); ?></td>
       <td><?php echo $quote_date; ?></td>
       <td><?php echo $quote_status; ?></td>
     </tr>
diff --git a/client_quotes.php b/client_quotes.php
index cb540a35..c14b2448 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -42,7 +42,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, categories 
   WHERE client_id = $client_id 
   AND categories.category_id = quotes.category_id 
-  AND (quote_number LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%') 
+  AND (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
diff --git a/invoices.php b/invoices.php
index f95fd2a7..6d60b4e5 100644
--- a/invoices.php
+++ b/invoices.php
@@ -104,7 +104,7 @@
     AND invoices.category_id = categories.category_id
     AND invoices.company_id = $session_company_id
     AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt'
-    AND (invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR category_name LIKE '%$q%') 
+    AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR category_name LIKE '%$q%') 
     ORDER BY $sb $o LIMIT $record_from, $record_to");
 
   $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
diff --git a/payments.php b/payments.php
index 3c463a90..a47cacf5 100644
--- a/payments.php
+++ b/payments.php
@@ -54,7 +54,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments, invoice
   AND payments.account_id = accounts.account_id
   AND payments.company_id = $session_company_id
   AND DATE(payment_date) BETWEEN '$dtf' AND '$dtt'
-  AND (invoice_number LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%')
+  AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%')
   ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
diff --git a/quotes.php b/quotes.php
index 60ae73b1..7f9a93b8 100644
--- a/quotes.php
+++ b/quotes.php
@@ -54,7 +54,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, clients,
   WHERE quotes.client_id = clients.client_id
   AND quotes.category_id = categories.category_id
   AND quotes.company_id = $session_company_id
-  AND (quote_number LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%' OR quote_amount LIKE '%$q%' OR client_name LIKE '%$q%')
+  AND (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%' OR quote_amount LIKE '%$q%' OR client_name LIKE '%$q%')
   AND DATE(quote_date) BETWEEN '$dtf' AND '$dtt'
   ORDER BY $sb $o LIMIT $record_from, $record_to");