diff --git a/controllers/app_controller.php b/controllers/app_controller.php
index c066fe4c..e5ba1214 100755
--- a/controllers/app_controller.php
+++ b/controllers/app_controller.php
@@ -17,14 +17,6 @@ class AppController extends Controller {
         $this->Auth->authorize = 'controller';
 
 
-        /**
-         * Define the scheme for issue Types.
-         */
-        $this->set('issueTypes', array(1=>"Bug Report", 2=>"Feature Request", 3=>"Other IT Help"));
-
-        $priorities = array(1 => 'Low',2=> "Medium",3=> "High", 4=> "Critical");
-        $this->set('issuePriorities', $priorities);
-
 
         
         if($this->RequestHandler->isAjax()) {
diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php
index 8ed037ea..6d453745 100755
--- a/controllers/enquiries_controller.php
+++ b/controllers/enquiries_controller.php
@@ -45,7 +45,10 @@ class EnquiriesController extends AppController {
 
         //$this->set('quotes', $enquiry['Quote']);
         $this->set('quotes', $this->Enquiry->Quote->find('all', array('recursive' => 0, 'conditions'=>array('Quote.enquiry_id'=>$id), 'order'=>'Quote.revision DESC')));
-        //$this->set('files', $this->Enquiry->EnquiryFile->find('all', array('conditions' => array('EnquiryFile.enquiry_id'=>$id), 'order' => 'EnquiryFile.created ASC')));
+
+        $this->set('invoices', $this->Enquiry->Invoice->find('all', array('conditions' => array('Invoice.enquiry_id' => $id))));
+
+//$this->set('files', $this->Enquiry->EnquiryFile->find('all', array('conditions' => array('EnquiryFile.enquiry_id'=>$id), 'order' => 'EnquiryFile.created ASC')));
 
 		/* Trying to optimise the queries for this part of the view - it's currently getting bogged down checking Email Attachments.
 		 * Going to create an array describing whether a particular email ID has an attachment. Trying to avoid checking binary data in a find('all') call
diff --git a/models/enquiry.php b/models/enquiry.php
index 3f38a82f..7fd34651 100755
--- a/models/enquiry.php
+++ b/models/enquiry.php
@@ -3,6 +3,8 @@ class Enquiry extends AppModel {
 
     var $name = 'Enquiry';
 
+    //var $recursive = 2;
+
     var $validate = array(
             'user_id' => array(
                             'rule' => 'numeric',
@@ -170,11 +172,13 @@ class Enquiry extends AppModel {
                             'counterQuery' => ''
             ),
 
-            
+
             'Email' => array('className' => 'Email',
                             'foreignKey' => 'enquiry_id',
                             'dependent' => false
             ),
+            'Invoice' => array('className' => 'Invoice',
+                            'foreignKey'=>'enquiry_id')
 
 
             /* 'EnquiryFile' => array('className' => 'EnquiryFile',
diff --git a/models/user.php b/models/user.php
index 46ba057b..fa82aa97 100755
--- a/models/user.php
+++ b/models/user.php
@@ -4,7 +4,9 @@ class User extends AppModel {
 	var $name = 'User';
 	
 	var $belongsTo = array('Group');
-	
+
+        var $displayField = 'username';
+
 	/* TO DO: Fix up this validation stuff
 	var $validate = array(
 		'username' => array(
diff --git a/vendors/shells/vault.php b/vendors/shells/vault.php
index f91907df..0805e52b 100755
--- a/vendors/shells/vault.php
+++ b/vendors/shells/vault.php
@@ -26,10 +26,10 @@ class VaultShell extends Shell {
 
         if($testing == 1) {
             $email_dir = '/Users/karlcordes/Sites/quotenik/app/emails';
-
             $ripmime_path = '/opt/local/bin/ripmime';
         }
 
+       
         $mbox = imap_open("{mail.cmctechnologies.com.au:143/novalidate-cert}INBOX", $username, $password) or die("can't connect: " . imap_last_error());
         $MC = imap_check($mbox);
         $number_of_messages = $MC->Nmsgs;
@@ -39,7 +39,7 @@ class VaultShell extends Shell {
         if($number_of_messages == 0) {
             exit(0);
         }
-
+        
 
         /* Loop through the messages and sort them into ones to be processed or discarded */
         for ($i=1; $i <= $number_of_messages; $i++) {
@@ -55,8 +55,6 @@ class VaultShell extends Shell {
                 //Generate a Uniqid for this email.
                 $uniqid = $this->getUniqId($email_dir);
 
-
-
                 $this->Email->create();
                 $this->data['Email']['enquiry_id'] = $enquiry['Enquiry']['id'];
                 $this->data['Email']['to'] = $message['to'];
diff --git a/views/enquiries/view.ctp b/views/enquiries/view.ctp
index f58a9000..b2781357 100755
--- a/views/enquiries/view.ctp
+++ b/views/enquiries/view.ctp
@@ -128,6 +128,85 @@ $class = ' class="altrow"';?>
 </div>
 
 
+<div class="related">
+    <h3><?php __($enquiry['Enquiry']['invoice_count'].' Invoices for this Enquiry');?></h3>
+    <table class="quotetable">
+       
+           <tr>
+            
+            <th>Issue Date</th>
+            <th>Due Date</th>
+            <th>Invoice Number</th>
+            <th>Customer</th>
+            <th>Paid / Unpaid</th>
+            <th>Payment Received Date</th>
+            <th>User</th>
+            <th class="actions"><?php __('Actions');?></th>
+        </tr>
+        <?php
+        $i = 0;
+        foreach ($invoices as $invoice):
+            $class = null;
+            if ($i++ % 2 == 0) {
+                $class = ' class="altrow"';
+            }
+            ?>
+        <tr<?php echo $class;?>>
+
+            
+            <td>
+                    <?php echo date('j M Y',$time->toUnix($invoice['Invoice']['issue_date'])); ?>
+            </td>
+            <td>
+                    <?php echo date('j M Y',$time->toUnix($invoice['Invoice']['due_date'])); ?>
+            </td>
+            <td>
+                    <?php echo $invoice['Invoice']['title']; ?>
+            </td>
+            <td>
+                   <? echo $html->link($invoice['Customer']['name'], array('controller'=> 'customers', 'action'=>'view', $invoice['Customer']['id'])); ?>
+            </td>
+            <td>
+                    <?php
+                    if($invoice['Invoice']['paid'] == 0) {
+                        echo "UNPAID";
+                        echo "</td>";
+                        echo "<td>";
+                        echo "N/A";
+                        echo "</td>";
+                    }
+                    else {
+                        echo "PAID";
+                        echo "</td>";
+                         echo "<td>";
+                        echo date('j M Y',$time->toUnix($invoice['Invoice']['payment_received_date']));
+                        echo "</td>";
+                    }
+
+
+
+                    ?>
+
+            <td>
+                    <?php echo $html->link($invoice['User']['username'], array('controller' => 'users', 'action' => 'view', $invoice['User']['id'])); ?>
+            </td>
+            <td class="actions">
+                    <?php echo $html->link(__('View', true), array('controller'=>'invoices', 'action' => 'view', $invoice['Invoice']['id'])); ?>
+                    <?php echo $html->link(__('Edit', true), array('controller'=>'invoices','action' => 'edit', $invoice['Invoice']['id'])); ?>
+                 
+            </td>
+        </tr>
+        <?php endforeach; ?>
+
+    </table>
+</div>
+
+<div class="actions">
+    <ul>
+        <li><?php echo $html->link(__('New Invoice', true), array('controller'=>'invoices', 'action' => 'add/enquiryid:'.$enquiry['Enquiry']['id'])); ?></li>
+    </ul>
+</div>
+
 <div id="showemail">
 
 </div>
diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp
index 5dbecc59..4fda9b37 100755
--- a/views/layouts/default.ctp
+++ b/views/layouts/default.ctp
@@ -71,6 +71,12 @@
                             </ul>
                         </li>
 
+                        <li><?php echo $html->link('Invoices', '/invoices/index'); ?>
+                            <ul>
+                                <li class="last"><?php echo $html->link('Invoices Index', '/invoices/index'); ?></li>
+                            </ul>
+                        </li>
+
                         <li><?php echo $html->link('Products', '/products/index'); ?>
                             <ul>
                                 <li><?php echo $html->link('Product Index', '/products/index'); ?></li>