PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -21941,214 +21941,6 @@ GO
 ==========================================================================================================
 */
 
-/****** Add the ApplicablePlant field to the Formats table ******/
-/****** Add the ApplicablePlant field to the Formats table ******/
-IF COL_LENGTH('Formats', 'ApplicablePlant') IS NULL
-BEGIN
-    ALTER TABLE Formats ADD ApplicablePlant int NULL;
-END
-GO
-
-/****** Update the Formats table with the appropriate ApplicablePlant value ******/
-
---This update statement corrects a typo in the name of one of the format records
-UPDATE Formats SET [Description] = REPLACE([Description], 'Robimson', 'Robinson') WHERE [Description] LIKE '%Robimson%';
-
-UPDATE Formats SET ApplicablePlant = 1000 WHERE [Description] LIKE '%Proms%' OR [Description] LIKE '%Generic%' OR [Name] LIKE 'EXP%' OR [Name] LIKE 'Proms%' OR [Name] LIKE 'base%';
-UPDATE Formats SET ApplicablePlant = 1 WHERE [Description] LIKE '%DC Cook%' OR [Name] LIKE 'AEP%';
-UPDATE Formats SET ApplicablePlant = 2 WHERE [Description] LIKE '%Calvert%' OR [Name] LIKE 'BGE%';
-UPDATE Formats SET ApplicablePlant = 3 WHERE [Description] LIKE '%BNPP%' OR [Name] LIKE 'BNPP%';
-UPDATE Formats SET ApplicablePlant = 4 WHERE [Description] LIKE '%Beaver Valley%' OR [Name] LIKE 'BVPS%';
-UPDATE Formats SET ApplicablePlant = 5 WHERE [Description] LIKE '%Byr-Bwd%' OR ([Name] LIKE 'EXC%' OR [Name] LIKE 'EXEB%' OR [Name] LIKE 'CWE%');
-UPDATE Formats SET ApplicablePlant = 6 WHERE [Description] LIKE '%Callaway%' OR [Name] LIKE 'CAL%';
-UPDATE Formats SET ApplicablePlant = 7 WHERE [Description] LIKE '%Catawba%' OR [Name] LIKE 'CAT%';
-UPDATE Formats SET ApplicablePlant = 8 WHERE [Description] LIKE '%Comanche%' OR ([Name] LIKE 'CAT%' OR [Name] LIKE 'ComPeak%' OR [Name] LIKE 'CPD%' OR [Name] LIKE 'CPF%' OR [Name] LIKE 'CPS%' OR [Name] LIKE 'TUEC%');
-UPDATE Formats SET ApplicablePlant = 9 WHERE [Description] LIKE '%Robinson%' OR [Name] LIKE 'AEP%' OR [Name] LIKE 'RNP%';
-UPDATE Formats SET ApplicablePlant = 10 WHERE [Description] LIKE '%Harris%' OR ([Name] LIKE 'CPLS%' OR [Name] LIKE 'SHE%');
-UPDATE Formats SET ApplicablePlant = 11 WHERE [Description] LIKE '%IP%' OR [Name] LIKE 'IP%';
-UPDATE Formats SET ApplicablePlant = 12 WHERE [Description] LIKE '%Farley%' OR [Name] LIKE 'FNP%';
-UPDATE Formats SET ApplicablePlant = 13 WHERE [Description] LIKE '%Turkey%' OR [Name] LIKE 'FPL%' OR [Name] LIKE 'TP%';
-UPDATE Formats SET ApplicablePlant = 14 WHERE [Description] LIKE '%Ginna%' OR [Name] LIKE 'Ginna%' OR [Name] LIKE 'RGE%';
-UPDATE Formats SET ApplicablePlant = 15 WHERE [Description] LIKE '%Vogtle%' OR [Name] LIKE 'GPC%' OR [Name] LIKE 'VEGP%';
-UPDATE Formats SET ApplicablePlant = 16 WHERE [Description] LIKE '%South Texas%' OR [Name] LIKE 'HLP%' OR [Name] LIKE 'OHLP%';
-UPDATE Formats SET ApplicablePlant = 17 WHERE [Description] LIKE '%McGuire%' OR [Name] LIKE 'MCG%';
-UPDATE Formats SET ApplicablePlant = 18 WHERE [Description] LIKE '%PI%' OR [Name] LIKE 'NSP%';
-UPDATE Formats SET ApplicablePlant = 19 WHERE [Description] LIKE '%Southern Nuclear%' OR [Name] LIKE 'STHN%';
-UPDATE Formats SET ApplicablePlant = 20 WHERE [Description] LIKE '%VC Summer%' OR [Name] LIKE 'SUM%' OR [Name] LIKE 'VCB%' OR [Name] LIKE 'VCS%';
-UPDATE Formats SET ApplicablePlant = 21 WHERE [Description] LIKE '%TVA%' OR [Name] LIKE 'TVA%';
-UPDATE Formats SET ApplicablePlant = 22 WHERE [Description] LIKE '%Wolf%' OR [Name] LIKE 'WCN%';
-UPDATE Formats SET ApplicablePlant = 23 WHERE [Description] LIKE '%Westinghouse%' OR [Name] LIKE 'WST%';
-
-
-/****** Object:  StoredProcedure [dbo].[getFormats]    Script Date: 9/28/2023 8:42:56 AM ******/
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-	
-/*****************************************************************************
-   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2018 - Volian Enterprises, Inc. All rights reserved.
-*****************************************************************************/
-ALTER PROCEDURE [dbo].[getFormats]
-
-WITH EXECUTE AS OWNER
-AS
-BEGIN
-		with formatz([FormatID], [ParentID],[Name],[Description],[Data],[Config],[GenMac],[DTS],[UserID],[LastChanged],[ApplicablePlant]) as 
-		(select [FormatID], [ParentID],[Name],[Description],[Data],[Config],[GenMac],[DTS],[UserID],[LastChanged],[ApplicablePlant]
-		FROM [dbo].[Formats] fs where DATALENGTH(fs.Data) > 5 
-		union all  -- Child formats
-		select fs.[FormatID], fs.[ParentID], fs.[Name], fs.[Description], fz.[Data], fs.[Config], fz.[GenMac], fs.[DTS], fs.[UserID], fs.[LastChanged], fs.[ApplicablePlant]
-		from formats fs 
-		join formatz fz on fz.FormatID = fs.ParentID
-		where DATALENGTH(fs.Data) = 5)   -- the DATALENGTH(fs.Data) = 5 is how to check for empty xml (Data's type is xml)
-		select * from (
-	select *,	
-	(SELECT COUNT(*) FROM [Contents] WHERE [Contents].[FormatID]=[Formatz].[FormatID]) [ContentCount],
-	(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[FormatID]=[Formatz].[FormatID]) [DocVersionCount],
-	(SELECT COUNT(*) FROM [Folders] WHERE [Folders].[FormatID]=[Formatz].[FormatID]) [FolderCount],
-	(SELECT COUNT(*) FROM [Formats] [Children] WHERE [Children].[ParentID]=[Formatz].[FormatID]) [ChildCount] from Formatz) t1
-	where Description not like '%(Unused)%' or (ContentCount + DocVersionCount + FolderCount + ChildCount > 0)
-END
-RETURN
-
-/****** Object:  StoredProcedure [dbo].[getAllFormats]    Script Date: 9/28/2023 8:32:15 AM ******/
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-	
-/*****************************************************************************
-   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2018 - Volian Enterprises, Inc. All rights reserved.
-*****************************************************************************/
-ALTER PROCEDURE [dbo].[getAllFormats]
-
-WITH EXECUTE AS OWNER
-AS
-	SELECT * From (SELECT
-		[FormatID],
-		[ParentID],
-		[Name],
-		[Description],
-		[Data],
-		[Config],
-		[GenMac],
-		[DTS],
-		[UserID],
-		[LastChanged],
-		[ApplicablePlant],
-		(SELECT COUNT(*) FROM [Contents] WHERE [Contents].[FormatID]=[Formats].[FormatID]) [ContentCount],
-		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[FormatID]=[Formats].[FormatID]) [DocVersionCount],
-		(SELECT COUNT(*) FROM [Folders] WHERE [Folders].[FormatID]=[Formats].[FormatID]) [FolderCount],
-		(SELECT COUNT(*) FROM [Formats] [Children] WHERE [Children].[ParentID]=[Formats].[FormatID]) [ChildCount]
-	FROM [Formats] ) T1
-	RETURN
-
-
-/****** Object:  StoredProcedure [dbo].[getFormatByName]    Script Date: 9/29/2023 12:16:48 PM ******/
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-ALTER PROCEDURE [dbo].[getFormatByName]
-(
-	@Name varchar(255)
-)
-WITH EXECUTE AS OWNER
-AS
-	DECLARE @FormatID INT
-	Set @FormatID = (select FormatID from Formats where Name = @Name)
-	BEGIN
-	with formatz([FormatID], [ParentID],[Name],[Description],[Data],[Config],[GenMac],[DTS],[UserID],[LastChanged],[ApplicablePlant]) as 
-	(select [FormatID], [ParentID],[Name],[Description],[Data],[Config],[GenMac],[DTS],[UserID],[LastChanged],[ApplicablePlant]
-	FROM [dbo].[Formats] fs where DATALENGTH(fs.Data) > 5 
-	union all  -- Child formats
-	select fs.[FormatID], fs.[ParentID], fs.[Name], fs.[Description], fz.[Data], fs.[Config], fz.[GenMac], fs.[DTS], fs.[UserID], fs.[LastChanged], fs.[ApplicablePlant]
-	from formats fs 
-	join formatz fz on fz.FormatID = fs.ParentID
-	where DATALENGTH(fs.Data) = 5)   -- the DATALENGTH(fs.Data) = 5 is how to check for empty xml (Data's type is xml)
-	select *,	
-	(SELECT COUNT(*) FROM [Contents] WHERE [Contents].[FormatID]=[Formatz].[FormatID]) [ContentCount],
-	(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[FormatID]=[Formatz].[FormatID]) [DocVersionCount],
-	(SELECT COUNT(*) FROM [Folders] WHERE [Folders].[FormatID]=[Formatz].[FormatID]) [FolderCount],
-	(SELECT COUNT(*) FROM [Formats] [Children] WHERE [Children].[ParentID]=[Formatz].[FormatID]) [ChildCount] from Formatz
-	WHERE [FormatID]=@FormatID
-	END
-
-	SELECT
-		[Contents].[ContentID],
-		[Contents].[Number],
-		[Contents].[Text],
-		[Contents].[Type],
-		[Contents].[FormatID],
-		[Contents].[Config],
-		[Contents].[DTS],
-		[Contents].[UserID],
-		[Contents].[LastChanged]
-	FROM [Contents]
-	WHERE
-		[Contents].[FormatID]=@FormatID
-
-
-	SELECT
-		[DocVersions].[VersionID],
-		[DocVersions].[FolderID],
-		[DocVersions].[VersionType],
-		[DocVersions].[Name],
-		[DocVersions].[Title],
-		[DocVersions].[ItemID],
-		[DocVersions].[FormatID],
-		[DocVersions].[Config],
-		[DocVersions].[DTS],
-		[DocVersions].[UserID],
-		[DocVersions].[LastChanged],
-		[Folders].[ParentID] [Folder_ParentID],
-		[Folders].[DBID] [Folder_DBID],
-		[Folders].[Name] [Folder_Name],
-		[Folders].[Title] [Folder_Title],
-		[Folders].[ShortName] [Folder_ShortName],
-		[Folders].[FormatID] [Folder_FormatID],
-		[Folders].[ManualOrder] [Folder_ManualOrder],
-		[Folders].[Config] [Folder_Config],
-		[Folders].[DTS] [Folder_DTS],
-		[Folders].[UsrID] [Folder_UsrID]
-	FROM [DocVersions]
-		JOIN [Folders]  ON
-			[Folders].[FolderID]=[DocVersions].[FolderID]
-	WHERE
-		[DocVersions].[FormatID]=@FormatID
-
-
-	SELECT
-		[Folders].[FolderID],
-		[Folders].[ParentID],
-		[Folders].[DBID],
-		[Folders].[Name],
-		[Folders].[Title],
-		[Folders].[ShortName],
-		[Folders].[FormatID],
-		[Folders].[ManualOrder],
-		[Folders].[Config],
-		[Folders].[DTS],
-		[Folders].[UsrID],
-		[Folders].[LastChanged],
-		[Connections].[Name] [Connection_Name],
-		[Connections].[Title] [Connection_Title],
-		[Connections].[ConnectionString] [Connection_ConnectionString],
-		[Connections].[ServerType] [Connection_ServerType],
-		[Connections].[Config] [Connection_Config],
-		[Connections].[DTS] [Connection_DTS],
-		[Connections].[UsrID] [Connection_UsrID]
-	FROM [Folders]
-		JOIN [Connections]  ON
-			[Connections].[DBID]=[Folders].[DBID]
-	WHERE
-		[Folders].[FormatID]=@FormatID
-
-	RETURN
-
 
 -----------------------------------------------------------------------------
 /*
@@ -22184,8 +21976,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '10/03/2023 11:00 AM'
-	set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section'
+	set @RevDate = '10/03/2022 2:00 PM'
+	set @RevDescription = 'B2022-124: [JPR] Blank RO Values (All Spaces) printing as ?'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
@@ -22203,6 +21995,3 @@ ELSE PRINT 'StoredProcedure [vesp_GetSQLCodeRevision] Error on Creation'
 go
 
 Exec vesp_GetSQLCodeRevision;
-
-
-

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -4116,11 +4116,6 @@ namespace VEPROMS
 
 					ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
 
-					// B2023-104 use this to replace RO Link information in the imported text
-					//            FormatRoidKey() was creating the roid with the new formatting introduce with B2022-088 & B2022-098
-					//           We need to save the ROID from the imported text in order to update it with the new RO link information
-					string contentROID = roid;
-
 					// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
 					// B2022-098: [JPR] ROs not being resolved in Word Sections
 					roid = ROFSTLookup.FormatRoidKey(roid, true);
@@ -4140,8 +4135,7 @@ namespace VEPROMS
 						rou.Save();
 
 						RoUsageInfo roui = RoUsageInfo.Get(rou.ROUsageID);
-						//B2023-104 use the ROID from the imported text (contentROID) to create the lookFor string
-						string lookFor = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rousageid, contentROID, oldRODbID.ToString());
+						string lookFor = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rousageid, roid, oldRODbID.ToString());
 						string replaceWith = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rou.ROUsageID.ToString(), roid, newRODbID.ToString());
 						_DidProcessROs = content.Text.Contains(lookFor); // B2017-076 RO link in the text so we will be processing it
 						

PROMS/VEPROMS User Interface/frmFolderProperties.cs

@@ -13,7 +13,6 @@ using DevComponents.DotNetBar.Controls;
 using System.Drawing.Imaging;
 using VEPROMS.Properties;
 using DescriptiveEnum;
-using Volian.Controls.Library;
 
 namespace VEPROMS
 {
@@ -151,7 +150,7 @@ namespace VEPROMS
 			ppCmbxFormat.DataSource = null;
 			ppCmbxFormat.DisplayMember = "FullName";
 			ppCmbxFormat.ValueMember = "FullName";
-			ppCmbxFormat.DataSource = FormatUtility.GetFilteredFormatList(FormatInfoList.SortedFormatInfoList);
+			ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList;
             if (_FolderConfig != null && _FolderConfig.MyFolder != null) _cmbxformatOriginal = _FolderConfig.MyFolder.FormatID;
 			if (_FolderConfig.FormatSelection != null)
 			{

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -324,10 +324,8 @@ namespace VEPROMS
 				{
 					if (UserInfo.CanEdit(frmVEPROMS.SMyUserInfo, MyPromsPrinter.MyItem.MyDocVersion))
 					{
-						// C2023-018: Clarify message on temporary/permanent removal of returns/spaces & page breaks
-						if (FlexibleMessageBox.Show(this, "The procedure PDF file was created by temporarily removing certain hard returns,\r\ntrailing spaces, and/or manual page breaks that could affect the pagination\r\n"+
-							"of the procedure.\r\n\r\nAfter reviewing the PDF file, do you want to permanently remove the deleted hard returns, \r\nspaces and/or manual page breaks?\r\n\r\n"+
-							"An annotation will be added to every location where data has been deleted.  The locations \r\ncan be found by performing a Global Search for the \"Manual Pagination Issues\" annotation type.",
+						if (FlexibleMessageBox.Show(this, "The procedure PDF file was created by removing certain hard returns,\r\ntrailing spaces, and manual page breaks that could affect the\r\n"+
+							"pagination of the procedure.\r\n\r\nAfter reviewing the PDF file, do you want to save the changes made?",
 							"Confirm Pagination Changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 						{
 							MyPromsPrinter.SavePaginationFixes();

PROMS/VEPROMS User Interface/frmProcedureProperties.cs

@@ -11,8 +11,6 @@ using DescriptiveEnum;
 using DevComponents.DotNetBar;
 using DevComponents.DotNetBar.Controls;
 using Volian.Controls.Library;
-using System.Xml;
-using Csla;
 
 namespace VEPROMS
 {
@@ -186,9 +184,7 @@ namespace VEPROMS
 			ppCmbxFormat.DataSource = null;
 			ppCmbxFormat.DisplayMember = "FullName";
 			ppCmbxFormat.ValueMember = "FullName";
-
-            //C2023-017: Retrieves a filtered list of formats for the current plant
-            ppCmbxFormat.DataSource = FormatUtility.GetFilteredFormatList(FormatInfoList.SortedFormatInfoList);
+			ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList;
             if (_ProcedureConfig.MyProcedure.MyProcedureInfo.ActiveFormat != null) _cmbxformatOriginal = _ProcedureConfig.MyProcedure.MyProcedureInfo.ActiveFormat.FormatID;
             if (_ProcedureConfig.FormatSelection != null)
                 ppCmbxFormat.SelectedValue = _ProcedureConfig.FormatSelection;

PROMS/VEPROMS User Interface/frmSectionProperties.cs

@@ -364,7 +364,7 @@ namespace VEPROMS
 			ppCmbxFormat.DataSource = null;
 			ppCmbxFormat.DisplayMember = "FullName";
 			ppCmbxFormat.ValueMember = "FullName";
-			ppCmbxFormat.DataSource = FormatUtility.GetFilteredFormatList(FormatInfoList.SortedFormatInfoList);
+			ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList;
       if (_SectionConfig.MySection.MySectionInfo.ActiveFormat != null) _cmbxformatOriginal = (int)_SectionConfig.MySection.MySectionInfo.ActiveFormat.FormatID;
 			if (_SectionConfig.FormatSelection != null)
 				ppCmbxFormat.SelectedValue = _SectionConfig.FormatSelection;

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -168,7 +168,7 @@ namespace VEPROMS
 			ppCmbxFormat.DataSource = null;
 			ppCmbxFormat.DisplayMember = "FullName";
 			ppCmbxFormat.ValueMember = "FullName";
-			ppCmbxFormat.DataSource = FormatUtility.GetFilteredFormatList(FormatInfoList.SortedFormatInfoList);
+			ppCmbxFormat.DataSource = FormatInfoList.SortedFormatInfoList;
 			_cmbxformatOriginal = _DocVersionConfig.MyDocVersion.FormatID;
 
 			if (_DocVersionConfig.FormatSelection != null)

PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs

@@ -2508,28 +2508,11 @@ namespace VEPROMS.CSLA.Library
 			firstTrans = false;
 			if (!CanDeleteObject())
 				throw new System.Security.SecurityException("User not authorized to remove a Item");
+			try
+			{
 				// B2016-009 check source and desintation types and display message box if needed
 				// C2022-017 moved the CheckSourceDestinationType call to  btnPasteReplace_Click in StepTabRibbon
-			// B2023-101 Handle Paste Replace when procedure to be replaced has Incoming Transitions, i.e. do a separate try/catch for this case
-			ItemInfo newItemInfo = null;
-			try
-			{
-				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
-				if (newItemInfo == null) return null;
-			}
-			catch (Exception ex1)
-			{
-				if (ex1.Message.Contains("has External Transitions and has no next step")
-						|| ex1.Message.Contains("has External Transitions to Procedure")
-						|| ex1.Message.Contains("has External Transitions to it's children"))
-
-				{
-					FlexibleMessageBox.Show("This procedure has external transition references to it that must be resolved before doing the Paste/Replace.\r\nRight Click on the procedure and select the Incoming Transitions menu option to find these references and resolve them.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
-					return null;
-				}
-			}
-			try
-			{
+				ItemInfo newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
 				// Delete business objects, including remove from tree
 				ItemInfo.DeleteItemInfoAndChildren(itemInfo.ItemID); // Dispose ItemInfo and Children
 				using (Item item = Get(newItemInfo.ItemID)) ItemInfo.Refresh(item);

PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs

@@ -192,16 +192,6 @@ namespace VEPROMS.CSLA.Library
 				return _UserID;
 			}
 		}
-		private int _ApplicablePlant = 0;
-		public int ApplicablePlant
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ApplicablePlant", true);
-				return _ApplicablePlant;
-			}
-		}
 		private int _FormatContentCount = 0;
 		/// <summary>
 		/// Count of FormatContents for this Format
@@ -528,7 +518,6 @@ namespace VEPROMS.CSLA.Library
 				_FormatDocVersionCount = dr.GetInt32("DocVersionCount");
 				_FormatFolderCount = dr.GetInt32("FolderCount");
 				_ChildFormatCount = dr.GetInt32("ChildCount");
-				_ApplicablePlant = dr.GetInt32("ApplicablePlant");
 			}
 			catch (Exception ex)
 			{

PROMS/VEPROMS.CSLA.Library/Generated/FormatInfoList.cs

@@ -160,14 +160,6 @@ namespace VEPROMS.CSLA.Library
 			catch (Exception ex)
 			{
 				if (_MyLog.IsErrorEnabled) _MyLog.Error("FormatInfoList.DataPortal_Fetch", ex);
-				System.Text.StringBuilder sbMsg = new System.Text.StringBuilder();
-				sbMsg.Append("The SQL Stored Procedures may need updating.");
-				sbMsg.Append("\n\nPlease have your DBA update the database with the PROMSFixes.sql script file that was delivered with this PROMS executable.");
-				sbMsg.Append("\n\nThe PROMSFixes.sql file is included with the PROMS installation download.");
-				sbMsg.Append("\n\nIt can also be found in your PROMS executable folder:");
-				sbMsg.AppendFormat("\n\t{0}", Volian.Base.Library.ExeInfo.PROMSExecutableFolderPath());
-
-				System.Windows.Forms.MessageBox.Show(sbMsg.ToString(), "Update Stored Procedures", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation);
 				throw new DbCslaException("FormatInfoList.DataPortal_Fetch", ex);
 			}
 			this.RaiseListChangedEvents = true;

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -544,7 +544,7 @@ namespace Volian.Controls.Library
 				foreach (DocVersionInfo dvi in dvil)
 				{
 					DocVersionConfig dvc = dvi.DocVersionConfig;
-					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
+					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
 					{
 						args += " \"PC=" + dvc.Unit_Name + "\"";
 						break;
@@ -1018,7 +1018,7 @@ namespace Volian.Controls.Library
 				{
 					DocVersionConfig jdvc = dvi.DocVersionConfig;
 
-					if (jdvc != null && jdvc.Unit_Name != "" && jdvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
+					if (jdvc != null && jdvc.Unit_Name != "" && jdvc.Unit_Name != "0")
 					{
 						args += " \"PC=" + jdvc.Unit_Name + "\"";
 						break;

PROMS/Volian.Controls.Library/DisplayReports.cs

@@ -733,7 +733,7 @@ namespace Volian.Controls.Library
 				foreach (DocVersionInfo dvi in dvil)
 				{
 					DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig;
-					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
+					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
 						roloc += " \"/PC=" + dvc.Unit_Name + "\"";
 					break;
 				}

PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs

@@ -1094,6 +1094,20 @@ namespace Volian.Controls.Library
 			// cbxSrchTypeUsage
 			// 
 			this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent;
+			// 
+			this.btnTranCvtAllToTxt.Enabled = false;
+			this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
+			this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
+			this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
+			this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
+            "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+			this.btnTranCvtAllToTxt.TabIndex = 1;
+			this.btnTranCvtAllToTxt.Text = "Convert All To Text";
+			this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
+			this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
+			// 
+			// lblSrchIncTran
+			// 
 			this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
 			this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom;

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -628,11 +628,6 @@ namespace Volian.Controls.Library
 				AddMessageForEmptyAnnotations();
 				cmbResultsStyle.SelectedIndex = 1;  //display step locations in results
 				DisplayResults();
-				//If any transitions are listed after the Convert, Admin Tools/Links/Refresh Transitions can be used to fix incorrect links.  This will eliminate any in the list.
-				// B2023-103 if any items are left in search list, there may be bad transition link data - put out a message box
-				if (fromTranCvtBtn)
-					FlexibleMessageBox.Show(this, "If items remain in the list after performing Convert All to Text, running Admin Tools/Links/Refresh Transitions will clear the list.", 
-						"Convert Transitions to Text", MessageBoxButtons.OK);
 			}
 			else
 			{
@@ -1139,9 +1134,6 @@ namespace Volian.Controls.Library
 		// C2020-033: Before allowing conversion of Incoming Transitions to text, get list of results that the user has permission edit.
 		private List<int> TranCvtCheckPermission(bool all)
 		{
-			// B2023-102 Don't crash on converting incoming transitions to text if there are none (can happen if 2nd pass occurs)
-			if (_SearchResults == null) return null;
-
 			// check if a non-reader can convert transitions to text even if a reader - this is set by an administrator on the top
 			// folder properties dialog
 			bool allowNonAdmin = IncTranCvtPerm();
@@ -1183,11 +1175,8 @@ namespace Volian.Controls.Library
 			}
 			else
 			{
-				// B2023-103 add spinner (WaitCursor) and also, change FlexibleMessageBox to regular MessageBox since restore of cursor to
-				//		wait cursor did not work after FlexibleMessageBox
-				Cursor savcursor = Cursor;
-				DialogResult ans = MessageBox.Show(this, "Are you sure you want to convert the transitions to text?", "Convert Transitions to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-				this.Cursor = savcursor;
+				DialogResult ans = FlexibleMessageBox.Show("Are you sure you want to convert the transitions to text?",
+							"Convert Transition to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
 				if (ans == DialogResult.No) return null;
 			}
 
@@ -1262,8 +1251,6 @@ namespace Volian.Controls.Library
 		// C2020-033: For items in list, do the actual conversion of the Incoming Transition to text
 		private void TranCvtToTxt(List<int> itmsEditable)
 		{
-			// B2023-103 Add wait cursor (and remove at end)
-			this.Cursor = Cursors.WaitCursor;
 			ItemInfo trII = SearchIncTransII;
 
 			if (trII != null)
@@ -1311,7 +1298,6 @@ namespace Volian.Controls.Library
 
 				}
 			}
-			this.Cursor = Cursors.Default;
 		}
 
 		#region (ProgressBar)
@@ -3333,15 +3319,9 @@ namespace Volian.Controls.Library
 		// C2020-033: Convert All (that have permissions) Incoming Transitions to text
 		private void btnTranCvtAllToTxt_Click(object sender, EventArgs e)
 		{
-			Cursor = Cursors.WaitCursor;
 			List<int> itmsEditable = TranCvtCheckPermission(true);      // Get list based on permissions
-			if (itmsEditable == null || itmsEditable.Count == 0)
-			{
-				Cursor = Cursors.Default;
-				return;
-			}
+			if (itmsEditable == null || itmsEditable.Count == 0) return;
 			TranCvtToTxt(itmsEditable);
-			Cursor = Cursors.Default;
 			fromTranCvtBtn = true;
 			UpdateSearchIncTransResults();  // B2021-009: Research after convert transitions to text
 			fromTranCvtBtn = false;

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -570,9 +570,7 @@ namespace Volian.Controls.Library
 		/// </summary>
 		/// <param name="myItemInfo"></param>
 		/// <returns></returns>
-		// C2023-016 Added doingFindReplace where if true Word section will not be opened - used only when doing Find/Replace
-		//           We are not opening and searching inside Word sections, instead we just stop on the section title in the procedure editor (if a match is found in the title)
-		public DisplayTabItem OpenItem(ItemInfo myItemInfo2, bool setFocus, bool doingFindReplace=false)
+		public DisplayTabItem OpenItem(ItemInfo myItemInfo2, bool setFocus)
 		{
 			ItemInfo myItemInfo = myItemInfo2;
 
@@ -651,8 +649,7 @@ namespace Volian.Controls.Library
 
 			_MyBar = GetParentBar(myItemInfo); // Get the docking bar associated with this item.
 
-			// C2023-016 if a Word section and doing Find/Replace don't open Word section, position to section title in step editor instead
-			if (myItemInfo.MyContent.MyEntry == null || doingFindReplace) // If it is not a Word document open in step editor
+			if (myItemInfo.MyContent.MyEntry == null) // If it is not a Word document open in step editor
 			{
 				return OpenStepTabPage(myItemInfo, setFocus);
 			}

PROMS/Volian.Controls.Library/DisplayTags.Designer.cs

@@ -30,6 +30,7 @@ namespace Volian.Controls.Library
 		{
 			this.groupPanelPaginate = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.cbPrefPageBreak = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.cbSubStepPageBreak = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cbPageBreak = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cbCAS = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cmbCheckoff = new DevComponents.DotNetBar.Controls.ComboBoxEx();
@@ -74,6 +75,7 @@ namespace Volian.Controls.Library
 			this.groupPanelPaginate.BackColor = System.Drawing.Color.Transparent;
 			this.groupPanelPaginate.CanvasColor = System.Drawing.SystemColors.Control;
 			this.groupPanelPaginate.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.groupPanelPaginate.Controls.Add(this.cbSubStepPageBreak);
 			this.groupPanelPaginate.Controls.Add(this.cbPrefPageBreak);
 			this.groupPanelPaginate.Controls.Add(this.cbPageBreak);
 			this.groupPanelPaginate.DisabledBackColor = System.Drawing.Color.Empty;
@@ -130,6 +132,23 @@ namespace Volian.Controls.Library
 			this.cbPrefPageBreak.Text = "Preferred Page Break (for Sup Info)";
 			this.cbPrefPageBreak.CheckedChanged += new System.EventHandler(this.cbPrefPageBreak_CheckedChanged);
 			// 
+			// cbSubStepPageBreak
+			// 
+			this.cbSubStepPageBreak.AutoSize = true;
+			// 
+			// 
+			// 
+			this.cbSubStepPageBreak.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbSubStepPageBreak.Location = new System.Drawing.Point(3, 19);
+			this.cbSubStepPageBreak.Margin = new System.Windows.Forms.Padding(2);
+			this.cbSubStepPageBreak.Name = "cbSubStepPageBreak";
+			this.cbSubStepPageBreak.Size = new System.Drawing.Size(195, 15);
+			this.superTooltipTags.SetSuperTooltip(this.cbSubStepPageBreak, new DevComponents.DotNetBar.SuperTooltipInfo("Page Break for Sub-Steps", "", "When set, starts this step at the top of a page.\r\n\r\nkeyboard command: <Ctrl><Ente" +
+			"r>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.cbSubStepPageBreak.TabIndex = 1;
+			this.cbSubStepPageBreak.Text = "Substep Page Break";
+			this.cbSubStepPageBreak.CheckedChanged += new System.EventHandler(this.cbSubStepPageBreak_CheckedChanged);
+			// 
 			// cbPageBreak
 			// 
 			this.cbPageBreak.AutoSize = true;
@@ -770,6 +789,7 @@ namespace Volian.Controls.Library
 		private System.Windows.Forms.TrackBar trBarFS;
 		private System.Windows.Forms.Button btnFSrestore;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbPrefPageBreak;
+		private DevComponents.DotNetBar.Controls.CheckBoxX cbSubStepPageBreak;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeInTOC;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbTCAS;
 	}

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -110,6 +110,7 @@ namespace Volian.Controls.Library
 			cmbCheckoff.Enabled = false;
 			cbPageBreak.Enabled = false;
 			cbPrefPageBreak.Enabled = false;
+			cbSubStepPageBreak.Enabled = false;
 			cbPlaceKeeper.Enabled = false;
 			cbPlaceKeeperCont.Enabled = false;
 			cbIncludeInTOC.Enabled = false;
@@ -178,12 +179,11 @@ namespace Volian.Controls.Library
 		public void UpdatePageBreakCheckBox() // for use with shortcut keystroke <Ctrl><Enter>
 		{
 			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
-			// C2023-018: if high, check oringinal flag, otherwise check sub-step flag for setting checkbox
-			cbPageBreak.Checked = false; // Page Break is set to false
+				if (CurItemInfo.IsHigh) cbPageBreak.Checked = false; // Page Break is set to false
 			if (sc != null && CurItemInfo.IsHigh)		// otherwise, get data from config
 					cbPageBreak.Checked = sc.Step_NewManualPagebreak; // High Level Step has a manual page break
-			else if (sc != null && !CurItemInfo.IsCautionOrNotePart)
-					cbPageBreak.Checked = sc.Step_SubStepPagebreak;
+			else
+				cbPageBreak.Checked = false; // Page Break is set to false
 		}
 		public DocVersionInfo Mydvi = null; // this is initialized in vlnTreeComboSetsFillIn()
 
@@ -245,23 +245,13 @@ namespace Volian.Controls.Library
 			groupPanelFigSize.Style.BackColor = Color.Cornsilk;
 			cbPageBreak.Checked = false; // will be set below if HLS & config has it on
 			cbPrefPageBreak.Checked = false;
+			cbSubStepPageBreak.Checked = false;
 			cbPlaceKeeper.Checked = false; // will be set below if HLS & config has this set
 			cbPlaceKeeperCont.Checked = false; // will be set below if substep & config has this set
-
-			// C2023-018: upgrade for 2023, allow page break setting on non-HLS under certain conditions as listed here:
-			//	- HLS only (original)
-			//	- Upgrade for sub-steps: Not in supplemental info (original)
-			//	- Upgrade for sub-steps: Not in Enhanced document
-			//	- Upgrade for sub-steps: Only for single column procedure
-			//	- Upgrade for sub-steps: Sequential sub-steps only
-			//	- Upgrade for sub-steps: First level sub-steps only (CurItemInfo.MyParent.IsHigh)
-			SectionConfig secConfig = (SectionConfig)CurItemInfo.ActiveSection.MyConfig;
-			bool isSingleColumn = secConfig != null && secConfig.Section_ColumnMode == SectionConfig.SectionColumnMode.One;
-			bool allowPageBreak = CurItemInfo.IsHigh || (!CurItemInfo.MyDocStyle.SupplementalInformation && !CurItemInfo.IsEnhancedStep
-				&& isSingleColumn && CurItemInfo.IsSequential && CurItemInfo.MyParent.IsHigh); 
-			cbPageBreak.Enabled = allowPageBreak;
-
+			cbPageBreak.Enabled = CurItemInfo.IsHigh;
 			cbPrefPageBreak.Visible = cbPrefPageBreak.Enabled = (!CurItemInfo.IsInSupInfo && CurItemInfo.MyDocStyle.SupplementalInformation);
+			// C2023-015:  Pagination on a sub-step
+			cbSubStepPageBreak.Visible = cbSubStepPageBreak.Enabled = CurItemInfo.IsSubStep && CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.AlarmPagination;
 			if (!CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw)
 			{
 				cbPlaceKeeper.Enabled = (((SectionConfig)CurItemInfo.ActiveSection.MyConfig).Section_Placekeeper == "Y");
@@ -307,7 +297,7 @@ namespace Volian.Controls.Library
 			}
 			else if (sc == null)		// if there is no config data ...
 			{
-				cbPageBreak.Checked = false; // Page Break is set to false
+				if (CurItemInfo.IsHigh)cbPageBreak.Checked = false; // Page Break is set to false
 				cbCAS.Checked = CurItemInfo.IncludeOnContActSum; // set based on step type format flag
 				cbTCAS.Checked = CurItemInfo.IncludeOnTimeCriticalActionSum; // set based on step type format flag
 				cbPlaceKeeper.Checked = false;
@@ -315,12 +305,10 @@ namespace Volian.Controls.Library
 			}
 			else				// otherwise, get data from config
 			{
-				// C2023-018: if high, use original config setting for page break, otherwise you sub-step setting
 				if (CurItemInfo.IsHigh)
 					cbPageBreak.Checked = sc.Step_NewManualPagebreak; // High Level Step has a manual page break
-				else 
-					cbPageBreak.Checked = sc.Step_SubStepPagebreak;
 				if (cbPrefPageBreak.Enabled) cbPrefPageBreak.Checked = sc.Step_PreferredPagebreak;
+				if (cbSubStepPageBreak.Enabled) cbSubStepPageBreak.Checked = sc.Step_SubStepPagebreak;
 				cbPlaceKeeper.Checked = (sc.Step_Placekeeper == "Y"); // step text to be included on PlaceKeeper (Calvert Cliffs)
 				cbPlaceKeeperCont.Checked = (sc.Step_Placekeeper == "C"); // step is included on Placekeeper and marked as continuous action (Calvert Cliffs)
 				// set the Continuous Action Summary check box to the saved setting in the config or, if nothing in config, set to format flag setting
@@ -559,10 +547,7 @@ namespace Volian.Controls.Library
 			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
 			if (sc == null) return;
 			MyEditItem.ChangeBarForConfigItemChange = false;
-			if (CurItemInfo.IsHigh)
 			sc.Step_NewManualPagebreak = cbPageBreak.Checked;
-			else  // C2023-018: allow for sub-step page breaks
-				sc.Step_SubStepPagebreak = cbPageBreak.Checked;
 			MyEditItem.ChangeBarForConfigItemChange = true;
 		}
 		private void cbCAS_CheckedChanged(object sender, EventArgs e)
@@ -911,6 +896,18 @@ namespace Volian.Controls.Library
 			sc.Step_PreferredPagebreak = cbPrefPageBreak.Checked;
 			MyEditItem.ChangeBarForConfigItemChange = true;
 		}
+		// C2023-015:  Pagination on a sub-step
+		private void cbSubStepPageBreak_CheckedChanged(object sender, EventArgs e)
+		{
+			if (_Initalizing) return;
+			MyEditItem.SaveContents();
+			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
+			if (sc == null) return;
+			MyEditItem.ChangeBarForConfigItemChange = false;
+			sc.Step_SubStepPagebreak = cbSubStepPageBreak.Checked;
+			MyEditItem.ChangeBarForConfigItemChange = true;
+		}
+
 		//private void txbxAltConActSumText_Leave(object sender, EventArgs e)
 		//{
 		//	// User left Atlernate Continuous Action Text field.  If text changed, then prompt

PROMS/Volian.Controls.Library/FindReplace.Designer.cs

@@ -183,6 +183,7 @@ namespace Volian.Controls.Library
 			this.cmboFindText.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.cmboFindText.WatermarkText = "Enter text to find";
 			this.cmboFindText.TextChanged += new System.EventHandler(this.cmboFindText_TextChanged);
+			this.cmboFindText.Leave += new System.EventHandler(this.cmboFindText_Leave);
 			// 
 			// labelX3
 			// 
@@ -348,7 +349,6 @@ namespace Volian.Controls.Library
 			this.cbxReverse.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.cbxReverse.TabIndex = 5;
 			this.cbxReverse.Text = "Reverse Find";
-			this.cbxReverse.CheckedChanged += new System.EventHandler(this.cbxReverse_CheckedChanged);
 			// 
 			// cbxWholeWord
 			// 
@@ -363,7 +363,6 @@ namespace Volian.Controls.Library
 			this.cbxWholeWord.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.cbxWholeWord.TabIndex = 4;
 			this.cbxWholeWord.Text = "Whole Word";
-			this.cbxWholeWord.CheckedChanged += new System.EventHandler(this.cbxWholeWord_CheckedChanged);
 			// 
 			// cbxCaseSensitive
 			// 
@@ -378,7 +377,6 @@ namespace Volian.Controls.Library
 			this.cbxCaseSensitive.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.cbxCaseSensitive.TabIndex = 3;
 			this.cbxCaseSensitive.Text = "Case Sensitive";
-			this.cbxCaseSensitive.CheckedChanged += new System.EventHandler(this.cbxCaseSensitive_CheckedChanged);
 			// 
 			// cmbScope
 			// 

PROMS/Volian.Controls.Library/FindReplace.cs

@@ -11,13 +11,11 @@ using JR.Utils.GUI.Forms;
 
 namespace Volian.Controls.Library
 {
-	// C2023-016 - Upgrade - have Find/Replace spin through all of the Step Editor sections within the current procedure
 	public partial class FindReplace : DevComponents.DotNetBar.Office2007Form
 	{
 		private bool doingfind = false;
 		private bool findingbookmarks = false;
 		private bool _FoundIt = false;
-		private ItemInfo _StartingItemInfo = null;// C2023-016 used to remember where we started doing the Find/Replace
 		public bool FoundIt
 		{
 			get { return _FoundIt; }
@@ -27,7 +25,7 @@ namespace Volian.Controls.Library
 		{
 			get
 			{
-				// B2022-067 get display text version to convert 8209 dash to normal (keyboard) dash
+				// B2022-067 get display text version to convert 8209 dash to nornal (keyboard) dash
 				string selStr = ItemInfo.ConvertToDisplayText(MyEditItem.MyStepRTB.SelectedText);
 				if (!cbxCaseSensitive.Checked)
 					return selStr.ToUpper() == cmboFindText.Text.ToUpper();
@@ -35,6 +33,7 @@ namespace Volian.Controls.Library
 					return selStr == cmboFindText.Text;
 			}
 		}
+		//private bool _offsetStartPos = false;
 		private EditItem _MyEditItem;
 		public EditItem MyEditItem
 		{
@@ -45,13 +44,25 @@ namespace Volian.Controls.Library
 				if (_MyEditItem == null) return;
 				_MyDocVersion = _MyEditItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo;
 				SetupContextMenu();
+				//_offsetStartPos = false; // in a different rtf box, don't offset find position first time around
 			}
 		}
 		private DocVersionInfo _MyDocVersion;
 		public DocVersionInfo Mydocversion
 		{
 			get { return _MyDocVersion; }
-			set {_MyDocVersion = value;	}
+			set
+			{
+				_MyDocVersion = value;
+				//if (_MyDocVersion != null)
+				//{
+				//    if (_MyDocVersion.DocVersionAssociationCount > 0)
+				//    {
+				//        MyROFSTLookup = _MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup;
+				//        _MyRODbID = _MyDocVersion.DocVersionAssociations[0].MyROFst.RODbID;
+				//    }
+				//}
+			}
 		}
 		private DisplayBookMarks _myDisplayBookMarks;
 
@@ -72,12 +83,17 @@ namespace Volian.Controls.Library
 		{
 			InitializeComponent();
 			LoadFindReplaceTextListBox();
+			//if (dvi != null && dvi.VersionType > 127)
+			//    InApproved = false; // in approved
 			cmbScope.SelectedIndex = 0;
 			btnBookMrkAll.Enabled = false;
 			btnFindNext.Enabled = false;
 			btnReplace.Enabled = false;
 			btnRplAll.Enabled = false;
+			//if (MyRTBItem.MyStepRTB.SelectionLength > 0)
+			//    cmboFindText.Text = MyRTBItem.MyStepRTB.SelectedText;
 			cmboFindText.Focus();
+			//SetupContextMenu();
 		}
 		private void LoadFindReplaceTextListBox()
 		{
@@ -97,34 +113,51 @@ namespace Volian.Controls.Library
 			}
 		}
 
+		//public FindReplace(RTBItem stpitm)
+		//{
+		//    MyRTBItem = stpitm;
+		//    DocVersionInfo dvi = MyRTBItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo;
+		//    InitializeComponent();
+		//    if (dvi != null && dvi.VersionType > 127)
+		//        InApproved = false; // in approved
+		//    cmbScope.SelectedIndex = 0;
+		//    btnBookMrkAll.Enabled = false;
+		//    btnFindNext.Enabled = false;
+		//    btnReplace.Enabled = false;
+		//    btnRplAll.Enabled = false;
+		//    if (MyRTBItem.MyStepRTB.SelectionLength > 0)
+		//        cmboFindText.Text = MyRTBItem.MyStepRTB.SelectedText;
+		//    cmboFindText.Focus();
+		//}
+
 		// bug fix: B2016-107, when Find/Replace is initially opened, set the cursor focus to the Find Text box (called from frmVEPROMS.cs)
 		public void SetFocusToTextBox()
 		{
 			cmboFindText.Focus();
 		}
-
 		private bool DoingClick = false; // Don't allow a button to be clicked until processing is complete for the last button
-
 		private void btnReplace_Click(object sender, EventArgs e)
 		{
 			if (DoingClick) return;// Don't allow a button to be clicked until processing is complete for the last button
-			DoingClick = true;// We started processing a click
+			DoingClick = true;// Don't allow a button to be clicked until processing is complete for the last button
 			DoReplace();
-			DoingClick = false;// we're done processing the click
+			DoingClick = false;// Don't allow a button to be clicked until processing is complete for the last button
 		}
 		private void DoReplace()
 		{
 			if (!IsFound) 
 				DoFindNext();
 			else
+			{
 				MyEditItem.ReplaceText(cmboReplaceText.Text, cmboFindText.Text, cbxCaseSensitive.Checked, cbxWholeWord.Checked, cbxReverse.Checked, false, null);
 			}
+		}
 		private void btnRplAll_Click(object sender, EventArgs e)
 		{
 			if (DoingClick) return;// Don't allow a button to be clicked until processing is complete for the last button
-			DoingClick = true; // We started processing a click
+			DoingClick = true;// Don't allow a button to be clicked until processing is complete for the last button
 			DoRplAll();
-			DoingClick = false; // we're done processing the click
+			DoingClick = false;// Don't allow a button to be clicked until processing is complete for the last button
 		}
 		private void DoRplAll()
 		{
@@ -139,9 +172,9 @@ namespace Volian.Controls.Library
 		private void btnBookMrkAll_Click(object sender, EventArgs e)
 		{
 			if (DoingClick) return;// Don't allow a button to be clicked until processing is complete for the last button
-			DoingClick = true; // We started processing a click
+			DoingClick = true;// Don't allow a button to be clicked until processing is complete for the last button
 			DoBookMrkAll();
-			DoingClick = false; // we're done processing the click
+			DoingClick = false;// Don't allow a button to be clicked until processing is complete for the last button
 		}
 		private void DoBookMrkAll()
 		{
@@ -160,6 +193,7 @@ namespace Volian.Controls.Library
 		}
 		private void btnFndRplDone_Click(object sender, EventArgs e)
 		{
+			//this.Close();
 			doingfind = false;
 			this.Visible = false; 
 		}
@@ -195,48 +229,10 @@ namespace Volian.Controls.Library
 		private void btnFindNext_Click(object sender, EventArgs e)
 		{
 			if (DoingClick) return;// Don't allow a button to be clicked until processing is complete for the last button
-			DoingClick = true;// We started processing a click
+			DoingClick = true;// Don't allow a button to be clicked until processing is complete for the last button
 			DoFindNext();
-			DoingClick = false;// we're done processing the click
+			DoingClick = false;// Don't allow a button to be clicked until processing is complete for the last button
 		}
-
-		// C2023-016 Find the next element, but stay in the same procedure
-		private ItemInfo FindNextStepElement(ItemInfo curStepElem, string fndStr)
-		{
-			ItemInfo nxtStepElem = curStepElem;
-			if (_StartingItemInfo == null)
-				_StartingItemInfo = MyEditItem.MyItemInfo;
-			if (cbxReverse.Checked)
-			{
-				if (curStepElem.IsProcedure)
-					nxtStepElem = curStepElem.MyProcedure.SearchBottom; // at the top of the procedure, so next step would be the last step of the last section (or the section title if the last section is a Word section)
-				else
-					nxtStepElem = curStepElem.SearchPrev;
-			}
-			else if (curStepElem.SearchNext.IsProcedure) // searching(finding) forward but next is the next procedure, so jump to the top of the procedure (the procedure title in the step editor)
-				nxtStepElem = curStepElem.MyProcedure;
-			else
-				nxtStepElem = curStepElem.SearchNext;
-			// B2015-131 Find was not finding series of words when one or more of the words were bolded or underlined (ex finding "Any SG" where Any was bolded)
-			while (nxtStepElem != null && nxtStepElem.ItemID != _StartingItemInfo.ItemID)
-			{
-				if (nxtStepElem.MyContent != null && ContainsFndStr(RtfTools.RTFConvertedSymbolsToUnicode(nxtStepElem.MyContent.Text).ToUpper(), fndStr.ToUpper()))
-					break;
-				if (cbxReverse.Checked)
-				{
-					if (nxtStepElem.IsProcedure)
-						nxtStepElem = nxtStepElem.MyProcedure.SearchBottom;// at the top of the procedure, so next step would be the last step of the last section (or the section title if the last section is a Word section)
-					else
-						nxtStepElem = nxtStepElem.SearchPrev;
-				}
-				else if (nxtStepElem.SearchNext.IsProcedure)
-					nxtStepElem = nxtStepElem.MyProcedure;// searching(finding) forward but next is the next procedure, so jump to the top of the procedure(the procedure title in the step editor)
-				else
-					nxtStepElem = nxtStepElem.SearchNext;
-			}
-			return nxtStepElem;
-		}
-
 		private void DoFindNext()
 		{
 			AddToComboLists();
@@ -244,21 +240,32 @@ namespace Volian.Controls.Library
 			string fndStr = FixSymbol(cmboFindText.Text.Replace(@"\", @"\u9586?").Replace("-", @"\u8209?").Replace("\xa0", @"\u160?"));
 			while (!MyEditItem.FindText(cmboFindText.Text, cbxCaseSensitive.Checked, cbxWholeWord.Checked, cbxReverse.Checked))
 			{
-				ItemInfo next = FindNextStepElement(MyEditItem.MyItemInfo, fndStr);
+				ItemInfo next = (cbxReverse.Checked) ? MyEditItem.MyItemInfo.SearchPrev : MyEditItem.MyItemInfo.SearchNext;
 
-				MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next,true,true);// C2023-016 open item (next), set focus (true), doing Find/Replace so don't open Word section (true)
+				// B2015-131 Find was not finding series of words when one or more of the words were bolded or underlined (ex finding "Any SG" where Any was bolded)
+				while ((next != null) && !next.IsSection && !ContainsFndStr(RtfTools.RTFConvertedSymbolsToUnicode(next.MyContent.Text).ToUpper(), fndStr.ToUpper()))
+				{
+					next = (cbxReverse.Checked) ? next.SearchPrev : next.SearchNext;
+				}
+					//if (next != null) Console.WriteLine("next {0} {1}", next.ItemID, next.MyContent.Text);
+				if ((next == null) || next.IsSection)
+				{
+					if (!findingbookmarks)
+					{
+						// C2020-015: Improve dialog messaging
+						if (cbxReverse.Checked)
+							FlexibleMessageBox.Show(this, "Nothing found here to beginning of this section", "End of Find/Replace");
+						else
+							FlexibleMessageBox.Show(this, "Nothing found here to end of this section", "End of Find/Replace");
+					}
+					FoundIt = false;
+					return;
+				}
+				
+				MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next);
 				if (cbxReverse.Checked)
 					MyEditItem.PositionToEnd();
 				if (next.IsTable && !cbxReverse.Checked) MyEditItem.PositionToStart();
-				//C2023-016 if we spun through all of the step editor sections, stop and display a message
-				if (MyEditItem.MyItemInfo.ItemID == _StartingItemInfo.ItemID)
-				{
-					FoundIt = false;
-					string msg = string.Format("Back to the starting point of the Find/Replace.{0}",(findingbookmarks)?"\n\n The Tools Panel will display showing the locations.":"");
-					FlexibleMessageBox.Show(this, msg, "Find/Replace Completed");
-					_StartingItemInfo = null;
-					return;
-				}
 			}
 			if (MyEditItem.MyStepRTB != null && !MyEditItem.MyStepRTB.Visible)
 			{
@@ -279,7 +286,7 @@ namespace Volian.Controls.Library
 			{
 				if (cmboFindText.Items.Count >= 10)
 					cmboFindText.Items.RemoveAt(9);
-				cmboFindText.Items.Insert(0, cmboFindText.Text);
+				cmboFindText.Items.Insert(0, cmboFindText.Text);//.Add(cmboFindText.Text);
 			}
 			hastext = this.cmboReplaceText.Text.Length > 0;
 			if (hastext && btnReplace.Enabled && !cmboReplaceText.Items.Contains(cmboReplaceText.Text))
@@ -295,13 +302,11 @@ namespace Volian.Controls.Library
 			btnFindNext.Enabled = hastext;
 			btnBookMrkAll.Enabled = hastext;
 			btnReplace.Enabled = btnRplAll.Enabled = hastext && !InApproved;
-			_StartingItemInfo = null; //C2023-016 reset the starting position
 		}
 
 		private void cmboReplaceText_TextChanged(object sender, EventArgs e)
 		{
 			btnReplace.Enabled = btnRplAll.Enabled = !InApproved && cmboFindText.Text.Length > 0;
-			_StartingItemInfo = null;//C2023-016 reset the starting position
 		}
 
 		public void PerformFindNext()
@@ -331,6 +336,17 @@ namespace Volian.Controls.Library
 			e.Cancel = true; // cancel the form close event - the Done_Click() will hide it instead
 		}
 
+		private void cmboFindText_Leave(object sender, EventArgs e)
+		{
+			//bool hastext = this.cmboFindText.Text.Length > 0;
+			//if (hastext && !cmboFindText.Items.Contains(cmboFindText.Text))
+			//{
+			//    if (cmboFindText.Items.Count >= 10)
+			//        cmboFindText.Items.RemoveAt(9);
+			//    cmboFindText.Items.Insert(0, cmboFindText.Text);//.Add(cmboFindText.Text);
+			//}
+		}
+
 		private void btnCmCut_Click(object sender, EventArgs e)
 		{
 			Clipboard.Clear();
@@ -440,22 +456,6 @@ namespace Volian.Controls.Library
 				tabReplace.Visible = true;
 				Text = "Find and Replace";//C2021-021 change the dialog title
 			}
-			_StartingItemInfo = null;//C2023-016 reset the starting position
-		}
-
-		private void cbxCaseSensitive_CheckedChanged(object sender, EventArgs e)
-		{
-			_StartingItemInfo = null;//C2023-016 reset the starting position
-		}
-
-		private void cbxWholeWord_CheckedChanged(object sender, EventArgs e)
-		{
-			_StartingItemInfo = null;//C2023-016 reset the starting position
-		}
-
-		private void cbxReverse_CheckedChanged(object sender, EventArgs e)
-		{
-			_StartingItemInfo = null;//C2023-016 reset the starting position
 		}
 	}
 }

PROMS/Volian.Controls.Library/FormatUtility.cs

@@ -1,61 +0,0 @@
-using Csla;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using VEPROMS.CSLA.Library;
-
-namespace Volian.Controls.Library
-{
-    public static class FormatUtility
-    {
-        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
-        //C2023-017: Remove any formats that are not applicable to the current plant
-        public static IList<FormatInfo> GetFilteredFormatList(SortedBindingList<FormatInfo> RawList)
-        {
-            List<FormatInfo> result = new List<FormatInfo>();
-
-            try
-            {
-                //Get the top folder configuration XML of the PROMS treeview and load
-                //the Formats node to retrieve the available formats for this plant
-                FolderInfo fi = FolderInfo.GetTop();
-                System.Xml.XmlDocument xDoc = new System.Xml.XmlDocument();
-                xDoc.LoadXml(fi.Config);
-                XmlNodeList fList = xDoc.GetElementsByTagName("Formats");
-
-                //We need to check to see if the current database has been updated with the necessary changes
-                //to the folder configuration value.  If so then build the list of available to be returned
-                //to the calling code
-                if (fList == null)
-                {
-                    _MyLog.InfoFormat("Filtered format list not available: Database update needed for config value of top folder record");
-                    return RawList;
-                }
-                else
-                {
-                    //Create a string array that we can use to filter the raw list and add the format to the return value
-                    string[] availableFormats = fList[0].Attributes["Active"].Value.Split(',');
-                    foreach (FormatInfo item in RawList)
-                    {
-                        if (Array.IndexOf(availableFormats, item.ApplicablePlant.ToString()) > -1)
-                        {
-                            result.Add(item);
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                //On any exception simply return the original list that was passed in
-                _MyLog.ErrorFormat("Error loading filtered format list - PopulateFormatList(): {0}", ex.Message);
-                return RawList;
-            }
-
-            return result;
-        }
-    }
-}

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -3112,18 +3112,9 @@ namespace Volian.Controls.Library
 				else
 				{
 					LinkText lt = new LinkText(_MyStepRTB.MyLinkText);
-					//B2023-104 If we could not get the MyRoUsageInfo then we have a bad RO Link. Tell user to re-link the RO
-					if (lt.MyRoUsageInfo != null)
-					{
 					myROID = lt.MyRoUsageInfo.ROID.ToLower();
 					myRODB = lt.MyRoUsageInfo.MyRODb;
 				}
-					else
-					{
-						FlexibleMessageBox.Show("Invalid RO link information.\n\n Please re-link this RO value.", "Invalid RO Reference", MessageBoxButtons.OK, MessageBoxIcon.Information);
-						return;
-					}
-				}
 				if (myROID == null) return;
 				if (myROID.StartsWith("ffff"))
 				{
@@ -3148,7 +3139,7 @@ namespace Volian.Controls.Library
 				foreach (DocVersionInfo dvi in dvil)
 				{
 					DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig;
-					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
+					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
 					{
 						args += " \"PC=" + dvc.Unit_Name + "\"";
 						break;
@@ -3318,7 +3309,7 @@ namespace Volian.Controls.Library
 			foreach (DocVersionInfo dvi in dvil)
 			{
 				DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig;
-				if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
+				if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
 				{
 					roloc += " \"PC=" + dvc.Unit_Name + "\"";
 					break;

PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj

@@ -240,7 +240,6 @@
     <Compile Include="FindReplace.designer.cs">
       <DependentUpon>FindReplace.cs</DependentUpon>
     </Compile>
-    <Compile Include="FormatUtility.cs" />
     <Compile Include="frmEnhanced.cs">
       <SubType>Form</SubType>
     </Compile>

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1942,12 +1942,7 @@ namespace Volian.Controls.Library
 				case "Incoming Transitions": // C2020-033:  Support the menu item to bring up Search/Incoming Transitions panel
 					VETreeNode tnx = SelectedNode as VETreeNode;
 					ItemInfo iii = tnx.VEObject as ItemInfo;
-					if (iii != null)
-					{
-						this.Cursor = Cursors.WaitCursor;       // B2023-103 add spinner when searching for incoming transitions
-						OnSearchIncTransIn(this, new vlnTreeItemInfoEventArgs(iii));
-						this.Cursor = Cursors.Default;
-					}
+					if (iii != null) OnSearchIncTransIn(this, new vlnTreeItemInfoEventArgs(iii));
 					break;
 				case "Properties..."://Show the properties for the selected node
 					SetLastValues((VETreeNode)SelectedNode);
@@ -2251,7 +2246,7 @@ namespace Volian.Controls.Library
 			foreach (DocVersionInfo dvi in dvil)
 			{
 				DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig;
-				if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
+				if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
 				{
 					roloc += " \"PC=" + dvc.Unit_Name + "\"";
 					break;

PROMS/Volian.Print.Library/Pagination.cs

@@ -100,16 +100,14 @@ namespace Volian.Print.Library
 				return retval;
 			}
 			// C2023-015:  Pagination on a sub-step added.  Do the code if supplemental info or if format supports sub-step pagination
-			// C2023-018: Pagination on sub-step (changed from C2023-015), do this code if on a step... will check for config flags in this code
-			else if (MyItemInfo.IsStep)
+			else if ((MyItemInfo.MyDocStyle.SupplementalInformation || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.AlarmPagination) && MyItemInfo.IsStep)
 			{
-				// C2023-018: only do the following if in supplemental info, doing checks on cautions/notes off substep
 				// if this is the first caution or note from a substep, if the substep has preferred page break, break at the first caution or note:
-				if ((MyItemInfo.MyDocStyle.SupplementalInformation && (MyItemInfo.IsCaution || MyItemInfo.IsNote) && MyItemInfo.MyParent.IsSubStep))
+				if ((MyItemInfo.IsCaution || MyItemInfo.IsNote) && MyItemInfo.MyParent.IsSubStep)
 				{
 					StepConfig scs = MyItemInfo.MyParent.MyConfig as StepConfig;
-					// C2023-015:  Pagination on a sub-step added on this check, C2023-018: removed substep check since this cannot occur
-					if (MyItemInfo.MyPrevious == null && scs.Step_PreferredPagebreak)
+					// C2023-015:  Pagination on a sub-step added on this check
+					if (MyItemInfo.MyPrevious == null && (scs.Step_PreferredPagebreak || scs.Step_SubStepPagebreak))
 					{
 						// B2018-103: The following flags a break within the step.  Before returning a '2' (flags break within step), clear it out of the
 						//	ParaBreaks.  Without the 'RemoveAt', a page break will occur after this step also.
@@ -123,16 +121,8 @@ namespace Volian.Print.Library
 					}
 				}
 				// Now see if there is a preferred page break on this step.
-				// C2023-018: Added check for sub-step
 				StepConfig sci = MyItemInfo.MyConfig as StepConfig;
 				if (sci.Step_PreferredPagebreak || sci.Step_SubStepPagebreak)
-				{
-					// C2023-018: if removing manual page breaks - add to list for permanent removal if selected and do not put a page break
-					//	on the sub-step (do not execute the 'else' code)
-					if (sci.Step_SubStepPagebreak && MyPageHelper.MyPromsPrinter.RemoveManualPageBreaks != null &&
-						!MyPageHelper.MyPromsPrinter.RemoveManualPageBreaks.Contains(MyItemInfo.ItemID))
-						MyPageHelper.MyPromsPrinter.RemoveManualPageBreaks.Add(MyItemInfo.ItemID);
-					else
 				{
 					if (MyItemInfo.IsHigh) return 1;
 					// if this is the top caution/note return 1 also.  Cautions always are first, that is why the check does not need to know if on a 
@@ -153,7 +143,6 @@ namespace Volian.Print.Library
 					return 2;
 				}
 			}
-			}
 			// if the EndForSingle format flag is set to false, then we do not print an End message if the section
 			// is a single column section.
 			//bool _skipEndMessage = MyPageHelper.MySection.SectionConfig.Section_ColumnMode == SectionConfig.SectionColumnMode.One && !MyItemInfo.ActiveFormat.MyStepSectionLayoutData.EndForSingle;
@@ -1486,8 +1475,7 @@ namespace Volian.Print.Library
 		private SortedList<float, vlnParagraph> GetMyPreferredBreaks(StepLevelList myList)
 		{
 			// C2023-015:  Pagination on a sub-step added.  Do the code if supplemental info or if format supports sub-step pagination
-			// C2023-018:  Remove the supplemental info & alarm check, doing the possible page breaks on sub-steps
-			//if (!MyItemInfo.MyDocStyle.SupplementalInformation && !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.AlarmPagination) return null;
+			if (!MyItemInfo.MyDocStyle.SupplementalInformation && !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.AlarmPagination) return null;
 			SortedList<float, vlnParagraph> sdpara = null;
 			foreach (int stepLevel in myList.Keys)				// loop thru StepLevels, starting with lowest.
 			{
@@ -1496,13 +1484,6 @@ namespace Volian.Print.Library
 					vlnParagraph myPara = myList[stepLevel][yLocation];
 					StepConfig sci = myPara.MyItemInfo.MyConfig as StepConfig;
 					if (sci != null && sci.Step_PreferredPagebreak || sci.Step_SubStepPagebreak)
-					{
-						// C2023-018: if removing manual page breaks - add to list for permanent removal if selected and do not add a possible page break
-						//	on the sub-step (do not execute the 'else' code)
-						if (sci.Step_SubStepPagebreak && MyPageHelper.MyPromsPrinter.RemoveManualPageBreaks != null &&
-						!MyPageHelper.MyPromsPrinter.RemoveManualPageBreaks.Contains(MyItemInfo.ItemID))
-							MyPageHelper.MyPromsPrinter.RemoveManualPageBreaks.Add(MyItemInfo.ItemID);
-						else
 					{
 						if (sdpara == null) sdpara = new SortedList<float, vlnParagraph>();
 						if (myPara.ChildrenAbove != null && myPara.ChildrenAbove.Count > 0) sdpara.Add(-yLocation, myPara.ChildrenAbove[0]);
@@ -1510,7 +1491,6 @@ namespace Volian.Print.Library
 					}
 				}
 			}
-			}
 			return sdpara;
 		}
 

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -2746,7 +2746,6 @@ namespace Volian.Print.Library
 						{
 							if (!HasManPagAnnot(ii, "Removed Manual Page Break")) VEPROMS.CSLA.Library.Annotation.MakeAnnotation(itm, AnnotationType.GetByNameOrCreate("Manual Pagination Issues"), null, "Removed Manual Page Break", null);
 							sc.Step_NewManualPagebreak = false;         // reset the flag that was set in the config
-							if (sc.Step_SubStepPagebreak) sc.Step_SubStepPagebreak = false;		// C2023-018: remove substep page break flags
 							itm.MyContent.Config = sc.ToString();
 							itm.MyContent.DTS = DateTime.Now;
 							itm.MyContent.UserID = Volian.Base.Library.VlnSettings.UserID;