diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs index d12a6d2c..1c52f404 100644 --- a/PROMS/VEPROMS User Interface/dlgExportImport.cs +++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs @@ -1829,15 +1829,16 @@ namespace VEPROMS //use overridden method to set the location for ROs protected void SetROLocation(ref XmlElement xindivid, string roid, int rodbid) { - if (MyDocVersion != null) + if (MyProcedure?.MyDocVersion != null) { - ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion); + ROFSTLookup lookup = MyProcedure.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyProcedure.MyDocVersion); using (RODbInfo myRODB = RODbInfoList.Get().FirstOrDefault(x => x.RODbID == rodbid)) { roid = ROFSTLookup.FormatRoidKey(roid, true); ROFSTLookup.rochild roc = lookup.GetRoChild(roid); - SetROLocation(ref xindivid, roc, myRODB, roc.type != 8); + if (Enumerable.Range(8, 15).Contains(roc.type)) + SetROLocation(ref xindivid, roc, myRODB, roc.type != 8); } } }