diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index fbb6eda8..27b59d42 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -5265,7 +5265,7 @@ namespace VEPROMS.CSLA.Library } itemInfo.AddContent(dr); itemInfo._SearchDVPath = dr.GetString("DVPath"); - //itemInfo._SearchPath = dr.GetString("Path"); + itemInfo._SearchPath = dr.GetString("Path"); IsReadOnly = false; this.Add(itemInfo); IsReadOnly = true; diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.cs b/PROMS/Volian.Controls.Library/DisplayHistory.cs index 8435b76f..4230209a 100644 --- a/PROMS/Volian.Controls.Library/DisplayHistory.cs +++ b/PROMS/Volian.Controls.Library/DisplayHistory.cs @@ -197,7 +197,7 @@ namespace Volian.Controls.Library ContentAuditInfo cai = lbChanges.SelectedItem as ContentAuditInfo; if (cai != null) { - if (cai.DeleteStatus > 0) + if (cai.DeleteStatus > 0 || (cai.DeleteStatus == 0 && cai.ActionWhen.Year == DateTime.MinValue.Year)) MessageBox.Show("This item has been deleted.","Deleted Item",MessageBoxButtons.OK,MessageBoxIcon.Exclamation); else OnHistorySelectionChanged(new DisplayHistoryEventArgs(cai.ItemID)); diff --git a/PROMS/Volian.Print.Library/PDFChronologyReport.cs b/PROMS/Volian.Print.Library/PDFChronologyReport.cs index 46010e0c..cf7ea7e6 100644 --- a/PROMS/Volian.Print.Library/PDFChronologyReport.cs +++ b/PROMS/Volian.Print.Library/PDFChronologyReport.cs @@ -380,9 +380,15 @@ namespace Volian.Print.Library string txt = ItemInfo.ConvertToDisplayText(cai.Text); if (MyProc.MyDocVersion.MultiUnitCount > 1) { - System.Xml.XmlDocument xd = new System.Xml.XmlDocument(); - xd.LoadXml(cai.Config); - System.Xml.XmlNode nd = xd.SelectSingleNode("//MasterSlave"); + System.Xml.XmlNode nd; + if (cai.Config == string.Empty) + nd = null; + else + { + System.Xml.XmlDocument xd = new System.Xml.XmlDocument(); + xd.LoadXml(cai.Config); + nd = xd.SelectSingleNode("//MasterSlave"); + } if (nd == null) txt += "\r\n\r\nApplicable to all units"; else