From 8ef05e533f8d6f09820779d2e0374c2091700b72 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Fri, 23 Jan 2009 11:00:50 +1100
Subject: [PATCH] Small changes. about to rework the enquiry number generator
 so its cleaner

---
 controllers/enquiries_controller.php                | 7 ++++---
 tmp/cache/models/cake_model_default_acos            | 2 +-
 tmp/cache/models/cake_model_default_addresses       | 2 +-
 tmp/cache/models/cake_model_default_aros            | 2 +-
 tmp/cache/models/cake_model_default_aros_acos       | 2 +-
 tmp/cache/models/cake_model_default_contacts        | 2 +-
 tmp/cache/models/cake_model_default_countries       | 2 +-
 tmp/cache/models/cake_model_default_currencies      | 2 +-
 tmp/cache/models/cake_model_default_customers       | 2 +-
 tmp/cache/models/cake_model_default_enquiries       | 2 +-
 tmp/cache/models/cake_model_default_groups          | 2 +-
 tmp/cache/models/cake_model_default_principles      | 2 +-
 tmp/cache/models/cake_model_default_product_options | 2 +-
 tmp/cache/models/cake_model_default_products        | 2 +-
 tmp/cache/models/cake_model_default_quote_products  | 2 +-
 tmp/cache/models/cake_model_default_quotenik_list   | 2 +-
 tmp/cache/models/cake_model_default_quotes          | 2 +-
 tmp/cache/models/cake_model_default_states          | 2 +-
 tmp/cache/models/cake_model_default_statuses        | 2 +-
 tmp/cache/models/cake_model_default_users           | 2 +-
 tmp/cache/persistent/cake_core_core_paths           | 2 +-
 tmp/cache/persistent/cake_core_default_en_us        | 2 +-
 tmp/cache/persistent/cake_core_dir_map              | 2 +-
 tmp/cache/persistent/cake_core_file_map             | 4 ++--
 views/customers/add.ctp                             | 1 +
 views/customers/view.ctp                            | 4 ++--
 views/enquiries/edit.ctp                            | 3 ++-
 views/principles/edit.ctp                           | 1 +
 webroot/css/quotenik.css                            | 6 +++---
 29 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php
