diff --git a/tests/enquirytests.rb b/tests/enquirytests.rb
index ee26340..25badb3 100644
--- a/tests/enquirytests.rb
+++ b/tests/enquirytests.rb
@@ -874,7 +874,7 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.text_field(:id,'P32_ACCESS_PASSWORD').set 'Test 25'
     @@ie.text_field(:id,'P32_ACCESS_ADDITIONAL').set 'no more info'
     @@ie.text_field(:id,'P32_MPRN').set '12345678910'
-    @@ie.text_field(:id,'P32_TRANSACTION_REFERENCE').set 'this is test 23'
+    @@ie.text_field(:id,'P32_TRANSACTION_REFERENCE').set 'this is test 25'
     @@ie.text_field(:id,'P32_INSTALL_SUB_BUILDING').set ADDRESSB[0]
     @@ie.text_field(:id,'P32_INSTALL_BUILDING').set ADDRESSB[1]
     @@ie.text_field(:id,'P32_INSTALL_STREET').set ADDRESSB[2]
@@ -907,6 +907,146 @@ class Test_02_enquiry < Test::Unit::TestCase
     assert(@@ie.contains_text('Upload File'),'Upload File region not found')
     assert(@@ie.link(:text,'Delete').exists?,'Could not find a Delete link')         
   end
