diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs index 0d5879b9..9cb521e8 100644 --- a/server/AyaNova/biz/PMBiz.cs +++ b/server/AyaNova/biz/PMBiz.cs @@ -1581,7 +1581,10 @@ namespace AyaNova.Biz var qid = await GetPMIdFromRelativeAsync(AyaType.PMItem, oProposed.PMId, ct); var WorkorderInfo = await ct.PM.AsNoTracking().Where(x => x.Id == qid.ParentId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync(); //for notification purposes because has no name field itself - oProposed.Name = WorkorderInfo.Serial.ToString(); + if (WorkorderInfo != null) + oProposed.Name = WorkorderInfo.Serial.ToString(); + else + oProposed.Name = "??"; //STANDARD EVENTS FOR ALL OBJECTS await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct); @@ -2346,7 +2349,10 @@ namespace AyaNova.Biz var wid = await GetPMIdFromRelativeAsync(AyaType.PMItem, oProposed.PMItemId, ct); var WorkorderInfo = await ct.PM.AsNoTracking().Where(x => x.Id == wid.ParentId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync(); //for notification purposes because has no name or tags field itself - oProposed.Name = WorkorderInfo.Serial.ToString(); + if (WorkorderInfo != null) + oProposed.Name = WorkorderInfo.Serial.ToString(); + else + oProposed.Name = "??"; oProposed.Tags = WorkorderInfo.Tags; diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs index fa174356..1cc54ed8 100644 --- a/server/AyaNova/biz/QuoteBiz.cs +++ b/server/AyaNova/biz/QuoteBiz.cs @@ -1981,7 +1981,10 @@ namespace AyaNova.Biz var qid = await GetQuoteIdFromRelativeAsync(AyaType.QuoteItem, oProposed.QuoteId, ct); var WorkorderInfo = await ct.Quote.AsNoTracking().Where(x => x.Id == qid.ParentId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync(); //for notification purposes because has no name field itself - oProposed.Name = WorkorderInfo.Serial.ToString(); + if (WorkorderInfo != null) + oProposed.Name = WorkorderInfo.Serial.ToString(); + else + oProposed.Name = "??"; //STANDARD EVENTS FOR ALL OBJECTS await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct); @@ -2366,6 +2369,10 @@ namespace AyaNova.Biz QuoteItemExpense oProposed = (QuoteItemExpense)proposedObj; var qid = await GetQuoteIdFromRelativeAsync(AyaType.QuoteItem, oProposed.QuoteItemId, ct); var WorkorderInfo = await ct.Quote.AsNoTracking().Where(x => x.Id == qid.ParentId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync(); + if (WorkorderInfo != null) + oProposed.Name = WorkorderInfo.Serial.ToString(); + else + oProposed.Name = "??"; oProposed.Tags = WorkorderInfo.Tags; //STANDARD EVENTS FOR ALL OBJECTS