fix for #526 and #525 removed unnecessary legacy reference on how to display the lifting gear and removed dependence on the quote item to be a labour before we get the meter, service pressure and enquiry type. Altered formatting on quote acceptance page for cost value (would only show 1 decimal place in some cases)

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5612 248e525c-4dfb-0310-94bc-949c084e9493
This commit is contained in:
PriestJ
2008-07-07 10:45:45 +00:00
parent c9fea81ea4
commit a04c43c75b

View File

@@ -508,24 +508,22 @@ PROCEDURE pl(p_in IN VARCHAR2
l_meter_type varchar2(80); --the lifting gear item or not l_meter_type varchar2(80); --the lifting gear item or not
l_enqu_type varchar2(80); l_enqu_type varchar2(80);
begin begin
--get the pressure
--get the meter type, pressure and job type so we can l_service_pressure := p_enqu_row.required_svcp_code;
--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 := p_enqu_row.required_svcp_code;
l_meter_type := quote_item_rec.mety_code;
l_enqu_type := quote_item_rec.enty_code;
end if;
end loop;
--cycle through the quote items picking up each item to store in the --cycle through the quote items picking up each item to store in the
--p_quote_data record --p_quote_data record
l_counter := 0; l_counter := 0;
p_quote_data.show_lifting_gear := false; --ensure by default we don't show the lifting gear caveat p_quote_data.show_lifting_gear := false; --ensure by default we don't show the lifting gear caveat
FOR quote_item_rec IN c_get_quote_item(p_quoteid) LOOP FOR quote_item_rec IN c_get_quote_item(p_quoteid) LOOP
--get the meter type, pressure and job type so we can --get the meter type and job type (we test each line)
--determine whether to display the lifting gear cost line or not if not quote_item_rec.mety_code is null then
l_meter_type := quote_item_rec.mety_code;
end if;
if not quote_item_rec.enty_code is null then
l_enqu_type := quote_item_rec.enty_code;
end if;
l_counter := l_counter + 1; l_counter := l_counter + 1;
case quote_item_rec.quit_type case quote_item_rec.quit_type
when 'BQI' then --base item when 'BQI' then --base item
@@ -1412,7 +1410,7 @@ PROCEDURE pl(p_in IN VARCHAR2
plpdf.SetPrintFont(p_font,null,10); --unset bold plpdf.SetPrintFont(p_font,null,10); --unset bold
plpdf.PrintText(p_indent,p_vertical_offset+62,'Contract sum (excluding V.A.T): '); plpdf.PrintText(p_indent,p_vertical_offset+62,'Contract sum (excluding V.A.T): ');
plpdf.SetPrintFont(p_font,'B',10); --set bold plpdf.SetPrintFont(p_font,'B',10); --set bold
plpdf.PrintText(85,p_vertical_offset+62,'<27>'||p_quote_data.total_cost); plpdf.PrintText(85,p_vertical_offset+62,'<27>'||to_char(p_quote_data.total_cost,'FM999999D90'));
plpdf.SetCurrentY(66); plpdf.SetCurrentY(66);
l_ybefore := plpdf.GetCurrentY; l_ybefore := plpdf.GetCurrentY;
-- CONT_SUM_QA caveat here -- CONT_SUM_QA caveat here