index bbf6fb3b..d99f762b 100755
--- a/controllers/enquiries_controller.php
+++ b/controllers/enquiries_controller.php
@@ -32,7 +32,7 @@ class EnquiriesController extends AppController {
 		
 		 
 		$states = $this->Enquiry->State->find('list');
-		$countries = $this->Enquiry->Country->find('list');
+		$countries = $this->Enquiry->Country->find('list', array('order'=> 'Country.name asc'));
 		$principles = $this->Enquiry->Principle->find('list', array('order' => 'Principle.name asc'));
 		$statuses = $this->Enquiry->Status->find('list');
 		$users = $this->Enquiry->User->find('list', array('fields' => array('User.id', 'User.username')));
@@ -240,6 +240,7 @@ class EnquiriesController extends AppController {
 		$enquiry = $this->Enquiry->read(null, $id);
 		$this->Email->to = $enquiry['Contact']['email'];
 		$this->Email->bcc = array('carpis@cmctechnologies.com.au');
+		
 		$this->Email->subject = $enquiry['Enquiry']['title'].' - Your Enquiry has been Entered in our System - CMC Technologies';
 		$this->Email->replyTo = $enquiry['User']['email'];
 		$this->Email->from = 'CMC Technologies - Sales <sales@cmctechnologies.com.au>';
@@ -284,7 +285,7 @@ class EnquiriesController extends AppController {
 		$country = $this->Enquiry->Country->findById($enquiry['Enquiry']['country_id']);
 		$principle = $this->Enquiry->Principle->findById($enquiry['Enquiry']['principle_id']);
 		$statuses = $this->Enquiry->Status->find('list');
-		
+		$principles = $this->Enquiry->Principle->find('list', array('conditions' => array('Principle.code' => $principle['Principle']['code'])));
 		$customerAddresses = $this->Enquiry->BillingAddress->find('all', array('conditions'=>array('BillingAddress.customer_id' => $customer['Customer']['id'])));
 			$this->set('billing_addresses', $customerAddresses);
 			$this->set('shipping_addresses', $customerAddresses);
@@ -305,7 +306,7 @@ class EnquiriesController extends AppController {
 			}
 		
 		
-		$this->set(compact('enquiry', 'users','customer','contacts','state','country','principle','statuses', 'addresses'));
+		$this->set(compact('enquiry', 'users','customer','contacts','state','country','principles','principle','statuses', 'addresses'));
 	}
 
 	function delete($id = null) {
diff --git a/tmp/cache/models/cake_model_default_acos b/tmp/cache/models/cake_model_default_acos
index e2b9eae1..354072c7 100644
--- a/tmp/cache/models/cake_model_default_acos
+++ b/tmp/cache/models/cake_model_default_acos
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:7:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:10;s:3:"key";s:7:"primary";}s:9:"parent_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:10;}s:5:"model";a:4:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:255;}s:11:"foreign_key";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:10;}s:5:"alias";a:4:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:255;}s:3:"lft";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:10;}s:4:"rght";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:10;}}
diff --git a/tmp/cache/models/cake_model_default_addresses b/tmp/cache/models/cake_model_default_addresses
index 5de506a3..97f18d29 100644
--- a/tmp/cache/models/cake_model_default_addresses
+++ b/tmp/cache/models/cake_model_default_addresses
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:8:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:7:"address";a:4:{s:4:"type";s:4:"text";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:4:"city";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:8:"state_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:10:"country_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:11:"customer_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:4:"type";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:8:"postcode";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:50;}}
diff --git a/tmp/cache/models/cake_model_default_aros b/tmp/cache/models/cake_model_default_aros
index e2b9eae1..354072c7 100644
--- a/tmp/cache/models/cake_model_default_aros
+++ b/tmp/cache/models/cake_model_default_aros
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:7:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:10;s:3:"key";s:7:"primary";}s:9:"parent_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:10;}s:5:"model";a:4:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:255;}s:11:"foreign_key";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:10;}s:5:"alias";a:4:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:255;}s:3:"lft";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:10;}s:4:"rght";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:10;}}
diff --git a/tmp/cache/models/cake_model_default_aros_acos b/tmp/cache/models/cake_model_default_aros_acos
index 953d00f4..b5f513ec 100644
--- a/tmp/cache/models/cake_model_default_aros_acos
+++ b/tmp/cache/models/cake_model_default_aros_acos
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:7:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:10;s:3:"key";s:7:"primary";}s:6:"aro_id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:10;s:3:"key";s:5:"index";}s:6:"aco_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:10;}s:7:"_create";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";s:1:"0";s:6:"length";i:2;}s:5:"_read";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";s:1:"0";s:6:"length";i:2;}s:7:"_update";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";s:1:"0";s:6:"length";i:2;}s:7:"_delete";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";s:1:"0";s:6:"length";i:2;}}
diff --git a/tmp/cache/models/cake_model_default_contacts b/tmp/cache/models/cake_model_default_contacts
index 83a2b5b3..0bf983f2 100644
--- a/tmp/cache/models/cake_model_default_contacts
+++ b/tmp/cache/models/cake_model_default_contacts
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:10:{s:11:"customer_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:4:"name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:10:"first_name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:9:"last_name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:5:"email";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:5:"phone";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:3:"fax";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:5:"notes";a:4:{s:4:"type";s:4:"text";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:6:"mobile";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}}
diff --git a/tmp/cache/models/cake_model_default_countries b/tmp/cache/models/cake_model_default_countries
index e986d693..a7442c6d 100644
--- a/tmp/cache/models/cake_model_default_countries
+++ b/tmp/cache/models/cake_model_default_countries
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:3:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:4:"name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:11:"currency_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}}
diff --git a/tmp/cache/models/cake_model_default_currencies b/tmp/cache/models/cake_model_default_currencies
index 29a7f067..766cbedd 100644
--- a/tmp/cache/models/cake_model_default_currencies
+++ b/tmp/cache/models/cake_model_default_currencies
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:4:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:4:"name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:6:"symbol";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:5;}s:7:"iso4217";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:3;}}
diff --git a/tmp/cache/models/cake_model_default_customers b/tmp/cache/models/cake_model_default_customers
index 3f972dd9..a5da9b56 100644
--- a/tmp/cache/models/cake_model_default_customers
+++ b/tmp/cache/models/cake_model_default_customers
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:4:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:4:"name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:3:"abn";a:4:{s:4:"type";s:6:"string";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:255;}s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}}
diff --git a/tmp/cache/models/cake_model_default_enquiries b/tmp/cache/models/cake_model_default_enquiries
index 12cc2d7b..8a0392c6 100644
--- a/tmp/cache/models/cake_model_default_enquiries
+++ b/tmp/cache/models/cake_model_default_enquiries
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:16:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:5:"title";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:7:"user_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:11:"customer_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:10:"contact_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:8:"state_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:10:"country_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:12:"principle_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:9:"status_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:8:"comments";a:4:{s:4:"type";s:4:"text";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:14:"principle_code";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:3;}s:3:"gst";a:4:{s:4:"type";s:7:"boolean";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:1;}s:18:"billing_address_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:11;}s:19:"shipping_address_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:1;s:7:"default";N;s:6:"length";i:11;}s:6:"posted";a:4:{s:4:"type";s:7:"boolean";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:1;}}
diff --git a/tmp/cache/models/cake_model_default_groups b/tmp/cache/models/cake_model_default_groups
index ba8751ce..dc0a81ff 100644
--- a/tmp/cache/models/cake_model_default_groups
+++ b/tmp/cache/models/cake_model_default_groups
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:2:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:4:"name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}}
diff --git a/tmp/cache/models/cake_model_default_principles b/tmp/cache/models/cake_model_default_principles
index b9ef0055..3d925dde 100644
--- a/tmp/cache/models/cake_model_default_principles
+++ b/tmp/cache/models/cake_model_default_principles
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:8:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:4:"name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:4:"code";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:7:"address";a:4:{s:4:"type";s:4:"text";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:4:"city";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:5:"state";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:10:"country_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:11:"currency_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}}
diff --git a/tmp/cache/models/cake_model_default_product_options b/tmp/cache/models/cake_model_default_product_options
index f87726ca..893f0082 100644
--- a/tmp/cache/models/cake_model_default_product_options
+++ b/tmp/cache/models/cake_model_default_product_options
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:5:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:10:"product_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:5:"title";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:11:"description";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:10:"cost_price";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}}
diff --git a/tmp/cache/models/cake_model_default_products b/tmp/cache/models/cake_model_default_products
index 79ce9021..5c7bb581 100644
--- a/tmp/cache/models/cake_model_default_products
+++ b/tmp/cache/models/cake_model_default_products
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:14:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:12:"principle_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:5:"title";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:11:"description";a:4:{s:4:"type";s:4:"text";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:21:"principle_part_number";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:15:"cmc_part_number";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:14:"costprice_each";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:12:"our_discount";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:12:"packing_each";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:20:"shipping_weight_each";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:18:"shipping_cost_each";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:4:"duty";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:9:"target_gp";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:14:"sellprice_each";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}}
diff --git a/tmp/cache/models/cake_model_default_quote_products b/tmp/cache/models/cake_model_default_quote_products
index a75b184f..66e4fe52 100644
--- a/tmp/cache/models/cake_model_default_quote_products
+++ b/tmp/cache/models/cake_model_default_quote_products
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:31:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:10:"itemnumber";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:3;}s:6:"option";a:4:{s:4:"type";s:7:"boolean";s:4:"null";b:0;s:7:"default";s:1:"0";s:6:"length";i:1;}s:8:"quantity";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:9:"costprice";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:11:"currency_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:3;}s:11:"ourdiscount";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:7:"packing";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:14:"shippingweight";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:12:"shippingcost";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:12:"exchangerate";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:4:"duty";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:7:"finance";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:4:"misc";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:14:"grosssellprice";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:14:"grossgpdollars";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:17:"grossgppercentage";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:12:"netgpdollars";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:12:"netgppercent";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:8:"targetgp";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:5:"title";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:500;}s:11:"description";a:4:{s:4:"type";s:4:"text";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:17:"total_landed_cost";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:20:"fob_countryof_export";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:8:"quote_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:10:"product_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:8:"discount";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:14:"discountamount";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:18:"grosssellpriceeach";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:16:"netsellpriceeach";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:12:"netsellprice";a:4:{s:4:"type";s:5:"float";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}}
diff --git a/tmp/cache/models/cake_model_default_quotenik_list b/tmp/cache/models/cake_model_default_quotenik_list
index f038a738..31c74f6e 100644
--- a/tmp/cache/models/cake_model_default_quotenik_list
+++ b/tmp/cache/models/cake_model_default_quotenik_list
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:23:{i:0;s:4:"acos";i:1;s:9:"addresses";i:2;s:4:"aros";i:3;s:9:"aros_acos";i:4;s:13:"cake_sessions";i:5;s:8:"contacts";i:6;s:9:"countries";i:7;s:10:"currencies";i:8;s:9:"customers";i:9;s:9:"enquiries";i:10;s:6:"groups";i:11;s:12:"job_products";i:12;s:4:"jobs";i:13;s:9:"jobstatus";i:14;s:18:"principle_contacts";i:15;s:10:"principles";i:16;s:15:"product_options";i:17;s:8:"products";i:18;s:14:"quote_products";i:19;s:6:"quotes";i:20;s:6:"states";i:21;s:8:"statuses";i:22;s:5:"users";}
diff --git a/tmp/cache/models/cake_model_default_quotes b/tmp/cache/models/cake_model_default_quotes
index df599b89..2da62b3d 100644
--- a/tmp/cache/models/cake_model_default_quotes
+++ b/tmp/cache/models/cake_model_default_quotes
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:11:{s:7:"created";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:8:"modified";a:4:{s:4:"type";s:8:"datetime";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:10:"enquiry_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:50;}s:8:"revision";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}s:10:"first_page";a:4:{s:4:"type";s:4:"text";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:11:"attachments";a:4:{s:4:"type";s:4:"text";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}s:13:"delivery_time";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:400;}s:13:"payment_terms";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:400;}s:10:"days_valid";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:5;}s:11:"date_issued";a:4:{s:4:"type";s:4:"date";s:4:"null";b:0;s:7:"default";N;s:6:"length";N;}}
diff --git a/tmp/cache/models/cake_model_default_states b/tmp/cache/models/cake_model_default_states
index 1ae46268..8e83c8fc 100644
--- a/tmp/cache/models/cake_model_default_states
+++ b/tmp/cache/models/cake_model_default_states
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:4:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:4:"name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:9:"shortform";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:7:"enqform";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:3;}}
diff --git a/tmp/cache/models/cake_model_default_statuses b/tmp/cache/models/cake_model_default_statuses
index ba8751ce..dc0a81ff 100644
--- a/tmp/cache/models/cake_model_default_statuses
+++ b/tmp/cache/models/cake_model_default_statuses
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:2:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:4:"name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}}
diff --git a/tmp/cache/models/cake_model_default_users b/tmp/cache/models/cake_model_default_users
index d33c5077..f7721c91 100644
--- a/tmp/cache/models/cake_model_default_users
+++ b/tmp/cache/models/cake_model_default_users
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:8:{s:2:"id";a:5:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;s:3:"key";s:7:"primary";}s:8:"username";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:50;}s:8:"password";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:60;}s:10:"first_name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:9:"last_name";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:5:"email";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:9:"job_title";a:4:{s:4:"type";s:6:"string";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:255;}s:8:"group_id";a:4:{s:4:"type";s:7:"integer";s:4:"null";b:0;s:7:"default";N;s:6:"length";i:11;}}
diff --git a/tmp/cache/persistent/cake_core_core_paths b/tmp/cache/persistent/cake_core_core_paths
index 16f40e53..b10bbd3d 100644
--- a/tmp/cache/persistent/cake_core_core_paths
+++ b/tmp/cache/persistent/cake_core_core_paths
@@ -1,2 +1,2 @@
-1232514123
+1232604095
 a:10:{s:4:"libs";a:1:{i:0;s:31:"/var/www/quotenik1.2/cake/libs/";}s:5:"model";a:1:{i:0;s:37:"/var/www/quotenik1.2/cake/libs/model/";}s:8:"behavior";a:1:{i:0;s:47:"/var/www/quotenik1.2/cake/libs/model/behaviors/";}s:10:"controller";a:1:{i:0;s:42:"/var/www/quotenik1.2/cake/libs/controller/";}s:9:"component";a:1:{i:0;s:53:"/var/www/quotenik1.2/cake/libs/controller/components/";}s:4:"view";a:1:{i:0;s:36:"/var/www/quotenik1.2/cake/libs/view/";}s:6:"helper";a:1:{i:0;s:44:"/var/www/quotenik1.2/cake/libs/view/helpers/";}s:4:"cake";a:1:{i:0;s:26:"/var/www/quotenik1.2/cake/";}s:6:"vendor";a:1:{i:0;s:29:"/var/www/quotenik1.2/vendors/";}s:5:"shell";a:1:{i:0;s:39:"/var/www/quotenik1.2/cake/console/libs/";}}
