diff --git a/ETS-WS/ETS-WS/DocTemplates/ETS-Fax.docx b/ETS-WS/ETS-WS/DocTemplates/ETS-Fax.docx
index 3c035b5..c99d254 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 9f9a2cf..9ebe414 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 9cf9966..a591531 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 77b7ffb..329e2a8 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/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj
index 0959a15..8684021 100644
--- a/ETS-WS/ETS-WS/ETS-WS.csproj
+++ b/ETS-WS/ETS-WS/ETS-WS.csproj
@@ -726,7 +726,7 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>55180</DevelopmentServerPort>
+          <DevelopmentServerPort>61133</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>
           </IISUrl>
diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config
index 1ea0efb..84dfdba 100644
--- a/ETS-WS/ETS-WS/Web.config
+++ b/ETS-WS/ETS-WS/Web.config
@@ -28,7 +28,7 @@
         <add key="appName" value="ETS-WS" />
         <add key="SiteName" value="ETS" />
         <add key="mainRev" value="1.0" />
-        <add key="minRev" value="106" />
+        <add key="minRev" value="107" />
         <add key="copyRight" value="SteamWare, ETS © 2012" />
         <add key="tempUplDir" value="~/TempUploads" />
         <add key="archiveDir" value="~/ArchivioDocs" />
@@ -39,7 +39,6 @@
         <add key="srcPageSize" value="15" />
         <!--update pagina-->
         <add key="intUpdatePagina_ms" value="120000" />
-        <add key="countDownUploadFile" value="2"/>
         <!--config x WebServices autocompletamento-->
         <add key="MinCharAutocomplete" value="2" />
         <add key="MaxRowToDisplay" value="15" />
diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs
index 403e565..30eb2e3 100644
--- a/ETS-WS/ETS-WS/WebShipUtils.cs
+++ b/ETS-WS/ETS-WS/WebShipUtils.cs
@@ -658,13 +658,13 @@ namespace ETS_WS
                 if (nomeTemplate.IndexOf("docx") >= 0)
                 {
                     // prendo il nuovo file generato e sostituisco parte del nome con il codice protocollo // link: msdn.microsoft.com/en-us/library/bb508261.aspx 
-                    officeXmlMan.replaceDocxText(fullPath, "{{Protocollo}}", protocollo);
-                    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, "{{Fonte}}", fonte); //!!!
-                    officeXmlMan.replaceDocxText(fullPath, "{{Redattore}}", utils.obj.currUserCognomeNome);
+                    officeXmlMan.replaceDocxText(fullPath, "Protocollo", protocollo);
+                    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, "Fonte", fonte);
+                    officeXmlMan.replaceDocxText(fullPath, "Redattore", utils.obj.currUserCognomeNome);
                 }
                 else if (nomeTemplate.IndexOf("eml") >= 0)
                 {
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
index 0b694dc..6bacd96 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
@@ -149,7 +149,7 @@ namespace ETS_WS.WebUserControls
             // nome standard con commessa...
             string nomeFile = "ETS-Lettera.docx";
             // controllo se NON c'è una commessa/progetto...
-            if (WebShipUtils.mng.currMetaData.commessa.IndexOf("0000") < 0)
+            if (WebShipUtils.mng.currMetaData.commessa.IndexOf("0000") >= 0)
             {
                 nomeFile = "ETS-Lettera_noPrj.docx";
             }
@@ -168,7 +168,7 @@ namespace ETS_WS.WebUserControls
             // nome standard con commessa...
             string nomeFile = "ETS-Fax.docx";
             // controllo se NON c'è una commessa/progetto...
-            if (WebShipUtils.mng.currMetaData.commessa.IndexOf("0000") < 0)
+            if (WebShipUtils.mng.currMetaData.commessa.IndexOf("0000") >= 0)
             {
                 nomeFile = "ETS-Fax_noPrj.docx";
             }
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index bc3c710..273e29c 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 1e0a484..8f48e05 100644
Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