diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 36d39108..24b3dbcb 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1714,7 +1714,15 @@ namespace Volian.Print.Library && minPara.MyItemInfo.FirstSibling.ItemID == minPara2.MyItemInfo.ItemID) minPara = null; //if (minPara != null) DebugPagination.WriteLine("### 111111 {0}", minPara); //if(minPara2 != null) DebugPagination.WriteLine("### n222222 {0}", minPara2); - return minPara ?? minPara2; + if (minPara != null && minPara.MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertPagination && + minPara.MyItemInfo.MyPrevious != null && minPara.MyItemInfo.IsCautionOrNotePart && + minPara2 != null && minPara2.MyItemInfo == minPara.MyItemInfo.FirstSibling) + { + minPara = null; // B2020-148 Calvert Approved folder Unit 2 AOP-3B section VI, Step H.18f - keep cautions/Notes with substep 18.f + DebugPagination.WriteLine("B2020-148 {0}", minPara2); + _MyLog.WarnFormat("\r\n+++ Paginagion Change B2020-148 {0}", minPara2); + } + return minPara ?? minPara2; } // B2020-013 premature break in RNO column - Callaway OTO-AC-00002 step 2