diff --git a/tmp/cache/persistent/cake_core_default_en_us b/tmp/cache/persistent/cake_core_default_en_us
index f7ea27a4..cdf0d23c 100644
--- a/tmp/cache/persistent/cake_core_default_en_us
+++ b/tmp/cache/persistent/cake_core_default_en_us
@@ -1,2 +1,2 @@
-1232514124
+1232604095
 a:1:{s:11:"LC_MESSAGES";a:2:{s:0:"";a:1:{s:7:"default";a:0:{}}s:5:"en-us";a:1:{s:7:"default";a:0:{}}}}
diff --git a/tmp/cache/persistent/cake_core_dir_map b/tmp/cache/persistent/cake_core_dir_map
index 882ca0f7..ff91496d 100644
--- a/tmp/cache/persistent/cake_core_dir_map
+++ b/tmp/cache/persistent/cake_core_dir_map
@@ -1,2 +1,2 @@
-1232514124
+1232604095
 a:12:{s:30:"/var/www/quotenik1.2/cake/libs";a:24:{i:0;s:30:"/var/www/quotenik1.2/cake/libs";i:1;s:41:"/var/www/quotenik1.2/cake/libs/controller";i:2;s:52:"/var/www/quotenik1.2/cake/libs/controller/components";i:3;s:36:"/var/www/quotenik1.2/cake/libs/cache";i:4;s:36:"/var/www/quotenik1.2/cake/libs/model";i:5;s:46:"/var/www/quotenik1.2/cake/libs/model/behaviors";i:6;s:48:"/var/www/quotenik1.2/cake/libs/model/datasources";i:7;s:52:"/var/www/quotenik1.2/cake/libs/model/datasources/dbo";i:8;s:35:"/var/www/quotenik1.2/cake/libs/view";i:9;s:42:"/var/www/quotenik1.2/cake/libs/view/errors";i:10;s:41:"/var/www/quotenik1.2/cake/libs/view/pages";i:11;s:44:"/var/www/quotenik1.2/cake/libs/view/elements";i:12;s:50:"/var/www/quotenik1.2/cake/libs/view/elements/email";i:13;s:55:"/var/www/quotenik1.2/cake/libs/view/elements/email/text";i:14;s:55:"/var/www/quotenik1.2/cake/libs/view/elements/email/html";i:15;s:43:"/var/www/quotenik1.2/cake/libs/view/layouts";i:16;s:47:"/var/www/quotenik1.2/cake/libs/view/layouts/xml";i:17;s:46:"/var/www/quotenik1.2/cake/libs/view/layouts/js";i:18;s:49:"/var/www/quotenik1.2/cake/libs/view/layouts/email";i:19;s:54:"/var/www/quotenik1.2/cake/libs/view/layouts/email/text";i:20;s:54:"/var/www/quotenik1.2/cake/libs/view/layouts/email/html";i:21;s:47:"/var/www/quotenik1.2/cake/libs/view/layouts/rss";i:22;s:45:"/var/www/quotenik1.2/cake/libs/view/scaffolds";i:23;s:43:"/var/www/quotenik1.2/cake/libs/view/helpers";}s:36:"/var/www/quotenik1.2/cake/libs/model";a:4:{i:0;s:36:"/var/www/quotenik1.2/cake/libs/model";i:1;s:46:"/var/www/quotenik1.2/cake/libs/model/behaviors";i:2;s:48:"/var/www/quotenik1.2/cake/libs/model/datasources";i:3;s:52:"/var/www/quotenik1.2/cake/libs/model/datasources/dbo";}s:46:"/var/www/quotenik1.2/cake/libs/model/behaviors";a:1:{i:0;s:46:"/var/www/quotenik1.2/cake/libs/model/behaviors";}s:41:"/var/www/quotenik1.2/cake/libs/controller";a:2:{i:0;s:41:"/var/www/quotenik1.2/cake/libs/controller";i:1;s:52:"/var/www/quotenik1.2/cake/libs/controller/components";}s:52:"/var/www/quotenik1.2/cake/libs/controller/components";a:1:{i:0;s:52:"/var/www/quotenik1.2/cake/libs/controller/components";}s:35:"/var/www/quotenik1.2/cake/libs/view";a:16:{i:0;s:35:"/var/www/quotenik1.2/cake/libs/view";i:1;s:42:"/var/www/quotenik1.2/cake/libs/view/errors";i:2;s:41:"/var/www/quotenik1.2/cake/libs/view/pages";i:3;s:44:"/var/www/quotenik1.2/cake/libs/view/elements";i:4;s:50:"/var/www/quotenik1.2/cake/libs/view/elements/email";i:5;s:55:"/var/www/quotenik1.2/cake/libs/view/elements/email/text";i:6;s:55:"/var/www/quotenik1.2/cake/libs/view/elements/email/html";i:7;s:43:"/var/www/quotenik1.2/cake/libs/view/layouts";i:8;s:47:"/var/www/quotenik1.2/cake/libs/view/layouts/xml";i:9;s:46:"/var/www/quotenik1.2/cake/libs/view/layouts/js";i:10;s:49:"/var/www/quotenik1.2/cake/libs/view/layouts/email";i:11;s:54:"/var/www/quotenik1.2/cake/libs/view/layouts/email/text";i:12;s:54:"/var/www/quotenik1.2/cake/libs/view/layouts/email/html";i:13;s:47:"/var/www/quotenik1.2/cake/libs/view/layouts/rss";i:14;s:45:"/var/www/quotenik1.2/cake/libs/view/scaffolds";i:15;s:43:"/var/www/quotenik1.2/cake/libs/view/helpers";}s:43:"/var/www/quotenik1.2/cake/libs/view/helpers";a:1:{i:0;s:43:"/var/www/quotenik1.2/cake/libs/view/helpers";}s:36:"/var/www/quotenik1.2/app/controllers";a:2:{i:0;s:36:"/var/www/quotenik1.2/app/controllers";i:1;s:47:"/var/www/quotenik1.2/app/controllers/components";}s:47:"/var/www/quotenik1.2/app/controllers/components";a:1:{i:0;s:47:"/var/www/quotenik1.2/app/controllers/components";}s:31:"/var/www/quotenik1.2/app/models";a:3:{i:0;s:31:"/var/www/quotenik1.2/app/models";i:1;s:41:"/var/www/quotenik1.2/app/models/behaviors";i:2;s:43:"/var/www/quotenik1.2/app/models/datasources";}s:41:"/var/www/quotenik1.2/app/models/behaviors";a:1:{i:0;s:41:"/var/www/quotenik1.2/app/models/behaviors";}s:38:"/var/www/quotenik1.2/app/views/helpers";a:1:{i:0;s:38:"/var/www/quotenik1.2/app/views/helpers";}}
