diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj
index b7c7654..d8ba097 100644
--- a/ETS-WS/ETS-WS/ETS-WS.csproj
+++ b/ETS-WS/ETS-WS/ETS-WS.csproj
@@ -688,7 +688,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="DocTemplates\ETS-Fax.docx" />
+    <None Include="DocTemplates\ETS-Fax_noPrj.docx" />
     <None Include="DocTemplates\ETS-Lettera.docx" />
+    <None Include="DocTemplates\ETS-Lettera_noPrj.docx" />
     <None Include="DocTemplates\ETS-Proto.docx" />
     <None Include="DocTemplates\PlaceHolder.file" />
     <Content Include="logs\PlaceHolder.file" />
diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs
index e149e43..1aa95a7 100644
--- a/ETS-WS/ETS-WS/WebShipUtils.cs
+++ b/ETS-WS/ETS-WS/WebShipUtils.cs
@@ -219,6 +219,54 @@ namespace ETS_WS
             return answ;
         }
         /// <summary>
+        /// commessa del file da idx DB
+        /// </summary>
+        /// <param name="idxFile"></param>
+        /// <returns></returns>
+        public static string commessaFromIdxFile(int idxFile)
+        {
+            string answ = "";
+            try
+            {
+                answ = string.Format("{0}", utils.obj.taDoc.getByIdxFile(idxFile)[0].Commessa);
+            }
+            catch
+            { }
+            return answ;
+        }
+        /// <summary>
+        /// oggetto del file da idx DB
+        /// </summary>
+        /// <param name="idxFile"></param>
+        /// <returns></returns>
+        public static string oggettoFromIdxFile(int idxFile)
+        {
+            string answ = "";
+            try
+            {
+                answ = string.Format("{0}", utils.obj.taDoc.getByIdxFile(idxFile)[0].Oggetto);
+            }
+            catch
+            { }
+            return answ;
+        }
+        /// <summary>
+        /// fonte del file da idx DB
+        /// </summary>
+        /// <param name="idxFile"></param>
+        /// <returns></returns>
+        public static string fonteFromIdxFile(int idxFile)
+        {
+            string answ = "";
+            try
+            {
+                answ = string.Format("{0}", utils.obj.taDoc.getByIdxFile(idxFile)[0].Fonte);
+            }
+            catch
+            { }
+            return answ;
+        }
+        /// <summary>
         /// statored/pubblico da idx DB
         /// </summary>
         /// <param name="idxFile"></param>
@@ -603,12 +651,19 @@ namespace ETS_WS
                 // recupero full path del documento
                 string fullPath = HttpContext.Current.Server.MapPath(string.Format("{0}{1}", pathDest, WebShipUtils.nomeFileFullFromIdxFile(idxFile)));
                 string protocollo = WebShipUtils.protocolloFromIdxFile(idxFile);
+                string commessa = WebShipUtils.commessaFromIdxFile(idxFile);
+                string oggetto = WebShipUtils.oggettoFromIdxFile(idxFile);
+                string fonte = WebShipUtils.fonteFromIdxFile(idxFile);
                 // se il nome contiene "docx" faccio sostituzioni...
                 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);
                 }
                 else if (nomeTemplate.IndexOf("eml") >= 0)
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs
index d33cf16..473c718 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs
@@ -308,8 +308,11 @@ namespace ETS_WS.WebUserControls
             string setName = txtNomeTMD.Text.Trim();
             if (setName != "")
             {
-                // elimino eventuale velore vecchio!
-                WebShipUtils.mng.eliminaTemplateMedatati(utils.obj.currUserId, dlElencoTemplate.SelectedValue);
+                // elimino eventuale velore vecchio SE nuovo = selected!
+                if (dlElencoTemplate.SelectedValue == setName)
+                {
+                    WebShipUtils.mng.eliminaTemplateMedatati(utils.obj.currUserId, dlElencoTemplate.SelectedValue);
+                }
                 // salvo!
                 WebShipUtils.mng.salvaTemplateMedatati(utils.obj.currUserId, setName, metaDatiDoc);
             }
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
index 10f3ee5..0b694dc 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
@@ -55,11 +55,12 @@ namespace ETS_WS.WebUserControls
         {
             // aggiorno
             updateVisual();
-            // indico evento di richeista spostamento
+            // indico evento di richiesta spostamento
             if (eh_reqSalva != null)
             {
                 eh_reqSalva(this, new EventArgs());
             }
+            Response.Redirect("~/GestioneDocumenti.aspx");
         }
 #if false
         /// <summary>
@@ -145,8 +146,14 @@ namespace ETS_WS.WebUserControls
         /// <param name="e"></param>
         protected void btnGenLettera_Click(object sender, EventArgs e)
         {
-            // effettua upload del documento "dummy" lettera
+            // nome standard con commessa...
             string nomeFile = "ETS-Lettera.docx";
+            // controllo se NON c'è una commessa/progetto...
+            if (WebShipUtils.mng.currMetaData.commessa.IndexOf("0000") < 0)
+            {
+                nomeFile = "ETS-Lettera_noPrj.docx";
+            }
+            // effettua upload del documento "dummy" lettera
             WebShipUtils.mng.generaDocDaTemplate(nomeFile, WebShipUtils.mng.currMetaData);
             WebShipUtils.dateIsOk(DateTime.Now);
             Response.Redirect("~/GestioneDocumenti.aspx");
@@ -158,8 +165,14 @@ namespace ETS_WS.WebUserControls
         /// <param name="e"></param>
         protected void btnGenFax_Click(object sender, EventArgs e)
         {
-            // effettua upload del documento "dummy" fax
+            // nome standard con commessa...
             string nomeFile = "ETS-Fax.docx";
+            // controllo se NON c'è una commessa/progetto...
+            if (WebShipUtils.mng.currMetaData.commessa.IndexOf("0000") < 0)
+            {
+                nomeFile = "ETS-Fax_noPrj.docx";
+            }
+            // effettua upload del documento "dummy" fax
             WebShipUtils.mng.generaDocDaTemplate(nomeFile, WebShipUtils.mng.currMetaData);
             WebShipUtils.dateIsOk(DateTime.Now);
             Response.Redirect("~/GestioneDocumenti.aspx");
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index c5b0a70..7eb7cce 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 b0dc5a6..1e0a484 100644
Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