diff --git a/Screens/f155.sql b/Screens/f155.sql
index bdd3178..aea551f 100644
--- a/Screens/f155.sql
+++ b/Screens/f155.sql
@@ -25,10 +25,10 @@ prompt  APPLICATION 155 - webmip
  
 -- Application Statistics:
 --   Pages:                52
---     Items:             360
+--     Items:             359
 --     Computations:        5
 --     Validations:       285
---     Processes:         121
+--     Processes:         122
 --     Regions:            77
 --     Buttons:           114
 --   Shared Components
@@ -144,7 +144,7 @@ wwv_flow_api.create_flow(
   p_default_region_template=> 28038130488354430 + wwv_flow_api.g_id_offset,
   p_error_template    => 42209241448421762 + wwv_flow_api.g_id_offset,
   p_page_protection_enabled_y_n=> 'N',
-  p_checksum_salt_last_reset => '20080417175713',
+  p_checksum_salt_last_reset => '20080411162223',
   p_home_link         => 'f?p=&APP_ID.:101',
   p_flow_language     => 'en-gb',
   p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE',
@@ -193,7 +193,7 @@ wwv_flow_api.create_flow(
   p_substitution_string_04 => 'HELP_URL',
   p_substitution_value_04  => 'http://www.nationalgrid.com/corporate/legal/help.htm',
   p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss=> '20080417175713',
+  p_last_upd_yyyymmddhh24miss=> '20080411162223',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -365,10 +365,10 @@ p:=p||'BEGIN'||chr(10)||
 '           AND LOV_NULL_VALUE   IS NULL'||chr(10)||
 '      )'||chr(10)||
 '    LOOP'||chr(10)||
-'        IF V(rItem.ITEM_NAME) = ''%null'' || ''%'''||chr(10)||
-'    ';
+'        IF V(rItem.ITEM_NAME) = ''%null'' ';
 
-p:=p||'    THEN'||chr(10)||
+p:=p||'|| ''%'''||chr(10)||
+'        THEN'||chr(10)||
 '            Apex_Util.set_session_state(rItem.ITEM_NAME, NULL);'||chr(10)||
 '        END IF;'||chr(10)||
 '    END LOOP;'||chr(10)||
@@ -2467,7 +2467,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Quote Reference Number',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
@@ -2490,7 +2489,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Supplier Name',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
@@ -2513,7 +2511,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Agent Name',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
@@ -2536,7 +2533,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Date submitted for quotation',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
@@ -2723,7 +2719,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'no data found',
   p_query_num_rows_type=> 'ROW_RANGES_IN_SELECT_LIST',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'N',
   p_sort_null=> 'F',
@@ -3466,7 +3461,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Quote Reference Number',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
@@ -3489,7 +3483,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Supplier Name',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
@@ -3512,7 +3505,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Agent Name',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
@@ -3535,7 +3527,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Date quote accepted',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
@@ -4381,7 +4372,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'no data found',
   p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'Y',
   p_csv_output_link_text=> 'Export to spreadsheet',
@@ -4408,7 +4398,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Base Code',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'N',
   p_sum_column=> 'N',
@@ -4432,7 +4421,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Drawing',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4456,7 +4444,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Description',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4480,7 +4467,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Dimension A',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4504,7 +4490,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 5,
   p_column_heading=> 'Dimension B',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4528,7 +4513,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 6,
   p_column_heading=> 'Dimension C',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4552,7 +4536,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 7,
   p_column_heading=> 'Dimension D',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4576,7 +4559,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 8,
   p_column_heading=> 'Dimension E',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4600,7 +4582,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 9,
   p_column_heading=> 'Dimension F',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4624,7 +4605,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 10,
   p_column_heading=> 'Dimension G',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4648,7 +4628,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 11,
   p_column_heading=> 'Dimension H',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4672,7 +4651,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 12,
   p_column_heading=> 'Dimension I',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4696,7 +4674,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 13,
   p_column_heading=> 'Depth',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4720,7 +4697,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 14,
   p_column_heading=> 'Material Cost (Selling Price)',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -4803,7 +4779,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'no data found',
   p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'Y',
   p_csv_output_link_text=> 'Export to spreadsheet',
@@ -5405,9 +5380,9 @@ s:=s||'SELECT qute.id AS "Quote Reference Number"'||chr(10)||
 'FROM (SELECT DISTINCT vlare.*'||chr(10)||
 '      FROM quotes qute, v_latest_rt_code_for_enro vlare'||chr(10)||
 '      WHERE vlare.enqu_id = qute.enqu_id'||chr(10)||
-'      AND vlare.rt_code = ''';
+'      AND vlare.rt_';
 
-s:=s||'ENQ SUPP'''||chr(10)||
+s:=s||'code = ''ENQ SUPP'''||chr(10)||
 '      ) supplier'||chr(10)||
 '    ,quotes qute'||chr(10)||
 '    ,quote_roles quro'||chr(10)||
@@ -5420,19 +5395,19 @@ s:=s||'ENQ SUPP'''||chr(10)||
 '    ,documents docs'||chr(10)||
 '    ,wwv_flow_files v_files'||chr(10)||
 '       '||chr(10)||
-'WHERE qute.id = quro.qute_id'||chr(10)||
-'AND';
+'WHERE qute.';
 
-s:=s||' supplier.prty_id = prty_supplier.id'||chr(10)||
+s:=s||'id = quro.qute_id'||chr(10)||
+'AND supplier.prty_id = prty_supplier.id'||chr(10)||
 'AND supplier.enqu_id = qute.enqu_id'||chr(10)||
 'AND quro.prty_id = prty_agent.id'||chr(10)||
 'AND qute.id = quote_status.qute_id'||chr(10)||
 'AND qute.qute_type = decode(:P14_QUTE_TYPE,''%'', qute.qute_type, :P14_QUTE_TYPE)'||chr(10)||
 'AND quro.rt_code = (decode(quote_status.qust_code, ''ACCEPTED'', ''Q ACC'','||chr(10)||
 '                                                   ''INP'', ''Q RFQ'','||chr(10)||
-'                                        ';
+'           ';
 
-s:=s||'           ''REJECTED'', ''Q REJ'','||chr(10)||
+s:=s||'                                        ''REJECTED'', ''Q REJ'','||chr(10)||
 '                                                   ''SELECTED'', ''Q SEL'','||chr(10)||
 '                                                   ''Q OWN''))'||chr(10)||
 'AND quote_status.qust_code <> ''LAPSED'''||chr(10)||
@@ -5622,10 +5597,10 @@ s:=s||'SELECT DISTINCT qute.id "Quote Reference Number"'||chr(10)||
 '               ,v_files.id as View_PDF '||chr(10)||
 'FROM (SELECT DISTINCT vlare.*'||chr(10)||
 '      FROM quote_roles quro, quotes qute, v_latest_rt_code_for_enro vlare'||chr(10)||
-'      WHERE quro.qute_id = qute.id'||chr(10)||
-'';
+'      WHERE quro.qute_id = q';
 
-s:=s||'      AND vlare.enqu_id = qute.enqu_id'||chr(10)||
+s:=s||'ute.id'||chr(10)||
+'      AND vlare.enqu_id = qute.enqu_id'||chr(10)||
 '      AND quro.rt_code = ''Q OWN'''||chr(10)||
 '      AND vlare.rt_code = ''ENQ SUPP'''||chr(10)||
 '      AND quro.prty_id = mip_parties.get_user_id(:APP_USER)'||chr(10)||
@@ -5636,10 +5611,10 @@ s:=s||'      AND vlare.enqu_id = qute.enqu_id'||chr(10)||
 '      ,v_current_quote_status vcqs'||chr(10)||
 '      ,parties prty_supplier'||chr(10)||
 '      ,parties prty_agent'||chr(10)||
-'      ,document_roles docro'||chr(10)||
-'      ,documen';
+'      ,document_roles d';
 
-s:=s||'ts docs'||chr(10)||
+s:=s||'ocro'||chr(10)||
+'      ,documents docs'||chr(10)||
 '      ,wwv_flow_files v_files'||chr(10)||
 'WHERE quro.qute_id = qute.id'||chr(10)||
 'AND vlare.enqu_id = qute.enqu_id'||chr(10)||
@@ -5649,10 +5624,10 @@ s:=s||'ts docs'||chr(10)||
 'AND supplier.prty_id = prty_supplier.id'||chr(10)||
 'AND quro.prty_id = prty_agent.id'||chr(10)||
 'AND quro.rt_code = ''Q OWN'''||chr(10)||
-'AND qute.qute_type = decode(:P14_QUTE_TYPE,''%'', qute.qute_type, :P14_QUTE_TYPE)'||chr(10)||
-'AND vcqs.qust_code =';
+'AND qute.qute_type = decode(:P14_QUTE_TYPE,''%'', qute.qute_type, :P14_Q';
 
-s:=s||' decode(:P14_QUTE_STATUS, ''%'', vcqs.qust_code, :P14_QUTE_STATUS)'||chr(10)||
+s:=s||'UTE_TYPE)'||chr(10)||
+'AND vcqs.qust_code = decode(:P14_QUTE_STATUS, ''%'', vcqs.qust_code, :P14_QUTE_STATUS)'||chr(10)||
 'AND vcqs.qust_code <> ''LAPSED'''||chr(10)||
 '   and vcqs.qust_code <> ''SELREJ'''||chr(10)||
 '   and docro.qute_id = qute.id'||chr(10)||
@@ -5712,7 +5687,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Quote Reference Number',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -5736,7 +5710,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Supplier',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -5760,7 +5733,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Agent',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -6106,10 +6078,10 @@ s:=s||'select "ID", '||chr(10)||
 '"VALID_FROM",-- all'||chr(10)||
 '"VALID_TO",-- all'||chr(10)||
 '"COST_TYPE"-- all'||chr(10)||
-'from "#OWNER#"."COSTS" '||chr(10)||
-'where ';
+'from "#OW';
 
-s:=s||'"#OWNER#"."COSTS"."COST_TYPE" = nvl(:P18_REQUIRED_COST_TYPE,''LACO'')'||chr(10)||
+s:=s||'NER#"."COSTS" '||chr(10)||
+'where "#OWNER#"."COSTS"."COST_TYPE" = nvl(:P18_REQUIRED_COST_TYPE,''LACO'')'||chr(10)||
 '  '||chr(10)||
 '';
 
@@ -6833,9 +6805,9 @@ p:=p||'IF :P18_REQUIRED_COST_TYPE = ''LACO'' THEN'||chr(10)||
 'ELSIF :P18_REQUIRED_COST_TYPE = ''BACO'' THEN'||chr(10)||
 ' :P18_COSTS_TITLE := ''Base Costs'';'||chr(10)||
 'ELSIF :P18_REQUIRED_COST_TYPE = ''HOCO'' THEN'||chr(10)||
-' :P18_COSTS_TITLE ';
+' :P18_COS';
 
-p:=p||':= ''Housing Costs'';'||chr(10)||
+p:=p||'TS_TITLE := ''Housing Costs'';'||chr(10)||
 'ELSE'||chr(10)||
 ' :P18_COSTS_TITLE := ''UNKNOWN:''||:P18_REQUIRED_COST_TYPE;'||chr(10)||
 'END IF;';
@@ -8376,9 +8348,9 @@ p:=p||'IF :P19_REQUIRED_COST_TYPE = ''LACO'' THEN'||chr(10)||
 'ELSIF :P19_REQUIRED_COST_TYPE = ''BACO'' THEN'||chr(10)||
 ' :P19_COSTS_TITLE := ''Base Costs'';'||chr(10)||
 'ELSIF :P19_REQUIRED_COST_TYPE = ''HOCO'' THEN'||chr(10)||
-' :P19_COSTS_TITLE ';
+' :P19_COS';
 
-p:=p||':= ''Housing Costs'';'||chr(10)||
+p:=p||'TS_TITLE := ''Housing Costs'';'||chr(10)||
 'ELSE'||chr(10)||
 ' :P19_COSTS_TITLE := ''UNKNOWN:''||:P19_REQUIRED_COST_TYPE;'||chr(10)||
 'END IF;';
@@ -9193,9 +9165,9 @@ s:=s||'SELECT DISTINCT enquiries.id "Enquiry ID"'||chr(10)||
 '                ,(SELECT ''View quotes'''||chr(10)||
 '                   FROM dual'||chr(10)||
 '                  WHERE EXISTS (SELECT 1'||chr(10)||
-'           ';
+'  ';
 
-s:=s||'                FROM quotes q'||chr(10)||
+s:=s||'                         FROM quotes q'||chr(10)||
 '                          WHERE q.enqu_id = enquiries.id)) AS "View Quotes"'||chr(10)||
 '  FROM (SELECT enq.id'||chr(10)||
 '              ,enq.mprn'||chr(10)||
@@ -9205,9 +9177,9 @@ s:=s||'                FROM quotes q'||chr(10)||
 '         WHERE (enq.id LIKE :p30_enquiry_id OR'||chr(10)||
 '               (REPLACE(:p30_enquiry_id'||chr(10)||
 '                        ,''_%'''||chr(10)||
-'                        ,';
+'      ';
 
-s:=s||''''') IS NULL))'||chr(10)||
+s:=s||'                  ,'''') IS NULL))'||chr(10)||
 '           AND (enq.mprn LIKE :p30_mprn OR'||chr(10)||
 '               (REPLACE(:p30_mprn'||chr(10)||
 '                        ,''_%'''||chr(10)||
@@ -9216,10 +9188,10 @@ s:=s||''''') IS NULL))'||chr(10)||
 '               (REPLACE(:p30_trans_ref'||chr(10)||
 '                        ,''_%'''||chr(10)||
 '                        ,'''') IS NULL))'||chr(10)||
-'           AND (upper(REPLACE(enq.install_postcode'||chr(10)||
-'  ';
+'           AND (upper(REP';
 
-s:=s||'                           ,'' '''||chr(10)||
+s:=s||'LACE(enq.install_postcode'||chr(10)||
+'                             ,'' '''||chr(10)||
 '                             ,'''')) LIKE'||chr(10)||
 '               upper(REPLACE(:p30_postcode'||chr(10)||
 '                             ,'' '''||chr(10)||
@@ -9536,9 +9508,9 @@ s:=s||'SELECT DISTINCT enquiries.id "Enquiry ID"'||chr(10)||
 '                ,(SELECT ''View quotes'''||chr(10)||
 '                   FROM dual'||chr(10)||
 '                  WHERE EXISTS (SELECT 1'||chr(10)||
-'                 ';
+'        ';
 
-s:=s||'          FROM quotes q'||chr(10)||
+s:=s||'                   FROM quotes q'||chr(10)||
 '                          WHERE q.enqu_id = enquiries.id)) AS "View Quotes"'||chr(10)||
 '  FROM (SELECT enq.id'||chr(10)||
 '              ,enq.mprn'||chr(10)||
@@ -9548,9 +9520,9 @@ s:=s||'          FROM quotes q'||chr(10)||
 '         WHERE (enq.id LIKE :p30_enquiry_id OR'||chr(10)||
 '               (REPLACE(:p30_enquiry_id'||chr(10)||
 '                        ,''_%'''||chr(10)||
-'                        ,'''') IS';
+'            ';
 
-s:=s||' NULL))'||chr(10)||
+s:=s||'            ,'''') IS NULL))'||chr(10)||
 '           AND (enq.mprn LIKE :p30_mprn OR'||chr(10)||
 '               (REPLACE(:p30_mprn'||chr(10)||
 '                        ,''_%'''||chr(10)||
@@ -9559,10 +9531,10 @@ s:=s||' NULL))'||chr(10)||
 '               (REPLACE(:p30_trans_ref'||chr(10)||
 '                        ,''_%'''||chr(10)||
 '                        ,'''') IS NULL))'||chr(10)||
-'           AND (upper(REPLACE(enq.install_postcode'||chr(10)||
-'        ';
+'           AND (upper(REPLACE(e';
 
-s:=s||'                     ,'' '''||chr(10)||
+s:=s||'nq.install_postcode'||chr(10)||
+'                             ,'' '''||chr(10)||
 '                             ,'''')) LIKE'||chr(10)||
 '               upper(REPLACE(:p30_postcode'||chr(10)||
 '                             ,'' '''||chr(10)||
@@ -9572,11 +9544,11 @@ s:=s||'                     ,'' '''||chr(10)||
 '                        ,'''') IS NULL))) enquiries'||chr(10)||
 '      ,enquiry_roles er'||chr(10)||
 '      ,parties p'||chr(10)||
-' WHERE enquiries.id IN'||chr(10)||
-'       (SELECT veps.enqu_id'||chr(10)||
-'         ';
+' WHERE enquiries.id I';
 
-s:=s||' FROM v_enquiry_prty_supp veps'||chr(10)||
+s:=s||'N'||chr(10)||
+'       (SELECT veps.enqu_id'||chr(10)||
+'          FROM v_enquiry_prty_supp veps'||chr(10)||
 '              ,v_enquiry_prty_supp veps2'||chr(10)||
 '         WHERE mip_parties.get_user_id(:app_user) = veps2.prty_id'||chr(10)||
 '           AND veps.supp_prty_id = veps2.supp_prty_id)'||chr(10)||
@@ -9663,7 +9635,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'MPRN',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'N',
   p_sum_column=> 'N',
@@ -9687,7 +9658,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Transaction Reference',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'N',
   p_sum_column=> 'N',
@@ -9711,7 +9681,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Postcode',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -10571,9 +10540,9 @@ p:=p||'declare'||chr(10)||
 ''||chr(10)||
 '  :P31_NEW_ID := l_ret_str;'||chr(10)||
 '  l_new_url := apex_util.prepare_url(''f?p=''||v(''APP_ID'')||'':32:''||v(''APP_SESSION'')||''::::P32_ID:''||l_ret_str);'||chr(10)||
-'  :P31_URL';
+' ';
 
-p:=p||' := l_new_url;'||chr(10)||
+p:=p||' :P31_URL := l_new_url;'||chr(10)||
 'end;';
 
 wwv_flow_api.create_page_process(
@@ -10643,8 +10612,8 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_role => 16097609166220701+ wwv_flow_api.g_id_offset,
   p_required_patch=> null + wwv_flow_api.g_id_offset,
-  p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss => '20080417175713',
+  p_last_updated_by => 'MULLENM',
+  p_last_upd_yyyymmddhh24miss => '20080410161335',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -10667,10 +10636,10 @@ s:=s||'<script language="JavaScript1.1" type="text/javascript">'||chr(10)||
 '	var get = new htmldb_Get(null,$x(''pFlowId'').value,''APPLICATION_PROCESS=Select_XML'',0);'||chr(10)||
 '	get.add(''SELECT_LIST_NAME'',pSelectList);'||chr(10)||
 '	get.add(''SELECT_LIST_KEY1'',pFirstKey);'||chr(10)||
-'	get.add(''SELECT_LIST_KEY2'',pSecondKey);'||chr(10)||
-'	gRetu';
+'	get.add(''SELECT_LIST_KEY2'',pSecondKey)';
 
-s:=s||'rn = get.get(''XML'');'||chr(10)||
+s:=s||';'||chr(10)||
+'	gReturn = get.get(''XML'');'||chr(10)||
 '	if(gReturn && l_Select){'||chr(10)||
 '		var l_Count = gReturn.getElementsByTagName("option").length;'||chr(10)||
 '		l_Select.length = 0;'||chr(10)||
@@ -10683,10 +10652,10 @@ s:=s||'rn = get.get(''XML'');'||chr(10)||
 ' }'||chr(10)||
 ' '||chr(10)||
 ' '||chr(10)||
-' function appendToSelect(pSelect, pValue, pContent) {'||chr(10)||
-' ';
+' function appendToSelect(pSelect,';
 
-s:=s||'   var l_Opt = document.createElement("option");'||chr(10)||
+s:=s||' pValue, pContent) {'||chr(10)||
+'    var l_Opt = document.createElement("option");'||chr(10)||
 '    l_Opt.value = pValue;'||chr(10)||
 '	if(document.all){/* why is ie different ask bill */'||chr(10)||
 '		pSelect.options.add(l_Opt);'||chr(10)||
@@ -11404,7 +11373,7 @@ wwv_flow_api.create_page_item(
   p_name=>'P32_L_REQUIRED_MESC_CODE',
   p_data_type=> 'VARCHAR',
   p_accept_processing=> 'REPLACE_EXISTING',
-  p_item_sequence=> 1400,
+  p_item_sequence=> 2,
   p_item_plug_id => 26597504596798255+wwv_flow_api.g_id_offset,
   p_use_cache_before_default=> 'NO',
   p_item_default_type => 'STATIC_TEXT_WITH_SUBSTITUTIONS',
@@ -12583,107 +12552,6 @@ wwv_flow_api.create_page_item(
   p_item_comment => '');
  
  
-end;
-/
-
-declare
-    h varchar2(32767) := null;
-begin
-wwv_flow_api.create_page_item(
-  p_id=>9444307798957371 + wwv_flow_api.g_id_offset,
-  p_flow_id=> wwv_flow.g_flow_id,
-  p_flow_step_id=> 32,
-  p_name=>'P32_DATA_ITEM_ROLES',
-  p_data_type=> 'VARCHAR',
-  p_accept_processing=> 'REPLACE_EXISTING',
-  p_item_sequence=> 2,
-  p_item_plug_id => 26597504596798255+wwv_flow_api.g_id_offset,
-  p_use_cache_before_default=> 'NO',
-  p_item_default_type => 'STATIC_TEXT_WITH_SUBSTITUTIONS',
-  p_prompt=>'L Data Item Roles',
-  p_source=>'--This field is used to list the O,M,H or + status of the specified fields'||chr(10)||
-'--The values stored in this field will be referenced by the appropriate'||chr(10)||
-'--fields to determine if they should be Hidden, Mandatory etc.'||chr(10)||
-'declare'||chr(10)||
-'--this var will hold our list of O, M, + or H values for each field'||chr(10)||
-'l_field_list varchar2(100);'||chr(10)||
-''||chr(10)||
-'begin'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''REQUIRED_MESC_CODE''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EXISTING_CONVERTOR''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''QMAX''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''BYPASS_REQUIRED''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EXISTING_MESC_CODE''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EXISTING_PRTY_ID''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''REQUIRED_SVCP_CODE''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''REQUIRED_IP_MBAR''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''ANNUAL_QUANTITY''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''BASE_REQUIRED''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''REQUIRED_METERING_PRESSURE''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EXISTING_METR_CODE''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''CONVERTOR_REQUIRED''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EXISTING_METER_OWNER''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''LOAD_CONTROL_TYPE''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''HOUSING_REQUIRED''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''TWIN_STREAM_REQUIRED''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EMS_REQUIRED''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EXISTING_METER_SERIAL_NO''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''AMR_REQUIRED''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''REQUIRED_IP_DETAILS''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''MPRN''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EXISTING_METY_CODE''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''DS_BOOSTER_OR_COMPRESS''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''EXISTING_LOGGER''),'' '');'||chr(10)||
-'l_field_list := l_field_list || nvl( mip_enquiries_helper.label_condition(:P32_ENTY_CODE, ''MPRN_ALT''),'' '');'||chr(10)||
-'return l_field_list;'||chr(10)||
-'end;',
-  p_source_type=> 'FUNCTION_BODY',
-  p_display_as=> 'HIDDEN_PROTECTED',
-  p_lov_columns=> 1,
-  p_lov_display_null=> 'NO',
-  p_lov_translated=> 'N',
-  p_cSize=> 30,
-  p_cMaxlength=> 2000,
-  p_cHeight=> 5,
-  p_cAttributes=> 'nowrap="nowrap" ',
-  p_begin_on_new_line => 'YES',
-  p_begin_on_new_field=> 'YES',
-  p_colspan => 2,
-  p_rowspan => 1,
-  p_label_alignment  => 'RIGHT',
-  p_field_alignment  => 'LEFT',
-  p_field_template => 28046657494354449+wwv_flow_api.g_id_offset,
-  p_is_persistent=> 'Y',
-  p_lov_display_extra=>'NO',
-  p_protection_level => 'N',
-  p_item_comment => 'REQUIRED_MESC_CODE'||chr(10)||
-'EXISTING_CONVERTOR'||chr(10)||
-'QMAX'||chr(10)||
-'BYPASS_REQUIRED'||chr(10)||
-'EXISTING_MESC_CODE'||chr(10)||
-'EXISTING_PRTY_ID'||chr(10)||
-'REQUIRED_SVCP_CODE'||chr(10)||
-'REQUIRED_IP_MBAR'||chr(10)||
-'ANNUAL_QUANTITY'||chr(10)||
-'BASE_REQUIRED'||chr(10)||
-'REQUIRED_METERING_PRESSURE'||chr(10)||
-'EXISTING_METR_CODE'||chr(10)||
-'CONVERTOR_REQUIRED'||chr(10)||
-'EXISTING_METER_OWNER'||chr(10)||
-'LOAD_CONTROL_TYPE'||chr(10)||
-'HOUSING_REQUIRED'||chr(10)||
-'TWIN_STREAM_REQUIRED'||chr(10)||
-'EMS_REQUIRED'||chr(10)||
-'EXISTING_METER_SERIAL_NO'||chr(10)||
-'AMR_REQUIRED'||chr(10)||
-'REQUIRED_IP_DETAILS'||chr(10)||
-'MPRN'||chr(10)||
-'EXISTING_METY_CODE'||chr(10)||
-'DS_BOOSTER_OR_COMPRESS'||chr(10)||
-'EXISTING_LOGGER'||chr(10)||
-'MPRN_ALT');
- 
- 
 end;
 /
 
@@ -14201,13 +14069,13 @@ declare
     h varchar2(32767) := null;
 begin
 h := null;
-h:=h||'Please select the job type from the drop down list. Standard Install – A standard install will allow the user to select standard 21 mbar metering pressure designs for LP and MP services.  If you require a higher metering pressure please select ‘install’.Install – for installations with a metering pressure above 21 mbar. Standard Exchange – to exchange a meter module with a metering press';
+h:=h||'Please select the job type from the drop down list. Standard Install – A standard install will allow the user to select standard 21 mbar metering pressure designs for LP and MP services.  If you require a higher metering pressure please select ‘install’.Install – for installations with a metering pressure above 21 mbar. Standard Exchange – to exchange a meter module with a metering pressure of 21 ';
 
-h:=h||'ure of 21 mbar.  Please note, the new meter module must be installed on the same MPRN.  For new services (and MPRN’s) please select one of the install options. Exchange – for all exchanges where the requested metering pressure is above 21 mbar. OFMAT – To request an OFGEM accuracy test. Standard Removal – For removal of meter modules that are on LP or MP services. Removal – For all other';
+h:=h||'mbar.  Please note, the new meter module must be installed on the same MPRN.  For new services (and MPRN’s) please select one of the install options. Exchange – for all exchanges where the requested metering pressure is above 21 mbar. OFMAT – To request an OFGEM accuracy test. Standard Removal – For removal of meter modules that are on LP or MP services. Removal – For all other removals. Adversari';
 
-h:=h||' removals. Adversarial – for adversarial meter removals. Alteration – used to request alterations such as pressure changes.  Change Capacity – used if the site occupier wants to change the amount of gas consumed.  Add-on – If EMS/AMR/Converter are requested, but as a stand alone job. Other – used if none of the other jobs types are suitable.  Please indicate in the Job Description field ';
+h:=h||'al – for adversarial meter removals. Alteration – used to request alterations such as pressure changes.  Change Capacity – used if the site occupier wants to change the amount of gas consumed.  Add-on – If EMS/AMR/Converter are requested, but as a stand alone job. Other – used if none of the other jobs types are suitable.  Please indicate in the Job Description field the requirements of the reques';
 
-h:=h||'the requirements of the request for quotation.  '||chr(10)||
+h:=h||'t for quotation.  '||chr(10)||
 '';
 
 wwv_flow_api.create_page_item(
@@ -15939,9 +15807,9 @@ begin
 h := null;
 h:=h||'"Please input the T/PM/GT/1(Management procedure for requesting gas service pipe pressure and capacity information from National Gid Gas/GT) information.  Through the T/PM/GT/1, a requestor can acquire the following essential information from the gas transporter regarding the supply of gas: -'||chr(10)||
 'a) Confirmation of a live gas service pipe (for an existing installation),'||chr(10)||
-'b) Design minimum pressure DMP,';
+'b) Design minimum pressure DM';
 
-h:=h||''||chr(10)||
+h:=h||'P,'||chr(10)||
 'c) Lowest operating pressure LOP,'||chr(10)||
 'd) Maximum operating pressure MOP,'||chr(10)||
 'e) Design pressure DP,'||chr(10)||
@@ -16255,20 +16123,20 @@ begin
 h := null;
 h:=h||'"Does the meter module require a by-pass?  A by-pass will allow continuity of the supply of gas during times of meter maintenance/replacement.  You will also need to specify why you require a by-pass as the facility may not be possible if the Gas Transporter deems it unecessary in the T/PM/GT/3 process.  A meter by-pass should only be provided where the provision of a meter by-pass would, in the M';
 
-h:=h||'AM’s or Gas Supplier’s opinion, be prudent in order to avoid the risk, of personal injury or death or damage to property (including prejudice to animal welfare) arising from a fault on the meter or metering equipment. And where gas is supplied to the following types of premises:'||chr(10)||
+h:=h||'AM’s or Gas Supplier’s opinion, be prudent in order to avoid the risk, of personal injury or death or damage to property (including prejudice to animal welfare) arising from a fault on the meter or metering equipment. And where gas is supplied to the following types of premises:'||chr(10)||
 'a) Hospitals or hospice'||chr(10)||
-'b) institutionalised accommodation (for example homes for the elderly, schools, and prisons)';
+'b) institutionalised accommodation (for example homes for the elderly, schools, and prisons)'||chr(10)||
+'';
 
-h:=h||''||chr(10)||
-'c) premises utilising large or complex plant supporting continuous bulk manufacturing (for'||chr(10)||
+h:=h||'c) premises utilising large or complex plant supporting continuous bulk manufacturing (for'||chr(10)||
 'example agricultural, baking or other commercial processes) and in comparable'||chr(10)||
 'circumstances'||chr(10)||
 'd) and at meter installations connected to:'||chr(10)||
-'• exceptionally extensive and complex pipework and gas consuming plant'||chr(10)||
-'• multi-occupied premises or a number of discrete consumers (for example a single'||chr(10)||
-'meter installat';
+'• exceptionally extensive and complex pipework and gas consuming plant'||chr(10)||
+'• multi-occupied premises or a number of discrete consumers (for example a single'||chr(10)||
+'meter installa';
 
-h:=h||'ion serving a block of flats)."'||chr(10)||
+h:=h||'tion serving a block of flats)."'||chr(10)||
 '';
 
 wwv_flow_api.create_page_item(
@@ -16328,15 +16196,15 @@ declare
 begin
 h := null;
 h:=h||'"Multi-stream systems may be installed for a variety of commercial and technical reasons, including:'||chr(10)||
-'• continuity of supply'||chr(10)||
-'• partial continuity of supply for essential loads'||chr(10)||
-'• improved pressure control over the required flow range'||chr(10)||
-'• achieving the required capacity'||chr(10)||
-'• provision of standby metering'||chr(10)||
-'• provision of reference metering'||chr(10)||
-'For supply pressures of MP and above with a single strea';
+'• continuity of supply'||chr(10)||
+'• partial continuity of supply for essential loads'||chr(10)||
+'• improved pressure control over the required flow range'||chr(10)||
+'• achieving the required capacity'||chr(10)||
+'• provision of standby metering'||chr(10)||
+'• provision of reference metering'||chr(10)||
+'For supply pressures of MP and above with a single stream ins';
 
-h:=h||'m installation - supply disruption will be necessary during maintenance.  By choosing ''yes'' to Twin Stream, you will not be able to generate an automatic quotation.  A manual quote will be generated off-line and uploaded back onto the system within the normal SLA."'||chr(10)||
+h:=h||'tallation - supply disruption will be necessary during maintenance.  By choosing ''yes'' to Twin Stream, you will not be able to generate an automatic quotation.  A manual quote will be generated off-line and uploaded back onto the system within the normal SLA."'||chr(10)||
 '';
 
 wwv_flow_api.create_page_item(
@@ -16489,13 +16357,9 @@ wwv_flow_api.create_page_item(
   p_rowspan => 1,
   p_label_alignment  => 'RIGHT',
   p_field_alignment  => 'LEFT',
-  p_display_when=>'if substr(:P32_DATA_ITEM_ROLES, 0, 1) = ''H'' then'||chr(10)||
-'  return false;'||chr(10)||
-'else'||chr(10)||
-'  return true;'||chr(10)||
-'end if;',
+  p_display_when=>'P32_L_REQUIRED_MESC_CODE',
   p_display_when2=>'H',
-  p_display_when_type=>'FUNCTION_BODY',
+  p_display_when_type=>'VAL_OF_ITEM_IN_COND_NOT_EQ_COND2',
   p_read_only_when=>'If (:P32_ID is not null and #OWNER#.mip_enquiry.get_enquiry_status(:P32_ID) <> ''INP'') or #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''R'') then'||chr(10)||
 'return true;'||chr(10)||
 'else'||chr(10)||
@@ -20939,9 +20803,9 @@ p:=p||'--Used to set the agent and supplier associations by writing records to t
 '    end if;'||chr(10)||
 '    --Used when an agent creates an enquiry'||chr(10)||
 '    if :P32_MKTP_REF2 is not null then'||chr(10)||
-'      success := ';
+'      s';
 
-p:=p||'#OWNER#.mip_enquiry.set_enquiry_role(:P32_ID,:P32_MKTP_REF2,''ENQ SUPP'');'||chr(10)||
+p:=p||'uccess := #OWNER#.mip_enquiry.set_enquiry_role(:P32_ID,:P32_MKTP_REF2,''ENQ SUPP'');'||chr(10)||
 '    end if;'||chr(10)||
 '  end if;'||chr(10)||
 'end;';
@@ -21060,26 +20924,26 @@ p:=p||'--Used to set the agent and supplier associations by writing records to t
 '  success  boolean;'||chr(10)||
 'begin'||chr(10)||
 '  if :P32_ID is not null then'||chr(10)||
-'    if v(''P32_UPLOAD_A';
+'    if v(''P32_U';
 
-p:=p||'SSET_LOCATION_NOTES'') is not null then'||chr(10)||
+p:=p||'PLOAD_ASSET_LOCATION_NOTES'') is not null then'||chr(10)||
 '      success := #OWNER#.mip_files.set_file_association(v(''P32_UPLOAD_ASSET_LOCATION_NOTES''),'||chr(10)||
 '                                                        ''Asset Location file for enquiry'','||chr(10)||
 '                                                        ''INDO'','||chr(10)||
 '                                                        ''ENQUIRY SUPPORTING DOC'','||chr(10)||
-'                              ';
+'                  ';
 
-p:=p||'                          null,'||chr(10)||
+p:=p||'                                      null,'||chr(10)||
 '                                                        :P32_ID,'||chr(10)||
 '                                                        null,'||chr(10)||
 '                                                        ''ENDO'');'||chr(10)||
 '      if not success then raise_application_error(-20001, l_msg); end if;'||chr(10)||
 '      #OWNER#.mip_virus_check.check_file(v(''P32_UPLOAD_ASSET_LOCATION_NOTES''));'||chr(10)||
-'    end if;'||chr(10)||
-'   '||chr(10)||
-'  end ';
+'    ';
 
-p:=p||'if;'||chr(10)||
+p:=p||'end if;'||chr(10)||
+'   '||chr(10)||
+'  end if;'||chr(10)||
 'end;';
 
 wwv_flow_api.create_page_process(
@@ -21120,9 +20984,9 @@ p:=p||'--Used to set the agent and supplier associations by writing records to t
 '      success := #OWNER#.mip_enquiry.set_enquiry_role(:P32_ID,:P32_AGENT_ID,''ENQ OWN'');'||chr(10)||
 '    end if;'||chr(10)||
 '    --Used when an agent creates an enquiry'||chr(10)||
-'    if nvl(:P32_AGENT_ID2,''%null%'') <> ''%n';
+'    if nvl(:P32_AGENT_ID2,''%null%';
 
-p:=p||'ull%'' then'||chr(10)||
+p:=p||''') <> ''%null%'' then'||chr(10)||
 '      success := #OWNER#.mip_enquiry.set_enquiry_role(:P32_ID,:P32_AGENT_ID2,''ENQ OWN'');'||chr(10)||
 '    end if;'||chr(10)||
 '  end if;'||chr(10)||
@@ -21173,15 +21037,17 @@ p:=p||'--Used to set the agent and supplier associations by writing records to t
 '    close c_partyid;'||chr(10)||
 ''||chr(10)||
 '  if :P32_ID is not null then'||chr(10)||
-'    if nvl(:P32_AGENT_ID,''%n';
+'    if nvl(:P3';
 
-p:=p||'ull%'') <> ''%null%'' and :P32_AGENT_ID <> partyid then'||chr(10)||
+p:=p||'2_AGENT_ID,''%null%'') <> ''%null%'' and :P32_AGENT_ID <> partyid then'||chr(10)||
 '      success := #OWNER#.mip_enquiry.set_enquiry_role(:P32_ID,:P32_AGENT_ID,''ENQ OWN'');'||chr(10)||
 '    end if;'||chr(10)||
 '    --Used when an agent creates an enquiry'||chr(10)||
 '    if nvl(:P32_AGENT_ID,''%null%'') <> ''%null%'' and :P32_AGENT_ID2 <> partyid then'||chr(10)||
 '      success := #OWNER#.mip_enquiry.set_enquiry_role(:P32_ID,:P32_AGENT_ID2,''ENQ OWN'');'||chr(10)||
-'    end if;'||chr(10)||
+'    end if;';
+
+p:=p||''||chr(10)||
 '  end if;'||chr(10)||
 ''||chr(10)||
 'end;';
@@ -21260,9 +21126,9 @@ p:=p||'declare'||chr(10)||
 'else'||chr(10)||
 '--if the user is a I&C User then pass the current user + the agent on behalf, else sent the agent id'||chr(10)||
 '  if :P32_AGENT_ID is not null then'||chr(10)||
-'    #OWNER#.mip_quotation.produce_quotes(:P32';
+'    #OWNER#.mip_quotation.produce_qu';
 
-p:=p||'_ID, #OWNER#.mip_parties.get_user_id(v(''APP_USER'')), :P32_AGENT_ID);'||chr(10)||
+p:=p||'otes(:P32_ID, #OWNER#.mip_parties.get_user_id(v(''APP_USER'')), :P32_AGENT_ID);'||chr(10)||
 '  else'||chr(10)||
 '    #OWNER#.mip_quotation.produce_quotes(:P32_ID,:P32_AGENT_ID2);'||chr(10)||
 '  end if;'||chr(10)||
@@ -21347,10 +21213,10 @@ p:=p||'--write code to get the quote id'||chr(10)||
 '  close c_partyid;'||chr(10)||
 '  select id into l_qute_id from quotes where enqu_id = :P32_ID;'||chr(10)||
 '  :P41_QUTE_ID := l_qute_id; '||chr(10)||
-'  :P41_AGENT_ID := :partyid;'||chr(10)||
-'  :P41_DEL';
+'  :P41_AGENT_ID := :partyid;';
 
-p:=p||'ETE_ONLY := ''NO'';'||chr(10)||
+p:=p||''||chr(10)||
+'  :P41_DELETE_ONLY := ''NO'';'||chr(10)||
 '  :P41_ENQU_ID := null;'||chr(10)||
 '  :P41_DRWG_CODE := null;'||chr(10)||
 'end;';
@@ -21653,7 +21519,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'no data found',
   p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'N',
   p_sort_null=> 'F',
@@ -22137,26 +22002,26 @@ p:=p||'declare '||chr(10)||
 '    --overwrite the current document reference'||chr(10)||
 '    success := #OWNER#.mip_files.update_file_association(v(''P41_FILE_UPLOAD''),'||chr(10)||
 '                                                        ''Drawing manually updated'','||chr(10)||
-'             ';
+'   ';
 
-p:=p||'                                           ''INDO'','||chr(10)||
+p:=p||'                                                     ''INDO'','||chr(10)||
 '                                                        null,'||chr(10)||
 '                                                        null,'||chr(10)||
 '                                                        :P41_DRWG_CODE);'||chr(10)||
 '    #OWNER#.mip_virus_check.check_file(v(''P41_FILE_UPLOAD''));      '||chr(10)||
 '  else'||chr(10)||
 '    --upload a new document'||chr(10)||
-'    success := #OWNER#.mip_files.set_file_associa';
+'    success := #OWNER#.mip_files';
 
-p:=p||'tion(v(''P41_FILE_UPLOAD''),'||chr(10)||
+p:=p||'.set_file_association(v(''P41_FILE_UPLOAD''),'||chr(10)||
 '                                                      ''Drawing manually uploaded'','||chr(10)||
 '                                                      ''INDO'','||chr(10)||
 '                                                      ''HIGH DEFINITION DRAWING'','||chr(10)||
 '                                                      null,'||chr(10)||
 '                                                      null,'||chr(10)||
-'                           ';
+'    ';
 
-p:=p||'                           :P41_DRWG_CODE,'||chr(10)||
+p:=p||'                                                  :P41_DRWG_CODE,'||chr(10)||
 '                                                      ''DRRO'');'||chr(10)||
 '    #OWNER#.mip_virus_check.check_file(v(''P41_FILE_UPLOAD''));'||chr(10)||
 '  end if;'||chr(10)||
@@ -22199,10 +22064,10 @@ p:=p||'declare '||chr(10)||
 '                                     ''Manual Quotation uploaded'','||chr(10)||
 '                                     ''INDO'','||chr(10)||
 '                                     ''MANUAL QUOTATION'','||chr(10)||
-'                                     :P41_QUTE_ID,'||chr(10)||
-'      ';
+'                                     :P41_QUTE_ID';
 
-p:=p||'                               null,'||chr(10)||
+p:=p||','||chr(10)||
+'                                     null,'||chr(10)||
 '                                     null,'||chr(10)||
 '                                     ''QUDO'');'||chr(10)||
 '    #OWNER#.mip_virus_check.check_file(v(''P41_FILE_UPLOAD'')); '||chr(10)||
@@ -22249,9 +22114,9 @@ p:=p||'declare '||chr(10)||
 '                                                    ''File added to Enquiry'','||chr(10)||
 '                                                    ''INDO'','||chr(10)||
 '                                                    ''ENQUIRY SUPPORTING DOC'','||chr(10)||
-'                                                   ';
+'                                           ';
 
-p:=p||' null,'||chr(10)||
+p:=p||'         null,'||chr(10)||
 '                                                    :P41_ENQU_ID,'||chr(10)||
 '                                                    null,'||chr(10)||
 '                                                    ''ENDO'');'||chr(10)||
@@ -22262,7 +22127,9 @@ p:=p||' null,'||chr(10)||
 '  #OWNER#.mip_virus_check.check_file(v(''P41_FILE_UPLOAD''));'||chr(10)||
 'EXCEPTION'||chr(10)||
 'when e_file_error then'||chr(10)||
-'  #OWNER#.cout_err.report_and_stop(-20100);'||chr(10)||
+'  #OWNER#.cout_err.report_and_stop(-201';
+
+p:=p||'00);'||chr(10)||
 'end;';
 
 wwv_flow_api.create_page_process(
@@ -24145,7 +24012,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Description',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -31835,7 +31701,7 @@ wwv_flow_api.create_page_validation(
   p_validation_name => 'P61_PASSWORD_Other',
   p_validation_sequence=> 60,
   p_validation => 'P61_PASSWORD',
-  p_validation2 => '`¬!"£$%^&*()_+-=[]{};''#:@~,./<>?¦\|',
+  p_validation2 => '`¬!"£$%^&*()_+-=[]{};''#:@~,./<>?¦\|',
   p_validation_type => 'ITEM_IN_VALIDATION_CONTAINS_AT_LEAST_ONE_CHAR_IN_STRING2',
   p_error_message => 'Item must contain at least 1 non-alphanumeric character e.g. "!"',
   p_validation_condition=> 'if upper(:P61_PRTY_TYPE) = ''PERS'' then'||chr(10)||
@@ -34351,11 +34217,11 @@ p:=p||'declare '||chr(10)||
 '   :P64_HOME_STREET    := l_addr.street;'||chr(10)||
 '   :P64_HOME_CITY      := l_addr.city;'||chr(10)||
 '   :P64_HOME_POSTCODE  := l_addr.postcode;'||chr(10)||
-'   '||chr(10)||
-'EXCEPTION'||chr(10)||
-' ';
+'';
 
-p:=p||' WHEN no_data_found THEN'||chr(10)||
+p:=p||'   '||chr(10)||
+'EXCEPTION'||chr(10)||
+'  WHEN no_data_found THEN'||chr(10)||
 '    NULL;'||chr(10)||
 'end;';
 
@@ -34400,31 +34266,31 @@ p:=p||'DECLARE'||chr(10)||
 ''||chr(10)||
 '  mip_parties.create_party(p_manu_ref                 => :P61_MANU_REF,'||chr(10)||
 '                           p_created_by               => :APP_USER,'||chr(10)||
-'                           p_s';
+'                 ';
 
-p:=p||'hortcode                => :P61_SHORTCODE,'||chr(10)||
+p:=p||'          p_shortcode                => :P61_SHORTCODE,'||chr(10)||
 '                           p_name                     => :P61_NAME,'||chr(10)||
 '                           p_description              => :P61_DESCRIPTION,'||chr(10)||
 '                           p_mktp_ref                 => :P61_MKTP_REF,'||chr(10)||
 '                           p_lt_7b_contract_ref       => :P61_LT_7B_CONTRACT_REF,'||chr(10)||
-'                           p_gt_7b_contract_ref       => :P6';
+'                           p_gt_7b_contrac';
 
-p:=p||'1_GT_7B_CONTRACT_REF,'||chr(10)||
+p:=p||'t_ref       => :P61_GT_7B_CONTRACT_REF,'||chr(10)||
 '                           p_adversarial_contract_ref => :P61_ADV_CONTRACT_REF,'||chr(10)||
 '                           p_username                 => :P61_USERNAME,'||chr(10)||
 '                           p_first_name               => :P61_FIRST_NAME,'||chr(10)||
 '                           p_last_name                => :P61_LAST_NAME,'||chr(10)||
-'                           p_personal_title           => :P61_TITLE,'||chr(10)||
-'          ';
+'                           p_personal_title           =>';
 
-p:=p||'                 p_comments                 => :P61_COMMENTS,'||chr(10)||
+p:=p||' :P61_TITLE,'||chr(10)||
+'                           p_comments                 => :P61_COMMENTS,'||chr(10)||
 '                           p_id                       => :P61_ID,'||chr(10)||
 '                           p_prty_type                => :P61_PRTY_TYPE,'||chr(10)||
 '                           p_tripartite_member        => :P61_TRIPARTITE,'||chr(10)||
 '                           p_password                 => :P61_PASSWORD,'||chr(10)||
-'                           p_expire_pword            ';
+'                        ';
 
-p:=p||' => :P61_EXPIRE_PWORD);'||chr(10)||
+p:=p||'   p_expire_pword             => :P61_EXPIRE_PWORD);'||chr(10)||
 ''||chr(10)||
 '  /**********************'||chr(10)||
 '  *  CREATE PARTY ROLE  *'||chr(10)||
@@ -34435,20 +34301,20 @@ p:=p||' => :P61_EXPIRE_PWORD);'||chr(10)||
 '  /*******************************'||chr(10)||
 '  *  CREATE PARTY RELATIONSHIP  *'||chr(10)||
 '  *******************************/'||chr(10)||
-'  IF upper(:P62_PRTY_ROLE) IN (''AGENT'', ''SUPPADMIN'') THEN'||chr(10)||
-'    -- associate th';
+'  IF upper(:P62_PRTY_ROLE) IN (''AGENT';
 
-p:=p||'em with a supplier'||chr(10)||
+p:=p||''', ''SUPPADMIN'') THEN'||chr(10)||
+'    -- associate them with a supplier'||chr(10)||
 '    mip_parties.create_relationship(p_from_prty_id   => :P61_ID,'||chr(10)||
 '                                    p_from_prty_role => :P62_PRTY_ROLE,'||chr(10)||
 '                                    p_to_prty_id     => :P62_USER_SUPPLIER,'||chr(10)||
 '                                    p_to_prty_role   => ''SUPP'');'||chr(10)||
 '  END IF;'||chr(10)||
 ''||chr(10)||
-'  -- if they''re an agent, associate them with a supp_admin too'||chr(10)||
-'  IF upper(:P62_PRTY_ROLE) = ';
+'  -- if they''re an agent, associate them wit';
 
-p:=p||'''AGENT'' THEN'||chr(10)||
+p:=p||'h a supp_admin too'||chr(10)||
+'  IF upper(:P62_PRTY_ROLE) = ''AGENT'' THEN'||chr(10)||
 '    mip_parties.create_relationship(p_from_prty_id   => :P61_ID,'||chr(10)||
 '                                    p_from_prty_role => :P62_PRTY_ROLE,'||chr(10)||
 '                                    p_to_prty_id     => :P62_SUPP_ADMIN,'||chr(10)||
@@ -34456,22 +34322,22 @@ p:=p||'''AGENT'' THEN'||chr(10)||
 '  END IF;'||chr(10)||
 ''||chr(10)||
 '  /***************************'||chr(10)||
-'  *  CREATE OFFICE ADDRESS  *'||chr(10)||
-'  ***************************/'||chr(10)||
-'  l_';
+'  *  CRE';
 
-p:=p||'addr_office.code         := :P63_OFF_CODE;'||chr(10)||
+p:=p||'ATE OFFICE ADDRESS  *'||chr(10)||
+'  ***************************/'||chr(10)||
+'  l_addr_office.code         := :P63_OFF_CODE;'||chr(10)||
 '  l_addr_office.sub_building := :P63_OFF_SUB_BUILD;'||chr(10)||
 '  l_addr_office.building     := :P63_OFF_BUILDING;'||chr(10)||
 '  l_addr_office.street       := :P63_OFF_STREET;'||chr(10)||
 '  l_addr_office.city         := :P63_OFF_CITY;'||chr(10)||
 '  l_addr_office.postcode     := :P63_OFF_POSTCODE;'||chr(10)||
 ''||chr(10)||
-'  mip_parties.add_address(l_addr_office);'||chr(10)||
-''||chr(10)||
-'  mip_parties.create_party_address(p_addr_code => :P63_OFF_CODE';
+'  mip_parties.add_address(l_addr_office)';
 
-p:=p||','||chr(10)||
+p:=p||';'||chr(10)||
+''||chr(10)||
+'  mip_parties.create_party_address(p_addr_code => :P63_OFF_CODE,'||chr(10)||
 '                                   p_prty_id   => :P61_ID,'||chr(10)||
 '                                   p_addr_type => ''OFFICE'');'||chr(10)||
 ''||chr(10)||
@@ -34480,11 +34346,11 @@ p:=p||','||chr(10)||
 '  *************************/'||chr(10)||
 ''||chr(10)||
 '  IF NOT :P63_OFF_CODE = :P64_HOME_CODE  and :P64_HOME_CODE is not null THEN'||chr(10)||
-'    l_addr.code         := :P64_HOME_CODE;'||chr(10)||
-'    l_addr.sub_building := :P64_HOME_SUB_BUILD;'||chr(10)||
-'    l_addr.building   ';
+'    l_addr.code         := :P64_HOME';
 
-p:=p||'  := :P64_HOME_BUILDING;'||chr(10)||
+p:=p||'_CODE;'||chr(10)||
+'    l_addr.sub_building := :P64_HOME_SUB_BUILD;'||chr(10)||
+'    l_addr.building     := :P64_HOME_BUILDING;'||chr(10)||
 '    l_addr.street       := :P64_HOME_STREET;'||chr(10)||
 '    l_addr.city         := :P64_HOME_CITY;'||chr(10)||
 '    l_addr.postcode     := :P64_HOME_POSTCODE;'||chr(10)||
@@ -34492,11 +34358,11 @@ p:=p||'  := :P64_HOME_BUILDING;'||chr(10)||
 '    mip_parties.add_address(l_addr);'||chr(10)||
 '  '||chr(10)||
 '    mip_parties.create_party_address(p_addr_code => :P64_HOME_CODE,'||chr(10)||
-'                                     p_prty_id   => :P61_ID,'||chr(10)||
-'                                     p_addr_type => ''HOME'');'||chr(10)||
-'  END I';
+'                                     p_prt';
 
-p:=p||'F;'||chr(10)||
+p:=p||'y_id   => :P61_ID,'||chr(10)||
+'                                     p_addr_type => ''HOME'');'||chr(10)||
+'  END IF;'||chr(10)||
 '  /***************************'||chr(10)||
 '  *  STORE CONTACT DETAILS  *'||chr(10)||
 '  ***************************/'||chr(10)||
@@ -34504,32 +34370,32 @@ p:=p||'F;'||chr(10)||
 '  IF :P62_PHONE IS NOT NULL THEN'||chr(10)||
 '    mip_parties.create_party_contact_details(p_prty_id           => :P61_ID,'||chr(10)||
 '                                             p_contact_mech_type => ''PHONE'','||chr(10)||
-'                                             p_contact_value     => :P62_PHONE);'||chr(10)||
+'                    ';
+
+p:=p||'                         p_contact_value     => :P62_PHONE);'||chr(10)||
 '  END IF;'||chr(10)||
 ''||chr(10)||
-'  IF :P62_FAX IS NOT NULL';
-
-p:=p||' THEN'||chr(10)||
+'  IF :P62_FAX IS NOT NULL THEN'||chr(10)||
 '    mip_parties.create_party_contact_details(p_prty_id           => :P61_ID,'||chr(10)||
 '                                             p_contact_mech_type => ''FAX'','||chr(10)||
 '                                             p_contact_value     => :P62_FAX);'||chr(10)||
 '  END IF;'||chr(10)||
 ''||chr(10)||
 '  IF :P62_MOBILE IS NOT NULL THEN'||chr(10)||
-'    mip_parties.create_party_contact_details(p_prty_id           => :P61_ID,'||chr(10)||
-'                                         ';
+'    mip_par';
 
-p:=p||'    p_contact_mech_type => ''MOBILE'','||chr(10)||
+p:=p||'ties.create_party_contact_details(p_prty_id           => :P61_ID,'||chr(10)||
+'                                             p_contact_mech_type => ''MOBILE'','||chr(10)||
 '                                             p_contact_value     => :P62_MOBILE);'||chr(10)||
 '  END IF;'||chr(10)||
 ''||chr(10)||
 '  IF :P62_EMAIL IS NOT NULL THEN'||chr(10)||
 '    mip_parties.create_party_contact_details(p_prty_id           => :P61_ID,'||chr(10)||
-'                                             p_contact_mech_type => ''EMAIL'','||chr(10)||
-'                                             p_contact_value     => :P62_EMAIL);'||chr(10)||
-'  ';
+'                                             p';
 
-p:=p||'END IF;'||chr(10)||
+p:=p||'_contact_mech_type => ''EMAIL'','||chr(10)||
+'                                             p_contact_value     => :P62_EMAIL);'||chr(10)||
+'  END IF;'||chr(10)||
 'END;';
 
 wwv_flow_api.create_page_process(
@@ -35516,7 +35382,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'No agents associated with this Supplier Administrator.',
   p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'N',
   p_sort_null=> 'F',
@@ -35572,7 +35437,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Created By',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35596,7 +35460,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Created On',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35620,7 +35483,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Updated On',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35644,7 +35506,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Updated By',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35668,7 +35529,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 5,
   p_column_heading=> 'Username',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35692,7 +35552,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 6,
   p_column_heading=> 'Status',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35716,7 +35575,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 7,
   p_column_heading=> 'First Name',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35740,7 +35598,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 8,
   p_column_heading=> 'Last Name',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35764,7 +35621,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 9,
   p_column_heading=> 'Personal Title',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35788,7 +35644,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 10,
   p_column_heading=> 'Comments',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35812,7 +35667,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 11,
   p_column_heading=> 'Party Type',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35896,7 +35750,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'no data found',
   p_query_num_rows_type=> '0',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'N',
   p_sort_null=> 'F',
@@ -35951,7 +35804,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Created By',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35975,7 +35827,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Created On',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -35999,7 +35850,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Updated On',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36023,7 +35873,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Updated By',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36047,7 +35896,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 5,
   p_column_heading=> 'Username',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36071,7 +35919,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 6,
   p_column_heading=> 'Status',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36095,7 +35942,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 7,
   p_column_heading=> 'First Name',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36119,7 +35965,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 8,
   p_column_heading=> 'Last Name',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36143,7 +35988,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 9,
   p_column_heading=> 'Personal Title',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36167,7 +36011,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 10,
   p_column_heading=> 'Comments',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36191,7 +36034,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 11,
   p_column_heading=> 'Party Type',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36515,7 +36357,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'No addresses assigned to the current user.',
   p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'N',
   p_sort_null=> 'F',
@@ -36565,7 +36406,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Code',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36589,7 +36429,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Sub Building',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36613,7 +36452,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Building',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36637,7 +36475,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Street',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36661,7 +36498,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 5,
   p_column_heading=> 'City',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36685,7 +36521,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 6,
   p_column_heading=> 'Postcode',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -36757,7 +36592,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 7,
   p_column_heading=> 'Address Code',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -38503,9 +38337,9 @@ p:=p||'begin'||chr(10)||
 ''||chr(10)||
 '  if not :P66_FAX is null then'||chr(10)||
 '    mip_parties.update_contact_details(p_prty_id => :P66_ID,'||chr(10)||
-'                                 p_contact_value => :P66_FA';
+'                                 p_contact_value =';
 
-p:=p||'X,'||chr(10)||
+p:=p||'> :P66_FAX,'||chr(10)||
 '                                 p_contact_mech_type => ''FAX'');'||chr(10)||
 '  end if;'||chr(10)||
 ''||chr(10)||
@@ -38516,9 +38350,9 @@ p:=p||'X,'||chr(10)||
 '  end if;'||chr(10)||
 ''||chr(10)||
 '  if not :P66_EMAIL is null then'||chr(10)||
-'    mip_parties.update_contact_details(p_prty_id =>';
+'    mip_parties.update_contact_';
 
-p:=p||' :P66_ID,'||chr(10)||
+p:=p||'details(p_prty_id => :P66_ID,'||chr(10)||
 '                                 p_contact_value => :P66_EMAIL,'||chr(10)||
 '                                 p_contact_mech_type => ''EMAIL'');'||chr(10)||
 '  end if;'||chr(10)||
@@ -38589,10 +38423,10 @@ p:=p||'begin'||chr(10)||
 '  :P66_MOBILE    := mip_contact_details.get_party_contact_detail(p_prty_id => :P66_ID,'||chr(10)||
 '                                        p_come_type => ''MOBILE'');'||chr(10)||
 ''||chr(10)||
-'  :P66_FAX       := mip_contact_details.get_party_contact_detail(p_prty_id => :P66_ID,'||chr(10)||
-'';
+'  :P66_FAX       := mip_contact_details.get_party_contact_detail(p_prty_id => :P';
 
-p:=p||'                                        p_come_type => ''FAX'');'||chr(10)||
+p:=p||'66_ID,'||chr(10)||
+'                                        p_come_type => ''FAX'');'||chr(10)||
 ''||chr(10)||
 '  :P66_EMAIL     := mip_contact_details.get_party_contact_detail(p_prty_id => :P66_ID,'||chr(10)||
 '                                        p_come_type => ''EMAIL'');'||chr(10)||
@@ -39122,7 +38956,7 @@ wwv_flow_api.create_page_validation(
   p_validation_name => 'P67_PASSWORD_other',
   p_validation_sequence=> 52,
   p_validation => 'P67_PASSWORD',
-  p_validation2 => '`¬!"£$%^&*()_+-=[]{};''#:@~,./<>?\|¦',
+  p_validation2 => '`¬!"£$%^&*()_+-=[]{};''#:@~,./<>?\|¦',
   p_validation_type => 'ITEM_IN_VALIDATION_CONTAINS_AT_LEAST_ONE_CHAR_IN_STRING2',
   p_error_message => 'Password must contain at least 1 non-alphanumeric character.  e.g. !',
   p_when_button_pressed=> 20949515424299567 + wwv_flow_api.g_id_offset,
@@ -40196,9 +40030,9 @@ p:=p||'declare'||chr(10)||
 ''||chr(10)||
 '  select rt_code'||chr(10)||
 '    into l_addr_type'||chr(10)||
-'    from party_addres';
+'    fr';
 
-p:=p||'s_roles paddr_ro'||chr(10)||
+p:=p||'om party_address_roles paddr_ro'||chr(10)||
 '   where paddr_ro.paddr_addr_code = :P69_ADDR_CODE'||chr(10)||
 '     and paddr_ro.paddr_prty_id = :P69_PRTY_ID'||chr(10)||
 '     and paddr_ro.end_date is null;'||chr(10)||
@@ -40209,9 +40043,9 @@ p:=p||'s_roles paddr_ro'||chr(10)||
 '  :P69_ADDR_BUILDING := l_addr.building;'||chr(10)||
 '  :P69_ADDR_STREET := l_addr.street;'||chr(10)||
 '  :P69_ADDR_CITY := l_addr.city;'||chr(10)||
-'  :P69_ADDR_POSTCODE := l_addr';
+'  :P';
 
-p:=p||'.postcode;'||chr(10)||
+p:=p||'69_ADDR_POSTCODE := l_addr.postcode;'||chr(10)||
 ''||chr(10)||
 'end;';
 
@@ -40260,11 +40094,11 @@ p:=p||'declare '||chr(10)||
 '   :P69_ADDR_BUILDING  := l_addr.building;'||chr(10)||
 '   :P69_ADDR_STREET    := l_addr.street;'||chr(10)||
 '   :P69_ADDR_CITY      := l_addr.city;'||chr(10)||
-'   :P69_ADDR_POSTCODE  := l_addr.postcode;'||chr(10)||
-'   '||chr(10)||
-'EXCEPTIO';
+'   :P69_ADDR_POSTCODE  := l_addr.postcode';
 
-p:=p||'N'||chr(10)||
+p:=p||';'||chr(10)||
+'   '||chr(10)||
+'EXCEPTION'||chr(10)||
 '  WHEN no_data_found THEN'||chr(10)||
 '    NULL;'||chr(10)||
 'end;';
@@ -40315,10 +40149,10 @@ p:=p||'declare'||chr(10)||
 ''||chr(10)||
 '  -- if we''re adding a new address then make the assignments.'||chr(10)||
 '  if :P69_ACTION = ''NEW'' then'||chr(10)||
-'    -- create the address'||chr(10)||
-' ';
+'    -- create';
 
-p:=p||'   mip_parties.add_address(l_addr);'||chr(10)||
+p:=p||' the address'||chr(10)||
+'    mip_parties.add_address(l_addr);'||chr(10)||
 ''||chr(10)||
 '    -- assign the address to the party'||chr(10)||
 '    mip_parties.create_party_address(p_addr_code => :P69_ADDR_CODE,'||chr(10)||
@@ -40326,10 +40160,10 @@ p:=p||'   mip_parties.add_address(l_addr);'||chr(10)||
 '                                     p_addr_type => :P69_ADDR_TYPE);'||chr(10)||
 ''||chr(10)||
 '    -- set the end date of the old addresses'||chr(10)||
-'    mip_parties.expire_old_addresses(p_prty_id => :P69_PRTY_ID, '||chr(10)||
-'          ';
+'    mip_parties.expire_old_addresses(p_prty_id => :P';
 
-p:=p||'                           p_addr_code => :P69_ADDR_CODE,'||chr(10)||
+p:=p||'69_PRTY_ID, '||chr(10)||
+'                                     p_addr_code => :P69_ADDR_CODE,'||chr(10)||
 '                                     p_paddr_type => :P69_ADDR_TYPE);'||chr(10)||
 '  else'||chr(10)||
 '    mip_parties.update_address(l_addr);'||chr(10)||
@@ -40850,9 +40684,9 @@ p:=p||'declare'||chr(10)||
 '  select rt_code'||chr(10)||
 '    into l_addr_type'||chr(10)||
 '    from party_address_roles paddr_ro'||chr(10)||
-'   where paddr_';
+'';
 
-p:=p||'ro.paddr_addr_code = :P70_ADDR_CODE'||chr(10)||
+p:=p||'   where paddr_ro.paddr_addr_code = :P70_ADDR_CODE'||chr(10)||
 '     and paddr_ro.paddr_prty_id = :P70_PRTY_ID;'||chr(10)||
 ''||chr(10)||
 '  -- set the page values'||chr(10)||
@@ -40951,9 +40785,9 @@ s:=s||'SELECT enqu.install_sub_building || '' '' || enqu.install_building || ''
 '       enty.description as Description,'||chr(10)||
 '       enqu.qmin as qmin,'||chr(10)||
 '       enqu.qmax as qmax'||chr(10)||
-'  FROM enquiries enqu, enquiry_types e';
+'  FROM enquiries enqu, enquiry';
 
-s:=s||'nty'||chr(10)||
+s:=s||'_types enty'||chr(10)||
 ' where enqu.enty_code = enty.code'||chr(10)||
 '   and enqu.id = :P80_ENQU_ID';
 
@@ -40981,7 +40815,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'no data found',
   p_query_num_rows_type=> '0',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'N',
   p_sort_null=> 'F',
@@ -41007,7 +40840,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Address',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41031,7 +40863,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Postcode',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41055,7 +40886,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'MPRN',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41079,7 +40909,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Transaction Reference',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41103,7 +40932,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 5,
   p_column_heading=> 'Description',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41175,9 +41003,9 @@ s:=s||'SELECT v.enquiry_id AS "Enquiry ID",'||chr(10)||
 '       v.bas_code AS "Base Code",'||chr(10)||
 '       v.qmax AS "Q max",'||chr(10)||
 '       decode(SIGN(:P80_QMIN-nvl(v.qmin,0)),-1 , ''YES'', ''NO'') as "Extra Information",'||chr(10)||
-'       v.inlet_ori';
+'       v.';
 
-s:=s||'entation AS "Inlet Orientation",'||chr(10)||
+s:=s||'inlet_orientation AS "Inlet Orientation",'||chr(10)||
 '       v.outlet_orientation AS "Outlet Orientation",'||chr(10)||
 '       v.total_cost AS "Total Cost",'||chr(10)||
 '       v.row_number AS "Row Number",'||chr(10)||
@@ -41821,7 +41649,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'No quote document found for selected quote.',
   p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'N',
   p_sort_null=> 'F',
@@ -41847,7 +41674,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 1,
   p_column_heading=> 'Enquiry ID',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41871,7 +41697,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Quote ID',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41895,7 +41720,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Enty Code',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41919,7 +41743,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'Module Code',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41943,7 +41766,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 5,
   p_column_heading=> 'Lead Time',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41967,7 +41789,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 6,
   p_column_heading=> 'Additional Items',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -41991,7 +41812,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 7,
   p_column_heading=> 'Base Code',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -42039,7 +41859,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 8,
   p_column_heading=> 'QMAX',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -42087,7 +41906,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 9,
   p_column_heading=> 'Inlet Orientation',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -42111,7 +41929,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 10,
   p_column_heading=> 'Outlet Orientation',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -42135,7 +41952,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 11,
   p_column_heading=> 'Total Cost',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -42159,7 +41975,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 12,
   p_column_heading=> 'Row Number',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -42252,7 +42067,6 @@ wwv_flow_api.create_report_region (
   p_query_break_cols=> '0',
   p_query_no_data_found=> 'no data found',
   p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
-  p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'N',
   p_sort_null=> 'F',
@@ -42736,20 +42550,20 @@ p:=p||'declare'||chr(10)||
 '    '||chr(10)||
 '      SELECT COUNT(*)'||chr(10)||
 '        INTO cur_quote'||chr(10)||
-'        FROM v_current_quote_status v'||chr(10)||
-'       WHERE';
+'        FROM v_current_quote_status v';
 
-p:=p||' v.qute_id = :P81_QUOTE_ID'||chr(10)||
+p:=p||''||chr(10)||
+'       WHERE v.qute_id = :P81_QUOTE_ID'||chr(10)||
 '         AND v.qust_code IN (''SELECTED'', ''ACCEPTED'');'||chr(10)||
 ''||chr(10)||
 '      if cur_quote = 0 then'||chr(10)||
 '        IF num_processed > 0 THEN -- Quote has already been processed'||chr(10)||
 '          raise_application_error(-20001, ''Unable to select quote.  A quote has already been selected or accepted for this enquiry.'');'||chr(10)||
 '        ELSE'||chr(10)||
-'          mip_quotation.select_quote(p_qute_id => :P81_QUOTE_ID'||chr(10)||
-'        ';
+'          mip_quotation.select_quote(p_qute_id => :';
 
-p:=p||'                ,p_prty_id => #OWNER#.mip_parties.get_user_id(:APP_USER)'||chr(10)||
+p:=p||'P81_QUOTE_ID'||chr(10)||
+'                        ,p_prty_id => #OWNER#.mip_parties.get_user_id(:APP_USER)'||chr(10)||
 '                        ,p_description => ''Selected by user '' ||:APP_USER);'||chr(10)||
 '        END IF;'||chr(10)||
 '      end if;'||chr(10)||
@@ -44840,7 +44654,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 2,
   p_column_heading=> 'Region',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -44864,7 +44677,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 3,
   p_column_heading=> 'Out Code',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -44888,7 +44700,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 4,
   p_column_heading=> 'In Code',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -44912,7 +44723,6 @@ wwv_flow_api.create_report_columns (
   p_column_display_sequence=> 5,
   p_column_heading=> 'Id',
   p_column_alignment=>'LEFT',
-  p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
   p_disable_sort_column=>'Y',
   p_sum_column=> 'N',
@@ -45427,10 +45237,10 @@ p:=p||'if #OWNER#.mip_parties.get_user_role(:P101_USERNAME)=''SUPPADMIN'' then'|
 '  mip_security.login('||chr(10)||
 '    P_UNAME       => :P101_USERNAME,'||chr(10)||
 '    P_PASSWORD    => :P101_PASSWORD,'||chr(10)||
-'    P_SESSION_ID  => v(''APP_SESSION''),'||chr(10)||
-'    P_FLOW_';
+'    P_SESSION_ID  => v(''APP_SESSION''),';
 
-p:=p||'PAGE   => :APP_ID ||'':30'''||chr(10)||
+p:=p||''||chr(10)||
+'    P_FLOW_PAGE   => :APP_ID ||'':30'''||chr(10)||
 '    );'||chr(10)||
 'end if;';
 
@@ -45918,7 +45728,7 @@ wwv_flow_api.create_page_validation(
   p_validation_name => 'P102_PASSWORD_OTHER',
   p_validation_sequence=> 60,
   p_validation => 'P102_NEW_PASSWORD',
-  p_validation2 => '`¬¦!"£$%^&*()_+-=[]{};''#:@~,./<>?\|€',
+  p_validation2 => '`¬¦!"£$%^&*()_+-=[]{};''#:@~,./<>?\|€',
   p_validation_type => 'ITEM_IN_VALIDATION_CONTAINS_AT_LEAST_ONE_CHAR_IN_STRING2',
   p_error_message => 'Password must contain at least 1 non-alphanumeric character.',
   p_when_button_pressed=> 14230906426813739 + wwv_flow_api.g_id_offset,
@@ -45976,7 +45786,9 @@ p:=p||'declare'||chr(10)||
 '  mip_security.new_password(:APP_USER, :P102_NEW_PASSWORD);'||chr(10)||
 'exception'||chr(10)||
 '  when others then'||chr(10)||
-'  null;'||chr(10)||
+'';
+
+p:=p||'  null;'||chr(10)||
 'end;';
 
 wwv_flow_api.create_page_process(
@@ -47144,10 +46956,10 @@ c1:=c1||'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"'||chr(10
 '  #HEAD# #FORM_OPEN#'||chr(10)||
 ''||chr(10)||
 '  <div id="rowHd">'||chr(10)||
-'    <div id="logo"'||chr(10)||
-'         class="';
+'    <div id="logo"';
 
-c1:=c1||'hskpcol1">'||chr(10)||
+c1:=c1||''||chr(10)||
+'         class="hskpcol1">'||chr(10)||
 '      <a href="http://www.nationalgrid.com/"><img src='||chr(10)||
 '      "#IMAGE_PREFIX#ng_logo_group_medium.gif"'||chr(10)||
 '           alt="National Grid Metering"'||chr(10)||
@@ -47159,24 +46971,24 @@ c1:=c1||'hskpcol1">'||chr(10)||
 '         class="hskpcol2">'||chr(10)||
 '      <div class="margin5">'||chr(10)||
 '        <a href="holdingpagefortheICOQsystem"'||chr(10)||
-'             class="hskpnav"'||chr(10)||
-'             title='||chr(10)||
-'       ';
+'             class="hskpnav';
 
-c1:=c1||'      "Return to the Metering Online Quotations Home Page"'||chr(10)||
+c1:=c1||'"'||chr(10)||
+'             title='||chr(10)||
+'             "Return to the Metering Online Quotations Home Page"'||chr(10)||
 '             accesskey="1">Home</a> | <a href="&LOGOUT_URL."'||chr(10)||
 '             class="hskpnav"'||chr(10)||
 '             title="Log out of the system"'||chr(10)||
 '             accesskey="2">Logout</a> | '||chr(10)||
 '             <!--a href="/group/help" class="hskpnav">Help</a>&nbsp;|&nbsp;--><span>'||chr(10)||
-'        You are logged in as:&APP_USER.</span>'||chr(10)||
+'        You are logged in as:&APP_USER.</span';
+
+c1:=c1||'>'||chr(10)||
 '      </div>'||chr(10)||
 '    </div>'||chr(10)||
 '  </div>'||chr(10)||
 ''||chr(10)||
-' ';
-
-c1:=c1||' <div id="rowSiteNav">'||chr(10)||
+'  <div id="rowSiteNav">'||chr(10)||
 '    <p>I &amp; C Online Quotation System'||chr(10)||
 '    &SYSTEM_ENVIRONMENT.</p>'||chr(10)||
 '  </div>';
@@ -47193,9 +47005,9 @@ c2:=c2||'<div id="rowFooter"><!-- bottom strip of info -->'||chr(10)||
 '	'||chr(10)||
 '	<div class="hskpcol2">'||chr(10)||
 '		<div id="navFooter">'||chr(10)||
-'                        <a href="';
+'                     ';
 
-c2:=c2||'&HELP_URL.">Help</a> | '||chr(10)||
+c2:=c2||'   <a href="&HELP_URL.">Help</a> | '||chr(10)||
 '			<a href="&T_AND_C_URL." target="blank">Terms &amp; conditions</a>'||chr(10)||
 ''||chr(10)||
 '			| <a href="&PRIVACY_URL.">Privacy policy</a>'||chr(10)||
@@ -47228,9 +47040,9 @@ c3:=c3||'  <div id="UKSubNav"'||chr(10)||
 '    </div>'||chr(10)||
 ''||chr(10)||
 '    <div id="colRight">'||chr(10)||
-'      <h1 class="podTitle"><im';
+'      <h1 c';
 
-c3:=c3||'g src='||chr(10)||
+c3:=c3||'lass="podTitle"><img src='||chr(10)||
 '      "#IMAGE_PREFIX#ng_exclaim.gif"'||chr(10)||
 '           alt=""'||chr(10)||
 '           width="23"'||chr(10)||
@@ -47273,7 +47085,6 @@ wwv_flow_api.create_template(
   p_breadcrumb_def_reg_pos => 'REGION_POSITION_01',
   p_theme_id  => 101,
   p_theme_class_id => 3,
-  p_translate_this_template => 'N',
   p_template_comment => '');
 end;
  
@@ -47452,16 +47263,16 @@ c1:=c1||'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://
 '</head>'||chr(10)||
 '<body #ONLOAD#>#FORM_OPEN#'||chr(10)||
 '<div id="rowHd">'||chr(10)||
-'<div id="logo" class="hskpcol1">'||chr(10)||
-'<a hr';
+'<div id="logo" class="hskpcol';
 
-c1:=c1||'ef="http://www.nationalgrid.com/"><img src="#IMAGE_PREFIX#ng_logo_group_medium.gif" alt="National Grid Metering"/></a>'||chr(10)||
+c1:=c1||'1">'||chr(10)||
+'<a href="http://www.nationalgrid.com/"><img src="#IMAGE_PREFIX#ng_logo_group_medium.gif" alt="National Grid Metering"/></a>'||chr(10)||
 '</div>'||chr(10)||
 '<div id="navHousekeep" class="hskpcol2">'||chr(10)||
 '<div class="margin5">'||chr(10)||
-'<a href="holdingpagefortheICOQsystem" class="hskpnav" title="Return to the Metering Online Quotations Home Page" accesskey="1">Home</a>&nbsp;|&nbsp;<a href="&LOGOUT_URL." class="hskpnav" title="Log out of the sy';
+'<a href="holdingpagefortheICOQsystem" class="hskpnav" title="Return to the Metering Online Quotations Home Page" accesskey="1">Home</a>&nbsp;|&nbsp;<a href="&LOGOUT_URL." class="hskpnav" title="Log';
 
-c1:=c1||'stem" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/group/help" class="hskpnav">Help</a>&nbsp;|&nbsp;--><span>You are logged in as:&APP_USER.</span>'||chr(10)||
+c1:=c1||' out of the system" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/group/help" class="hskpnav">Help</a>&nbsp;|&nbsp;--><span>You are logged in as:&APP_USER.</span>'||chr(10)||
 '</div>'||chr(10)||
 '</div>'||chr(10)||
 '</div>'||chr(10)||
@@ -47474,10 +47285,10 @@ c1:=c1||'stem" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/group/help" cla
 'function MyErrorPage(p_err_item,p_err_process)'||chr(10)||
 '{'||chr(10)||
 ''||chr(10)||
-' var vElementList = null;'||chr(10)||
-' var vElement     = null';
+' var vElementList = nul';
 
-c1:=c1||';'||chr(10)||
+c1:=c1||'l;'||chr(10)||
+' var vElement     = null;'||chr(10)||
 ' var vErrorStack  = null;'||chr(10)||
 ' var vOraErrorStack = null;'||chr(10)||
 ' var vOraError    = null;'||chr(10)||
@@ -47493,12 +47304,12 @@ c1:=c1||';'||chr(10)||
 ' return;'||chr(10)||
 ''||chr(10)||
 ' vElementList = window.document.getElementsByTagName("div");'||chr(10)||
-' for (i=0; i < vElementList.length; i++)'||chr(10)||
+' for (i=0; i < vElementList.len';
+
+c1:=c1||'gth; i++)'||chr(10)||
 ' {'||chr(10)||
 '  vElement = vElementList[i];'||chr(10)||
-' ';
-
-c1:=c1||''||chr(10)||
+' '||chr(10)||
 '  if (vElement.className == "ErrorPageMessage")'||chr(10)||
 '  {'||chr(10)||
 '    vErrorStack = (vErrorStack ==null?"":vErrorStack)+vElement.innerHTML;'||chr(10)||
@@ -47507,9 +47318,9 @@ c1:=c1||''||chr(10)||
 '      vElement.innerHTML = ''''; '||chr(10)||
 '      for(var j=1; j < vOraErrorStack.length; j++) {'||chr(10)||
 '        vOraError = vOraErrorStack[j];'||chr(10)||
-'        vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION';
+'        ';
 
-c1:=c1||'_PROCESS=''+p_err_process,0);'||chr(10)||
+c1:=c1||'vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS=''+p_err_process,0);'||chr(10)||
 '        vAjaxRequest.add(p_err_item,vOraError);'||chr(10)||
 '        vAjaxResult = vAjaxRequest.get();'||chr(10)||
 '        if (vAjaxResult) {'||chr(10)||
@@ -47519,21 +47330,21 @@ c1:=c1||'_PROCESS=''+p_err_process,0);'||chr(10)||
 '        }'||chr(10)||
 '      }'||chr(10)||
 '    }'||chr(10)||
-'if (document.getElementById && document.createElement && vMyMsg.length > 0) {'||chr(10)||
-'   var divA = document.getElementById(''Err';
+'if (document.getElementById && document.createElement ';
 
-c1:=c1||'orOutputDiv'');'||chr(10)||
+c1:=c1||'&& vMyMsg.length > 0) {'||chr(10)||
+'   var divA = document.getElementById(''ErrorOutputDiv'');'||chr(10)||
 '   var oH = document.createElement(''h1'');'||chr(10)||
 '   oH.appendChild(document.createTextNode(''Validation failed because:''));'||chr(10)||
 '   var oP = document.createElement(''p'');'||chr(10)||
 '   oP.id = ''FriendlyError'';'||chr(10)||
 '   oP.appendChild(document.createTextNode(vMyMsg));'||chr(10)||
 '   // Insert the heading as the first child of the element'||chr(10)||
-'   divA.insertBefore(oP, divA.firstChild);'||chr(10)||
-'   divA.insertBefore(oH, divA.firstChild);'||chr(10)||
-'   ';
+'   divA.insertB';
 
-c1:=c1||'}'||chr(10)||
+c1:=c1||'efore(oP, divA.firstChild);'||chr(10)||
+'   divA.insertBefore(oH, divA.firstChild);'||chr(10)||
+'   }'||chr(10)||
 '  }'||chr(10)||
 ' }'||chr(10)||
 '}'||chr(10)||
@@ -47556,9 +47367,9 @@ c2:=c2||'<div id="rowFooter"><!-- bottom strip of info -->'||chr(10)||
 '	<div class="hskpcol2">'||chr(10)||
 '		<div id="navFooter">'||chr(10)||
 '                        <a href="&HELP_URL.">Help</a> | '||chr(10)||
-'			<a href="&T';
+'	';
 
-c2:=c2||'_AND_C_URL." target="blank">Terms &amp; conditions</a>'||chr(10)||
+c2:=c2||'		<a href="&T_AND_C_URL." target="blank">Terms &amp; conditions</a>'||chr(10)||
 ''||chr(10)||
 '			| <a href="&PRIVACY_URL.">Privacy policy</a>'||chr(10)||
 '                        | <span style="color:#0067c6; text-decoration:none" id="app_version">#APP_VERSION#</span>'||chr(10)||
@@ -47586,9 +47397,9 @@ c3:=c3||'<div id="UKSubNav" class="reg">'||chr(10)||
 ''||chr(10)||
 '<div id="colRight">'||chr(10)||
 '<h1 class="podTitle"><img src="#IMAGE_PREFIX#ng_exclaim.gif" alt=""/>Important Messages</h1>'||chr(10)||
-'<div class="t4messages">#GLOBAL_NOTIFICATION##SUCC';
+'<div class="t4messages">#GLOBAL_NOT';
 
-c3:=c3||'ESS_MESSAGE##NOTIFICATION_MESSAGE#</div>'||chr(10)||
+c3:=c3||'IFICATION##SUCCESS_MESSAGE##NOTIFICATION_MESSAGE#</div>'||chr(10)||
 '</div>'||chr(10)||
 '</div>'||chr(10)||
 ''||chr(10)||
@@ -47630,7 +47441,6 @@ wwv_flow_api.create_template(
 '<b id=''ORA''>Error</b>'||chr(10)||
 '<tr><td><a href=#BACK_LINK#>#OK#</a></td>'||chr(10)||
 '<td><br /></td></tr></table> ',
-  p_translate_this_template => 'N',
   p_template_comment => '');
 end;
  
@@ -50505,7 +50315,6 @@ wwv_flow_api.create_popup_lov_template (
   p_before_result_set=>'<div class="t4PopupBody">',
   p_theme_id  => 101,
   p_theme_class_id => 1,
-  p_translate_this_template => 'N',
   p_after_result_set   =>'</div>');
 end;
 null;