diff --git a/tmp/cache/persistent/cake_core_file_map b/tmp/cache/persistent/cake_core_file_map
index 8bb4e32e..ed6f8267 100644
--- a/tmp/cache/persistent/cake_core_file_map
+++ b/tmp/cache/persistent/cake_core_file_map
@@ -1,2 +1,2 @@
-1232514124
-a:6:{s:4:"Core";a:17:{s:6:"Router";s:41:"/var/www/quotenik1.2/cake/libs/router.php";s:9:"Component";s:55:"/var/www/quotenik1.2/cake/libs/controller/component.php";s:12:"Overloadable";s:47:"/var/www/quotenik1.2/cake/libs/overloadable.php";s:6:"Helper";s:46:"/var/www/quotenik1.2/cake/libs/view/helper.php";s:13:"ClassRegistry";s:49:"/var/www/quotenik1.2/cake/libs/class_registry.php";s:4:"View";s:44:"/var/www/quotenik1.2/cake/libs/view/view.php";s:10:"Controller";s:56:"/var/www/quotenik1.2/cake/libs/controller/controller.php";s:10:"Dispatcher";s:40:"/var/www/quotenik1.2/cake/dispatcher.php";s:8:"Sanitize";s:43:"/var/www/quotenik1.2/cake/libs/sanitize.php";s:17:"ConnectionManager";s:59:"/var/www/quotenik1.2/cake/libs/model/connection_manager.php";s:9:"Multibyte";s:44:"/var/www/quotenik1.2/cake/libs/multibyte.php";s:10:"Validation";s:45:"/var/www/quotenik1.2/cake/libs/validation.php";s:8:"Behavior";s:49:"/var/www/quotenik1.2/cake/libs/model/behavior.php";s:6:"String";s:41:"/var/www/quotenik1.2/cake/libs/string.php";s:5:"Model";s:46:"/var/www/quotenik1.2/cake/libs/model/model.php";s:4:"l10n";s:39:"/var/www/quotenik1.2/cake/libs/l10n.php";s:4:"i18n";s:39:"/var/www/quotenik1.2/cake/libs/i18n.php";}s:10:"Controller";a:2:{s:13:"AppController";s:60:"/var/www/quotenik1.2/cake/libs/controller/app_controller.php";s:19:"EnquiriesController";s:61:"/var/www/quotenik1.2/app/controllers/enquiries_controller.php";}s:9:"Component";a:4:{s:16:"SessionComponent";s:64:"/var/www/quotenik1.2/cake/libs/controller/components/session.php";s:14:"EmailComponent";s:62:"/var/www/quotenik1.2/cake/libs/controller/components/email.php";s:13:"AuthComponent";s:61:"/var/www/quotenik1.2/cake/libs/controller/components/auth.php";s:23:"RequestHandlerComponent";s:72:"/var/www/quotenik1.2/cake/libs/controller/components/request_handler.php";}s:5:"Model";a:16:{s:8:"AppModel";s:50:"/var/www/quotenik1.2/cake/libs/model/app_model.php";s:7:"Enquiry";s:43:"/var/www/quotenik1.2/app/models/enquiry.php";s:4:"User";s:40:"/var/www/quotenik1.2/app/models/user.php";s:5:"Group";s:41:"/var/www/quotenik1.2/app/models/group.php";s:8:"Customer";s:44:"/var/www/quotenik1.2/app/models/customer.php";s:7:"Address";s:43:"/var/www/quotenik1.2/app/models/address.php";s:5:"State";s:41:"/var/www/quotenik1.2/app/models/state.php";s:7:"Country";s:43:"/var/www/quotenik1.2/app/models/country.php";s:8:"Currency";s:44:"/var/www/quotenik1.2/app/models/currency.php";s:9:"Principle";s:45:"/var/www/quotenik1.2/app/models/principle.php";s:7:"Product";s:43:"/var/www/quotenik1.2/app/models/product.php";s:13:"ProductOption";s:50:"/var/www/quotenik1.2/app/models/product_option.php";s:12:"QuoteProduct";s:49:"/var/www/quotenik1.2/app/models/quote_product.php";s:5:"Quote";s:41:"/var/www/quotenik1.2/app/models/quote.php";s:7:"Contact";s:43:"/var/www/quotenik1.2/app/models/contact.php";s:6:"Status";s:42:"/var/www/quotenik1.2/app/models/status.php";}s:8:"Behavior";a:2:{s:11:"AclBehavior";s:54:"/var/www/quotenik1.2/cake/libs/model/behaviors/acl.php";s:12:"TreeBehavior";s:55:"/var/www/quotenik1.2/cake/libs/model/behaviors/tree.php";}s:6:"Helper";a:8:{s:9:"AppHelper";s:58:"/var/www/quotenik1.2/cake/libs/view/helpers/app_helper.php";s:10:"HtmlHelper";s:52:"/var/www/quotenik1.2/cake/libs/view/helpers/html.php";s:10:"FormHelper";s:52:"/var/www/quotenik1.2/cake/libs/view/helpers/form.php";s:16:"JavascriptHelper";s:58:"/var/www/quotenik1.2/cake/libs/view/helpers/javascript.php";s:10:"TimeHelper";s:52:"/var/www/quotenik1.2/cake/libs/view/helpers/time.php";s:10:"AjaxHelper";s:52:"/var/www/quotenik1.2/cake/libs/view/helpers/ajax.php";s:15:"PaginatorHelper";s:57:"/var/www/quotenik1.2/cake/libs/view/helpers/paginator.php";s:13:"SessionHelper";s:55:"/var/www/quotenik1.2/cake/libs/view/helpers/session.php";}}
+1232604095
+a:6:{s:4:"Core";a:15:{s:6:"Router";s:41:"/var/www/quotenik1.2/cake/libs/router.php";s:9:"Component";s:55:"/var/www/quotenik1.2/cake/libs/controller/component.php";s:12:"Overloadable";s:47:"/var/www/quotenik1.2/cake/libs/overloadable.php";s:6:"Helper";s:46:"/var/www/quotenik1.2/cake/libs/view/helper.php";s:13:"ClassRegistry";s:49:"/var/www/quotenik1.2/cake/libs/class_registry.php";s:4:"View";s:44:"/var/www/quotenik1.2/cake/libs/view/view.php";s:10:"Controller";s:56:"/var/www/quotenik1.2/cake/libs/controller/controller.php";s:10:"Dispatcher";s:40:"/var/www/quotenik1.2/cake/dispatcher.php";s:17:"ConnectionManager";s:59:"/var/www/quotenik1.2/cake/libs/model/connection_manager.php";s:10:"Validation";s:45:"/var/www/quotenik1.2/cake/libs/validation.php";s:8:"Behavior";s:49:"/var/www/quotenik1.2/cake/libs/model/behavior.php";s:6:"String";s:41:"/var/www/quotenik1.2/cake/libs/string.php";s:5:"Model";s:46:"/var/www/quotenik1.2/cake/libs/model/model.php";s:4:"l10n";s:39:"/var/www/quotenik1.2/cake/libs/l10n.php";s:4:"i18n";s:39:"/var/www/quotenik1.2/cake/libs/i18n.php";}s:10:"Controller";a:2:{s:13:"AppController";s:60:"/var/www/quotenik1.2/cake/libs/controller/app_controller.php";s:19:"CustomersController";s:61:"/var/www/quotenik1.2/app/controllers/customers_controller.php";}s:9:"Component";a:3:{s:16:"SessionComponent";s:64:"/var/www/quotenik1.2/cake/libs/controller/components/session.php";s:13:"AuthComponent";s:61:"/var/www/quotenik1.2/cake/libs/controller/components/auth.php";s:23:"RequestHandlerComponent";s:72:"/var/www/quotenik1.2/cake/libs/controller/components/request_handler.php";}s:5:"Model";a:16:{s:8:"AppModel";s:50:"/var/www/quotenik1.2/cake/libs/model/app_model.php";s:8:"Customer";s:44:"/var/www/quotenik1.2/app/models/customer.php";s:7:"Address";s:43:"/var/www/quotenik1.2/app/models/address.php";s:5:"State";s:41:"/var/www/quotenik1.2/app/models/state.php";s:7:"Enquiry";s:43:"/var/www/quotenik1.2/app/models/enquiry.php";s:4:"User";s:40:"/var/www/quotenik1.2/app/models/user.php";s:5:"Group";s:41:"/var/www/quotenik1.2/app/models/group.php";s:7:"Contact";s:43:"/var/www/quotenik1.2/app/models/contact.php";s:7:"Country";s:43:"/var/www/quotenik1.2/app/models/country.php";s:8:"Currency";s:44:"/var/www/quotenik1.2/app/models/currency.php";s:9:"Principle";s:45:"/var/www/quotenik1.2/app/models/principle.php";s:7:"Product";s:43:"/var/www/quotenik1.2/app/models/product.php";s:13:"ProductOption";s:50:"/var/www/quotenik1.2/app/models/product_option.php";s:12:"QuoteProduct";s:49:"/var/www/quotenik1.2/app/models/quote_product.php";s:5:"Quote";s:41:"/var/www/quotenik1.2/app/models/quote.php";s:6:"Status";s:42:"/var/www/quotenik1.2/app/models/status.php";}s:8:"Behavior";a:2:{s:11:"AclBehavior";s:54:"/var/www/quotenik1.2/cake/libs/model/behaviors/acl.php";s:12:"TreeBehavior";s:55:"/var/www/quotenik1.2/cake/libs/model/behaviors/tree.php";}s:6:"Helper";a:8:{s:9:"AppHelper";s:58:"/var/www/quotenik1.2/cake/libs/view/helpers/app_helper.php";s:10:"HtmlHelper";s:52:"/var/www/quotenik1.2/cake/libs/view/helpers/html.php";s:10:"FormHelper";s:52:"/var/www/quotenik1.2/cake/libs/view/helpers/form.php";s:10:"TimeHelper";s:52:"/var/www/quotenik1.2/cake/libs/view/helpers/time.php";s:16:"JavascriptHelper";s:58:"/var/www/quotenik1.2/cake/libs/view/helpers/javascript.php";s:15:"PaginatorHelper";s:57:"/var/www/quotenik1.2/cake/libs/view/helpers/paginator.php";s:10:"AjaxHelper";s:52:"/var/www/quotenik1.2/cake/libs/view/helpers/ajax.php";s:13:"SessionHelper";s:55:"/var/www/quotenik1.2/cake/libs/view/helpers/session.php";}}
diff --git a/views/customers/add.ctp b/views/customers/add.ctp
index 55e599bf..f7dcf50c 100755
--- a/views/customers/add.ctp
+++ b/views/customers/add.ctp
@@ -6,6 +6,7 @@
 		echo $form->input('name', array('label'=>'Company Name', 'title' => 'The Company Name. Eg. XYZ Business Pty Ltd'));
 		echo $form->input('abn', array('label'=>'ABN', 'title' => 'The 11-digit Australian Business Number for the new Customer. Enter numbers only, no dashes or punctuation'));
 		echo '<br><span>You will be able to add Contacts and Addresses to this Customer after it has been created</span>';
