diff --git a/Modules/mip_quotation_document.pck b/Modules/mip_quotation_document.pck index 3d43a1f..2b1349c 100644 --- a/Modules/mip_quotation_document.pck +++ b/Modules/mip_quotation_document.pck @@ -958,15 +958,15 @@ CREATE OR REPLACE PACKAGE BODY mip_quotation_document IS plpdf.PrintText(p_indent,p_vertical_offset+114,'Contract sum (excluding V.A.T): '); plpdf.SetPrintFont(p_font,'B',10); --set bold --only show the lifing gear caveat if we give a price for lifting gear - if p_quote_data.show_lifting_gear = true then - plpdf.PrintText(85,p_vertical_offset+114,'£'||to_char(p_quote_data.total_cost,'FM999999D90')||' excluding lifting gear if required.'); - else - plpdf.PrintText(85,p_vertical_offset+114,'£'||to_char(p_quote_data.total_cost,'FM999999D90')); - end if; + --if p_quote_data.show_lifting_gear = true then + -- plpdf.PrintText(85,p_vertical_offset+114,'£'||to_char(p_quote_data.total_cost,'FM999999D90')||' excluding lifting gear if required.'); + --else + plpdf.PrintText(85,p_vertical_offset+114,'£'||to_char(p_quote_data.total_cost,'FM999999D90')); + --end if; l_ybefore := plpdf.GetCurrentY; -- CONT_SUM caveat here if p_quote_data.caveat_cont_sum is not null then - print_caveats(p_quote_data.caveat_cont_sum, p_vertical_offset+118,4,1); + print_caveats(p_quote_data.caveat_cont_sum, p_vertical_offset+115,4,1); end if; l_vertical_offset_for_costs := l_vertical_offset_for_costs+(plpdf.GetCurrentY-l_ybefore); plpdf.SetPrintFont(p_font,null,10); --unset bold @@ -984,11 +984,11 @@ CREATE OR REPLACE PACKAGE BODY mip_quotation_document IS plpdf.DrawLine(p_indent,l_cost_totals_offset+2,185,l_cost_totals_offset+2); plpdf.PrintText(p_indent,l_cost_totals_offset+6,'Total costs:'); --only show the lifing gear caveat if we give a price for lifting gear - if p_quote_data.show_lifting_gear = true then - plpdf.PrintText(120,l_cost_totals_offset+6,'£'||to_char(p_quote_data.total_cost,'FM999999D90')||' excluding lifting gear if required'); - else - plpdf.PrintText(120,l_cost_totals_offset+6,'£'||to_char(p_quote_data.total_cost,'FM999999D90')); - end if; + --if p_quote_data.show_lifting_gear = true then + -- plpdf.PrintText(120,l_cost_totals_offset+6,'£'||to_char(p_quote_data.total_cost,'FM999999D90')||' excluding lifting gear if required'); + --else + plpdf.PrintText(120,l_cost_totals_offset+6,'£'||to_char(p_quote_data.total_cost,'FM999999D90')); + --end if; end build_costs_page; /* PROCEDURE build_caveats_page @@ -1337,16 +1337,16 @@ CREATE OR REPLACE PACKAGE BODY mip_quotation_document IS plpdf.PrintText(p_indent,p_vertical_offset+62,'Contract sum (excluding V.A.T): '); plpdf.SetPrintFont(p_font,'B',10); --set bold --only show the lifing gear caveat if we give a price for lifting gear - if p_quote_data.show_lifting_gear = true then - plpdf.PrintText(85,p_vertical_offset+62,'£'||p_quote_data.total_cost||' excluding lifting gear if required.'); - else - plpdf.PrintText(85,p_vertical_offset+62,'£'||p_quote_data.total_cost); - end if; + --if p_quote_data.show_lifting_gear = true then + -- plpdf.PrintText(85,p_vertical_offset+62,'£'||p_quote_data.total_cost||' excluding lifting gear if required.'); + --else + plpdf.PrintText(85,p_vertical_offset+62,'£'||p_quote_data.total_cost); + -- end if; plpdf.SetCurrentY(66); l_ybefore := plpdf.GetCurrentY; -- CONT_SUM_QA caveat here if p_quote_data.caveat_cont_sum_qa is not null then - print_caveats(p_quote_data.caveat_cont_sum_qa, p_vertical_offset+66,4,1); + print_caveats(p_quote_data.caveat_cont_sum_qa, p_vertical_offset+63,4,1); end if; l_vertical_offset := l_vertical_offset+(plpdf.GetCurrentY-l_ybefore); plpdf.SetPrintFont(p_font,null,10); --unset bold