+  
+  def test_26_upload_manual_quote
+   menu('Logout')
+    assert(@@ie.button(:value, 'Login').exists?,'The Login button was not available')        
+    @@ie.button(:value, 'Login').click        
+    @@ie.wait
+    login(MIPADMIN, MIPADMIN_PWD)
+    menu('Enquiries')
+    menu('Create Enquiry')
+    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear')
+    #check the regions appear
+    assert(@@ie.contains_text('Site Detail'),'Site Detail region not found')
+    assert(@@ie.contains_text('Site Address'),'The Site Address region not found')
+    assert(@@ie.contains_text('Contact Details'),'The Contact Details region not found')
+    assert(@@ie.contains_text('Job Info'),'The Job Info region not found') 
+    #check we've got the save and cancel buttons but not apply changes
+    assert(@@ie.button(:value, 'Save').exists?,'Could not find a Save button')
+    assert(@@ie.button(:value, 'Cancel').exists?,'Could not find a Cancel button')
+    assert_not_equal(@@ie.button(:value, 'Apply Changes').exists?,true,'Found Apply Changes button when it should have been hidden')
+    #make sure that the ID field is not accessable (a form object)
+    #assert_not_equal(@@ie.text_field(:name, 'P32_ID').exists?,true,'Found Apply Changes button when it should have been hidden')
+    @@ie.select_list(:id,'P32_MKTP_REF').set 'Northern Supplies'
+    @@ie.wait
+    @@ie.select_list(:id,'P32_AGENT_ID').set 'Fred Smith'
+    @@ie.wait
+    @@ie.select_list(:id,'P32_AGENT_COMT_CODE').set 'Fax'
+    @@ie.wait
+    @@ie.text_field(:id,'P32_AGENT_CONTACT_VALUE').set '1234567890'
+    @@ie.select_list(:id,'P32_ALTY_CODE').set 'Office' 
+    @@ie.select_list(:id,'P32_CACA_CODE').set 'Blind'
+    @@ie.select_list(:id,'P32_ASSET_LOCATION_NOTES').set 'Post'
+    @@ie.text_field(:id,'P32_ACCESS_PASSWORD').set 'Test 26'
+    @@ie.text_field(:id,'P32_ACCESS_ADDITIONAL').set 'no more info'
+    @@ie.text_field(:id,'P32_MPRN').set '12345678910'
+    @@ie.text_field(:id,'P32_TRANSACTION_REFERENCE').set 'this is test 26'
+    @@ie.text_field(:id,'P32_INSTALL_SUB_BUILDING').set ADDRESSB[0]
+    @@ie.text_field(:id,'P32_INSTALL_BUILDING').set ADDRESSB[1]
+    @@ie.text_field(:id,'P32_INSTALL_STREET').set ADDRESSB[2]
+    @@ie.text_field(:id,'P32_INSTALL_CITY').set ADDRESSB[3]
+    @@ie.text_field(:id,'P32_INSTALL_POSTCODE').set ADDRESSB[4]
+    @@ie.text_field(:id,'P32_FIRST_CONTACT_NAME').set 'Chaz Test26'
+    @@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_1').set '123456789'
+    @@ie.text_field(:id,'P32_FIRST_CONTACT_TELEPHONE_2').set '123456789'
+    @@ie.text_field(:id,'P32_FIRST_CONTACT_FAX').set '123456789'
+    @@ie.button(:value, 'Save').click
+    @@ie.wait
+    assert_nil(@@ie.contains_text('Error'),'Error found') 
+    assert(@@ie.button(:value, 'Apply Changes').exists?,'Could not find a Save button')         
+    assert(@@ie.button(:value, 'Upload File').exists?,'Could not find a Save button')         
+
+    assert_nil(@@ie.contains_text('Error'),'Error found')    
+    assert_equal(false,@@ie.button(:value, 'Save').exists?,'Found Save button when it should have been hidden')
+    assert(@@ie.button(:value, 'Apply Changes').exists?,'Could not find an Apply Changes button')    
+    assert(@@ie.button(:value, 'Cancel').exists?,'Could not find a Cancel button')  
+    assert(@@ie.button(:value, 'Upload File').exists?,'Could not find an Upload File button')
+    assert(@@ie.text_field(:id,'P32_ID').to_s,'No value in the ID field')
+    #
+    #We'll save the enquiry id so we can search for it later
+    #
+    @@savedenquiryid = @@ie.text_field(:id,'P32_ID').value    
+    #Job details
+    @@ie.select_list(:id,'P32_ENTY_CODE').set @@enquirytypes[7]
+    @@ie.wait
+    @@ie.select_list(:id,'P32_EXISTING_METER_OWNER').set 'Supplier'
+    @@ie.text_field(:id,'P32_EXISTING_METER_ASSET_PROVIDER').set 'Mam stuff goes here'
+    #@@ie.select_list(:id,'P32_INDICATIVE_TIME').set ''
+    @@ie.select_list(:id,'P32_REQUIRED_SVCP_CODE').set 'MP65'
+    @@ie.wait
+    @@ie.text_field(:id,'P32_ANNUAL_QUANTITY').set '1000'
+    @@ie.text_field(:id,'P32_REQUIRED_METERING_PRESSURE').set '65'
+    @@ie.select_list(:id,'P32_DOWNSTREAM_BOOSTER_OR_COMPRESS').set 'Yes'
+    @@ie.text_field(:id,'P32_INDICATIVE_DATE').set '17/07/2008'
+    @@ie.text_field(:id,'P32_OTHER_PROJECT_REFERENCE').set 'Test 23'
+    @@ie.select_list(:id,'P32_HOUSING_REQUIRED').set 'No'
+    @@ie.select_list(:id,'P32_BASE_REQUIRED').set 'No'
+    @@ie.select_list(:id,'P32_CONVERTOR_REQUIRED').set 'Yes'
+    #@@ie.select_list(:id,'P32_AMR_REQUIRED').set 'No'
+    @@ie.select_list(:id,'P32_EMS_REQUIRED').set 'No'
+    @@ie.select_list(:id,'P32_BYPASS_REQUIRED').set 'Not required'
+    @@ie.wait
+    @@ie.select_list(:id,'P32_LOAD_CONTROL_TYPE').set 'Constant'
+    @@ie.select_list(:id,'P32_TWIN_STREAM_REQUIRED').set 'No'
+    @@ie.text_field(:id,'P32_JOB_DESCRIPTION').set ''
+    @@ie.text_field(:id,'P32_QMAX').set '100'
+    @@ie.text_field(:id,'P32_QMIN').set ''
+    #@@ie.select_list(:id,'P32_EXISTING_METY_CODE').set ''
+    #@@ie.select_list(:id,'P32_EXISTING_MESC_CODE').set ''
+    #@@ie.text_field(:id,'P32_EXISTING_METER_SERIAL_NO').set ''
+    #@@ie.text_field(:id,'P32_EXISTING_METER_MODEL').set ''
+    #@@ie.select_list(:id,'P32_MARKET_SECTOR_CODE').set ''
+    @@ie.text_field(:id,'P32_OTHER_INFORMATION').set ''
+    #@@ie.text_field(:id,'P32_EXISTING_LOGGER').set ''
+    #@@ie.text_field(:id,'P32_EXISTING_CONVERTOR').set ''
+    @@ie.button(:value, 'Request Quotation').click    
+    @@ie.wait
+    assert_nil(@@ie.contains_text('Error'),'Error found')
+    menu('Enquiries')
+    menu('Search for Enquiry')
+    assert(@@ie.contains_text('Search Enquiries'),'Search Enquiries region not found')
+    assert(@@ie.contains_text('All Enquiries'),'All Enquiries region not found')
+        
+    assert(@@ie.button(:value, 'Search').exists?,'Could not find a Search button')
+    assert(@@ie.button(:value, 'New').exists?,'Could not find a New button')
+    
+    @@ie.text_field(:id,'P30_ENQUIRY_ID').set @@savedenquiryid 
+    @@ie.button(:value, 'Search').click
+    @@ie.wait
+    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found')
+    assert(@@ie.link(:name,'View_enquiry_'+@@savedenquiryid).exists?,'Could not find link to Enquiry '+@@savedenquiryid)
+    @@ie.link(:name,'View_enquiry_'+@@savedenquiryid).click
+    @@ie.wait
+    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear')
+    #check the regions appear
+    assert(@@ie.contains_text('Site Detail'),'Site Detail region not found')
+    assert(@@ie.contains_text('Site Address'),'The Site Address region not found')
+    assert(@@ie.contains_text('Contact Details'),'The Contact Details region not found')
+    assert(@@ie.contains_text('Job Info'),'The Job Info region not found') 
+    assert_equal(@@savedenquiryid,@@ie.text_field(:id,'P32_ID').value,' Enquiry screen for'+@@savedenquiryid+' not found')
+    assert(@@ie.hidden(:id,'P32_ACCESS_PASSWORD').exists?,'Password field is not read only, it should be!') 
+    #Start manual quote stuff 
+    assert(@@ie.button(:value, 'Manual Quote').exists?,'Could not find Manual Quote button')
+    @@ie.button(:value, 'Manual Quote').click
+    @@ie.wait
+    @@ie.file_field(:id, 'P41_FILE_UPLOAD').set(WORKINGDIR+'\\InstallMIP.cmd')
+    @@ie.button(:value, 'Upload').click    
+    @@ie.wait
+    assert_nil(@@ie.contains_text('Error'),'Error found')
+    menu('Enquiries')
+    menu('Search for Enquiry')
+    @@ie.text_field(:id,'P30_ENQUIRY_ID').set @@savedenquiryid 
+    @@ie.button(:value, 'Search').click
+    @@ie.wait
+    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found')
+    assert(@@ie.link(:name,'View_enquiry_'+@@savedenquiryid).exists?,'Could not find link to Enquiry '+@@savedenquiryid)
+    @@ie.link(:name,'View_quote_'+@@savedenquiryid).click
+    @@ie.wait
+    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found')
+    assert(@@ie.contains_text('Manual Quote'),'Manual Quote Region not found')
+    assert(@@ie.link(:text,'View PDF').exists?,'Could not find link to manual quote file')      
+  end
 #Check asterisk on correct fields
 #Amend an existing enquiry
 #Is dash doing this?Copy an existing enquiry to a new enquiry