Merge pull request 'Development' (#282 ) from Development into master

Merging all items through B2024-018 from development into master after successful testing.
Merge pull request 'Development' (#275 ) from Development into master
2024-03-27 13:39:46 -04:00 · 2024-03-20 16:07:27 -04:00 · 2024-03-18 10:00:30 -04:00 · 2024-03-15 09:33:57 -04:00 · 2024-03-12 14:01:12 -04:00 · 2024-03-04 15:02:18 -05:00
124 changed files with 17568 additions and 1593 deletions
@@ -27,7 +27,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
 						{
 							// Allow for setting build revision on either proms or the roeditor:
 							if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
-								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
-							else
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
+							else
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
 					//		if (outline != line)
 					//		{
 					//			Console.WriteLine("Before: '{0}'", line);
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
@@ -6,7 +6,7 @@
        </sectionGroup>
    </configSections>
    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
    </startup>
    <userSettings>
        <Baseline.Properties.Settings>
@@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Baseline</RootNamespace>
    <AssemblyName>Baseline</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SccProjectName>
    </SccProjectName>
@@ -18,7 +18,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>FlexableMessageBox</RootNamespace>
    <AssemblyName>FlexableMessageBox</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
    <SccProjectName>
@@ -241,21 +241,6 @@ namespace JR.Utils.GUI.Forms
            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
        }

-        /// <summary>
-        /// Shows the specified message box.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <param name="text">The text.</param>
-        /// <param name="caption">The caption.</param>
-        /// <param name="buttons">The buttons.</param>
-        /// <param name="icon">The icon.</param>
-        /// <param name="defaultButton">The default button.</param>
-        /// <returns>The dialog result.</returns>
-        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-        {
-            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
-        }
-
        #endregion

        #region Internal form class
@@ -435,15 +420,15 @@ namespace JR.Utils.GUI.Forms
            private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";

            //These are the possible buttons (in a standard MessageBox)
-            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
-
+            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE };
+            
            //These are the buttons texts for different languages. 
            //If you want to add a new language, add it here and in the GetButtonText-Function
            private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
-            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore" }; //Note: This is also the fallback language
+            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren" };
+            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" };

            #endregion

@@ -708,7 +693,6 @@ namespace JR.Utils.GUI.Forms

                        flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
                        break;
-             

                    case MessageBoxButtons.OK:
                    default:
@@ -725,38 +709,16 @@ namespace JR.Utils.GUI.Forms
                flexibleMessageBoxForm.defaultButton = defaultButton;
            }

-            private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
-            {
-                flexibleMessageBoxForm.visibleButtonsCount = 3;
+            #endregion

-                flexibleMessageBoxForm.button1.Visible = true;
-                flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
-                flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
+            #region Private event handlers

-                flexibleMessageBoxForm.button2.Visible = true;
-                flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
-                flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
-
-                flexibleMessageBoxForm.button3.Visible = true;
-                flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
-                flexibleMessageBoxForm.button3.DialogResult = DialogResult.Ignore;
-
-                flexibleMessageBoxForm.ControlBox = false;
-            }
-
-
-
-
-                #endregion
-
-                #region Private event handlers
-
-                /// <summary>
-                /// Handles the Shown event of the FlexibleMessageBoxForm control.
-                /// </summary>
-                /// <param name="sender">The source of the event.</param>
-                /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-                private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
+            /// <summary>
+            /// Handles the Shown event of the FlexibleMessageBoxForm control.
+            /// </summary>
+            /// <param name="sender">The source of the event.</param>
+            /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+            private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
            {
                int buttonIndexToFocus = 1;
                Button buttonToFocus;
@@ -904,46 +866,6 @@ namespace JR.Utils.GUI.Forms
                return flexibleMessageBoxForm.ShowDialog(owner);
            }

-            /// <summary>
-            /// Shows the specified message box.
-            /// </summary>
-            /// <param name="owner">The owner.</param>
-            /// <param name="text">The text.</param>
-            /// <param name="caption">The caption.</param>
-            /// <param name="buttons">The buttons.</param>
-            /// <param name="icon">The icon.</param>
-            /// <param name="defaultButton">The default button.</param>
-            /// <returns>The dialog result.</returns>
-            public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-            {
-                //Create a new instance of the FlexibleMessageBox form
-                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
-                flexibleMessageBoxForm.ShowInTaskbar = false;
-
-                //Bind the caption and the message text
-                flexibleMessageBoxForm.CaptionText = caption;
-                flexibleMessageBoxForm.MessageText = text;
-                flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
-
-                //Set the buttons visibilities and texts. Also set a default button.
-                SetDialogButtonsCustom(flexibleMessageBoxForm);
-
-                //Set the dialogs icon. When no icon is used: Correct placement and width of rich text box.
-                SetDialogIcon(flexibleMessageBoxForm, icon);
-
-                //Set the font for all controls
-                flexibleMessageBoxForm.Font = FONT;
-                flexibleMessageBoxForm.richTextBoxMessage.Font = FONT;
-
-                //Calculate the dialogs start size (Try to auto-size width to show longest text row). Also set the maximum dialog size. 
-                SetDialogSizes(flexibleMessageBoxForm, text, caption);
-
-				//Set the dialogs start position when given. Otherwise center the dialog on the current screen.
-				SetDialogStartPosition(flexibleMessageBoxForm, owner);
-				//Show the dialog
-				return flexibleMessageBoxForm.ShowDialog(owner);
-			}
-
            #endregion
        } //class FlexibleMessageBoxForm

@@ -18,7 +18,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -126,7 +126,6 @@
    <Content Include="fmtall\BVPSAOPall.xml" />
    <Content Include="fmtall\BVPSAtchall.xml" />
    <Content Include="fmtall\BVPSBCKall.xml" />
-    <Content Include="fmtall\BVPSAOPDEVall.xml" />
    <Content Include="fmtall\BVPSFlexDEVall.xml" />
    <Content Include="fmtall\BVPSDEVall.xml" />
    <Content Include="fmtall\BVPSNIBCKall.xml" />
@@ -407,7 +406,6 @@
    <Content Include="genmacall\BVPSAOP.svg" />
    <Content Include="genmacall\BVPSAtch.svg" />
    <Content Include="genmacall\BVPSbck.svg" />
-    <Content Include="genmacall\BVPSAOPdev.svg" />
    <Content Include="genmacall\BVPSFlexdev.svg" />
    <Content Include="genmacall\BVPSdev.svg" />
    <Content Include="genmacall\BVPSNIBCK.svg" />
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
@@ -18,7 +18,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -33,7 +33,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime></configuration>
@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[assembly: AssemblyVersion("2.2.2306.2212")]
+[assembly: AssemblyFileVersion("2.2.2306.2212")]

 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -89,8 +89,6 @@ using System.Runtime.CompilerServices;



-
-



@@ -44,7 +44,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime>
 	<appSettings>
@@ -35,7 +35,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -18,7 +18,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -35,7 +35,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -35,7 +35,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -35,7 +35,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -51,7 +51,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,7 +46,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -35,7 +35,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -35,7 +35,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -60,6 +60,6 @@
 			</logger>
 		</log4net>
 		<startup>
-			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
 		</startup>
 	</configuration>
@@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>RoAccessToSql</RootNamespace>
    <AssemblyName>RoAccessToSql</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
    <SccProjectName>
@@ -33,7 +33,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-      <section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    </sectionGroup>
  </configSections>
  <log4net>
    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt"/>
+      <param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt" />
      <!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />-->
      <!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />-->
-      <param name="AppendToFile" value="true"/>
+      <param name="AppendToFile" value="true" />
      <layout type="log4net.Layout.PatternLayout">
        <!--<param name="Header" value="[Header]\r\n" />-->
        <!--<param name="Footer" value="[Footer]\r\n" />-->
-        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
+        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
      </layout>
    </appender>
    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline"/>
+        <conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline" />
      </layout>
    </appender>
    <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
-      <threshold value="WARN"/>
+      <threshold value="WARN" />
      <mapping>
-        <level value="DEBUG"/>
-        <eventLogEntryType value="Information"/>
+        <level value="DEBUG" />
+        <eventLogEntryType value="Information" />
      </mapping>
      <mapping>
-        <level value="INFO"/>
-        <eventLogEntryType value="Information"/>
+        <level value="INFO" />
+        <eventLogEntryType value="Information" />
      </mapping>
      <mapping>
-        <level value="WARN"/>
-        <eventLogEntryType value="Warning"/>
+        <level value="WARN" />
+        <eventLogEntryType value="Warning" />
      </mapping>
      <mapping>
-        <level value="ERROR"/>
-        <eventLogEntryType value="Error"/>
+        <level value="ERROR" />
+        <eventLogEntryType value="Error" />
      </mapping>
      <mapping>
-        <level value="FATAL"/>
-        <eventLogEntryType value="Error"/>
+        <level value="FATAL" />
+        <eventLogEntryType value="Error" />
      </mapping>
      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n"/>
+        <param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n" />
      </layout>
    </appender>
    <root>
-      <level value="ALL"/>
-      <appender-ref ref="ConsoleAppender"/>
-      <appender-ref ref="LogFileAppender"/>
-      <appender-ref ref="EventLogAppender"/>
+      <level value="ALL" />
+      <appender-ref ref="ConsoleAppender" />
+      <appender-ref ref="LogFileAppender" />
+      <appender-ref ref="EventLogAppender" />
    </root>
    <logger name="VEPROMS.CSLA.Library">
-      <level value="INFO"/>
+      <level value="INFO" />
    </logger>
    <logger name="Volian.Controls.Library">
-      <level value="INFO"/>
+      <level value="INFO" />
    </logger>
  </log4net>
  <appSettings>
-    <add key="OperatingMode" value="Production"/>
+    <add key="OperatingMode" value="Production" />
    <!--"Debug" "Production" "Demo"/-->
-    <add key="OriginalPageBreak" value="False"/>
-    <add key="CslaAuthentication" value="Windows"/>
+    <add key="OriginalPageBreak" value="False" />
+    <add key="CslaAuthentication" value="Windows" />
    <!--
    <add key="CslaDataPortalProxy" 
      value="Csla.DataPortalClient.RemotingProxy, Csla"/>
@@ -85,17 +85,17 @@
      value="EnterpriseServicesHost.EnterpriseServicesProxy,
      EnterpriseServicesHost"/>      
      -->
-    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
  </appSettings>
  <connectionStrings>
-    <add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient"/>
-    <add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
-    <add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
-    <add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
+    <add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
    <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
 	  <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
-    <add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
-    <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
+    <add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
    <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
    <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
  </connectionStrings>
@@ -135,10 +135,10 @@
        <value>True</value>
      </setting>
      <setting name="QATItems" serializeAs="String">
-        <value/>
+        <value />
      </setting>
      <setting name="DefaultDB" serializeAs="String">
-        <value/>
+        <value />
      </setting>
      <setting name="LastVersion" serializeAs="String">
        <value>0.0</value>
@@ -150,10 +150,10 @@
        <value>True</value>
      </setting>
      <setting name="SMTPServer" serializeAs="String">
-        <value/>
+        <value />
      </setting>
      <setting name="SMTPUser" serializeAs="String">
-        <value/>
+        <value />
      </setting>
      <setting name="UpdateSettings" serializeAs="String">
        <value>True</value>
@@ -181,22 +181,18 @@
    </UISampleNetBar1.Properties.Settings>
  </userSettings>
  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
  </startup>
-  <runtime>
-    <AppContextSwitchOverrides
-      value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
-  </runtime>
  <system.web>
    <membership defaultProvider="ClientAuthenticationMembershipProvider">
      <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
      </providers>
    </membership>
    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
      <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
      </providers>
    </roleManager>
  </system.web>
-</configuration>
+</configuration>
@@ -1320,10 +1320,6 @@ namespace VEPROMS
 			if (swtbtnPDFLinks.Value)
 				swtbtnPDFdtPrefixSuffix.Value = false;
 			BuildPDFFileName();
