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

Merging F2024-005 and B2024-004 from development into master after successful testing

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)
+					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
 						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) 
+				if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
 					GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
 				else
 				{