diff --git a/HRM.Report/Class/rptEmployee.cs b/HRM.Report/Class/rptEmployee.cs index 79d3d6e..ef123ef 100644 --- a/HRM.Report/Class/rptEmployee.cs +++ b/HRM.Report/Class/rptEmployee.cs @@ -3661,22 +3661,6 @@ namespace HRM.Report #endregion - - - //string templatePath = Path.Combine(Environment.CurrentDirectory, "Documents", "LetterTempFolder", lFileName); - - - //FileInfo ossInfo = null; - //ossInfo = new FileInfo(sFilePath); - //if (ossInfo.Exists) - //{ - // ossInfo.Delete(); - //} - - - - - string templatePath = System.IO.Path.Combine(System.Environment.CurrentDirectory + "\\Documents\\LetterTempFolder\\" + lFileName); // Copy template to output file diff --git a/HRM.UI/Controllers/LetterRequest/LetterRequestController.cs b/HRM.UI/Controllers/LetterRequest/LetterRequestController.cs index d39409e..c39ab02 100644 --- a/HRM.UI/Controllers/LetterRequest/LetterRequestController.cs +++ b/HRM.UI/Controllers/LetterRequest/LetterRequestController.cs @@ -816,7 +816,7 @@ namespace HRM.UI.Controllers ltemplate.Type = EnumDocType.Desktop_Letter; ltemplate.TypeID = (int)EnumDocType.Desktop_Letter; - lFileName = "Staff.doc"; + lFileName = "Staff.docx"; } else { @@ -828,7 +828,7 @@ namespace HRM.UI.Controllers ltemplate.Type = EnumDocType.Desktop_Letter; ltemplate.TypeID = (int)EnumDocType.Desktop_Letter; - lFileName = "Worker.doc"; + lFileName = "Worker.docx"; }