-			// C2024-013: When Create RO & Transition Hyperlinks in pdf is ON, disable the MergePdf
-			//	button.  The Create RO & Transition Hyperlinks option looks for individual file names
-			//	for procedures.
-			btnMergePDFs.Enabled = !swtbtnPDFLinks.Value; 
 		}

 		// C2019-004: Allow user to define duplex blank page text.  The text box for blank page text is always enabled for procedures with
@@ -22226,419 +22226,6 @@ Go
 	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
 	ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
 	GO
-
-
-
-/*
-==========================================================================================================
- Begin: C2024-004: KL - Update Copy Replace functionality, (remove ''copy of'')
-==========================================================================================================
-*/
-	
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[CopyItemAndChildren]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [CopyItemAndChildren];
-GO
-	
-	/*****************************************************************************
-	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-		   Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
-	*****************************************************************************/
-	/*
-	==========================================================================================================
-	 Author:		Kevin Laskey
-	 Modified Date:	07/09/2024
-	 Description:	Copy Item and its Children
-	==========================================================================================================
-	 */
-CREATE PROCEDURE [dbo].[CopyItemAndChildren]
-(
-	@StartItemID INT,
-	@DestFormatID INT,
-	@UserID NVARCHAR(100),
-	@NewStartItemID int output
-)
-WITH EXECUTE AS OWNER
-AS
-BEGIN TRY -- Try Block
-
--+-----------------------------------------------------------------+
--& BEGIN TRANSACTION to make these changes temporary               &
--+-----------------------------------------------------------------+
-	BEGIN TRANSACTION
-	if exists (select * from tblitems where itemid = @StartItemID and DeleteStatus !=0)
-		BEGIN
-			RAISERROR ('###Cannot Paste Step###This step has been deleted',16,1)
-			RETURN
-		END
-DECLARE @Children AS TABLE
-(
-	ItemID INT PRIMARY KEY,
-	NewItemID INT,
-	ContentID INT,
-	NewContentID INT,
-	FormatID INT,
-	NewFormatID INT
-)
-DECLARE @NewDocuments AS TABLE
-(
-	DocID INT PRIMARY KEY,
-	NewDocID INT
-)
-- Locals
-DECLARE @DTS DATETIME -- DTS of all New Items
-DECLARE @StartContentID INT
-Select @StartContentID = ContentID from Items where ItemID = @StartItemID
-SET @DTS = GETDATE() -- Get the current Date and Time
-- Get a list of all of the Items to be copied based upon StartItemID and EndItemID
-- If the StartItemID = EndItemID then it is a single item and it's children
-INSERT INTO @Children SELECT ItemID,ItemID,ContentID,ContentID,FormatID,FormatID FROM vefn_ChildItemsRange(@StartItemID,@StartItemID,null)
-- <<< Copy Contents >>>
-- Create new content rows to match the existing rows.  Set the type to the Current ContentID temporarily
-- so that the new content rows can be associated with the existing content rows.
-- Rem 'Copy Of ' + before first [Number] for C2024-004 (KL)
-INSERT INTO Contents
-  ([Number],[Text],[Type],[FormatID],[Config],[DTS],[UserID])
-	select CASE when [ContentID] = @StartContentID and [Type]<20000 then [Number] else [Number] end,
-	[Text],[ContentID],[FormatID],[Config],@DTS,@UserID
- from Contents where ContentID in(Select ContentID from @Children)
-- Update the @Children with the NewConentIDs
--print 'A	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-UPDATE NN set NN.NewContentID = CC.ContentID
-From Contents CC
-Join @Children NN on NN.ContentID = CC.Type AND CC.DTS = @DTS and CC.UserID = @UserID
-- Reset the Type column in the Contents table with the Type column from the original Records.
--print 'B	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-DECLARE @SourceType INT
-Select @SourceType = Type from Contents where ContentID = @StartContentID
-if @SourceType =  0
-	BEGIN
-		UPDATE CC set CC.Type = CC2.Type, CC.DTS = CC2.DTS, CC.UserID = CC2.UserID
-		From Contents CC
-		Join @Children NN on NN.NewContentID = CC.ContentID
-		Join Contents CC2 on NN.ContentID = CC2.ContentID
-	END
-else
-	BEGIN
-UPDATE CC set CC.Type = CC2.Type
-From Contents CC
-Join @Children NN on NN.NewContentID = CC.ContentID
-Join Contents CC2 on NN.ContentID = CC2.ContentID
-	END
--print 'B1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- Contents are done
-	-- SELECT * From Contents where DTS = @DTS and UserID = @UserID
-- <<< Copy Grids >>>
-INSERT INTO [Grids]([ContentID],[Data],[Config],[DTS],[UserID])
-	SELECT NN.[NewContentID],[Data],[Config],@DTS,@UserID
-		FROM [Grids] GG Join @Children NN on GG.ContentID = NN.ContentID
-- <<< Copy Images >>>
--print 'B2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-INSERT INTO [Images]([ContentID],[ImageType],[FileName],[Data],[Config],[DTS],[UserID])
-	SELECT NN.[NewContentID],[ImageType],[FileName],[Data],[Config],@DTS,@UserID
-		FROM [Images] II Join @Children NN on II.ContentID = NN.ContentID
-- Create new item rows based upon the current item rows and the @Children table, with the NewContentIDs
--print 'B3	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-INSERT INTO [Items] ([PreviousID],[ContentID],[DTS],[UserID])
-     SELECT II.[PreviousID], -- Leave the PreviousID as is for now
-			NN.NewContentID, @DTS, @UserID
-			from @Children NN
-			join Items II on II.ContentID = NN.ContentID
-- Update the @Children with the NewItemIDs
--print 'B4	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-UPDATE NN set NN.NewItemID = II.ItemID
-From Items II
-Join @Children NN on NN.NewContentID = II.ContentID AND II.DTS = @DTS and II.UserID = @UserID
-DECLARE @NewItemID int
-SELECT @NewItemID = NewItemID
-	FROM @Children
-	WHERE ItemID = @StartItemID
--print 'B5	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-UPDATE NN SET NN.[NewFormatID] = CC.[FormatID]
-	FROM @Children NN
-	Join vefn_ChildItemsRange(@NewItemID,@NewItemID,@DestFormatID) CC
-	ON NN.NewItemID = CC.ItemID
-- The @Children table is now complete
-	--SELECT * From @Children
-- Update the PreviousID in the new Item rows, to the new ItemIDs based upon the old ItemIDs
--print 'B6	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-Update II Set II.[PreviousID] = NN.NewItemID
-from Items II
-Join @Children NN on NN.ItemID = II.PreviousID AND II.DTS = @DTS and II.UserID = @UserID
-- Get the new ItemIDs based upon the old ItemIDs
-SELECT @NewStartItemID = NewItemID from @Children where ItemID = @StartItemID
--SELECT @NewEndItemID = NewItemID from @Children where ItemID = @EndItemID
-- Set the PreviousID for the starting Item to null temporarily.
-- This will be adjusted based upon where the step is inserted.
--print 'B7	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-Update Items Set PreviousID = null where ItemID = @NewStartItemID
-if @SourceType =  0
-	BEGIN
-		UPDATE II SET II.DTS = II2.DTS, II.UserID = II2.UserID
-		From Items II
-		Join @Children NN on NN.NewItemID = II.ItemID
-		Join Items II2 on NN.ItemID = II2.ItemID
-		WHERE NN.ItemID = @StartItemID
-	END
--print 'C	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- Items are done
-	--SELECT * From Items where DTS = @DTS and UserID = @UserID
-- <<< Copy Parts >>>
-INSERT INTO [Parts] ([ContentID],[FromType],[ItemID],[DTS],[UserID])
-Select NNF.NewContentID,[FromType],NNT.NewItemID, @DTS, @UserID from Parts PP
-JOIN @Children NNF on PP.ContentID = NNF.ContentID
-JOIN @Children NNT on PP.ItemID = NNT.ItemID
--print 'D	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- Parts are done
-	-- SELECT * From Parts where DTS = @DTS and UserID = @UserID
-- <<< Copy Annotations >>>
-INSERT INTO [Annotations] ([ItemID],[TypeID],[RtfText],[SearchText],[Config],[DTS],[UserID])
-     Select NewItemID, TypeID, RtfText, SearchText, Config, @DTS, @UserID
-			from Annotations AA Join @Children NN on AA.ItemID = NN.ItemID
--print 'E	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- Annotations are done
-	-- SELECT * From Annotations where DTS = @DTS and UserID = @UserID
-- <<< Copy Documents and Entries>>>
-- logic to create Entries for Library Documents
-INSERT INTO [Entries] ([ContentID],[DocID],[DTS],[UserID])
-	SELECT NN.[NewContentID],EE.[DocID],@DTS,@UserID
-  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
-	JOIN [Documents] DD on EE.[DocID] = DD.[DocID] and Isnull(LibTitle,'') <> ''
-- Logic to create new documents for any documents used that do not have libtitles
-INSERT INTO [Documents] ([LibTitle],[DocContent],[DocAscii],[Config],[DTS],[UserID],[FileExtension])
-  OUTPUT CAST(INSERTED.[LibTitle] as INT),INSERTED.[DocID] INTO @NewDocuments
-	SELECT str(DD.[DocID]),[DocContent],[DocAscii],[Config],@DTS,@UserID,[FileExtension]
-  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
-	JOIN [Documents] DD on EE.[DocID] = DD.[DocID] and Isnull(LibTitle,'') = ''
-UPDATE DD SET LibTitle = ''
-	FROM Documents DD JOIN @NewDocuments ND on DD.[DocID] = ND.[NewDocID]
-	where DTS = @DTS and UserID = @UserID
--print 'F	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- Documents are Done
-	-- SELECT * From Documents where DTS = @DTS and UserID = @UserID
-- Logic to create entries for these newly created documents
-INSERT INTO [Entries] ([ContentID],[DocID],[DTS],[UserID])
-	SELECT NN.[NewContentID],ND.[NewDocID],@DTS,@UserID
-  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
-	JOIN @NewDocuments ND on EE.[DocID] = ND.[DocID]
-- Logic to Create DROUsages for these newly created documents
-INSERT INTO [DROUsages] ([DocID],[ROID],[Config],[DTS],[UserID],[RODbID])
- 	SELECT ND.[NewDocID],[ROID],[Config],@DTS,@UserID,[RODbID]
-  FROM [DROUsages] RR
-	JOIN @NewDocuments ND on RR.[DocID] = ND.[DocID]
-
--print 'G	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- Entries are done
-	-- SELECT * From Entries EE JOIN Documents DD on ee.DocID = DD.DocID where EE.DTS = @DTS and EE.UserID = @UserID
-- <<< Copy RoUsages >>>
-INSERT INTO [RoUsages] ([ContentID],[ROID],[Config],[DTS],[UserID],[RODbID])
-	SELECT NN.[NewContentID],CAST([ROUsageID] as nvarchar(16)),[Config],@DTS,@UserID,[RODbID]
-		FROM [RoUsages] RR Join @Children NN on RR.ContentID = NN.ContentID
-- Update content records for newly copied records to use correct RO usage ids in the RO tags
-DECLARE @RowsAffected int
-SET @RowsAffected=1
-WHILE @RowsAffected > 0
-BEGIN
-	UPDATE CC SET [TEXT] = C2.NewText
-	FROM CONTENTS CC
-	JOIN (SELECT C1.ContentID, .dbo.vefn_FixROText(C1.Text, CAST([ROID] as int), [ROUsageID]) NewText
-	FROM CONTENTS C1
-	JOIN @Children NN on C1.ContentID = NN.NewContentID
-	JOIN RoUsages RO on NN.NewContentID = RO.ContentID where Len([ROID]) < 12) C2 ON CC.ContentID = C2.ContentID
-	WHERE [TEXT] <> C2.NewText
-	SET @RowsAffected = @@RowCount
-END
-- Update grid records for newly copied records to use correct RO usage ids in the RO tags
-SET @RowsAffected=1
-WHILE @RowsAffected > 0
-BEGIN
-	UPDATE GG SET [Data] = G2.NewData
-	FROM GRIDS GG
-	JOIN (SELECT G1.ContentID, .dbo.vefn_FixROData(G1.Data, CAST([ROID] as int), [ROUsageID]) NewData
-	FROM GRIDS G1
-	JOIN @Children NN on G1.ContentID = NN.NewContentID
-	JOIN RoUsages RO on NN.NewContentID = RO.ContentID where Len([ROID]) < 12) G2 ON GG.ContentID = G2.ContentID
-	WHERE Cast([Data] as nvarchar(max)) <> cast(G2.NewData as nvarchar(max))
-	SET @RowsAffected = @@RowCount
-END
-UPDATE RON SET [ROID] = ROO.[ROID]
-	FROM RoUsages RON
-	JOIN @Children NN on RON.ContentID = NN.NewContentID
-	JOIN RoUsages ROO on CAST(RON.ROID as int) = ROO.RoUsageID
-	where Len(RON.[ROID]) < 12
--print 'H	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- RoUsages are done
-	-- SELECT * From RoUsages where DTS = @DTS and UserID = @UserID
-
-- <<< Copy Transtions >>>
-- Note that the inserted record has the 'TranType' field set to old transitionid.  This is done
-- so that the next step can replace the old transitionid with the new transitionid in the
-- content record's transition tokens.  The TranType gets reset after the content records are
-- updated.
-- Also note that the 'toid/rangeid' may need converted to newly copied ids or may not.  If it's
-- not a range, then it always is converted to new, if there is a new.  If it's a range, both
-- the toid & the rangeid must be new in order for the conversion to be correct.  You cannot
-- have part of the range pointing to the new and part of the range pointing to the original
-- locations.
-
-INSERT INTO .[dbo].[Transitions] ([FromID],[ToID],[RangeID],[IsRange],[TranType],[Config],[DTS],[UserID])
-	SELECT NNF.[NewContentID],
-		-- if both toid & range are null, use the original toid & rangeid
-		CASE WHEN NNT.[NewItemID] is null or NNR.[NewItemID] is null THEN [ToID] ELSE NNT.[NewItemID] END,
-		CASE WHEN NNT.[NewItemID] is null or NNR.[NewItemID] is null THEN [RangeID] ELSE NNR.[NewItemID] END,
-		[IsRange],[TransitionID],[Config],@DTS,@UserID
-	FROM .[dbo].[Transitions] TT
-	JOIN @Children NNF on TT.[FromID] = NNF.[ContentID]
-	LEFT JOIN @Children NNT on TT.[ToID] = NNT.[ItemID]
-	LEFT JOIN @Children NNR on TT.[RangeID] = NNR.[ItemID]
--print 'H1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- -- Update content records for newly copied records to use correct TransitionIDs in the Transition tags
-SET @RowsAffected=1
-WHILE @RowsAffected > 0
-BEGIN
-UPDATE CC SET [TEXT] = C2.NewText
-	FROM CONTENTS CC
-	JOIN (SELECT C1.ContentID, .dbo.vefn_FixTransitionTextForCopy(C1.Text, TRO.TransitionID, TRO.TranType,  TRO.[ToID], TRO.[RangeID],TR.[TransitionID], TR.[ToID], TR.[RangeID], .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)) NewText
-	FROM CONTENTS C1
-	JOIN @Children NN on C1.ContentID = NN.NewContentID
-	JOIN Transitions TR on NN.NewContentID = TR.FromID
-	JOIN Transitions TRO on TR.TranType = TRO.TransitionID) C2 ON CC.ContentID = C2.ContentID
-	WHERE [TEXT] <> C2.NewText
-	SET @RowsAffected = @@RowCount
-END
--print 'H2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--set nocount off
-- -- Update grid records for newly copied records to use correct TransitionIDs in the Transition tags
-declare @grids table
-(
-contentid int primary key,
-data xml
-)
-insert into @grids select gg.contentid,gg.data from GRIDS GG
-	where gg.contentid in (select nn.newcontentid from
-	@Children NN
-	JOIN Transitions TR on NN.NewContentID = TR.FromID
-	JOIN Transitions TRO on TR.TranType = TRO.TransitionID)
--print 'H2.1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--select * from @grids
-SET @RowsAffected=1
-WHILE @RowsAffected > 0
-BEGIN
-UPDATE GG SET [DATA] = G2.NewData
-	FROM @GRIDS GG
-	JOIN (SELECT G1.ContentID, .dbo.vefn_FixTransitionDataForCopy(G1.Data, TRO.TransitionID, TRO.TranType,  TRO.[ToID], TRO.[RangeID],TR.[TransitionID], TR.[ToID], TR.[RangeID], .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)) NewData
-	FROM @GRIDS G1
-	JOIN @Children NN on G1.ContentID = NN.NewContentID
-	JOIN Transitions TR on NN.NewContentID = TR.FromID
-	JOIN Transitions TRO on TR.TranType = TRO.TransitionID) G2 ON GG.ContentID = G2.ContentID
-	WHERE Cast([DATA] as nvarchar(max)) <> CAST(G2.NewData as nvarchar(max))
-	SET @RowsAffected = @@RowCount
-END
--print 'H2.2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-update GG set data = g1.data from Grids gg join @grids g1 on gg.contentid = g1.contentid
--print 'H3	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--set nocount on
-- Add 'Verification Required' AnnotationType
-	DECLARE @typeID int
-	SELECT @typeID = TypeID from AnnotationTypes where Name = 'Verification Required'
-	IF(@typeID IS NULL)
-	BEGIN
-		INSERT INTO [AnnotationTypes]	([Name],[UserID])	VALUES	('Verification Required','Volian')
-		SELECT @typeID = SCOPE_IDENTITY()
-	END
-	-- Add "Verification Required" Annotation for each Transition whose transition format changes
-INSERT INTO [Annotations] ([ItemID],[TypeID],[SearchText],[UserID])
-		SELECT NN.NewItemID, @typeID,'Verify Transition Format',@UserID
-			FROM Transitions TR
-			JOIN @Children NN on TR.FromID = NN.NewContentID
-			JOIN Transitions TRO on TR.TranType = TRO.TransitionID
-			WHERE .dbo.vefn_CompareTranFormat(NN.FormatID, NN.NewFormatID, TRO.TranType) <> 0
--print 'H4	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-UPDATE TR SET TR.[TranType] = .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)
-	FROM Transitions TR
-	JOIN @Children NN on TR.FromID = NN.NewContentID
-	JOIN Transitions TRO on TR.TranType = TRO.TransitionID
--print 'H5	' + cast(datediff(s,@dts,getdate()) as varchar(100))
-- Transitions are done
-	-- SELECT * From Transitions where DTS = @DTS and UserID = @UserID
--print 'Z	' + cast(datediff(s,@dts,getdate()) as varchar(100))
--foldouts fixing code
-if exists (select * from contents where contentid in (select newcontentid from @children) and config like '%FloatingFoldout%')
-begin
-	--insert into #mytemp
-	select cc.contentid,xsteps.value('@FloatingFoldout','int') oldfoldoutid,(select newitemid 
-	from @children 
-	where itemid = xsteps.value('@FloatingFoldout','int')) newfoldoutid,xconfig 
-	into #mytemp 
-	from (select *,cast(config as xml) xconfig from contents where contentid in (select newcontentid from @children)) cc
-	cross apply xconfig.nodes('Config/Step') tsteps(xsteps)
-	--build @cmd string
-	declare @cmd nvarchar(max)
-	declare cmds cursor for
-	select distinct 'update #mytemp set xconfig.modify(''replace value of (Config/Step/@FloatingFoldout)[1] with "'
-	 + cast(newfoldoutid as varchar(10))
-	 + '"'') where xconfig.value(''(Config/Step/@FloatingFoldout)[1]'',''int'') = '
-	 + cast(oldfoldoutid as varchar(10))
-	from #mytemp
-	--execute cursor over rows
-	open cmds
-	fetch next from cmds into @cmd
-	while @@fetch_status = 0
-	begin
-		exec sp_executesql @cmd
-		fetch next from cmds into @cmd
-	end
-	close cmds
-	deallocate cmds
-	--actually update contents
-	update cc set config = cast(xconfig as varchar(max)) from contents cc join #mytemp mt on cc.contentid = mt.contentid
-	--get rid of #mytemp
-	drop table #mytemp
-end
--end foldouts fixing code
--section start
-DECLARE @NewContentID int
-Select @NewContentID = NewContentID from @Children where ItemID = @StartItemID
-DECLARE @Config varchar(max)
-DECLARE @XConfig xml
-select @Config = config from contents where contentid = @NewContentID
-select @XConfig = cast(@Config as xml)
-if @Config like '%SectionStart%' begin
-	DECLARE @SectionStart int
-	select @SectionStart = xproc.value('@SectionStart','int') from @xconfig.nodes('Config/Procedure') tproc(xproc)
-	DECLARE @NewSectionStart int
-	select @NewSectionStart = newitemid from @children where itemid = @SectionStart
-	DECLARE @cmd2 nvarchar(max)
-	set @cmd2 = '
-		declare @XConfig xml; 
-		set @XConfig = cast(''' + @Config + ''' as xml); 
-		set @XConfig.modify(''replace value of (Config/Procedure/@SectionStart)[1] with "' + cast(@NewSectionStart as nvarchar(10)) + '"''); 
-		update contents set config = cast(@XConfig as varchar(max)) where contentid = ' + cast(@NewContentID as nvarchar(10)) + ';'
-	exec sp_executesql @cmd2
-end
--end section start
-	IF( @@TRANCOUNT > 0 ) COMMIT
-END TRY
-BEGIN CATCH -- Catch Block
-	IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level
- 	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
-	EXEC vlnErrorHandler
-END CATCH
-
-Go
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [CopyItemAndChildren] Succeeded'
-	ELSE PRINT 'Procedure Creation: [CopyItemAndChildren] Error on Creation'
-	GO
-
-/*
-==========================================================================================================
- End: C2024-004: KL - Update Copy Replace functionality, (remove ''copy of'')
-==========================================================================================================
-*/
-
-
-
-
 -----------------------------------------------------------------------------
 /*
  ---------------------------------------------------------------------------
@@ -22673,8 +22260,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)

-	set @RevDate = '07/09/2024 9:00 AM'
-	set @RevDescription = 'C2024-004: Update Copy Replace functionality'
+	set @RevDate = '03/27/2024 11:00 AM'
+	set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced'

 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
@@ -0,0 +1,92 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PROMS")]
+[assembly: AssemblyDescription("Create, Edit, and Maintain Procedures Sets.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Volian Enterprises, Inc.")]
+[assembly: AssemblyProduct("PROMS")]
+[assembly: AssemblyCopyright("Copyright © 2012. All Rights Reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2ffeb031-bf85-4153-baa2-2d4da2fd5556")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build YYMM (two digit year, two digit month)
+//      Revision DHH (day - no leading zero, two digit hour - military time
+//
+[assembly: AssemblyVersion("11.6.1205.316")]
+[assembly: AssemblyFileVersion("11.6.1205.316")]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1,2 +1 @@
 da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8
@@ -19,7 +19,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -99,7 +99,12 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
    <Reference Include="Csla">
      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
    </Reference>
@@ -99,10 +99,6 @@ namespace VEPROMS
 			MyProcedure = procedureInfo;
 			InitializeComponent();
 			this.Text = mode + " Dialog for " + procedureInfo.DisplayNumber;
-
-			//Preset path for single procedures.
-			PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
-			txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 		}
 		private void dlgExportImport_Load(object sender, EventArgs e)
 		{
@@ -176,7 +172,6 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
-				txtExport.Enabled = true;
 				txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 			}
 		}
@@ -195,8 +190,6 @@ namespace VEPROMS
 		private bool successfullExport = true;
 		private void btnDoExport_Click(object sender, EventArgs e)
 		{
-		
-
 			btnExport.Enabled = false;
 			string msg = "Finished Exporting:\n\n";
 			if (_MyMode.ToUpper().Contains("FORMAT"))
@@ -227,42 +220,6 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
-				var fileLocation = txtExport.Text;
-				if (File.Exists(fileLocation))
-					{   // C2022-029 if an existing export of the same name is found, provide option to overwrite it
-					DialogResult ovewriteEx = FlexibleMessageBox.ShowCustom(null, "There is already another export file with the same name.  You can choose to either overwrite the existing file or have the existing file renamed with the original creation date appended.\r\n\r\nSelecting 'Cancel' will cancel the export.", "What would you like to do?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
-
-					// Extract directory, filename, and extension
-					string directory = Path.GetDirectoryName(fileLocation);
-					string filename = Path.GetFileNameWithoutExtension(fileLocation);
-					string extension = Path.GetExtension(fileLocation);
-					fileLocation = $"{directory}\\{filename}{extension}";
-
-					if (ovewriteEx == DialogResult.Abort)
-					{
-						MessageBox.Show("Export has been cancelled", "You have chosen to cancel the export.", MessageBoxButtons.OK, MessageBoxIcon.Information); // C2020-042 changed mesage box title
-						btnCloseExport.Enabled = true;
-						return;
-					}
-					else if (ovewriteEx == DialogResult.Retry)
-					{
-						//Overwrite will occur, set msg.
-						msg = "The export file has been overwritten.  ";
-					}
-					else if (ovewriteEx == DialogResult.Ignore)
-					{
-						// Get the modified date of the existing file, create a datestamp for use in name, set newlocation to move to
-						DateTime modifiedDate = File.GetLastWriteTime(fileLocation);
-						string datestamp = modifiedDate.ToString("yyyyMMddHHmmss");
-						string newFileLocation = $"{directory}\\{filename}_{datestamp}{extension}";
-
-						//Move and set msg.
-						File.Move(fileLocation, newFileLocation);
-						msg = "The previous export has been renamed, the export file has been created.  ";
-					}
-
-				}
-
 				this.Cursor = Cursors.WaitCursor;
 				MyStart = DateTime.Now;
 				btnDoExport.Enabled = false;
@@ -273,7 +230,7 @@ namespace VEPROMS
 				XmlElement xe = xd.CreateElement("formats");
 				xd.DocumentElement.AppendChild(xe);
 				ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false);
-				xd.Save(fileLocation);
+				xd.Save(txtExport.Text);
 				TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
 				lblExportStatus.Text = "Export Completed in " + elapsed.ToString();
 				this.Cursor = Cursors.Default;
@@ -749,7 +706,7 @@ namespace VEPROMS
 			}
 			catch (Exception ex)
 			{
-				FlexibleMessageBox.Show(null, "The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				FlexibleMessageBox.Show("The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				_MyLog.Warn("Failure During Import", ex);
 			}
 			return false;
@@ -400,7 +400,6 @@ namespace VEPROMS
 			this.pnlImport.PerformLayout();
 			this.ResumeLayout(false);

-
 		}

 		#endregion
@@ -57,7 +57,7 @@
 			this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(179, 111);
+			this.btnCancel.Location = new System.Drawing.Point(165, 111);
 			this.btnCancel.Name = "btnCancel";
 			this.btnCancel.Size = new System.Drawing.Size(64, 23);
 			this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +88,7 @@
 			this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
 			this.dateTimeInput1.ButtonDropDown.Visible = true;
-			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
+			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy";
 			this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
 			this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
 			this.dateTimeInput1.IsPopupCalendarOpen = false;
@@ -122,7 +122,7 @@
 			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
 			this.dateTimeInput1.Name = "dateTimeInput1";
-			this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
+			this.dateTimeInput1.Size = new System.Drawing.Size(113, 20);
 			this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
 			this.dateTimeInput1.TabIndex = 4;
@@ -133,7 +133,7 @@
 			// 
 			this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnNow.Location = new System.Drawing.Point(182, 51);
+			this.btnNow.Location = new System.Drawing.Point(149, 51);
 			this.btnNow.Name = "btnNow";
 			this.btnNow.Size = new System.Drawing.Size(49, 23);
 			this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -146,7 +146,7 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(268, 144);
+			this.ClientSize = new System.Drawing.Size(241, 144);
 			this.Controls.Add(this.btnNow);
 			this.Controls.Add(this.dateTimeInput1);
 			this.Controls.Add(this.label1);
@@ -32,46 +32,13 @@ namespace VEPROMS
 		{
 			string cbdt = MyProcConfig.Print_ChangeBarDate;
 			string[] tmp = cbdt.Split(' ');
-
-			if (tmp[0] == null || tmp[0] == "")  // First time date set.
-			{
-				cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss");
-				dateTimeInput1.Value = DateTime.Parse(cbdt);
-				return;
-			}
-			else
-			{
-				DateTime tmpdt = DateTime.Parse(cbdt);
-				if (tmpdt.Date == DateTime.Today) // Date has before been set.
-				{
-					TimeSpan start = TimeSpan.Parse("00:00:00");
-
-					var time = tmpdt.TimeOfDay;
-					if (start < time) // If time is greater than 12:00:00 AM
-					{
-						cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString();
-						dateTimeInput1.Value = DateTime.Parse(cbdt);
-						return;
-					}
-					else // if time is 12:00:00 AM
-					{
-						cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00";
-						dateTimeInput1.Value = DateTime.Parse(cbdt);
-						return;
-					}
-				}
-				else
-				{
-					cbdt = tmpdt.ToString();
-					dateTimeInput1.Value = DateTime.Parse(cbdt);
-					return;
-				}
-			}
+			cbdt = tmp[0] + " 00:00:00";
+			dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt);
 		}

 		private void btnOK_Click(object sender, EventArgs e)
 		{
-			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
+			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss");
 		}


@@ -112,12 +112,12 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
 </root>
@@ -45,6 +45,7 @@ namespace VEPROMS
 			this.itemContainer3 = new DevComponents.DotNetBar.ItemContainer();
 			this.btnNew = new DevComponents.DotNetBar.ButtonItem();
 			this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
+			this.btnPrint = new DevComponents.DotNetBar.ButtonItem();
 			this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
 			this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
 			this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
@@ -67,7 +68,6 @@ namespace VEPROMS
 			this.cbScrunch = new System.Windows.Forms.CheckBox();
 			this.btnNext = new System.Windows.Forms.Button();
 			this.cmbFont = new System.Windows.Forms.ComboBox();
-			this.lblDummy = new System.Windows.Forms.Label();
 			this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
 			this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
 			this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@@ -338,6 +338,7 @@ namespace VEPROMS
 			this.itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
            this.btnNew,
            this.btnOpen,
+            this.btnPrint,
            this.btnPrepare,
            this.btnAdmin});
 			// 
@@ -363,7 +364,16 @@ namespace VEPROMS
 			this.btnOpen.SubItemsExpandWidth = 24;
 			this.btnOpen.Text = "&Open...";
 			this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
-
+			// 
+			// btnPrint
+			// 
+			this.btnPrint.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnPrint.Enabled = false;
+			this.btnPrint.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.Image")));
+			this.btnPrint.Name = "btnPrint";
+			this.btnPrint.SubItemsExpandWidth = 24;
+			this.btnPrint.Text = "Create &PDF";
+			this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
 			// 
 			// btnPrepare
 			// 
@@ -504,7 +514,6 @@ namespace VEPROMS
 			this.bottomBar.Controls.Add(this.cbScrunch);
 			this.bottomBar.Controls.Add(this.btnNext);
 			this.bottomBar.Controls.Add(this.cmbFont);
-			this.bottomBar.Controls.Add(this.lblDummy);
 			this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
 			this.bottomBar.IsMaximized = false;
@@ -592,15 +601,6 @@ namespace VEPROMS
 			this.cmbFont.TabIndex = 0;
 			this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
 			// 
-			// lblDummy
-			// 
-			this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
-			this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-			this.lblDummy.Location = new System.Drawing.Point(1013, 0);
-			this.lblDummy.Name = "lblDummy";
-			this.lblDummy.Size = new System.Drawing.Size(10, 25);
-			this.lblDummy.Visible = false;
-			// 
 			// labelItem10
 			// 
 			this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@@ -1635,6 +1635,7 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnNew;
 		private DevComponents.DotNetBar.ButtonItem btnOpen;
 		private DevComponents.DotNetBar.ButtonItem btnPrepare;
+		private DevComponents.DotNetBar.ButtonItem btnPrint;
 		private DevComponents.DotNetBar.ItemContainer icRecentDocs;
 		private DevComponents.DotNetBar.LabelItem labelItem8;
 		private DevComponents.DotNetBar.ItemContainer itemContainer5;
@@ -1731,7 +1732,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnShortCuts;
 		private DevComponents.DotNetBar.LabelItem lblItemID;
 		private System.Windows.Forms.ComboBox cmbFont;
-		private System.Windows.Forms.Label lblDummy;
 		private DevComponents.DotNetBar.LabelItem lblResolution;
 		private DevComponents.DotNetBar.LabelItem lblUser;
 		private DevComponents.DotNetBar.LabelItem lblLastChange;
@@ -2098,6 +2098,7 @@ namespace VEPROMS
 			btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
 			btnAdmin.SubItems.Add(btnAdministrativeTools);

+			this.superTooltip1.SetSuperTooltip(btnPrint, new SuperTooltipInfo("Create PDF", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray));
@@ -3125,45 +3126,23 @@ namespace VEPROMS
 							if (dvi != null)
 							{
 								DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
-								if (dvi.MultiUnitCount == 0)
-								{
-									prnDlg.SelectedSlave = -1;
-								}
-								else if (dvi.MultiUnitCount > 0)
-								{
-									string[] arguments = Environment.GetCommandLineArgs();
-									for (int i = 0; i < arguments.Length; i++)
-									{
-										if (arguments[i].Contains("/C="))
-										{
-											Console.WriteLine("In arguments loop");
-											//int num;
-											string[] childarg = arguments[i].Split('=');
-											if (int.TryParse(childarg[1], out int num))
-											{
-												prnDlg.SelectedSlave = num;
-											}
-										}
-									}
-
-								}
+								if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1;
 								prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties)
 								prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
 														 //prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed);
 														 //while (!_RunNext) Application.DoEvents();
-
 							}
-							
 						}
+
 						ranAuto = true;
 					}
-
-					if (ranAuto)
-					{
-						this.Close();
-					}
 				}
 			}
+
+			if (ranAuto)
+			{
+				this.Close();
+			}
 		}

 		private FontFamily GetFamily(string name)
@@ -3223,14 +3202,6 @@ namespace VEPROMS
 				txtSearch.Visible = false;
 				lblLastChange.Visible = false;
 				btnStepRTF.Visible = false;
-				lblDummy.Visible = false;
-			}
-			else
-			{
-				// C2024-007: On Proms main form, allow for control of whether the FontMenu
-				//	combo box is displayed.  Only done when running in debugmode
-				cmbFont.Visible = Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
-				lblDummy.Visible = !Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
 			}
 		}

@@ -4113,6 +4084,10 @@ namespace VEPROMS

 			lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole;

+			if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1)
+				btnPrint.Visible = false;
+			else
+				btnPrint.Visible = true;

 			// Reset the ribbon buttons B2016-148 (ex. a copystep done in a different procedure tab my require the paste step options to be active
 			if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyStepTabPanel != null) // MyStepTabPanel will be null if the active tab is a Word Attachment
@@ -4367,6 +4342,7 @@ namespace VEPROMS
 				ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); // set the CurrentItem (send Message) when the MSWord section is opened.
 			}

+			btnPrint.Enabled = (_CurrentItem != null);
 		}

 		void _LastStepRTB_EditModeChanged(object sender, EventArgs args)
@@ -4858,7 +4834,12 @@ namespace VEPROMS
 			StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily;
 		}

-
+		private void btnPrint_Click(object sender, EventArgs e)
+		{
+			DlgPrintProcedure prnDlg = new DlgPrintProcedure(this._CurrentItem.MyProcedure);
+			prnDlg.MySessionInfo = MySessionInfo;
+			prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
+		}

 		private void lblResolution_Click(object sender, EventArgs e)
 		{
@@ -254,7 +254,7 @@ namespace VEPROMS
 			// 
 			this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.ppBtnCancel.Location = new System.Drawing.Point(742, 338);
+			this.ppBtnCancel.Location = new System.Drawing.Point(742, 342);
 			this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnCancel.Name = "ppBtnCancel";
 			this.ppBtnCancel.Size = new System.Drawing.Size(56, 21);
@@ -266,7 +266,7 @@ namespace VEPROMS
 			// ppBtnOK
 			// 
 			this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.ppBtnOK.Location = new System.Drawing.Point(669, 338);
+			this.ppBtnOK.Location = new System.Drawing.Point(669, 342);
 			this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnOK.Name = "ppBtnOK";
 			this.ppBtnOK.Size = new System.Drawing.Size(56, 21);
@@ -29,7 +29,6 @@ namespace VEPROMS
 		private List<MiniConfig> _DeletedApples;
 		private List<EnhancedMiniConfig> _Enhanced;
 		private DocVersionConfig _DocVersionConfig;
-		private string _OrgPDFPath; // B2024-030 used to save last PDF path
 		
 		// Default values
 		private string _DefaultFormatName = null;
@@ -98,7 +97,6 @@ namespace VEPROMS

 			_Initializing = true;
 			InitializeComponent();
-			_OrgPDFPath = _DocVersionConfig.Print_PDFLocation; // B2024-030 save last PDF path
 			btnGeneral.PerformClick(); // always start with General tab or button
 			_Initializing = false;

@@ -325,6 +323,8 @@ namespace VEPROMS
 				tiApplicability.Visible = false;
 			}

+			ppTxtBxPDFLoc.TextChanged += new EventHandler(ppTxtBxPDFLoc_TextChanged);
+
 			//end add new applicability stuff
 			lblProcSetRev.Visible = ppRTxtProcSetRev.Visible = _DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.MyStepSectionPrintData.UseXtraRevNumber;

@@ -538,32 +538,11 @@ namespace VEPROMS
 			}
 		}

-		//B2024-030 Check the PDF Location path and prompt to create the folders if needed
-		private void CheckPDFLocationPath()
+		// The following code was added to fix Bug B2013-117
+		private void ppTxtBxPDFLoc_TextChanged(object sender, EventArgs e)
 		{
-			string pdfloc = ppTxtBxPDFLoc.Text;
-			if (pdfloc == string.Empty) return;
-			if (!Directory.Exists(ppTxtBxPDFLoc.Text))
-			{
-				string msg = string.Format(" The Folder: '{0}' does not exist. \n\nCreate it?", ppTxtBxPDFLoc.Text);
-				DialogResult dr = MessageBox.Show(msg, "PDF Location Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-				if (dr == DialogResult.Yes)
-				{
-					try
-					{
-						Directory.CreateDirectory(ppTxtBxPDFLoc.Text);
-					}
-					catch (Exception ex)
-					{
-						MessageBox.Show(ex.Message, "Error trying to create folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
-						_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
-					}
-				}
-				else
-				{
-					_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
-				}
-			}
+			if (_Initializing == false)
+				_DocVersionConfig.Print_PDFLocation = ppTxtBxPDFLoc.Text;
 		}

 		private string AddSlaveNode(MiniConfig mc)
@@ -609,9 +588,6 @@ namespace VEPROMS

 		private void btnVersionsPropOK_Click(object sender, EventArgs e)
 		{
-			//B2024-030 Check the PDF Location path and prompt to create the folders if needed
-			CheckPDFLocationPath();
-
 			docVersionConfigBindingSource.EndEdit(); // need to end the edit session first or any format selection chanage will not stick  B2015-157

 			// if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
@@ -797,6 +773,7 @@ namespace VEPROMS

 			// B2019-132 update the association count for this working draft
 			_DocVersionConfig.MyDocVersion.MyDocVersionInfo.RefreshDocVersionAssociations();
+
 			this.Close();
 		}

@@ -285,16 +285,18 @@ namespace VEPROMS.CSLA.Library
 		#region ROTextConvertMethods
 		// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 		//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-		public static string ROConvertSymbols(string retval, bool arr1, bool arr2)
+		public static string ROConvertSymbols(string retval, ItemInfo MyItemInfo = null)
 		{
-			if (arr1)
+			// _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+			// _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue
+			if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue)
 			{ 
 				retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
 				retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
 				retval = retval.Replace("->", @"\u8594?"); // Right Arrow
 				retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
 			}
-			if (arr2)
+			if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
 			{
 				retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
 				retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
@@ -490,7 +492,7 @@ namespace VEPROMS.CSLA.Library
 			return rc;
 		}

-		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols, ItemInfo myiteminfo)
+		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols)
 		{
 			roid = FormatRoidKey(roid, true);

@@ -502,13 +504,7 @@ namespace VEPROMS.CSLA.Library
 			retval = ReplaceUnicode(retval, DoCaret);
 			// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 			//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-
-			//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
-			//			_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
-			bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-			bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-
-			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval, arrows1, arrows2);
+			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval);

 			retval = ConvertFortranFormatToScienctificNotation(retval);

@@ -1616,7 +1616,7 @@ namespace VEPROMS.CSLA.Library
 						foreach (ContentRoUsage ro in cont.ContentRoUsages)
 						{
 							RoUsageInfo rou = RoUsageInfo.Get(ro.ROUsageID);
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 							
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							
@@ -1844,7 +1844,7 @@ namespace VEPROMS.CSLA.Library
 						ROFSTLookup mylookup = myRoFst.GetROFSTLookup(tmp.ContentItems[0].MyProcedure.MyDocVersion);
 						foreach (RoUsageInfo rou in tmp.ContentRoUsages)
 						{
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp.ContentItems[0]);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							int mytype = rocc.type;
 							ctmp.FixContentText(rou, myvalue, mytype, myRoFst);
@@ -468,12 +468,10 @@ namespace VEPROMS.CSLA.Library
 			return text;
 		}
 		// B2022-035: resolve unit specific designators - moved code to here so that other objects can use it
-		// B2024-025 added <ID> to the replace list
 		public static string ResolveUnitSpecific(DocVersionInfo mydocversion, string text)
 		{
 			if (mydocversion == null) return text;
 			text = Regex.Replace(text, @"\<U\>", mydocversion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
-			text = Regex.Replace(text, @"\<ID\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NAME)\>", mydocversion.DocVersionConfig.Unit_Name, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)TEXT)\>", mydocversion.DocVersionConfig.Unit_Text, RegexOptions.IgnoreCase);
@@ -696,12 +694,10 @@ namespace VEPROMS.CSLA.Library
 					// B2017-147: backquotes should be translated to degrees for edit/print:
 					newvalue = newvalue.Replace("`", @"\'b0");
 					// B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it
-					bool arrows1 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-					bool arrows2 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
 					//	is done here so that output (print & edit/view) has symbol, not 2 characters.
 					if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
 						_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
-						newvalue = ROFSTLookup.ROConvertSymbols(newvalue, arrows1, arrows2);
+						newvalue = ROFSTLookup.ROConvertSymbols(newvalue, _MyItemInfo);

 					if (gg != newvalue)
 						text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength);
@@ -908,7 +908,7 @@ namespace VEPROMS.CSLA.Library
 					{
 						string oldText = this.MyContent.Text;

-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 						
 						this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this);
@@ -964,7 +964,7 @@ namespace VEPROMS.CSLA.Library
 						ROCheckCount++;
 						string oldText = itemInfo.MyContent.Text;

-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, sectionInfo);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);

 						itemInfo.MyContent.FixContentText(rousage, roval, roch.type, origROFst, itemInfo);
@@ -1184,10 +1184,9 @@ namespace VEPROMS.CSLA.Library
 						if (sectionInfo != null)
 						{
 							// B2023-037: loading print text, resolve the RO symbols 
-
-							bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-							bool GLTArrows = !itemInfo.IsTable &&  sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
+							bool GTLT = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
+							bool GLTArrows = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, itemInfo.IsTable && GTLT || GLTArrows);
 							ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 							itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
 						}
@@ -2934,8 +2933,7 @@ namespace VEPROMS.CSLA.Library
 			{
 				string str = MyContent.Text;
 				// B2022-035: resolve unit specific designators 
-				// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-				str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
+				if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
 				return ConvertToDisplayText(str, false, " "); // B2024-013 added " " to replace hard returns with a space instead of semi-colon
 			}
 		}
@@ -2947,8 +2945,7 @@ namespace VEPROMS.CSLA.Library
 			{
 				string str = MyContent.Text;
 				// B2022-035: resolve unit specific designators 
-				// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-				str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
+				if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
 				return ConvertToDisplayText(str, false, ""); // pass in empty string for hard retun char will keep hard return
 			}
 		}
@@ -2962,8 +2959,7 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				if (MyDocVersion != null)
 				{
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
 				}
 				else
 				{
@@ -2982,13 +2978,16 @@ namespace VEPROMS.CSLA.Library
 				if (MyDocVersion != null)
 				{
 					// B2022-035: resolve unit specific designators 
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					if (str.ToUpper().Contains("<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
 					_MyLog.WarnFormat("Disconnected Data - ItemID = {0}", ItemID);
 				}
+				//if (str.Contains("<u>"))
+				//  str = str.Replace("<u>", MyDocVersion.DocVersionConfig.Unit_Number);
+				//if (str.Contains("<U>"))
+				//  str = str.Replace("<U>", MyDocVersion.DocVersionConfig.Unit_Number);
 				return ConvertToDisplayText(str);
 			}
 		}
@@ -3047,8 +3046,7 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				if (MyDocVersion != null)
 				{
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
 				}
 				else
 				{
@@ -3081,8 +3079,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					else
 						str = MyContent.Number;
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					str = Regex.Replace(str, @"\<U-ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
+					str = Regex.Replace(str, @"\<ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 				}
 				else
 				{
@@ -3095,9 +3093,7 @@ namespace VEPROMS.CSLA.Library
 				//  str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID);
 				str = ConvertToDisplayText(str);
 				if (MyDocVersion != null) // B2020-086 check for null doc version - happens if item we are trying to open is no longer there (disconnected)
-					// B2017-019 - process "<u>" in section number
-					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "<u>" in section number
 				return str;
 			}
 			//get { return ConvertToDisplayText(MyContent.Number); }
@@ -4455,10 +4451,9 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 				// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
-				// F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4)
-				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
+				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
 				{
-					localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
+					localPrintLevel--; // since parent is a high level step we only need to go back one level
 					itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
 				}
 				if (!tbformat.Contains(@"{!C"))
@@ -1309,8 +1309,7 @@ namespace VEPROMS.CSLA.Library
 					else if (addType == EAddpingPart.Replace)   // what about user interface for enhanced pasted steps?
 					{
 						ItemInfo enhReplaceItem = ItemInfo.Get(edSource.ItemID);
-						TreeNode trn = null;
-						newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid, trn);
+						newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid);
 					}

 					// update the config data for the new enhanced item (procedure, section or step) to point back to the correct source
@@ -1944,54 +1943,6 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region DataPortal
-		private void DataPortal_Fetch(PastingPartEnhancedCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					Csla.ApplicationContext.LocalContext["cn"] = cn;
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.Parameters.AddWithValue("@StartItemID", criteria.StartItemID);  // copy children
-						cm.Parameters.AddWithValue("@ItemID", criteria.ItemID);            //copy to
-						cm.Parameters.AddWithValue("@Type", criteria.Type);
-						cm.Parameters.AddWithValue("@DTS", criteria.DTS);
-						cm.Parameters.AddWithValue("@UserID", criteria.UserID);
-						SqlParameter param_ItemID = new SqlParameter("@NewItemID", SqlDbType.Int);
-						param_ItemID.Direction = ParameterDirection.Output;
-						cm.Parameters.Add(param_ItemID);
-						cm.CommandText = "PasteItemEnhancedReplace";
-						//cm.CommandText = "PasteItemReplace";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							//int newItemID = (int)cm.Parameters["@NewItemID"].Value;
-							if (!dr.Read())
-							{
-								_ErrorMessage = "No Record Found";
-								return;
-							}
-							ReadData(dr);
-						}
-					}
-					// removing of item only needed for local data portal
-					if (Csla.ApplicationContext.ExecutionLocation == Csla.ApplicationContext.ExecutionLocations.Client)
-						Csla.ApplicationContext.LocalContext.Remove("cn");
-				}
-			}
-			catch (Exception ex)
-			{
-				if (!ex.Message.Contains("This step has been deleted") && !ex.Message.Contains("This current step has been deleted in another session"))
-				{
-					if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemInfo.DataPortal_Fetch", ex);
-				}
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
-			}
-		}
 		private void DataPortal_Fetch(PastingPartCriteria criteria)
 		{
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
@@ -2114,68 +2065,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion
-		#region PastingPartEnhancedCriteria
-		[Serializable()]
-		public class PastingPartEnhancedCriteria
-		{
-			#region Properties
-			private int _StartItemID;
-			public int StartItemID
-			{
-				get { return _StartItemID; }
-				set { _StartItemID = value; }
-			}
-			private int _ItemID;            // paste relative to this itemid
-			public int ItemID
-			{
-				get { return _ItemID; }
-				set { _ItemID = value; }
-			}
-			private EAddpingPart _AddType;
-			public EAddpingPart AddType
-			{
-				get { return _AddType; }
-				set { _AddType = value; }
-			}
-			private int? _FromType = null;
-			public int? FromType
-			{
-				get { return _FromType; }
-				set { _FromType = value; }
-			}
-			private int? _Type = null;
-			public int? Type
-			{
-				get { return _Type; }
-				set { _Type = value; }
-			}
-			private DateTime _DTS;
-			public DateTime DTS
-			{
-				get { return _DTS; }
-				set { _DTS = value; }
-			}
-			private string _UserID;
-			public string UserID
-			{
-				get { return _UserID; }
-				set { _UserID = value; }
-			}
-			#endregion
-			#region Constructor
-			public PastingPartEnhancedCriteria(int startItemid, int itemID, EAddpingPart addType, int? type, int? fromType, DateTime dts, string userID)
-			{
-				_StartItemID = startItemid;
-				_ItemID = itemID;
-				_AddType = addType;
-				_Type = type;
-				_FromType = fromType;
-				_DTS = dts;
-				_UserID = userID;
-			}
-			#endregion
-		}
-		#endregion
 		#region PastingPartCriteria
 		[Serializable()]
 		public class PastingPartCriteria
@@ -2466,17 +2355,6 @@ namespace VEPROMS.CSLA.Library
 			_MyPrevious = null; // Reset list so that the next line gets a new list
 			if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value
 		}
-		internal static ItemInfo CopyPasteReplaceEnhancedItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
-		{
-			ItemInfo tmp = null;
-			tmp = DataPortal.Fetch<StepInfo>(new ItemInfo.PastingPartEnhancedCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID));
-			if (tmp == null)
-			{
-				tmp = ItemInfo.Get(copyStartID);
-			}
-			AddToCache(tmp);
-			return tmp;
-		}
 		internal static ItemInfo CopyPasteReplaceItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
 		{
 			ItemInfo tmp = null;
@@ -2619,24 +2497,13 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region PasteReplace
-
-
-
-		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace)
+		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid)
 		{
-			if (itemInfo.IsEnhancedStep)
-			{
-				// don't replace the step, just remove current children & add new children:
-				if (!CanDeleteObject())
-					throw new System.Security.SecurityException("User not authorized to remove a Item");
-
-			}
-			bool tmp = false;
-			return PasteReplace(itemInfo, copyStartID, chgid, treeNodeReplace, ref tmp);
+			bool tmp= false;
+			return PasteReplace(itemInfo, copyStartID, chgid, ref tmp);
 		}
 		// B2017-179 return a bool (firstTrans) if  we could not replace the step but the user wants to position to the first transition that needs resolved
-		// B2017-179 return a bool (firstTrans) if  we could not replace the step but the user wants to position to the first transition that needs resolved
-		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace, ref bool firstTrans)
+		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, ref bool firstTrans)
 		{
 			firstTrans = false;
 			if (!CanDeleteObject())
@@ -2647,17 +2514,8 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo newItemInfo = null;
 			try
 			{
-				// if this item is an enhanced item, do a pastereplace specific to it:
-				if (itemInfo.IsEnhancedStep)
-				{
-					newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
-					if (newItemInfo == null) return null;
-				}
-				else
-				{
-					newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
-					if (newItemInfo == null) return null;
-				}
+				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
+				if (newItemInfo == null) return null;
 			}
 			catch (Exception ex1)
 			{
@@ -2702,14 +2560,7 @@ namespace VEPROMS.CSLA.Library
 				}
 				else
 				{
-					//Create tree node for copied procedure when no other procedures exist in the folder
-					VETreeNode vtn = treeNodeReplace as VETreeNode;
-					DocVersionInfo dvi = vtn.VEObject as DocVersionInfo;
-
-					ItemInfo newProc = dvi.PasteChild(copyStartID);
-					VETreeNode tn1 = new VETreeNode(newProc);
-					treeNodeReplace.Nodes.Add(tn1);        // add tree node to end of list.
-					treeNodeReplace = tn1;
+					newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child));
 				}
 				return newItemInfo;
 			}
@@ -2722,23 +2573,23 @@ namespace VEPROMS.CSLA.Library
 					firstTrans = true; // B2017-179 set the firstTrans to true and return the itminfo of the first transition location that needs resolved
 					return iii;
 				}
-				if (!HandleSqlExceptionOnCopy(ex))
-				{
-					if (ex.Message.Contains("has External Transitions and has no next step")
-								  || ex.Message.Contains("has External Transitions to Procedure")
-								  || ex.Message.Contains("has External Transitions to it's children")
-					  || ex.Message.Contains("This step has been deleted")
-					  )
-						throw ex;
+        if (!HandleSqlExceptionOnCopy(ex))
+        {
+          if (ex.Message.Contains("has External Transitions and has no next step")
+						|| ex.Message.Contains("has External Transitions to Procedure")
+						|| ex.Message.Contains("has External Transitions to it's children")
+            || ex.Message.Contains("This step has been deleted")
+            )
+            throw ex;
 					FlexibleMessageBox.Show("Details were written to the Error Log.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
-					return itemInfo;
-				}
-				else
-					return itemInfo;
+          return itemInfo;
+        }
+        else
+          return itemInfo;
 			}
 		}
 		#endregion
-		private static bool HandleSqlExceptionOnCopy(Exception ex)
+    private static bool HandleSqlExceptionOnCopy(Exception ex)
    {
      if (ex.Message.Contains("This step has been deleted"))
      {
@@ -722,7 +722,7 @@ namespace VEPROMS.CSLA.Library
 								{
 									foreach (ItemInfo ii in roUsg.MyContent.ContentItems)
 									{
-										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, ii);
+										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 										content.FixContentText(roUsg, val, roch.type, origROFstInfo, true);

 										if (content.IsDirty)
@@ -1227,10 +1227,7 @@ namespace VEPROMS.CSLA.Library
 					case 0:
 						break;
 					default:
-						//F2024-048 use a hard space (\\u160;) instead of a space in the page number text
-						//          to keep that text together on the page
-						//B2024-026: hard space unicode ends with '?' not ';'
-						tb.Append(string.Format(" (Page{0}{1})", "\\u160?", tb._ToItem.PageNumber + 1));
+						tb.Append(string.Format(" (Page {0})", tb._ToItem.PageNumber + 1));
 						break;
 				}
 			}
@@ -1541,8 +1538,8 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo tmpitm = TranGetSectionItem(itminfo);
 			if (!tmpitm.IsSection) return "";
 			string str = tmpitm.MyContent.Number;
-			// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-			str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(itminfo.MyDocVersion, str);
+			str = Regex.Replace(str, @"\<U\>", itminfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase );
+			str = Regex.Replace(str, @"\<ID\>", itminfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			return (str);
 		}
 		private static string TranGetSectionNumber(TransitionBuilder tb, bool allLevels)
@@ -1567,8 +1564,8 @@ namespace VEPROMS.CSLA.Library
 			}
 			//string str = tmpitm.MyContent.Number;
 			string str = BuildSectionPath(ToSections);
-			// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
-			str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(tb._ToItem.MyDocVersion, str);
+			str = Regex.Replace(str, @"\<U\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
+			str = Regex.Replace(str, @"\<ID\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			//if (!str.EndsWith(".") && tb._ToItem.ItemID != tb._ToItem.ActiveSection.ItemID)
 			tb.StepPrefix = ".";
 			tb.SectionNumberLength = str.Length;
@@ -58,8 +58,7 @@ namespace VEPROMS.CSLA.Library
 		SectMenuStep = 0x0020,
 		StepAllowNone = 0x0040,
 		StepFirst = 0x0080,
-		StepLast = 0x0100,
-		StepAllChildren = 0x0200
+		StepLast = 0x0100
 	}
 	public enum E_EMode : uint
 	{
@@ -4508,9 +4508,8 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
 			}
 		}
-		// F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4)
-		private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS;
-		public int? ResetSeqNumberingAfterUnnumberedHLS
+		private LazyLoad<bool> _ResetSeqNumberingAfterUnnumberedHLS;
+		public bool ResetSeqNumberingAfterUnnumberedHLS
 		{
 			get
 			{
@@ -199,12 +199,9 @@ namespace VEPROMS.CSLA.Library
 			LoadChildren(true);
 		}
 		private bool _allParts = true;
-		private bool _excludeTablesFigsEqu = false; // used for inserting Step Text transitions (BNPP)
-		public virtual void LoadChildren(bool allParts, bool excldTablesFigEq = false)
+		public virtual void LoadChildren(bool allParts)
 		{
 			_allParts = allParts;
-			// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-			_excludeTablesFigsEqu = excldTablesFigEq;
 			if (!_ChildrenLoaded)
 			{
 				this.Nodes.Clear();
@@ -265,10 +262,6 @@ namespace VEPROMS.CSLA.Library
 					if (!skipIt)
 					{
 						VETreeNode tmp = new VETreeNode(o, _allParts);
-						// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-						bool isTableFigEqu = tmp.Text.Equals("Table") ||
-									tmp.Text.Equals("Figure") ||
-									tmp.Text.Equals("Equation");
 						if (o.HasChildren)
 						{
 							if (o is PartInfo)
@@ -286,8 +279,7 @@ namespace VEPROMS.CSLA.Library
 							tmp._ChildrenLoaded = true;// Reset the children loaded flag
 						if (lastWasSection)
 							this.Nodes.Insert(0, tmp);
-						// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-						else if (!_excludeTablesFigsEqu || !isTableFigEqu)
+						else
 							this.Nodes.Add(tmp);
 						// if last thing was section & this is step, do insert - i.e. so that steps go before sections.
 						lastWasSection = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Section);
@@ -18,7 +18,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -35,7 +35,7 @@
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -18,7 +18,7 @@
    </SccAuxPath>
    <SccProvider>
    </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -56,9 +56,6 @@ namespace Volian.Controls.Library

 		private ROFSTLookup.rochild selectedChld;

-		private DisplayTags displayTags;
-
-
 		#endregion

 		#region Properties
@@ -271,10 +268,6 @@ namespace Volian.Controls.Library
 				_searchTimer.Stop();
 			}

-
-			// Initialize the DisplayTags object
-			displayTags = new DisplayTags();
-
 			_progressBar = null;
 		}

@@ -910,9 +903,9 @@ namespace Volian.Controls.Library
 						// Pad to 16 to store in the RoUsage table.
 						string padroid = ROFSTLookup.FormatRoidKey(roc.roid, true);
 						string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyROFST.RODbID);
-						
+
 						// Resolve symbols and scientific notation in the RO return value
-						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyRTB.MyItemInfo);
+						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);

 						MyRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, selectedChld.value, linktxt, padroid, MyROFST.RODbID));
 					}
@@ -934,7 +927,7 @@ namespace Volian.Controls.Library
 			bool replacingRO = (_savCurROLink != null);

 			string insrpl = (replacingRO) ? "Cannot Replace" : "Cannot Insert";
-			string errormsg = string.Empty;	
+			string errormsg = string.Empty;

 			switch (selectedRO.type)
 			{
@@ -975,10 +968,7 @@ namespace Volian.Controls.Library
 						errormsg = (replacingRO) ? "a graphics RO with a non-graphcis RO." : "a Graphics RO in an non-Figure or a non-Accessory Page type.";
 						//TODO: Prompt user to insert a new substep type that handles x/y Plots and place this RO into it
 						goodToGo = false;
-
-						
-
-	}
+					}
 					break;
 			}

@@ -669,7 +669,7 @@ namespace Volian.Controls.Library
 			ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item
 			string key = "Item - " + proc.ItemID.ToString();

-			if (_MyDisplayTabItems.ContainsKey(key) && pasteType != ItemInfo.EAddpingPart.Replace) // If procedure page open use it unless replace
+			if (_MyDisplayTabItems.ContainsKey(key)) // If procedure page open use it
 			{
 				DisplayTabItem pg = _MyDisplayTabItems[key];
 				if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) &&
@@ -688,14 +688,8 @@ namespace Volian.Controls.Library
 							edtitm.PasteSiblingAfter(copyStartID);
 							break;
 						case ItemInfo.EAddpingPart.Replace:
-
 							EditItem ei = edtitm.PasteReplace(copyStartID);
-							if (ei == null)
-							{
-								CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
-								return false; //B2017-179 PasteReplace will return null if was aborted
-							}
-
+							if (ei == null) return false; //B2017-179 PasteReplace will return null if was aborted
 							if (ei.MyItemInfo.ItemID != edtitm.MyItemInfo.ItemID)
 							{
 								edtitm.Dispose();
@@ -708,12 +702,6 @@ namespace Volian.Controls.Library
 					return true;
 				}
 			}
-			else if (_MyDisplayTabItems.ContainsKey(key) && pasteType == ItemInfo.EAddpingPart.Replace)
-			{
-				CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
-				return false; //B2017-179 PasteReplace will return null if was aborted
-			}
-
 			return false;
 		}

@@ -640,7 +640,7 @@ namespace Volian.Controls.Library
 			this.btnFSrestore.Location = new System.Drawing.Point(112, 27);
 			this.btnFSrestore.Margin = new System.Windows.Forms.Padding(2);
 			this.btnFSrestore.Name = "btnFSrestore";
-			this.btnFSrestore.Size = new System.Drawing.Size(54, 20);
+			this.btnFSrestore.Size = new System.Drawing.Size(54, 26);
 			this.btnFSrestore.TabIndex = 6;
 			this.btnFSrestore.Text = "Restore";
 			this.btnFSrestore.UseVisualStyleBackColor = true;
@@ -96,22 +96,6 @@ namespace Volian.Controls.Library
 			get { return Visible; }
 			set { if (Visible != value) Visible = value; }
 		}
-
-		/// <summary>
-		/// Expose text properties for height and widht to handle selecting RO Image Types.
-		/// </summary>
-		public string TbFSwd
-		{
-			get	{return tbFSWd.Text;}
-			set { tbFSWd.Text = value; tbFSWd.Refresh(); trBarFS.Value = Convert.ToInt32(value); }
-		}
-
-		public string TbFSht
-		{
-			get { return tbFSHt.Text; }
-			set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
-		}
-	
 		#endregion
 		#region Constructor
 		public DisplayTags()
@@ -399,8 +383,6 @@ namespace Volian.Controls.Library
 				cmbCheckoff.Enabled = false;
 			}

-			
-
 			// show the part of panel for resizing a figure (if figure already exists: MyImage is set for non-RO existing images & content.text has a link in it)
 			if (MyEditItem.MyItemInfo.IsFigure && (MyEditItem.MyItemInfo.MyContent.MyImage != null || MyEditItem.MyItemInfo.MyContent.Text.ToUpper().Contains("#LINK")))
 			{
@@ -409,41 +391,20 @@ namespace Volian.Controls.Library
 				int wd = (MyEditItem as ImageItem).MyPictureBox.Width;
 				_origFigureSizeRatio = (float)ht / (float)wd;   // use this to keep width/height ratio while changing size.
 				float wd1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageWidth - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.LeftMargin;
-				float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;  // 36 is to allow for end message 
-				float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);      // keep original ratio
-
-				SetFigure(wd1, wd2);
-
-				tbFSWd.Text = wd.ToString();
-				tbFSHt.Text = ht.ToString();
-
-				//trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
-				//if (wd > trBarFS.Maximum) trBarFS.Maximum = wd + 1;
-				//trBarFS.Minimum = Math.Min(wd, 72);
-				//trBarFS.Value = (int)wd;
-				//ImageItem ii = MyEditItem as ImageItem;
-				//_origFigureSizeWidth = ii.MyPictureBox.Width;
-				//tbFSWd.Text = ii.MyPictureBox.Width.ToString();
-				//tbFSHt.Text = ii.MyPictureBox.Height.ToString();
+				float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;	// 36 is to allow for end message 
+				float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);		// keep original ratio
+				trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
+				if (wd > trBarFS.Maximum) trBarFS.Maximum = wd + 1;
+				trBarFS.Minimum = Math.Min(wd, 72);
+				trBarFS.Value = (int)wd;
+				ImageItem ii = MyEditItem as ImageItem;
+				_origFigureSizeWidth = ii.MyPictureBox.Width;
+				tbFSWd.Text = ii.MyPictureBox.Width.ToString();
+				tbFSHt.Text = ii.MyPictureBox.Height.ToString();
 			}
 			else
 			{
-				if (MyEditItem.MyItemInfo.IsFigure)
-				{
-					//No Current image, but still show groupPanelFigSize, will adjust when file is selected, but let's give it a default
-					//size on using the picturebox.
-					groupPanelFigSize.Visible = true;
-					int ht = (MyEditItem as ImageItem).MyPictureBox.Height;
-					int wd = (MyEditItem as ImageItem).MyPictureBox.Width;
-					_origFigureSizeRatio = (float)ht / (float)wd;   // use this to keep width/height ratio while changing size.
-					float wd1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageWidth - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.LeftMargin;
-					float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;  // 36 is to allow for end message 
-					float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);      // keep original ratio
-
-					SetFigure(wd1, wd2);
-				}
-				else
-					groupPanelFigSize.Visible = false;
+				groupPanelFigSize.Visible = false;
 			}

 			// change bar setting depends on whether step has changed (dts) as compared to date/time off the
@@ -555,22 +516,6 @@ namespace Volian.Controls.Library
 			}
 			_Initalizing = false;
 		}
-		public void SetFigure(double wd, double wd2)
-		{
-			// Check MyEditItem type and cast if needed
-			ImageItem ii = MyEditItem as ImageItem;
-			if (ii == null) return;
-
-			// Set the values as needed
-			trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
-			if (wd > trBarFS.Maximum) trBarFS.Maximum = (int)wd + 1;
-			trBarFS.Minimum = Math.Min((int)wd, 72);
-			trBarFS.Value = (int)wd;
-			_origFigureSizeWidth = ii.MyPictureBox.Width;
-			//tbFSWd.Text = ii.MyPictureBox.Width.ToString();
-			//tbFSHt.Text = ii.MyPictureBox.Height.ToString();
-		}
-
 		private int DoListStepTypes(FormatData fmtdata, StepData topType, string curType)
 		{
 			int cursel=-1;
@@ -912,7 +857,7 @@ namespace Volian.Controls.Library
 			}
 		}
 		private float _origFigureSizeRatio = 0;		// keep original ratio & width in case of 'restore'
-		public int _origFigureSizeWidth = 0;
+		private int _origFigureSizeWidth = 0;
 		// support user changing size using slider.  This saves change back to ImageItem and sets 
 		// width/height text boxes to slider values.
 		private void trBarFS_Scroll(object sender, EventArgs e)
@@ -926,14 +871,11 @@ namespace Volian.Controls.Library
 		// restore the orignal image size
 		private void btnFSrestore_Click(object sender, EventArgs e)
 		{
-			if (_origFigureSizeWidth != 0)
-			{
-				tbFSWd.Text = _origFigureSizeWidth.ToString();
-				int ht = (int)(_origFigureSizeRatio * _origFigureSizeWidth);
-				tbFSHt.Text = ht.ToString();
-				(MyEditItem as ImageItem).SizeImage(_origFigureSizeWidth, ht);
-				trBarFS.Value = _origFigureSizeWidth;
-			}
+			tbFSWd.Text = _origFigureSizeWidth.ToString();
+			int ht = (int)(_origFigureSizeRatio * _origFigureSizeWidth);
+			tbFSHt.Text = ht.ToString();
+			(MyEditItem as ImageItem).SizeImage(_origFigureSizeWidth, ht);
+			trBarFS.Value = _origFigureSizeWidth;
 		}
 		// user entered width in text box, this event gets called on leave of text box.
 		private void tbFSWd_Leave(object sender, EventArgs e)
@@ -898,11 +898,7 @@ namespace Volian.Controls.Library
 			// allow this (12/2/09).  Note that this was changed to not allow transitions
 			// to RNOs (10/2010), this 'feature' will be added at some later date.
 			tn.ChildrenLoaded = false;
-			// F2024-047 BNPP standard Text transition - pass True to LoadChildren to load all children.
-			E_TransUI etm = (E_TransUI) _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransUI;
-			bool loadAllChildren = ((etm & E_TransUI.StepAllChildren) == E_TransUI.StepAllChildren);
-			bool excludeTableFigEqu = loadAllChildren; // don't show Tables, Figures, or Equations in step list
-			tn.LoadChildren(loadAllChildren, excludeTableFigEqu); 
+			tn.LoadChildren(false); 
 		}
 		private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e)
 		{
@@ -944,9 +940,7 @@ namespace Volian.Controls.Library
 		private void HideStepTreeIfNeeded()
 		{
 			string trnFmt = _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransFormat;
-			// F2024-047 Added check for {Step Text} so that the step tree is displayed
-			//           Needed for BNPP transition to step text only for standard text
-			bool showStepList = trnFmt.Contains("{First Step}") || trnFmt.Contains("{Step Text}");
+			bool showStepList = trnFmt.Contains("{First Step}");
 			if (!showStepList)
 				tvTran.Nodes.Clear(); // clear the tree view of steps if not needed for selected transition
 			tvTran.Enabled = showStepList; // show the tree view of steps?
@@ -1342,13 +1336,7 @@ namespace Volian.Controls.Library
 				return;
 			}
 			// B2015-170 - don't allow a transition to step that is not sequential
-			// B2024-019  - but allow if TranFmt only contains {Step Text}
-			//            - Calvert uses {Step Text} but also includes step number
-			//            - Barakah (BNPP) uses just {Step Text} to link to standard text
-			bool onlyStepText = false;
-			if (listBoxTranFmt.Text.Contains("{Step Text}") && !listBoxTranFmt.Text.Contains("{First Step}"))
-				onlyStepText = true;
-			if (!onlyStepText && (toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
+			if ((toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
 			{
 				FlexibleMessageBox.Show("For transitions containing step references, the transition must be to a numbered or lettered step.",
 					"Cannot add transition to a non-sequential step", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
djankowski	16a4d335ea	Merge pull request 'Development' (#282 ) from Development into master Merging all items through B2024-018 from development into master after successful testing.	2024-03-27 13:39:46 -04:00
djankowski	ba69bb0772	Merge pull request 'Development' (#275 ) from Development into master Merging F2024-037 and CSLA updates into master after successful testing.	2024-03-20 16:07:27 -04:00
djankowski	455940caa2	Merge pull request 'Development' (#271 ) from Development into master Merging F2024-040 into master after successful testing.	2024-03-18 10:00:30 -04:00
djankowski	439344757e	Merge pull request 'Development' (#269 ) from Development into master Merging F2024-044, F2024-043, and F2024-019 in master after successful testing.	2024-03-15 09:33:57 -04:00
djankowski	ad912691c9	Merge pull request 'Development' (#265 ) from Development into master Merging F2024-016, F2024-032, B2024-013, F2024-025, F2024-027 & F2024-028 into master after successful testing.	2024-03-12 14:01:12 -04:00
djankowski	237144aff6	Merge pull request 'Development' (#259 ) from Development into master Merging B2024-014 from development into master after successful testing.	2024-03-04 15:02:18 -05:00
djankowski	810332d558	Merge pull request 'Development' (#256 ) from Development into master Merging F2024-020 from development into master. No testing required since formats are under development.	2024-02-29 13:23:48 -05:00
djankowski	f8431d0ba1	Merge pull request 'Development' (#252 ) from Development into master Merging F2024-022 from development into master. No testing required since formats are under development.	2024-02-29 09:23:51 -05:00
djankowski	57c3bfa16a	Merge pull request 'Development' (#250 ) from Development into master Merging C2023-003 and F2024-026 into master after successful testing.	2024-02-28 11:56:15 -05:00
djankowski	61f1077608	Merge pull request 'Development' (#248 ) from Development into master Merging F2024-029, B2024-009, F2024-023, B2024-011, B2024-012 and F2024-017 from development into master after successful testing.	2024-02-27 14:21:22 -05:00
djankowski	8877e968b9	Merge pull request 'Development' (#239 ) from Development into master Merging F2024-018, B2024-008, B2024-007, and F2024-015 from development into master after successful testing.	2024-02-22 08:22:26 -05:00
djankowski	4575c90bee	Merge pull request 'Development' (#233 ) from Development into master Merging updated formats from development into master after successful testing.	2024-02-14 16:07:57 -05:00
djankowski	21279a87ae	Merge pull request 'Development' (#231 ) from Development into master Merging B2024-006 from development into master after successful testing.	2024-02-14 08:19:09 -05:00
djankowski	3d5ad4a17e	Merge pull request 'Development' (#229 ) from Development into master Merging C2024-002 and F2024-013 from development into master after successful testing.	2024-02-09 11:30:41 -05:00
djankowski	9bb7b044a8	Merge pull request 'Development' (#226 ) from Development into master Merging F2024-010, F2024-011, F2024-008, B2024-002, F2024-012 and B2024-005 from development into master after successful testing.	2024-02-08 11:38:49 -05:00
djankowski	dc8f2f7561	Merge pull request 'Development' (#219 ) from Development into master Merging C2022-009 into master after successful testing.	2024-02-02 13:53:22 -05:00
djankowski	829dbf84da	Merge pull request 'Development' (#217 ) from Development into master Merging F2024-005 and B2024-004 from development into master after successful testing	2024-01-31 08:34:00 -05:00
djankowski	7b156c17f8	Merge pull request 'Development' (#212 ) from Development into master Merging all changes up through F2024-006 from development into master after successful testing.	2024-01-24 11:30:40 -05:00
djankowski	cbf7cbc164	Merge pull request 'Development' (#198 ) from Development into master Merging F2024-002 and F2023-112 from development into master. No testing required since formats are under development.	2024-01-08 15:24:15 -05:00
djankowski	b04faa816e	Merge pull request 'Development' (#196 ) from Development into master Merging F2023-126, F2024-001, C2022-009, C2023-024 and C2023-023 from development into Master after successful testing.	2024-01-03 10:54:22 -05:00
djankowski	517ebe2902	Merge pull request 'Development' (#189 ) from Development into master Initial check-in of Vogtle Background formats. No testing required since formats are under development.	2023-12-15 15:48:55 -05:00
djankowski	03d0d314e3	Merge pull request 'Development' (#187 ) from Development into master Merging B2023-115 from development into master after successful testing.	2023-12-12 15:31:06 -05:00
djankowski	3e804c5cce	Merge pull request 'Development' (#185 ) from Development into master Merging F2023-133 into from development into master. No testing required since formats are under development.	2023-12-11 10:08:22 -05:00
djankowski	ee2b8b538e	Merge pull request 'Development' (#183 ) from Development into master Merging PROMSFixes from development into master after minor changes to UpdateFormatList.	2023-12-08 14:51:21 -05:00
djankowski	fdfd34fe92	Merge pull request 'Development' (#181 ) from Development into master Merging F2023-151 from development into master. No testing required since formats are under development.	2023-12-07 15:55:16 -05:00
djankowski	2d6fb6523b	Merge pull request 'Development' (#179 ) from Development into master Merging F2023-133 from development into master. No testing required since formats are under development.	2023-12-07 11:44:31 -05:00
djankowski	3084bf3982	Merge pull request 'Development' (#177 ) from Development into master Merging B2023-115 and F2023-150 from development into master. No testing required since formats are under development.	2023-12-06 09:08:18 -05:00
djankowski	5ba51e8392	Merge pull request 'Development' (#174 ) from Development into master Merging F2023-149 from development into master. No testing required since formats are under development.	2023-12-05 16:30:39 -05:00
djankowski	fb5eb43e34	Merge pull request 'Development' (#172 ) from Development into master Merging F2023-124 from development into master. No testing required since formats are under development.	2023-12-04 11:22:59 -05:00
djankowski	b154056276	Merge pull request 'Development' (#170 ) from Development into master Merging F2023-119 from development into master. No testing required since formats are under development.	2023-12-01 15:36:22 -05:00
djankowski	c67b8f9ca1	Merge pull request 'Development' (#168 ) from Development into master Merging F2023-146 from development to master. No testing required since formats are under development.	2023-12-01 10:02:50 -05:00
djankowski	95e4181360	Merge pull request 'Development' (#166 ) from Development into master Merging F2023-148, F2023-148, and B2023-120 from development into Master. No testing required since formats are under development.	2023-11-30 14:38:49 -05:00
djankowski	32dffbe56b	Merge pull request 'Development' (#162 ) from Development into master Merging B2023-116, B2023-117, and F2023-143 from development to master after successful testing.	2023-11-29 15:58:44 -05:00
jjenko	6b3c8d373b	Merge pull request 'F2023-143_Vogtle3&4_Alrm_Footer' (#159 ) from F2023-143_Vogtle3&4_Alrm_Footer into master Format only change. Vogtle 3&4 formats under development. This change will be tested as data in entered into PROMS by Volian	2023-11-27 16:23:44 -05:00
djankowski	db29107f47	Merge pull request 'Development' (#156 ) from Development into master Merging F2023-142 and B2022-046 in from development to master after successful testing.	2023-11-14 08:45:47 -05:00
djankowski	355537f2ab	Merge pull request 'Development' (#153 ) from Development into master Merging F2023-140, F2023-123, B2023-007, B2023-108, F2023-139, F2023-138 and B2023-103	2023-11-09 10:33:40 -05:00
djankowski	0729ef0c21	Merge pull request 'Development' (#147 ) from Development into master Merging F2023-139 from development into master after successful testing.	2023-10-26 10:10:33 -04:00
djankowski	6fe82bfd0f	Merge pull request 'Development' (#145 ) from Development into master Merging F2023-138 from development into master after successful testing.	2023-10-25 14:40:15 -04:00
djankowski	39bf072363	Merge pull request 'Development' (#142 ) from Development into master Merging B2023-103 from development into master after successful testing.	2023-10-23 15:28:31 -04:00
djankowski	da7c384fd8	Merge pull request 'Development' (#139 ) from Development into master Merging C2023-017, C2023-019, B2023-104, B2023-101 and B2023-102 from development into master after successful testing.	2023-10-18 10:37:59 -04:00
djankowski	95130fd9a0	Merge pull request 'Development' (#133 ) from Development into master Merging C2023-018 from development into master after successful testing.	2023-10-11 09:26:45 -04:00
djankowski	978e2344a3	Merge pull request 'Development' (#131 ) from Development into master Merging C2023-016 and C2023-017 from development into master after successful testing.	2023-10-06 10:56:34 -04:00
djankowski	c9bf45602c	Merge pull request 'Development' (#128 ) from Development into master Merging F2023-137 and B2023-100 from development into master. F2023-137 does not require testing since formats are under development. B2023-100 tested successfully.	2023-10-02 11:52:22 -04:00
djankowski	aa160b2036	Merge pull request 'Development' (#124 ) from Development into master Merging B2023-099 from development into master after successful testing.	2023-09-28 15:58:27 -04:00
djankowski	f82b32d351	Merge pull request 'Development' (#122 ) from Development into master Merging B2023-097 and B2023-098 from development into master after successful testing.	2023-09-26 14:58:05 -04:00
djankowski	e519dc9a57	Merge pull request 'Development' (#120 ) from Development into master Merging B2023-094 from development into master after successful testing.	2023-09-22 13:24:17 -04:00
djankowski	f020c37db9	Merge pull request 'Development' (#118 ) from Development into master Merged B2023-096 from development into master after successful testing.	2023-09-15 11:50:57 -04:00
djankowski	5a4ec3b6b1	Merge pull request 'Development' (#117 ) from Development into master Merging F2023-135 and B2023-093 from development into master after successful testing.	2023-09-14 15:58:52 -04:00
djankowski	2602d6c9d2	Merge pull request 'Development' (#113 ) from Development into master Merging C2023-015 from development into master.	2023-09-12 09:23:57 -04:00
djankowski	ff403583d7	Merge pull request 'Development' (#111 ) from Development into master Merging B2023-091 and B2023-078 from development into master.	2023-08-30 16:07:17 -04:00
djankowski	c5577cc2bd	Merge pull request 'Development' (#108 ) from Development into master Merging F2023-134 from development into master. No testing required since formats are under development.	2023-08-24 15:01:12 -04:00
djankowski	78be6e5dc1	Merge pull request 'Development' (#106 ) from Development into master Merging GitAutomation from Development into Master.	2023-08-24 09:13:06 -04:00
djankowski	b954a41375	Merge pull request 'Development' (#104 ) from Development into master Merging B2023-089 and F2023-131 from Development into Master. No testing required since formats are under development.	2023-08-24 09:05:31 -04:00
djankowski	0100a11cfe	Merge pull request 'Development' (#101 ) from Development into master Merging F2023-125 from development into master. No testing required since formats are under development.	2023-08-23 08:19:00 -04:00
djankowski	04cf2e8534	Merge pull request 'Development' (#99 ) from Development into master Merging F2023-130 from Development into Master. No testing required since formats are under development.	2023-08-22 15:04:22 -04:00
djankowski	be00724818	Merge pull request 'Development' (#97 ) from Development into master Merging B2023-088 from development into master. No testing required since formats are under development.	2023-08-22 10:52:09 -04:00
djankowski	274d93c61a	Merge pull request 'Development' (#94 ) from Development into master Merging F2023-122 from development into master. No testing required since formats are under development.	2023-08-22 08:53:57 -04:00
djankowski	7dc4c30436	Merge pull request 'Development' (#92 ) from Development into master Merging F2023-127 from development into master. No testing required since formats are under development.	2023-08-22 08:33:56 -04:00
djankowski	028ef4bc31	Merge pull request 'Development' (#89 ) from Development into master Merging F2023-128 and F2023-129 from development into master. No testing required since formats are under development.	2023-08-21 11:46:01 -04:00
djankowski	42124d65c7	Merge pull request 'Development' (#87 ) from Development into master Merging F2023-118, F2023-120 and F2023-121 from development into master. No testing required since formats are under development.	2023-08-16 10:13:52 -04:00