diff --git a/StockManMVC/Controllers/ItemFluxesController.cs b/StockManMVC/Controllers/ItemFluxesController.cs
index 840f4d2..9ed4b39 100644
--- a/StockManMVC/Controllers/ItemFluxesController.cs
+++ b/StockManMVC/Controllers/ItemFluxesController.cs
@@ -510,7 +510,6 @@ namespace StockManMVC.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         public ActionResult Edit([Bind(Include = "ID,LocationID,ExtLocationID,dtMov,Qta,TotValue,UnitVal,CodDoc,Note,dtExport")] ItemFlux itemFlux)
-        //public ActionResult Edit([Bind(Include = "ID,ItemID,LocationID,MovTypeID,ExtLocationID,dtMov,Qta,TotValue,UnitVal,CodDoc,Note,dtExport,OperatorID")] ItemFlux itemFlux)
         {
             // recupero vecchi valori...
             ItemFlux itemFluxOld = db.ItemFlux.Find(itemFlux.ID);
diff --git a/StockManMVC/Controllers/LocationsController.cs b/StockManMVC/Controllers/LocationsController.cs
index 6dba853..035874b 100644
--- a/StockManMVC/Controllers/LocationsController.cs
+++ b/StockManMVC/Controllers/LocationsController.cs
@@ -171,8 +171,20 @@ namespace StockManMVC.Controllers
         [ValidateAntiForgeryToken]
         public ActionResult Edit([Bind(Include = "ID,Descr,LocTypeID")] Location location)
         {
+            // recupero vecchi valori...
+            Location locationOld = db.Location.Find(location.ID);
+            // imposto valori vecchi x campi "bloccati" (tipo locazione...)
+            location.LocTypeID = locationOld.LocTypeID;
+            // ora devo eliminare gli errori pendenti x il campo ID 
+            ModelState["LocTypeID"].Errors.Clear();
+            // va ri-validato il modello 
+            UpdateModel(location);
+            // verifico!
             if (ModelState.IsValid)
             {
+                // sblocco vecchio item x non fare conflitto
+                db.Entry(locationOld).State = EntityState.Detached;
+                // indico che devo salvare nuovo!
                 db.Entry(location).State = EntityState.Modified;
                 db.SaveChanges();
                 return RedirectToAction("Index");
diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll
index 0b43131..b0de7dd 100644
Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