PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -746,7 +746,7 @@ namespace RODBInterface
 					string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
 					//applicValues += ",";
 					XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
+					if (cn == null)
 						applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
 					else
 					{

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -473,7 +473,7 @@ namespace ctlXMLEditLib
 				nd = node.SelectSingleNode(str);
 				// if not found with just the string, search the tree.
 				if (nd==null)nd = node.SelectSingleNode("*/"+str);
-				if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
+				if (nd == null) 
 					GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
 				else
 				{	

PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs

@@ -44,16 +44,8 @@ using System.Runtime.InteropServices;
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
 // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
-[assembly: AssemblyVersion("2.1.2402.508")]
-[assembly: AssemblyFileVersion("2.1.2402.508")]
-
-
-
-
-
-
-
-
+[assembly: AssemblyVersion("2.1.2311.3014")]
+[assembly: AssemblyFileVersion("2.1.2311.3014")]
 
 
 

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -36,8 +36,6 @@ namespace VEPROMS
 			this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem();
 			this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem();
 			this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem();
-			this.btnShowErrFld = new DevComponents.DotNetBar.ButtonItem();
-			this.btnShowPrtFld = new DevComponents.DotNetBar.ButtonItem();
 			this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem();
 			this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton();
 			this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
@@ -212,9 +210,7 @@ namespace VEPROMS
             this.btnShortCuts,
             this.btnHelpVWeb,
             this.btnSendErrorLog,
-			this.btnShowErrFld,
-			this.btnShowPrtFld,
-			this.btnHelpAbout}); ;
+            this.btnHelpAbout});
 			this.btnHelp.Text = "Help";
 			// 
 			// btnHelpManual
@@ -248,24 +244,6 @@ namespace VEPROMS
 			this.btnSendErrorLog.Text = "Send Error Log";
 			this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
 			// 
-			// btnShowErrFld
-			//
-			//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
-			this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
-			this.btnShowErrFld.Name = "btnShowErrFld";
-			this.btnShowErrFld.Text = "Open Log Folder";
-			this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
-			// 
-			// btnShowPrtFld
-			//
-			//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
-			this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
-			this.btnShowPrtFld.Name = "btnShowPrtFld";
-			this.btnShowPrtFld.Text = "Open Default Print Folder";
-			this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
-			// 
-			// 
-			// 
 			// btnHelpAbout
 			// 
 			this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
@@ -1755,8 +1733,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.TabItem infotabFoldoutMaint;
 		private Volian.Controls.Library.DisplayFoldoutMaint displayFoldoutMaint;
 		private DevComponents.DotNetBar.ButtonItem btnSendErrorLog;
-		private DevComponents.DotNetBar.ButtonItem btnShowErrFld;
-		private DevComponents.DotNetBar.ButtonItem btnShowPrtFld;
 		private DevComponents.DotNetBar.TabControlPanel tabControlPanel3;
 		private DevComponents.DotNetBar.TabItem toosTabReports;
 		private Volian.Controls.Library.DisplayReports displayReports;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -21,7 +21,6 @@ using DescriptiveEnum;
 using Volian.Base.Library;
 using Volian.Print.Library;
 using JR.Utils.GUI.Forms;
-using System.Diagnostics;
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
 
@@ -4933,26 +4932,6 @@ namespace VEPROMS
 			}
 		}
 
-		private void btnShowErrFld_Click(object sender, EventArgs e)
-		{
-			string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-			path = path + @"\Documents\VEPROMS";
-			if (Directory.Exists(path))
-			{
-				Process.Start("explorer.exe", path);
-			}
-		}
-
-		private void btnShowPrtFld_Click(object sender, EventArgs e)
-		{
-			string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-			path = path + @"\AppData\Local\Temp\VEPROMS";
-			if (Directory.Exists(path))
-			{
-				Process.Start("explorer.exe", path);
-			}
-		}
-
 		private void btnHelpManual_Click(object sender, EventArgs e)
 		{
 			// C2019-024 Display the PROMS User Manual when user click on the option in the Help drop down menu

PROMS/VEPROMS User Interface/frmVEPROMS.resx

@@ -170,18 +170,6 @@
         rkJggg==
 </value>
   </data>
-  <data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-    </value>
-  </data>
-
-  <data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-    </value>
-  </data>
-  
   <data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6

PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs

@@ -1533,13 +1533,9 @@ namespace VEPROMS.CSLA.Library
 
 			return myGrp;
 		}
-		// B2024-001:  Loading of Ros was getting called over and over when ROs are in tables.  Added
-		//	a flag to only process once until completed, 'currentlyLoading'.
-		static bool currentlyLoading = false;
+
 		private void Load(int rofstID)
 		{
-			if (currentlyLoading) return;		// B2024-001:  don't load if in process of loading
-			currentlyLoading = true;
 			_dicRoCounts = new Dictionary<int, int>();
 
 			DateTime dtStart = DateTime.Now;
@@ -1635,7 +1631,6 @@ namespace VEPROMS.CSLA.Library
 				}
 				catch { }
 			}
-			currentlyLoading = false;       // B2024-001:  done loading
 		}
 
 		private void LoadChild(int rofstID, int dbiID, ROFSTLookup.rochild child)