+		echo "<br><br><span>Please <b>make sure</b> that the Customer you are adding doesn't already exist on the ".$html->link('Customers Index', array('action' => 'index'))."</span>";
 		/*
 		echo '<br><span>Add a Contact to this new Customer</span>';
 		echo $form->input('Contact.0.first_name');
diff --git a/views/customers/view.ctp b/views/customers/view.ctp
index 89bd8cef..351a9623 100755
--- a/views/customers/view.ctp
+++ b/views/customers/view.ctp
@@ -68,7 +68,7 @@
 
 
 <div class="related">
-	<h3><?php __('Addresses');?></h3>
+	<h3><?php __('Addresses');?><?php echo $html->image('x-office-address-book.png'); ?></h3>
 	<?php if (!empty($customer['Address'])) {
 		echo $this->element('address_table', $addresses);
 	}
@@ -78,7 +78,7 @@
 	?>
 <div class="actions">
 		<ul>
-			<li><?php echo $html->link(__('New Address for this Customer', true), array('controller'=> 'addresses', 'action'=>'add/customerid:'.$customer['Customer']['id']));?> </li>
+			<li><?php echo $html->link(__('New Address for this Customer', true), array('controller'=> 'addresses', 'action'=>'add/customerid:'.$customer['Customer']['id']));?><?php echo $html->link($html->image('address-book-new.png'), array('controller'=> 'addresses', 'action'=>'add/customerid:'.$customer['Customer']['id']), null, null, false); ?> </li>
 		</ul>
 	</div>
 </div>
diff --git a/views/enquiries/edit.ctp b/views/enquiries/edit.ctp
index fcf5a11f..64faedf6 100755
--- a/views/enquiries/edit.ctp
+++ b/views/enquiries/edit.ctp
@@ -5,7 +5,8 @@
 	<?php
 		echo $form->input('id');
 		echo $form->input('user_id', array('label'=>'Assigned to User'));
-		echo $form->input('Principle.name', array('label'=>'Principle','readonly'=>'readonly', 'value'=>$principle['Principle']['name']));
+		echo $form->input('principle_id');
+		//echo $form->input('Principle.name', array('label'=>'Principle','readonly'=>'readonly', 'value'=>$principle['Principle']['name']));
 		echo $form->input('Customer.name', array('label'=>'Customer','readonly'=>'readonly', 'value'=>$customer['Customer']['name']));
 		echo $form->input('contact_id');
 		echo $form->input('State.name', array('label'=>'State','readonly'=>'readonly', 'value'=>$state['State']['name']));
diff --git a/views/principles/edit.ctp b/views/principles/edit.ctp
index 5a405db3..43b4c732 100755
--- a/views/principles/edit.ctp
+++ b/views/principles/edit.ctp
@@ -9,6 +9,7 @@
 		echo $form->input('address');
 		echo $form->input('city');
 		echo $form->input('state');
+		echo $form->input('postcode');
 		echo $form->input('country_id');
 		echo $form->input('currency_id');
 	?>
diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css
index 4339629b..c9bd47a6 100755
--- a/webroot/css/quotenik.css
+++ b/webroot/css/quotenik.css
@@ -306,18 +306,18 @@ table.mer tr.joblost td {
 	background: #FFC0CB;
 }
 table.mer tr.jobwon td {
-	background: #FFEC35;
+	background: #55E055;
 }
 table.mer tr.information td {
 	background: #ADD8E6;
 }
 
 table.mer tr.quoted td {
-	background: #00FF00;
+	background: #FFEC35;
 }
 
 table.mer tr td.posted {
-	background: #00FF00;
+	background: #55E055;
 }
 table.mer tr td.notposted {
 	background: #FFFFFF;