diff --git a/Screens/f155.sql b/Screens/f155.sql
index 14a9dcc..00539e2 100644
--- a/Screens/f155.sql
+++ b/Screens/f155.sql
@@ -13,7 +13,7 @@ prompt  APPLICATION 155 - webmip
 -- Application Export:
 --   Application:     155
 --   Name:            webmip
---   Date and Time:   14:53 Wednesday March 5, 2008
+--   Date and Time:   12:09 Thursday March 6, 2008
 --   Exported By:     PRIESTJ
 --   Flashback:       0
 --   Export Type:     Application Export
@@ -26,12 +26,12 @@ prompt  APPLICATION 155 - webmip
  
 -- Application Statistics:
 --   Pages:                57
---     Items:             350
+--     Items:             352
 --     Computations:        1
---     Validations:       268
---     Processes:          94
---     Regions:            82
---     Buttons:           119
+--     Validations:       269
+--     Processes:          95
+--     Regions:            84
+--     Buttons:           123
 --   Shared Components
 --     Breadcrumbs:         1
 --        Entries           1
@@ -145,7 +145,7 @@ wwv_flow_api.create_flow(
   p_default_region_template=> 24740611526526770 + wwv_flow_api.g_id_offset,
   p_error_template    => 38911722486594102 + wwv_flow_api.g_id_offset,
   p_page_protection_enabled_y_n=> 'N',
-  p_checksum_salt_last_reset => '20080305145300',
+  p_checksum_salt_last_reset => '20080306120930',
   p_home_link         => 'f?p=&APP_ID.:1',
   p_flow_language     => 'en-gb',
   p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE',
@@ -155,7 +155,8 @@ wwv_flow_api.create_flow(
   p_login_url         => '',
   p_logout_url        => 'wwv_flow_custom_auth_std.logout?p_this_flow=&FLOW_ID.&p_next_flow_page_sess =&FLOW_ID.:500',
   p_application_tab_set=> 1,
-  p_logo_image => 'TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:',
+  p_logo_image => 'TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:',
+  p_logo_image_attributes => 'style="font-family:Arial; color:#004C66; font-size:18px; white-space:nowrap; font-weight:bold;"',
   p_public_url_prefix => '',
   p_public_user       => 'APEX_PUBLIC_USER',
   p_dbauth_url_prefix => '',
@@ -186,7 +187,7 @@ wwv_flow_api.create_flow(
   p_substitution_string_01 => 'SYSTEM_ENVIRONMENT',
   p_substitution_value_01  => '(Development)',
   p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss=> '20080305145300',
+  p_last_upd_yyyymmddhh24miss=> '20080306120930',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -3389,7 +3390,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'DHARSHANIK',
-  p_last_upd_yyyymmddhh24miss => '20080305133939',
+  p_last_upd_yyyymmddhh24miss => '20080305162314',
   p_page_comment  => '');
  
 end;
@@ -3452,7 +3453,7 @@ s:=s||'du.outlet_cnor_code = cnor_outlet.code'||chr(10)||
 'AND modu.code = cost.modu_code'||chr(10)||
 'AND modu.valid_from is not null'||chr(10)||
 'AND cost.cost_type = ''MOCO'''||chr(10)||
-'AND modu.qmax LIKE :P4_REQUESTED_QMAX'||chr(10)||
+'AND modu.qmax >= :P4_REQUESTED_QMAX'||chr(10)||
 'AND modu.svcp_code LIKE :P4_SERVICE_PRESSURE_TIER';
 
 wwv_flow_api.create_report_region (
@@ -4288,7 +4289,14 @@ declare
 begin
 h:=h||'No help is available for this page.';
 
-ph := null;
+ph:=ph||'<script language="JavaScript" type="text/javascript">'||chr(10)||
+'<!--'||chr(10)||
+''||chr(10)||
+' htmldb_delete_message=''"DELETE_CONFIRM_MSG"'';'||chr(10)||
+''||chr(10)||
+'//-->'||chr(10)||
+'</script>';
+
 wwv_flow_api.create_page(
   p_id     => 8,
   p_flow_id=> wwv_flow.g_flow_id,
@@ -4300,15 +4308,16 @@ wwv_flow_api.create_page(
   p_first_item=> 'AUTO_FIRST_ITEM',
   p_include_apex_css_js_yn=>'Y',
   p_help_text => ' ',
-  p_html_page_header => '',
+  p_html_page_header => ' ',
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
-  p_last_updated_by => 'DHARSHANIK',
-  p_last_upd_yyyymmddhh24miss => '20080305144813',
+  p_last_updated_by => 'PRIESTJ',
+  p_last_upd_yyyymmddhh24miss => '20080305155023',
   p_page_is_public_y_n=> 'N',
   p_page_comment  => '');
  
 wwv_flow_api.set_page_help_text(p_flow_id=>wwv_flow.g_flow_id,p_flow_step_id=>8,p_text=>h);
+wwv_flow_api.set_html_page_header(p_flow_id=>wwv_flow.g_flow_id,p_flow_step_id=>8,p_text=>ph);
 end;
  
 end;
@@ -4319,60 +4328,48 @@ declare
   l_clob clob;
   l_length number := 1;
 begin
-s:=s||'SELECT DISTINCT modu.code AS modu_code, modu.svcp_code, prty_modu.name AS modu_manf, modu.drwg_code AS modu_drwg, modu.lead_time,'||chr(10)||
+s:=s||'--MODULE DETAILS'||chr(10)||
+'SELECT DISTINCT modu.code AS modu_code, modu.svcp_code, prty_modu.name AS modu_manf, modu.drwg_code AS modu_drwg, modu.lead_time,'||chr(10)||
 '                modu.dim_a AS modu_dima, modu.dim_b AS modu_dimb, modu.dim_c AS modu_dimc, modu.dim_d AS modu_dimd, modu.dim_e AS modu_dime, '||chr(10)||
 '                modu.dim_f AS modu_dimf, modu.dim_h AS modu_dimh, modu.weight AS modu_weight, modu.qmax,'||chr(10)||
-'                cnor';
+'  ';
 
-s:=s||'_inlet.description AS inlet_orientation, cnty_inlet.description inlet_con_type, modu.inlet_height, modu.inlet_size,'||chr(10)||
+s:=s||'              cnor_inlet.description AS inlet_orientation, cnty_inlet.description inlet_con_type, modu.inlet_height, modu.inlet_size,'||chr(10)||
 '                cnor_outlet.description AS outlet_orientation, cnty_outlet.description AS outlet_con_type, modu.outlet_height, modu.outlet_size,'||chr(10)||
-'                modu.metr_code, cost_modu.selling_price AS modu_selling_price,'||chr(10)||
-'                -- base'||chr(10)||
-'                nvl(bas.code, ''N';
-
-s:=s||'o Base'') AS bas_code, nvl(bas.drwg_code, ''-'') AS bas_drwg, nvl(bas.description, ''-'') AS bas_description, '||chr(10)||
-'                nvl(bas.dim_a, 0) AS bas_dima, nvl(bas.dim_b, 0) AS bas_dimb, nvl(bas.dim_c, 0) AS bas_dimc, nvl(bas.dim_d, 0) AS bas_dimd, '||chr(10)||
-'                nvl(bas.dim_e, 0) AS bas_dime, nvl(bas.dim_f, 0) AS bas_dimf, nvl(bas.dim_g, 0) AS bas_dimg, '||chr(10)||
-'                nvl(bas.dim_h, 0) AS bas';
-
-s:=s||'_dimh, nvl(bas.dim_i, 0) AS bas_dimi, nvl(bas.depth, 0), nvl(cost_bas.selling_price, 0.00) AS bas_selling_price,'||chr(10)||
-'                -- housing'||chr(10)||
-'                nvl(hou.code, ''No Housing'') AS hou_code, nvl(hou.drwg_code, ''-'') AS hou_drwg, nvl(hoty.description,''-'') AS hoty_decription, '||chr(10)||
-'                nvl(hou.description, ''-'') AS hou_description, nvl(hou.dim_l, 0), nvl(hou.dim_w, 0), nvl(hou.dim_h, 0';
-
-s:=s||') AS hou_dimh, '||chr(10)||
-'                nvl(hou.weight, 0) AS hou_weight, nvl(prty_hou.name,''-'') AS hou_manf, nvl(cost_hou.selling_price, 0.00) AS hou_selling_price'||chr(10)||
+'                modu.metr_code, cost_modu.selling_price AS modu_selling_price'||chr(10)||
 'FROM modules modu, parties prty_modu, '||chr(10)||
-'     connection_orientations cnor_inlet, connection_types cnty_inlet, connection_orientations cnor_outlet, connection_types cnty_outlet,'||chr(10)||
-'     costs cost_modu, bases bas, costs cost_bas, housings hou, ';
+'';
 
-s:=s||'housing_types hoty, parties prty_hou, costs cost_hou'||chr(10)||
+s:=s||'     connection_orientations cnor_inlet, connection_types cnty_inlet, connection_orientations cnor_outlet, connection_types cnty_outlet,'||chr(10)||
+'     costs cost_modu, bases bas, costs cost_bas, housings hou, housing_types hoty, parties prty_hou, costs cost_hou'||chr(10)||
 'WHERE modu.prty_id = prty_modu.id'||chr(10)||
 '  AND modu.inlet_cnor_code = cnor_inlet.code'||chr(10)||
 '  AND modu.inlet_cnty_code = cnty_inlet.code'||chr(10)||
-'  AND modu.outlet_cnor_code = cnor_outlet.code'||chr(10)||
+'  AND modu.outlet_';
+
+s:=s||'cnor_code = cnor_outlet.code'||chr(10)||
 '  AND modu.outlet_cnty_code = cnty_outlet.code'||chr(10)||
 '  AND modu.code = cost_modu.modu_code'||chr(10)||
 '  AND modu.bas_code = bas.code(+)'||chr(10)||
 '  AND bas.code = cost_bas.bas_code(+)'||chr(10)||
-'  AND modu';
-
-s:=s||'.hou_code = hou.code(+)'||chr(10)||
+'  AND modu.hou_code = hou.code(+)'||chr(10)||
 '  AND hou.hoty_code = hoty.code(+)'||chr(10)||
 '  AND hou.prty_id = prty_hou.id(+)'||chr(10)||
 '  AND hou.code = cost_hou.hou_code(+)'||chr(10)||
 '  AND modu.valid_from IS NOT NULL'||chr(10)||
-'  AND cost_modu.cost_type = ''MOCO'''||chr(10)||
+'  AND cost_modu.cost_type = ';
+
+s:=s||'''MOCO'''||chr(10)||
 '  AND cost_bas.cost_type(+) = ''BACO'''||chr(10)||
 '  AND cost_hou.cost_type(+) = ''HOCO'''||chr(10)||
-'  AND modu.code LIKE ''AD016S'' --:P8_MODULE_CODE';
+'  AND modu.code LIKE ''AD016S''--:P8_MODULE_CODE';
 
 wwv_flow_api.create_report_region (
   p_id=> 997215818433865 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
   p_page_id=> 8,
   p_name=> 'Module Details',
-  p_region_name=>'',
+  p_region_name=>'module',
   p_template=> 24740611526526770+ wwv_flow_api.g_id_offset,
   p_display_sequence=> 10,
   p_display_column=> 1,
@@ -4394,7 +4391,7 @@ wwv_flow_api.create_report_region (
   p_query_row_count_max=> '500',
   p_pagination_display_position=> 'BOTTOM_RIGHT',
   p_csv_output=> 'Y',
-  p_csv_output_link_text=> 'Save as csv/spreadsheet file',
+  p_csv_output_link_text=> 'Export to spreadsheet',
   p_prn_output=> 'N',
   p_sort_null=> 'F',
   p_query_asc_image=> 'arrow_down_gray_dark.gif',
@@ -4465,7 +4462,7 @@ wwv_flow_api.create_report_columns (
   p_form_element_id=> null,
   p_column_alias=> 'MODU_MANF',
   p_column_display_sequence=> 3,
-  p_column_heading=> 'Module Manufacturer',
+  p_column_heading=> 'Manufacturer',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4489,7 +4486,7 @@ wwv_flow_api.create_report_columns (
   p_form_element_id=> null,
   p_column_alias=> 'MODU_DRWG',
   p_column_display_sequence=> 4,
-  p_column_heading=> 'Module Drawing',
+  p_column_heading=> 'Drawing',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4512,7 +4509,7 @@ wwv_flow_api.create_report_columns (
   p_query_column_id=> 5,
   p_form_element_id=> null,
   p_column_alias=> 'LEAD_TIME',
-  p_column_display_sequence=> 5,
+  p_column_display_sequence=> 11,
   p_column_heading=> 'Lead Time',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
@@ -4536,8 +4533,8 @@ wwv_flow_api.create_report_columns (
   p_query_column_id=> 6,
   p_form_element_id=> null,
   p_column_alias=> 'MODU_DIMA',
-  p_column_display_sequence=> 6,
-  p_column_heading=> 'Module Dimension A',
+  p_column_display_sequence=> 5,
+  p_column_heading=> 'Dimension A',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4560,8 +4557,8 @@ wwv_flow_api.create_report_columns (
   p_query_column_id=> 7,
   p_form_element_id=> null,
   p_column_alias=> 'MODU_DIMB',
-  p_column_display_sequence=> 7,
-  p_column_heading=> 'Module Dimension B',
+  p_column_display_sequence=> 6,
+  p_column_heading=> 'Dimension B',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4584,8 +4581,8 @@ wwv_flow_api.create_report_columns (
   p_query_column_id=> 8,
   p_form_element_id=> null,
   p_column_alias=> 'MODU_DIMC',
-  p_column_display_sequence=> 8,
-  p_column_heading=> 'Module Dimension C',
+  p_column_display_sequence=> 7,
+  p_column_heading=> 'Dimension C',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4608,8 +4605,8 @@ wwv_flow_api.create_report_columns (
   p_query_column_id=> 9,
   p_form_element_id=> null,
   p_column_alias=> 'MODU_DIMD',
-  p_column_display_sequence=> 9,
-  p_column_heading=> 'Module Dimension D',
+  p_column_display_sequence=> 8,
+  p_column_heading=> 'Dimension D',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4632,8 +4629,8 @@ wwv_flow_api.create_report_columns (
   p_query_column_id=> 10,
   p_form_element_id=> null,
   p_column_alias=> 'MODU_DIME',
-  p_column_display_sequence=> 10,
-  p_column_heading=> 'Module Dimension E',
+  p_column_display_sequence=> 9,
+  p_column_heading=> 'Dimension E',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4656,8 +4653,8 @@ wwv_flow_api.create_report_columns (
   p_query_column_id=> 11,
   p_form_element_id=> null,
   p_column_alias=> 'MODU_DIMF',
-  p_column_display_sequence=> 11,
-  p_column_heading=> 'Module Dimension F',
+  p_column_display_sequence=> 10,
+  p_column_heading=> 'Dimension F',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4681,7 +4678,7 @@ wwv_flow_api.create_report_columns (
   p_form_element_id=> null,
   p_column_alias=> 'MODU_DIMH',
   p_column_display_sequence=> 12,
-  p_column_heading=> 'Module Dimension H',
+  p_column_heading=> 'Dimension H',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4705,7 +4702,7 @@ wwv_flow_api.create_report_columns (
   p_form_element_id=> null,
   p_column_alias=> 'MODU_WEIGHT',
   p_column_display_sequence=> 13,
-  p_column_heading=> 'Module Weight',
+  p_column_heading=> 'Weight',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4969,7 +4966,7 @@ wwv_flow_api.create_report_columns (
   p_form_element_id=> null,
   p_column_alias=> 'MODU_SELLING_PRICE',
   p_column_display_sequence=> 24,
-  p_column_heading=> 'Module Material Cost (Selling Price)',
+  p_column_heading=> 'Material Cost (Selling Price)',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -4981,23 +4978,107 @@ wwv_flow_api.create_report_columns (
   p_column_comment=>'');
 end;
 /
+declare
+  s varchar2(32767) := null;
+  l_clob clob;
+  l_length number := 1;
+begin
+s:=s||'SELECT DISTINCT nvl(bas.code, ''No Base'') AS bas_code, '||chr(10)||
+'                nvl(bas.drwg_code, ''-'') AS bas_drwg, '||chr(10)||
+'                nvl(bas.description, ''-'') AS bas_description, '||chr(10)||
+'                nvl(bas.dim_a, 0) AS bas_dima, '||chr(10)||
+'                nvl(bas.dim_b, 0) AS bas_dimb, '||chr(10)||
+'                nvl(bas.dim_c, 0) AS bas_dimc, '||chr(10)||
+'                nvl(bas.dim_d, 0) AS bas_dimd, '||chr(10)||
+'                nvl(bas.dim_e';
+
+s:=s||', 0) AS bas_dime, '||chr(10)||
+'                nvl(bas.dim_f, 0) AS bas_dimf, '||chr(10)||
+'                nvl(bas.dim_g, 0) AS bas_dimg, '||chr(10)||
+'                nvl(bas.dim_h, 0) AS bas_dimh, '||chr(10)||
+'                nvl(bas.dim_i, 0) AS bas_dimi, '||chr(10)||
+'                nvl(bas.depth, 0), '||chr(10)||
+'                nvl(cost_bas.selling_price, 0.00) AS bas_selling_price'||chr(10)||
+'FROM modules modu, parties prty_modu, '||chr(10)||
+'     connection_orientations cnor_i';
+
+s:=s||'nlet, connection_types cnty_inlet, '||chr(10)||
+'     connection_orientations cnor_outlet, connection_types cnty_outlet,'||chr(10)||
+'     costs cost_modu, bases bas, costs cost_bas, '||chr(10)||
+'     housings hou, housing_types hoty, parties prty_hou, costs cost_hou'||chr(10)||
+'WHERE modu.prty_id = prty_modu.id'||chr(10)||
+'  AND modu.inlet_cnor_code = cnor_inlet.code'||chr(10)||
+'  AND modu.inlet_cnty_code = cnty_inlet.code'||chr(10)||
+'  AND modu.outlet_cnor_code = cnor_outl';
+
+s:=s||'et.code'||chr(10)||
+'  AND modu.outlet_cnty_code = cnty_outlet.code'||chr(10)||
+'  AND modu.code = cost_modu.modu_code'||chr(10)||
+'  AND modu.bas_code = bas.code(+)'||chr(10)||
+'  AND bas.code = cost_bas.bas_code(+)'||chr(10)||
+'  AND modu.hou_code = hou.code(+)'||chr(10)||
+'  AND hou.hoty_code = hoty.code(+)'||chr(10)||
+'  AND hou.prty_id = prty_hou.id(+)'||chr(10)||
+'  AND hou.code = cost_hou.hou_code(+)'||chr(10)||
+'  AND modu.valid_from IS NOT NULL'||chr(10)||
+'  AND cost_modu.cost_type = ''MOCO'''||chr(10)||
+'  AND cost_ba';
+
+s:=s||'s.cost_type(+) = ''BACO'''||chr(10)||
+'  AND cost_hou.cost_type(+) = ''HOCO'''||chr(10)||
+'  AND modu.code LIKE ''AD016S''--:P8_MODULE_CODE';
+
+wwv_flow_api.create_report_region (
+  p_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_page_id=> 8,
+  p_name=> 'Base Details',
+  p_region_name=>'base',
+  p_template=> 24740611526526770+ wwv_flow_api.g_id_offset,
+  p_display_sequence=> 20,
+  p_display_column=> 1,
+  p_display_point=> 'AFTER_SHOW_ITEMS',
+  p_source=> s,
+  p_source_type=> 'SQL_QUERY',
+  p_display_error_message=> '#SQLERRM#',
+  p_customized=> '0',
+  p_translate_title=> 'Y',
+  p_ajax_enabled=> 'Y',
+  p_query_row_template=> 11,
+  p_query_headings_type=> 'COLON_DELMITED_LIST',
+  p_query_options=> 'DERIVED_REPORT_COLUMNS',
+  p_query_show_nulls_as=> ' - ',
+  p_query_break_cols=> '0',
+  p_query_no_data_found=> 'no data found',
+  p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
+  p_pagination_display_position=> 'BOTTOM_RIGHT',
+  p_csv_output=> 'Y',
+  p_csv_output_link_text=> 'Export to spreadsheet',
+  p_sort_null=> 'F',
+  p_query_asc_image=> 'arrow_down_gray_dark.gif',
+  p_query_asc_image_attr=> 'width="13" height="12" alt=""',
+  p_query_desc_image=> 'arrow_up_gray_dark.gif',
+  p_query_desc_image_attr=> 'width="13" height="12" alt=""',
+  p_plug_query_strip_html=> 'Y',
+  p_comment=>'');
+end;
+/
 declare
   s varchar2(32767) := null;
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1013219424760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1057710091079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 25,
+  p_query_column_id=> 1,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_CODE',
-  p_column_display_sequence=> 25,
+  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=>'Y',
+  p_disable_sort_column=>'N',
   p_sum_column=> 'N',
   p_hidden_column=> 'N',
   p_display_as=>'WITHOUT_MODIFICATION',
@@ -5010,16 +5091,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1013319557760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1057828380079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 26,
+  p_query_column_id=> 2,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DRWG',
-  p_column_display_sequence=> 26,
-  p_column_heading=> 'Base Drawing',
+  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',
@@ -5034,16 +5114,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1013409776760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1057908273079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 27,
+  p_query_column_id=> 3,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DESCRIPTION',
-  p_column_display_sequence=> 37,
-  p_column_heading=> 'Base Description',
+  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',
@@ -5058,16 +5137,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1013521194760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058009888079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 28,
+  p_query_column_id=> 4,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIMA',
-  p_column_display_sequence=> 27,
-  p_column_heading=> 'Base Dimension A',
+  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',
@@ -5082,16 +5160,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1013600050760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058117676079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 29,
+  p_query_column_id=> 5,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIMB',
-  p_column_display_sequence=> 28,
-  p_column_heading=> 'Base Dimension B',
+  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',
@@ -5106,16 +5183,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1013711294760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058232659079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 30,
+  p_query_column_id=> 6,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIMC',
-  p_column_display_sequence=> 29,
-  p_column_heading=> 'Base Dimension C',
+  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',
@@ -5130,16 +5206,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1013810443760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058302882079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 31,
+  p_query_column_id=> 7,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIMD',
-  p_column_display_sequence=> 30,
-  p_column_heading=> 'Base Dimension D',
+  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',
@@ -5154,16 +5229,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1013930725760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058424114079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 32,
+  p_query_column_id=> 8,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIME',
-  p_column_display_sequence=> 31,
-  p_column_heading=> 'Base Dimension E',
+  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',
@@ -5178,16 +5252,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1014015957760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058520321079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 33,
+  p_query_column_id=> 9,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIMF',
-  p_column_display_sequence=> 32,
-  p_column_heading=> 'Base Dimension F',
+  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',
@@ -5202,16 +5275,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1014117104760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058612754079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 34,
+  p_query_column_id=> 10,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIMG',
-  p_column_display_sequence=> 33,
-  p_column_heading=> 'Base Dimension G',
+  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',
@@ -5226,16 +5298,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1014223432760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058731729079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 35,
+  p_query_column_id=> 11,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIMH',
-  p_column_display_sequence=> 34,
-  p_column_heading=> 'Base Dimension H',
+  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',
@@ -5250,16 +5321,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1014311536760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058809152079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 36,
+  p_query_column_id=> 12,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_DIMI',
-  p_column_display_sequence=> 35,
-  p_column_heading=> 'Base Dimension I',
+  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',
@@ -5274,16 +5344,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1014411446760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1058907671079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 37,
+  p_query_column_id=> 13,
   p_form_element_id=> null,
   p_column_alias=> 'NVL(BAS.DEPTH,0)',
-  p_column_display_sequence=> 36,
-  p_column_heading=> 'Base Depth',
+  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',
@@ -5298,16 +5367,15 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1014504797760053 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1059016815079584 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1057420210079578 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 38,
+  p_query_column_id=> 14,
   p_form_element_id=> null,
   p_column_alias=> 'BAS_SELLING_PRICE',
-  p_column_display_sequence=> 38,
-  p_column_heading=> 'Base Material Cost (Selling Price)',
+  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',
@@ -5317,18 +5385,97 @@ wwv_flow_api.create_report_columns (
   p_column_comment=>'');
 end;
 /
+declare
+  s varchar2(32767) := null;
+  l_clob clob;
+  l_length number := 1;
+begin
+s:=s||'SELECT DISTINCT nvl(hou.code, ''No Housing'') AS hou_code, '||chr(10)||
+'                nvl(hou.drwg_code, ''-'') AS hou_drwg, '||chr(10)||
+'                nvl(hoty.description,''-'') AS hoty_decription, '||chr(10)||
+'                nvl(hou.description, ''-'') AS hou_description, '||chr(10)||
+'                nvl(hou.dim_l, 0), '||chr(10)||
+'                nvl(hou.dim_w, 0), '||chr(10)||
+'                nvl(hou.dim_h, 0) AS hou_dimh, '||chr(10)||
+'                nvl(hou.weight, 0) ';
+
+s:=s||'AS hou_weight, '||chr(10)||
+'                nvl(prty_hou.name,''-'') AS hou_manf, '||chr(10)||
+'                nvl(cost_hou.selling_price, 0.00) AS hou_selling_price'||chr(10)||
+'FROM modules modu, parties prty_modu, '||chr(10)||
+'     connection_orientations cnor_inlet, connection_types cnty_inlet, '||chr(10)||
+'     connection_orientations cnor_outlet, connection_types cnty_outlet,'||chr(10)||
+'     costs cost_modu, bases bas, costs cost_bas, '||chr(10)||
+'     housings hou, ho';
+
+s:=s||'using_types hoty, parties prty_hou, costs cost_hou'||chr(10)||
+'WHERE modu.prty_id = prty_modu.id'||chr(10)||
+'  AND modu.inlet_cnor_code = cnor_inlet.code'||chr(10)||
+'  AND modu.inlet_cnty_code = cnty_inlet.code'||chr(10)||
+'  AND modu.outlet_cnor_code = cnor_outlet.code'||chr(10)||
+'  AND modu.outlet_cnty_code = cnty_outlet.code'||chr(10)||
+'  AND modu.code = cost_modu.modu_code'||chr(10)||
+'  AND modu.bas_code = bas.code(+)'||chr(10)||
+'  AND bas.code = cost_bas.bas_code(+)'||chr(10)||
+'  AND modu.h';
+
+s:=s||'ou_code = hou.code(+)'||chr(10)||
+'  AND hou.hoty_code = hoty.code(+)'||chr(10)||
+'  AND hou.prty_id = prty_hou.id(+)'||chr(10)||
+'  AND hou.code = cost_hou.hou_code(+)'||chr(10)||
+'  AND modu.valid_from IS NOT NULL'||chr(10)||
+'  AND cost_modu.cost_type = ''MOCO'''||chr(10)||
+'  AND cost_bas.cost_type(+) = ''BACO'''||chr(10)||
+'  AND cost_hou.cost_type(+) = ''HOCO'''||chr(10)||
+'  AND modu.code LIKE ''AD016S''--:P8_MODULE_CODE';
+
+wwv_flow_api.create_report_region (
+  p_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_page_id=> 8,
+  p_name=> 'Housing Details',
+  p_region_name=>'housing',
+  p_template=> 24740611526526770+ wwv_flow_api.g_id_offset,
+  p_display_sequence=> 30,
+  p_display_column=> 1,
+  p_display_point=> 'AFTER_SHOW_ITEMS',
+  p_source=> s,
+  p_source_type=> 'SQL_QUERY',
+  p_display_error_message=> '#SQLERRM#',
+  p_customized=> '0',
+  p_translate_title=> 'Y',
+  p_ajax_enabled=> 'Y',
+  p_query_row_template=> 11,
+  p_query_headings_type=> 'COLON_DELMITED_LIST',
+  p_query_options=> 'DERIVED_REPORT_COLUMNS',
+  p_query_show_nulls_as=> ' - ',
+  p_query_break_cols=> '0',
+  p_query_no_data_found=> 'no data found',
+  p_query_num_rows_type=> 'NEXT_PREVIOUS_LINKS',
+  p_pagination_display_position=> 'BOTTOM_RIGHT',
+  p_csv_output=> 'Y',
+  p_csv_output_link_text=> 'Export to spreadsheet',
+  p_sort_null=> 'F',
+  p_query_asc_image=> 'arrow_down_gray_dark.gif',
+  p_query_asc_image_attr=> 'width="13" height="12" alt=""',
+  p_query_desc_image=> 'arrow_up_gray_dark.gif',
+  p_query_desc_image_attr=> 'width="13" height="12" alt=""',
+  p_plug_query_strip_html=> 'Y',
+  p_comment=>'');
+end;
+/
 declare
   s varchar2(32767) := null;
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1015223505768285 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1121306998172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 39,
+  p_query_column_id=> 1,
   p_form_element_id=> null,
   p_column_alias=> 'HOU_CODE',
-  p_column_display_sequence=> 39,
+  p_column_display_sequence=> 1,
   p_column_heading=> 'Housing Code',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
@@ -5346,14 +5493,14 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1015326081768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1121417438172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 40,
+  p_query_column_id=> 2,
   p_form_element_id=> null,
   p_column_alias=> 'HOU_DRWG',
-  p_column_display_sequence=> 40,
-  p_column_heading=> 'Housing Drawing',
+  p_column_display_sequence=> 2,
+  p_column_heading=> 'Drawing',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -5370,13 +5517,13 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1015430306768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1121523546172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 41,
+  p_query_column_id=> 3,
   p_form_element_id=> null,
   p_column_alias=> 'HOTY_DECRIPTION',
-  p_column_display_sequence=> 41,
+  p_column_display_sequence=> 3,
   p_column_heading=> 'Housing Type',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
@@ -5394,14 +5541,14 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1015532161768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1121628959172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 42,
+  p_query_column_id=> 4,
   p_form_element_id=> null,
   p_column_alias=> 'HOU_DESCRIPTION',
-  p_column_display_sequence=> 42,
-  p_column_heading=> 'Housing Description',
+  p_column_display_sequence=> 4,
+  p_column_heading=> 'Description',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -5418,14 +5565,14 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1015617608768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1121708821172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 43,
+  p_query_column_id=> 5,
   p_form_element_id=> null,
   p_column_alias=> 'NVL(HOU.DIM_L,0)',
-  p_column_display_sequence=> 43,
-  p_column_heading=> 'Housing Dimension L',
+  p_column_display_sequence=> 5,
+  p_column_heading=> 'Dimension L',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -5442,14 +5589,14 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1015724725768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1121803134172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 44,
+  p_query_column_id=> 6,
   p_form_element_id=> null,
   p_column_alias=> 'NVL(HOU.DIM_W,0)',
-  p_column_display_sequence=> 44,
-  p_column_heading=> 'Housing Dimension W',
+  p_column_display_sequence=> 6,
+  p_column_heading=> 'Dimension W',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -5466,14 +5613,14 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1015819000768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1121904678172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 45,
+  p_query_column_id=> 7,
   p_form_element_id=> null,
   p_column_alias=> 'HOU_DIMH',
-  p_column_display_sequence=> 45,
-  p_column_heading=> 'Housing Dimension H',
+  p_column_display_sequence=> 7,
+  p_column_heading=> 'Dimenstion H',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -5490,14 +5637,14 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1015907318768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1122031403172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 46,
+  p_query_column_id=> 8,
   p_form_element_id=> null,
   p_column_alias=> 'HOU_WEIGHT',
-  p_column_display_sequence=> 46,
-  p_column_heading=> 'Housing Weight',
+  p_column_display_sequence=> 8,
+  p_column_heading=> 'Weight',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -5514,14 +5661,14 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1016001343768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1122123341172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 47,
+  p_query_column_id=> 9,
   p_form_element_id=> null,
   p_column_alias=> 'HOU_MANF',
-  p_column_display_sequence=> 47,
-  p_column_heading=> 'Housing Manufacturer',
+  p_column_display_sequence=> 9,
+  p_column_heading=> 'Manufacturer',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -5538,14 +5685,14 @@ declare
 begin
 s := null;
 wwv_flow_api.create_report_columns (
-  p_id=> 1016124289768287 + wwv_flow_api.g_id_offset,
-  p_region_id=> 997215818433865 + wwv_flow_api.g_id_offset,
+  p_id=> 1122207976172153 + wwv_flow_api.g_id_offset,
+  p_region_id=> 1121013209172151 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
-  p_query_column_id=> 48,
+  p_query_column_id=> 10,
   p_form_element_id=> null,
   p_column_alias=> 'HOU_SELLING_PRICE',
-  p_column_display_sequence=> 48,
-  p_column_heading=> 'Housing Material Cost (Selling Price)',
+  p_column_display_sequence=> 10,
+  p_column_heading=> 'Material Cost (Selling Price)',
   p_column_alignment=>'LEFT',
   p_heading_alignment=>'CENTER',
   p_default_sort_column_sequence=>0,
@@ -5560,7 +5707,62 @@ end;
  
 begin
  
-null;
+wwv_flow_api.create_page_button(
+  p_id             => 1080210902112656 + wwv_flow_api.g_id_offset,
+  p_flow_id        => wwv_flow.g_flow_id,
+  p_flow_step_id   => 8,
+  p_button_sequence=> 20,
+  p_button_plug_id => 1079803765112650+wwv_flow_api.g_id_offset,
+  p_button_name    => 'SAVE',
+  p_button_image   => 'template:'||to_char(24749440874526790+wwv_flow_api.g_id_offset),
+  p_button_image_alt=> 'Apply Changes',
+  p_button_position=> 'REGION_TEMPLATE_CHANGE',
+  p_button_alignment=> 'RIGHT',
+  p_database_action=>'UPDATE',
+  p_required_patch => null + wwv_flow_api.g_id_offset);
+ 
+wwv_flow_api.create_page_button(
+  p_id             => 1080004244112656 + wwv_flow_api.g_id_offset,
+  p_flow_id        => wwv_flow.g_flow_id,
+  p_flow_step_id   => 8,
+  p_button_sequence=> 10,
+  p_button_plug_id => 1079803765112650+wwv_flow_api.g_id_offset,
+  p_button_name    => 'CANCEL',
+  p_button_image   => 'template:'||to_char(24749440874526790+wwv_flow_api.g_id_offset),
+  p_button_image_alt=> 'Cancel',
+  p_button_position=> 'REGION_TEMPLATE_CLOSE',
+  p_button_alignment=> 'RIGHT',
+  p_required_patch => null + wwv_flow_api.g_id_offset);
+ 
+wwv_flow_api.create_page_button(
+  p_id             => 1080115870112656 + wwv_flow_api.g_id_offset,
+  p_flow_id        => wwv_flow.g_flow_id,
+  p_flow_step_id   => 8,
+  p_button_sequence=> 20,
+  p_button_plug_id => 1079803765112650+wwv_flow_api.g_id_offset,
+  p_button_name    => 'CREATE',
+  p_button_image   => 'template:'||to_char(24749440874526790+wwv_flow_api.g_id_offset),
+  p_button_image_alt=> 'Create',
+  p_button_position=> 'REGION_TEMPLATE_CREATE',
+  p_button_alignment=> 'RIGHT',
+  p_database_action=>'INSERT',
+  p_required_patch => null + wwv_flow_api.g_id_offset);
+ 
+wwv_flow_api.create_page_button(
+  p_id             => 1080300993112656 + wwv_flow_api.g_id_offset,
+  p_flow_id        => wwv_flow.g_flow_id,
+  p_flow_step_id   => 8,
+  p_button_sequence=> 20,
+  p_button_plug_id => 1079803765112650+wwv_flow_api.g_id_offset,
+  p_button_name    => 'DELETE',
+  p_button_image   => 'template:'||to_char(24749440874526790+wwv_flow_api.g_id_offset),
+  p_button_image_alt=> 'Delete',
+  p_button_position=> 'REGION_TEMPLATE_DELETE',
+  p_button_alignment=> 'RIGHT',
+  p_button_redirect_url=> 'javascript:confirmDelete(htmldb_delete_message,''DELETE'');',
+  p_database_action=>'DELETE',
+  p_required_patch => null + wwv_flow_api.g_id_offset);
+ 
  
 end;
 /
@@ -34814,7 +35016,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'MULLENM',
-  p_last_upd_yyyymmddhh24miss => '20080227112418',
+  p_last_upd_yyyymmddhh24miss => '20080306111409',
   p_page_is_public_y_n=> 'N',
   p_page_comment  => '');
  
@@ -34910,6 +35112,7 @@ wwv_flow_api.create_report_region (
   p_display_condition_type=> 'FUNCTION_BODY',
   p_customized=> '0',
   p_translate_title=> 'Y',
+  p_ajax_enabled=> 'N',
   p_query_row_template=> 24743617611526775+ wwv_flow_api.g_id_offset,
   p_query_headings_type=> 'COLON_DELMITED_LIST',
   p_query_num_rows=> '15',
@@ -36579,7 +36782,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'MULLENM',
-  p_last_upd_yyyymmddhh24miss => '20080305094311',
+  p_last_upd_yyyymmddhh24miss => '20080305170240',
   p_page_is_public_y_n=> 'N',
   p_page_comment  => '');
  
@@ -36695,6 +36898,7 @@ wwv_flow_api.create_report_region (
   p_display_error_message=> '#SQLERRM#',
   p_customized=> '0',
   p_translate_title=> 'Y',
+  p_ajax_enabled=> 'N',
   p_query_row_template=> 24743617611526775+ wwv_flow_api.g_id_offset,
   p_query_headings_type=> 'COLON_DELMITED_LIST',
   p_query_num_rows=> '15',
@@ -37119,6 +37323,52 @@ wwv_flow_api.create_page_branch(
   p_branch_comment=> '');
  
  
+end;
+/
+
+declare
+    h varchar2(32767) := null;
+begin
+wwv_flow_api.create_page_item(
+  p_id=>1179105122586153 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id=> 66,
+  p_name=>'P66_SUPPLIER',
+  p_data_type=> 'VARCHAR',
+  p_accept_processing=> 'REPLACE_EXISTING',
+  p_item_sequence=> 210,
+  p_item_plug_id => 20933610466296942+wwv_flow_api.g_id_offset,
+  p_use_cache_before_default=> 'YES',
+  p_item_default_type => 'STATIC_TEXT_WITH_SUBSTITUTIONS',
+  p_prompt=>'Supplier',
+  p_source_type=> 'STATIC',
+  p_display_as=> 'TEXT',
+  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',
+  p_begin_on_new_line => 'YES',
+  p_begin_on_new_field=> 'YES',
+  p_colspan => 1,
+  p_rowspan => 1,
+  p_label_alignment  => 'RIGHT',
+  p_field_alignment  => 'LEFT',
+  p_display_when=>'if upper(:P66_PRTY_TYPE) = ''PERS'' then'||chr(10)||
+'  return true;'||chr(10)||
+'else return false;'||chr(10)||
+'end if;',
+  p_display_when_type=>'FUNCTION_BODY',
+  p_read_only_when_type=>'ALWAYS',
+  p_field_template => 24749138532526789+wwv_flow_api.g_id_offset,
+  p_is_persistent=> 'Y',
+  p_lov_display_extra=>'NO',
+  p_protection_level => 'N',
+  p_item_comment => '');
+ 
+ 
 end;
 /
 
@@ -37428,7 +37678,7 @@ wwv_flow_api.create_page_item(
   p_label_alignment  => 'RIGHT',
   p_field_alignment  => 'LEFT',
   p_read_only_when_type=>'ALWAYS',
-  p_field_template => 24749318534526790+wwv_flow_api.g_id_offset,
+  p_field_template => 24749138532526789+wwv_flow_api.g_id_offset,
   p_is_persistent=> 'Y',
   p_lov_display_extra=>'NO',
   p_protection_level => 'N',
@@ -38479,6 +38729,53 @@ end;
 /
 
  
+begin
+ 
+declare
+  p varchar2(32767) := null;
+  l_clob clob;
+  l_length number := 1;
+begin
+p:=p||'begin'||chr(10)||
+''||chr(10)||
+'  if upper(:P66_PRTY_TYPE) = ''PERS'' then '||chr(10)||
+'    SELECT p.NAME'||chr(10)||
+'      INTO :P66_SUPPLIER'||chr(10)||
+'      FROM v_party_relationships v, parties p'||chr(10)||
+'     WHERE v.to_parl_prty_id = p.ID'||chr(10)||
+'       AND v.from_parl_prty_id = :P66_ID'||chr(10)||
+'       AND v.to_rt_code = ''SUPP'';'||chr(10)||
+'  end if;'||chr(10)||
+'exception'||chr(10)||
+'  when no_data_found then'||chr(10)||
+'    :P66_SUPPLIER := ''N/A'';'||chr(10)||
+'end;';
+
+wwv_flow_api.create_page_process(
+  p_id     => 1182815052730943 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id => 66,
+  p_process_sequence=> 50,
+  p_process_point=> 'AFTER_HEADER',
+  p_process_type=> 'PLSQL',
+  p_process_name=> 'get_supplier',
+  p_process_sql_clob => p, 
+  p_process_error_message=> '',
+  p_process_when=>'if upper(:P66_PRTY_TYPE) = ''PERS'' then'||chr(10)||
+'  return true;'||chr(10)||
+'else return false;'||chr(10)||
+'end if;',
+  p_process_when_type=>'',
+  p_process_success_message=> '',
+  p_process_is_stateful_y_n=>'N',
+  p_process_comment=>'');
+end;
+null;
+ 
+end;
+/
+
+ 
 begin
  
 declare
@@ -39327,7 +39624,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'MULLENM',
-  p_last_upd_yyyymmddhh24miss => '20080220142909',
+  p_last_upd_yyyymmddhh24miss => '20080306111145',
   p_page_is_public_y_n=> 'N',
   p_page_comment  => '');
  
@@ -41739,7 +42036,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'HARDYA',
-  p_last_upd_yyyymmddhh24miss => '20080305145224',
+  p_last_upd_yyyymmddhh24miss => '20080305163508',
   p_page_is_public_y_n=> 'N',
   p_page_comment  => '');
  
@@ -42327,12 +42624,16 @@ wwv_flow_api.create_page_item(
   p_item_plug_id => 26078608102874706+wwv_flow_api.g_id_offset,
   p_use_cache_before_default=> 'YES',
   p_item_default_type => 'STATIC_TEXT_WITH_SUBSTITUTIONS',
+  p_prompt=>'Terms and Conditions',
+  p_format_mask=>'style="display: inline;"',
   p_source_type=> 'STATIC',
-  p_display_as=> 'RADIOGROUP',
+  p_display_as=> 'COMBOBOX',
   p_lov => 'STATIC2:I accept the Terms and Conditions described within the quotation document;YES,I <b>do not</b> accept the Terms and Conditions described within the quotation document;NO',
   p_lov_columns=> 1,
-  p_lov_display_null=> 'NO',
+  p_lov_display_null=> 'YES',
   p_lov_translated=> 'N',
+  p_lov_null_text=>'-- Select one of the following statements --',
+  p_lov_null_value=> '',
   p_cSize=> 30,
   p_cMaxlength=> 2000,
   p_cHeight=> 5,
@@ -44919,8 +45220,8 @@ wwv_flow_api.create_page(
   p_html_page_header => '',
   p_step_template => 24734011047526756+ 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 => '20080229134330',
+  p_last_updated_by => 'HARDYA',
+  p_last_upd_yyyymmddhh24miss => '20080305172524',
   p_page_is_public_y_n=> 'Y',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -44943,7 +45244,7 @@ wwv_flow_api.create_page_plug (
   p_plug_name=> 'Login',
   p_region_name=>'',
   p_plug_template=> 0,
-  p_plug_display_sequence=> 10,
+  p_plug_display_sequence=> 20,
   p_plug_display_column=> 1,
   p_plug_display_point=> 'AFTER_SHOW_ITEMS',
   p_plug_source=> s,
@@ -44993,6 +45294,47 @@ begin
  
 null;
  
+end;
+/
+
+declare
+    h varchar2(32767) := null;
+begin
+wwv_flow_api.create_page_item(
+  p_id=>1181431450669473 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id=> 101,
+  p_name=>'P101_TC_ACCEPTED',
+  p_data_type=> 'VARCHAR',
+  p_accept_processing=> 'REPLACE_EXISTING',
+  p_item_sequence=> 49,
+  p_item_plug_id => 11076809493541525+wwv_flow_api.g_id_offset,
+  p_use_cache_before_default=> 'YES',
+  p_item_default_type => 'STATIC_TEXT_WITH_SUBSTITUTIONS',
+  p_prompt=>'The Terms and Conditions for using this site are defined <a href="www.nationalgrid.com/uk/metering/mip/tc.htm" color=red>here</a>',
+  p_source_type=> 'STATIC',
+  p_display_as=> 'RADIOGROUP',
+  p_lov => 'STATIC2:I accept the Terms and Conditions of using this site;YES,I do NOT accept the Terms and Conditions of using this site;NO',
+  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  => 'ABOVE',
+  p_field_alignment  => 'LEFT',
+  p_field_template => 24749222941526790+wwv_flow_api.g_id_offset,
+  p_is_persistent=> 'Y',
+  p_lov_display_extra=>'NO',
+  p_protection_level => 'N',
+  p_item_comment => '');
+ 
+ 
 end;
 /
 
@@ -45006,7 +45348,7 @@ wwv_flow_api.create_page_item(
   p_name=>'P101_USERNAME',
   p_data_type=> '',
   p_accept_processing=> 'REPLACE_EXISTING',
-  p_item_sequence=> 10,
+  p_item_sequence=> 51,
   p_item_plug_id => 11076809493541525+wwv_flow_api.g_id_offset,
   p_use_cache_before_default=> 'YES',
   p_item_default_type => 'STATIC_TEXT_WITH_SUBSTITUTIONS',
@@ -45045,7 +45387,7 @@ wwv_flow_api.create_page_item(
   p_name=>'P101_PASSWORD',
   p_data_type=> '',
   p_accept_processing=> 'REPLACE_EXISTING',
-  p_item_sequence=> 20,
+  p_item_sequence=> 52,
   p_item_plug_id => 11076809493541525+wwv_flow_api.g_id_offset,
   p_use_cache_before_default=> 'YES',
   p_item_default_type => 'STATIC_TEXT_WITH_SUBSTITUTIONS',
@@ -45084,7 +45426,7 @@ wwv_flow_api.create_page_item(
   p_name=>'P101_LOGIN',
   p_data_type=> '',
   p_accept_processing=> 'REPLACE_EXISTING',
-  p_item_sequence=> 30,
+  p_item_sequence=> 53,
   p_item_plug_id => 11076809493541525+wwv_flow_api.g_id_offset,
   p_use_cache_before_default=> '',
   p_item_default => 'LOGIN',
@@ -45193,6 +45535,28 @@ end;
 /
 
  
+begin
+ 
+wwv_flow_api.create_page_validation(
+  p_id => 1181729634687871 + wwv_flow_api.g_id_offset,
+  p_flow_id => wwv_flow.g_flow_id,
+  p_flow_step_id => 101,
+  p_validation_name => 'TC_ACCEPTED',
+  p_validation_sequence=> 30,
+  p_validation => 'P101_TC_ACCEPTED',
+  p_validation2 => 'YES',
+  p_validation_type => 'ITEM_IN_VALIDATION_EQ_STRING2',
+  p_error_message => 'Terms and Conditions must be accepted before entering this site',
+  p_associated_item=> 1181431450669473 + wwv_flow_api.g_id_offset,
+  p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
+  p_validation_comment=> '');
+ 
+null;
+ 
+end;
+/
+
+ 
 begin
  
 declare
@@ -45986,8 +46350,8 @@ wwv_flow_api.create_page(
   p_html_page_header => '',
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
-  p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss => '20080201175936',
+  p_last_updated_by => 'MULLENM',
+  p_last_upd_yyyymmddhh24miss => '20080306111043',
   p_page_is_public_y_n=> 'Y',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -46080,7 +46444,7 @@ wwv_flow_api.create_page_item(
   p_cSize=> null,
   p_cMaxlength=> 2000,
   p_cHeight=> null,
-  p_tag_attributes  => 'id="login"',
+  p_tag_attributes  => 'id="login" name = "login"',
   p_begin_on_new_line => 'NO',
   p_begin_on_new_field=> 'YES',
   p_colspan => 1,
@@ -46292,7 +46656,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'HARDYA',
-  p_last_upd_yyyymmddhh24miss => '20080305115234',
+  p_last_upd_yyyymmddhh24miss => '20080305150951',
   p_page_comment  => '');
  
 end;
@@ -46368,7 +46732,7 @@ wwv_flow_api.create_page_item(
   p_cSize=> 30,
   p_cMaxlength=> 2000,
   p_cHeight=> 5,
-  p_cAttributes=> 'nowrap="nowrap"',
+  p_tag_attributes  => 'style="display: inline;"',
   p_begin_on_new_line => 'YES',
   p_begin_on_new_field=> 'YES',
   p_colspan => 1,
@@ -46997,6 +47361,8 @@ wwv_flow_api.create_list_item (
   p_list_item_display_sequence=>430,
   p_list_item_link_text=> 'Design Selection Tool',
   p_list_item_link_target=> 'f?p=&APP_ID.:4:&SESSION.::&DEBUG.::::',
+  p_list_item_disp_cond_type=> 'PLSQL_EXPRESSION',
+  p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''icadmin'')',
   p_list_countclicks_y_n=> 'N',
   p_list_text_01=> '',
   p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST',