Bring up to date with Dev -- clearing merge conflicts

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

@@ -178,7 +178,7 @@ namespace VEPROMS.CSLA.Library
 					}
 					else if (si.ProcessID != ProcessID && objectType == CheckOutType.Document)
 					{
-						message = string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(objectID).DocumentEntries[0].MyContent.Text, si.UserID);
+						message = string.Format("The document {0} is already checked out to {1}", ItemInfo.ConvertToDisplayText(DocumentInfo.Get(objectID).DocumentEntries[0].MyContent.Text), si.UserID);
 						rv = rv && false;
 					}
 					else if (si.ProcessID != ProcessID && objectType == CheckOutType.DocVersion)
@@ -198,7 +198,7 @@ namespace VEPROMS.CSLA.Library
 							message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
 						}
 						else if (oi.OwnerType == 1)
-							message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
+							message = message + string.Format("The document {0} is already checked out to {1}", ItemInfo.ConvertToDisplayText(DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text), si.UserID) + Environment.NewLine;
 						else if (oi.OwnerType == 2)
 							message += string.Format("The working draft is already checked out to {0}", si.UserID);
 						rv = rv && false;
@@ -221,7 +221,7 @@ namespace VEPROMS.CSLA.Library
 								message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
 							}
 							else if (oi.OwnerType == 1)
-								message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
+								message = message + string.Format("The document {0} is already checked out to {1}", ItemInfo.ConvertToDisplayText(DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text), si.UserID) + Environment.NewLine;
 							else if (oi.OwnerType == 2)
 								message += string.Format("The working draft is already checked out to {0}", si.UserID);
 							else if (oi.OwnerType == 3)

PROMS/Volian.Print.Library/vlnTab.cs

@@ -129,11 +129,18 @@ namespace Volian.Print.Library
 			// To do this we set the TabData.Bullet.Separate to true (currently - 4/26/2013 - only NSP uses this).
 			// Because of the different font sizes, when the Caution/Note did have have a bullet, the positioning 
 			// was off by the lenght of IdentB (the bullet string), thus the "alignAsIfBulleted" bool
+			//           added check if there is previous or next, it must of the same step type to get the bullet
 			if ((myparent.MyItemInfo.FormatStepData != null) && myparent.MyItemInfo.FormatStepData.TabData.Bullet.Separate)
-				if (myparent.MyItemInfo.MyPrevious != null || myparent.MyItemInfo.NextItem != null)
+			{
+			// F2026-023 Farley, when there was a single Note and single Caution off of the same step, the Note was still getting a bullet.
+				if ((myparent.MyItemInfo.MyPrevious != null && (myparent.MyItemInfo.MyPrevious.FormatStepType == myparent.MyItemInfo.FormatStepType)) ||
+					(myparent.MyItemInfo.NextItem != null && (myparent.MyItemInfo.NextItem.FormatStepType == myparent.MyItemInfo.FormatStepType)))
+				{
 					SeparateBullet = true;
+				}
 				else
 					alignAsIfBulleted = true;
+			}
 
 			if (origTab.Contains(@"{!"))
 			{

PROMS/Word Add-Ins for PROMS Import/W2PGrid/W2PGrid/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs

@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]

PROMS/Word Add-Ins for PROMS Import/W2PGrid/W2PGrid/obj/Debug/W2PGrid.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-246d3ad250f340ad54f0151601c03d29dea49063

PROMS/Word Add-Ins for PROMS Import/W2PGrid/W2PGrid/obj/Debug/W2PGrid.csproj.FileListAbsolute.txt

@@ -1,11 +0,0 @@
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\bin\Debug\W2PGrid.dll
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\bin\Debug\W2PGrid.pdb
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\bin\Debug\W2PGrid.tlb
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\bin\Debug\C1.Win.C1FlexGrid.2.dll
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\bin\Debug\C1.Win.C1FlexGrid.2.xml
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\obj\Debug\W2PGrid.csproj.CoreCompileInputs.cache
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\obj\Debug\W2PGrid.csproj.CopyComplete
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\obj\Debug\W2PGrid.dll
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\obj\Debug\W2PGrid.pdb
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\obj\Debug\W2PGrid.dll.licenses
-C:\Users\Jeff.VLN\source\repos\W2PGrid\W2PGrid\obj\Debug\W2PGrid.csprojAssemblyReference.cache