diff --git a/ETS-WS/ETS-WS/DocTemplates/ETS-Fax.docx b/ETS-WS/ETS-WS/DocTemplates/ETS-Fax.docx index c99d254..78e9523 100644 Binary files a/ETS-WS/ETS-WS/DocTemplates/ETS-Fax.docx and b/ETS-WS/ETS-WS/DocTemplates/ETS-Fax.docx differ diff --git a/ETS-WS/ETS-WS/DocTemplates/ETS-Fax_noPrj.docx b/ETS-WS/ETS-WS/DocTemplates/ETS-Fax_noPrj.docx index 9ebe414..12a787e 100644 Binary files a/ETS-WS/ETS-WS/DocTemplates/ETS-Fax_noPrj.docx and b/ETS-WS/ETS-WS/DocTemplates/ETS-Fax_noPrj.docx differ diff --git a/ETS-WS/ETS-WS/DocTemplates/ETS-Lettera.docx b/ETS-WS/ETS-WS/DocTemplates/ETS-Lettera.docx index a591531..6ba9828 100644 Binary files a/ETS-WS/ETS-WS/DocTemplates/ETS-Lettera.docx and b/ETS-WS/ETS-WS/DocTemplates/ETS-Lettera.docx differ diff --git a/ETS-WS/ETS-WS/DocTemplates/ETS-Lettera_noPrj.docx b/ETS-WS/ETS-WS/DocTemplates/ETS-Lettera_noPrj.docx index 329e2a8..736ae94 100644 Binary files a/ETS-WS/ETS-WS/DocTemplates/ETS-Lettera_noPrj.docx and b/ETS-WS/ETS-WS/DocTemplates/ETS-Lettera_noPrj.docx differ diff --git a/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx b/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx index 45be212..457ea5c 100644 Binary files a/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx and b/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx differ diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index 39a1ce0..a7f929b 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -18,6 +18,8 @@ + + @@ -28,7 +30,7 @@ - + diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs index 485cf3a..f4fb573 100644 --- a/ETS-WS/ETS-WS/WebShipUtils.cs +++ b/ETS-WS/ETS-WS/WebShipUtils.cs @@ -662,7 +662,7 @@ namespace ETS_WS officeXmlMan.replaceDocxText(fullPath, "DataDoc", docsData.dataDoc.ToShortDateString()); officeXmlMan.replaceDocxText(fullPath, "Anno", docsData.dataDoc.Year.ToString()); officeXmlMan.replaceDocxText(fullPath, "Commessa", commessa); - officeXmlMan.replaceDocxText(fullPath, "Oggetto", oggetto); + officeXmlMan.replaceDocxText(fullPath, "OggettoDoc", oggetto); officeXmlMan.replaceDocxText(fullPath, "Fonte", fonte); officeXmlMan.replaceDocxText(fullPath, "Redattore", utils.obj.currUserCognomeNome); } @@ -683,7 +683,7 @@ namespace ETS_WS destinatario = mittente; } string subject = string.Format("{0}, prot. num {1}", docsData.oggetto, protocollo); - string body = string.Format("Commessa: {1}{0}Fase: {2}{0}Oggetto: {3}{0}prot. num: {4}", Environment.NewLine, docsData.commessa, docsData.fase, docsData.oggetto, protocollo); + string body = string.Format("Villa D'Almè, {1:dd/MM/yyyy}{0}Rif.Comm. N.: {2}{0}Prot. N.: {3}{0}{0}{0}{0}Distinti Saluti.{0}{4}{0}{0}ETS S.p.a.{0}Via Mazzi, 32 - 24018 Villa D'Almè (BG){0}Trasmesso da:{0}{5}", Environment.NewLine, docsData.dataDoc, docsData.commessa, protocollo, redattore, mittente); string newFileName = WebShipUtils.CreaEml(mittente, destinatario, subject, body, null, HttpContext.Current.Server.MapPath(pathDest)); // sostituisco file appena creato con quello nuovo fileMover.obj.muoviFile(pathDest, pathDest, newFileName, WebShipUtils.nomeFileFullFromIdxFile(idxFile), true); diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 2fdbdde..b2f1099 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index abc0964..1aafa8b 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config index 5545cc3..bdfc69e 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config @@ -18,6 +18,8 @@ + + @@ -28,7 +30,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config index ff5ea09..e695180 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config @@ -18,6 +18,8 @@ + + @@ -28,7 +30,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache index 5e7a2af..e7325c2 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll index 2fdbdde..b2f1099 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip index 2da0fa6..ea36641 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip and b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip differ diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config index 13d7338..e2706d6 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config @@ -18,6 +18,8 @@ + + @@ -28,7 +30,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config index 5545cc3..bdfc69e 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config @@ -18,6 +18,8 @@ + + @@ -28,7 +30,7 @@ - + diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index abc0964..1aafa8b 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/bin/Release/DocumentFormat.OpenXml.dll b/ETS_Data/bin/Release/DocumentFormat.OpenXml.dll new file mode 100644 index 0000000..a3249c1 Binary files /dev/null and b/ETS_Data/bin/Release/DocumentFormat.OpenXml.dll differ diff --git a/ETS_Data/bin/Release/ETS_Data.dll b/ETS_Data/bin/Release/ETS_Data.dll index 3347998..66e9588 100644 Binary files a/ETS_Data/bin/Release/ETS_Data.dll and b/ETS_Data/bin/Release/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index abc0964..1aafa8b 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.pdb b/ETS_Data/obj/ETS/ETS_Data.pdb index 39f62ee..c5ac275 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.pdb and b/ETS_Data/obj/ETS/ETS_Data.pdb differ