Merge branch 'develop'

ETS-WS/ETS-WS/Web.config

@@ -18,6 +18,8 @@
                 <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
             </controls>
         </pages>
+        <authentication mode="Windows" />
+        <globalization culture="it-IT" enableClientBasedCulture="true" uiCulture="it" />
     </system.web>
     <appSettings>
         <!--config base applicazione-->
@@ -28,7 +30,7 @@
         <add key="appName" value="ETS-WS" />
         <add key="SiteName" value="ETS" />
         <add key="mainRev" value="1.0" />
-        <add key="minRev" value="113" />
+        <add key="minRev" value="115" />
         <add key="copyRight" value="SteamWare, ETS © 2012-2013" />
         <add key="tempUplDir" value="~/TempUploads" />
         <add key="archiveDir" value="~/ArchivioDocs" />

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);

ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config

@@ -18,6 +18,8 @@
                 <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
             </controls>
         </pages>
+        <authentication mode="Windows" />
+        <globalization culture="it-IT" enableClientBasedCulture="true" uiCulture="it" />
     </system.web>
     <appSettings>
         <!--config base applicazione-->
@@ -28,7 +30,7 @@
         <add key="appName" value="ETS-WS" />
         <add key="SiteName" value="ETS" />
         <add key="mainRev" value="1.0" />
-        <add key="minRev" value="113" />
+        <add key="minRev" value="115" />
         <add key="copyRight" value="SteamWare, ETS © 2012-2013" />
         <add key="tempUplDir" value="~/TempUploads" />
         <add key="archiveDir" value="~/ArchivioDocs" />

ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config

@@ -18,6 +18,8 @@
                 <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
             </controls>
         </pages>
+        <authentication mode="Windows" />
+        <globalization culture="it-IT" enableClientBasedCulture="true" uiCulture="it" />
     </system.web>
     <appSettings>
         <!--config base applicazione-->
@@ -28,7 +30,7 @@
         <add key="appName" value="ETS-WS" />
         <add key="SiteName" value="ETS" />
         <add key="mainRev" value="1.0" />
-        <add key="minRev" value="113" />
+        <add key="minRev" value="115" />
         <add key="copyRight" value="SteamWare, ETS © 2012-2013" />
         <add key="tempUplDir" value="~/TempUploads" />
         <add key="archiveDir" value="~/ArchivioDocs" />

ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config

@@ -18,6 +18,8 @@
                 <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
             </controls>
         </pages>
+        <authentication mode="Windows" />
+        <globalization culture="it-IT" enableClientBasedCulture="true" uiCulture="it" />
     </system.web>
     <appSettings>
         <!--config base applicazione-->
@@ -28,7 +30,7 @@
         <add key="appName" value="ETS-WS" />
         <add key="SiteName" value="ETS" />
         <add key="mainRev" value="1.0" />
-        <add key="minRev" value="113" />
+        <add key="minRev" value="115" />
         <add key="copyRight" value="SteamWare, ETS © 2012-2013" />
         <add key="tempUplDir" value="~/TempUploads" />
         <add key="archiveDir" value="~/ArchivioDocs" />

ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config

@@ -18,6 +18,8 @@
                 <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
             </controls>
         </pages>
+        <authentication mode="Windows" />
+        <globalization culture="it-IT" enableClientBasedCulture="true" uiCulture="it" />
     </system.web>
     <appSettings>
         <!--config base applicazione-->
@@ -28,7 +30,7 @@
         <add key="appName" value="ETS-WS" />
         <add key="SiteName" value="ETS" />
         <add key="mainRev" value="1.0" />
-        <add key="minRev" value="113" />
+        <add key="minRev" value="115" />
         <add key="copyRight" value="SteamWare, ETS © 2012-2013" />
         <add key="tempUplDir" value="~/TempUploads" />
         <add key="archiveDir" value="~/ArchivioDocs" />