diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln index 0357f81..d3731dc 100644 --- a/AyaNovaSolution.sln +++ b/AyaNovaSolution.sln @@ -1143,7 +1143,6 @@ Global {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|x86.ActiveCfg = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.ActiveCfg = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/MemoFetcher.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/MemoFetcher.cs index 19f982d..5352e44 100644 --- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/MemoFetcher.cs +++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/MemoFetcher.cs @@ -180,8 +180,15 @@ namespace GZTW.AyaNova.BLL UserPickList up=UserPickList.GetListOfOneSpecificUser(this.FromID); //From - sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.FromID", mLanguage) + ": " + up[0].Name +"\r\n"); - + //case 3826 + if (up.Count == 0)//User not found (utility user probably) + { + sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.FromID", mLanguage) + ": -\r\n"); + } + else + { + sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.FromID", mLanguage) + ": " + up[0].Name + "\r\n"); + } //Sent sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.Sent", mLanguage) + ": " + this.SentRelative + " (" + this.Created +")\r\n"); diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs index ef479d7..3545a1d 100644 --- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs +++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs @@ -4246,7 +4246,20 @@ namespace GZTW.AyaNova.BLL Memo mwarn = Memo.NewItem(); mwarn.ToID = User.AdministratorID; - mwarn.FromID = User.CurrentThreadUserID; + + //case 3826 + if (User.CurrentUserType == UserTypes.Utility) + { + //Utility accounts should not be sending memos, it fucks up downstream + //trying to view the memo, also it's confusing + mwarn.FromID = User.AdministratorID; + } + else + { + mwarn.FromID = User.CurrentThreadUserID; + } + + mwarn.Subject = "SYSTEM WARNING: Preventive Maintenance WO PROBLEM"; StringBuilder sb = new StringBuilder(); sb.AppendLine("This is an automated message sent on behalf of the current user from the \"NewServiceWorkorderFromPM\" module.");