From 6bd177231b989f92e7efa3340938c64d9d6139a7 Mon Sep 17 00:00:00 2001 From: PriestJ Date: Wed, 9 Apr 2008 14:04:19 +0000 Subject: [PATCH] Fix for #476(SC4001 & SC4002) and #496(SC2021) Altered works description so that it now gets the meter model for jobs where we need to know the existing meter model. Also set the Service pressure part to get the service pressure from the enquiry rather than the quote items as the quote items only display the high level pressure tier, due to the pricing structure. git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4750 248e525c-4dfb-0310-94bc-949c084e9493 --- Modules/mip_quotation_document.pck | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Modules/mip_quotation_document.pck b/Modules/mip_quotation_document.pck index 53d7965..87b9e4c 100644 --- a/Modules/mip_quotation_document.pck +++ b/Modules/mip_quotation_document.pck @@ -63,6 +63,7 @@ CREATE OR REPLACE PACKAGE mip_quotation_document IS module_inlet_orientation varchar2(80), module_outlet_orientation varchar2(80), meter_reference varchar(80), + existing_meter_reference varchar(80), caveat_cont_sum_qa caveat_text:= caveat_text(null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null), mety_code varchar(80), svcpt_code varchar(10), @@ -460,7 +461,7 @@ CREATE OR REPLACE PACKAGE BODY mip_quotation_document IS --determine whether to display the lifting gear cost line or not FOR quote_item_rec IN c_get_quote_item(p_quoteid) LOOP if quote_item_rec.quit_type = 'LQI' then - l_service_pressure := quote_item_rec.svcpt_code; + l_service_pressure := p_enqu_row.required_svcp_code; l_meter_type := quote_item_rec.mety_code; l_enqu_type := quote_item_rec.enty_code; end if; @@ -606,7 +607,7 @@ CREATE OR REPLACE PACKAGE BODY mip_quotation_document IS --get existing meter if appropriate if quote_item_rec.enty_code is not null then if quote_item_rec.enty_code <>'INSTALL' and quote_item_rec.enty_code <>'STD INSTALL' then - l_works(5) := 'Existing Meter Type: '|| p_enqu_row.existing_mesc_code ||' '||get_meter_type_code_desc(p_enqu_row.existing_mety_code)||', MSN: '||p_enqu_row.existing_meter_serial_no ; + l_works(5) := 'Existing Meter Type: '|| p_enqu_row.existing_mesc_code ||' '||get_meter_type_code_desc(p_enqu_row.existing_mety_code)||', Model: '||p_enqu_row.existing_metr_code||', MSN: '||p_enqu_row.existing_meter_serial_no ; end if; --if it's not an install or exchange get the existing meter type (will overwrite --current value if already set in the code above)