diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 7e63e134..f9299e27 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1575,7 +1575,10 @@ namespace VEPROMS.CSLA.Library return includeOnCAS; } } - + public bool IsSameType(ItemInfo cmpItmInfo) + { + return (((int)MyContent.Type) % 10000) == (((int)cmpItmInfo.MyContent.Type) % 10000); + } public bool IsCautionOrNotePart { get @@ -4044,8 +4047,8 @@ namespace VEPROMS.CSLA.Library // if there is only step in the group or we have a change in step type (caution/note) when there is // use of the MixCautionsAndNotes format flag - no bullet is used, if more that one replace the tab // with a bullet. Also, if only one in group and tab text ends with 'S', remove it: - bool mixCandN = MixCautionNotesDiffType(); - if ((MyPrevious == null && (nextItem == null || specialCalvertAlarm)) || mixCandN || FormatStepData.SeparateBox) + bool mixCandN = MixCautionNotesDiffType(); + if (((MyPrevious == null || !this.IsSameType(MyPrevious)) && ((nextItem == null || !this.IsSameType(nextItem)) || specialCalvertAlarm)) || mixCandN || FormatStepData.SeparateBox) { if (_MyHeader.CleanText.ToUpper().EndsWith("S")) {