diff --git a/StockManMVC/Controllers/ItemsController.cs b/StockManMVC/Controllers/ItemsController.cs
deleted file mode 100644
index d33499f..0000000
--- a/StockManMVC/Controllers/ItemsController.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Entity;
-using System.Linq;
-using System.Net;
-using System.Web;
-using System.Web.Mvc;
-using StockManMVC.Models;
-
-namespace StockManMVC.Controllers
-{
-    public class ItemsController : Controller
-    {
-        private StockManEntities db = new StockManEntities();
-
-        // GET: Items
-        public ActionResult Index()
-        {
-            return View(db.Items.ToList());
-        }
-
-        // GET: Items/Details/5
-        public ActionResult Details(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            Items items = db.Items.Find(id);
-            if (items == null)
-            {
-                return HttpNotFound();
-            }
-            return View(items);
-        }
-
-        // GET: Items/Create
-        public ActionResult Create()
-        {
-            return View();
-        }
-
-        // POST: Items/Create
-        // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Create([Bind(Include = "ID,Descr,Family,DescrExt,CodExt,CodInt,QtaMin,QtaBatch,Value")] Items items)
-        {
-            if (ModelState.IsValid)
-            {
-                db.Items.Add(items);
-                db.SaveChanges();
-                return RedirectToAction("Index");
-            }
-
-            return View(items);
-        }
-
-        // GET: Items/Edit/5
-        public ActionResult Edit(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            Items items = db.Items.Find(id);
-            if (items == null)
-            {
-                return HttpNotFound();
-            }
-            return View(items);
-        }
-
-        // POST: Items/Edit/5
-        // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Edit([Bind(Include = "ID,Descr,Family,DescrExt,CodExt,CodInt,QtaMin,QtaBatch,Value")] Items items)
-        {
-            if (ModelState.IsValid)
-            {
-                db.Entry(items).State = EntityState.Modified;
-                db.SaveChanges();
-                return RedirectToAction("Index");
-            }
-            return View(items);
-        }
-
-        // GET: Items/Delete/5
-        public ActionResult Delete(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            Items items = db.Items.Find(id);
-            if (items == null)
-            {
-                return HttpNotFound();
-            }
-            return View(items);
-        }
-
-        // POST: Items/Delete/5
-        [HttpPost, ActionName("Delete")]
-        [ValidateAntiForgeryToken]
-        public ActionResult DeleteConfirmed(int id)
-        {
-            Items items = db.Items.Find(id);
-            db.Items.Remove(items);
-            db.SaveChanges();
-            return RedirectToAction("Index");
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                db.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-    }
-}
diff --git a/StockManMVC/Controllers/LocTypesController.cs b/StockManMVC/Controllers/LocTypesController.cs
index 458170f..5486a61 100644
--- a/StockManMVC/Controllers/LocTypesController.cs
+++ b/StockManMVC/Controllers/LocTypesController.cs
@@ -46,7 +46,7 @@ namespace StockManMVC.Controllers
         // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult Create([Bind(Include = "ID,Descr")] LocType locType)
+        public ActionResult Create([Bind(Include = "ID,Descr,IsStock,IsCli,IsFor")] LocType locType)
         {
             if (ModelState.IsValid)
             {
@@ -78,7 +78,7 @@ namespace StockManMVC.Controllers
         // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult Edit([Bind(Include = "ID,Descr")] LocType locType)
+        public ActionResult Edit([Bind(Include = "ID,Descr,IsStock,IsCli,IsFor")] LocType locType)
         {
             if (ModelState.IsValid)
             {
diff --git a/StockManMVC/Controllers/StockMovsController.cs b/StockManMVC/Controllers/StockMovsController.cs
deleted file mode 100644
index e59e632..0000000
--- a/StockManMVC/Controllers/StockMovsController.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Entity;
-using System.Linq;
-using System.Net;
-using System.Web;
-using System.Web.Mvc;
-using StockManMVC.Models;
-
-namespace StockManMVC.Controllers
-{
-    public class StockMovsController : Controller
-    {
-        private StockManEntities db = new StockManEntities();
-
-        // GET: StockMovs
-        public ActionResult Index()
-        {
-            var stockMov = db.StockMov.Include(s => s.MovType).Include(s => s.Stock);
-            return View(stockMov.ToList());
-        }
-
-        // GET: StockMovs/Details/5
-        public ActionResult Details(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            StockMov stockMov = db.StockMov.Find(id);
-            if (stockMov == null)
-            {
-                return HttpNotFound();
-            }
-            return View(stockMov);
-        }
-
-        // GET: StockMovs/Create
-        public ActionResult Create()
-        {
-            ViewBag.MovTypeID = new SelectList(db.MovType, "ID", "Descr");
-            ViewBag.ItemID = new SelectList(db.Stock, "ItemID", "Note");
-            return View();
-        }
-
-        // POST: StockMovs/Create
-        // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Create([Bind(Include = "ItemID,LocationID,dtMov,Qta,Note,dtExport,MovTypeID")] StockMov stockMov)
-        {
-            if (ModelState.IsValid)
-            {
-                db.StockMov.Add(stockMov);
-                db.SaveChanges();
-                return RedirectToAction("Index");
-            }
-
-            ViewBag.MovTypeID = new SelectList(db.MovType, "ID", "Descr", stockMov.MovTypeID);
-            ViewBag.ItemID = new SelectList(db.Stock, "ItemID", "Note", stockMov.ItemID);
-            return View(stockMov);
-        }
-
-        // GET: StockMovs/Edit/5
-        public ActionResult Edit(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            StockMov stockMov = db.StockMov.Find(id);
-            if (stockMov == null)
-            {
-                return HttpNotFound();
-            }
-            ViewBag.MovTypeID = new SelectList(db.MovType, "ID", "Descr", stockMov.MovTypeID);
-            ViewBag.ItemID = new SelectList(db.Stock, "ItemID", "Note", stockMov.ItemID);
-            return View(stockMov);
-        }
-
-        // POST: StockMovs/Edit/5
-        // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Edit([Bind(Include = "ItemID,LocationID,dtMov,Qta,Note,dtExport,MovTypeID")] StockMov stockMov)
-        {
-            if (ModelState.IsValid)
-            {
-                db.Entry(stockMov).State = EntityState.Modified;
-                db.SaveChanges();
-                return RedirectToAction("Index");
-            }
-            ViewBag.MovTypeID = new SelectList(db.MovType, "ID", "Descr", stockMov.MovTypeID);
-            ViewBag.ItemID = new SelectList(db.Stock, "ItemID", "Note", stockMov.ItemID);
-            return View(stockMov);
-        }
-
-        // GET: StockMovs/Delete/5
-        public ActionResult Delete(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            StockMov stockMov = db.StockMov.Find(id);
-            if (stockMov == null)
-            {
-                return HttpNotFound();
-            }
-            return View(stockMov);
-        }
-
-        // POST: StockMovs/Delete/5
-        [HttpPost, ActionName("Delete")]
-        [ValidateAntiForgeryToken]
-        public ActionResult DeleteConfirmed(int id)
-        {
-            StockMov stockMov = db.StockMov.Find(id);
-            db.StockMov.Remove(stockMov);
-            db.SaveChanges();
-            return RedirectToAction("Index");
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                db.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-    }
-}
diff --git a/StockManMVC/Controllers/StocksController.cs b/StockManMVC/Controllers/StocksController.cs
deleted file mode 100644
index 67d7bea..0000000
--- a/StockManMVC/Controllers/StocksController.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Entity;
-using System.Linq;
-using System.Net;
-using System.Web;
-using System.Web.Mvc;
-using StockManMVC.Models;
-
-namespace StockManMVC.Controllers
-{
-    public class StocksController : Controller
-    {
-        private StockManEntities db = new StockManEntities();
-
-        // GET: Stocks
-        public ActionResult Index()
-        {
-            var stock = db.Stock.Include(s => s.Location).Include(s => s.Items);
-            return View(stock.ToList());
-        }
-
-        // GET: Stocks/Details/5
-        public ActionResult Details(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            Stock stock = db.Stock.Find(id);
-            if (stock == null)
-            {
-                return HttpNotFound();
-            }
-            return View(stock);
-        }
-
-        // GET: Stocks/Create
-        public ActionResult Create()
-        {
-            ViewBag.LocationID = new SelectList(db.Location, "ID", "Descr");
-            ViewBag.ItemID = new SelectList(db.Items, "ID", "Descr");
-            return View();
-        }
-
-        // POST: Stocks/Create
-        // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Create([Bind(Include = "ItemID,LocationID,QtyConf,Note,dtLastUpd")] Stock stock)
-        {
-            if (ModelState.IsValid)
-            {
-                db.Stock.Add(stock);
-                db.SaveChanges();
-                return RedirectToAction("Index");
-            }
-
-            ViewBag.LocationID = new SelectList(db.Location, "ID", "Descr", stock.LocationID);
-            ViewBag.ItemID = new SelectList(db.Items, "ID", "Descr", stock.ItemID);
-            return View(stock);
-        }
-
-        // GET: Stocks/Edit/5
-        public ActionResult Edit(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            Stock stock = db.Stock.Find(id);
-            if (stock == null)
-            {
-                return HttpNotFound();
-            }
-            ViewBag.LocationID = new SelectList(db.Location, "ID", "Descr", stock.LocationID);
-            ViewBag.ItemID = new SelectList(db.Items, "ID", "Descr", stock.ItemID);
-            return View(stock);
-        }
-
-        // POST: Stocks/Edit/5
-        // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult Edit([Bind(Include = "ItemID,LocationID,QtyConf,Note,dtLastUpd")] Stock stock)
-        {
-            if (ModelState.IsValid)
-            {
-                db.Entry(stock).State = EntityState.Modified;
-                db.SaveChanges();
-                return RedirectToAction("Index");
-            }
-            ViewBag.LocationID = new SelectList(db.Location, "ID", "Descr", stock.LocationID);
-            ViewBag.ItemID = new SelectList(db.Items, "ID", "Descr", stock.ItemID);
-            return View(stock);
-        }
-
-        // GET: Stocks/Delete/5
-        public ActionResult Delete(int? id)
-        {
-            if (id == null)
-            {
-                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
-            }
-            Stock stock = db.Stock.Find(id);
-            if (stock == null)
-            {
-                return HttpNotFound();
-            }
-            return View(stock);
-        }
-
-        // POST: Stocks/Delete/5
-        [HttpPost, ActionName("Delete")]
-        [ValidateAntiForgeryToken]
-        public ActionResult DeleteConfirmed(int id)
-        {
-            Stock stock = db.Stock.Find(id);
-            db.Stock.Remove(stock);
-            db.SaveChanges();
-            return RedirectToAction("Index");
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                db.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-    }
-}
diff --git a/StockManMVC/Models/Items.cs b/StockManMVC/Models/Item.cs
similarity index 70%
rename from StockManMVC/Models/Items.cs
rename to StockManMVC/Models/Item.cs
index 9a782aa..6a91582 100644
--- a/StockManMVC/Models/Items.cs
+++ b/StockManMVC/Models/Item.cs
@@ -12,25 +12,28 @@ namespace StockManMVC.Models
     using System;
     using System.Collections.Generic;
     
-    public partial class Items
+    public partial class Item
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public Items()
+        public Item()
         {
-            this.Stock = new HashSet<Stock>();
+            this.ItemFlux = new HashSet<ItemFlux>();
+            this.ItemStock = new HashSet<ItemStock>();
         }
     
         public int ID { get; set; }
         public string Descr { get; set; }
-        public string Family { get; set; }
-        public string DescrExt { get; set; }
-        public string CodExt { get; set; }
         public string CodInt { get; set; }
+        public string Family { get; set; }
+        public string CodExt { get; set; }
+        public string DescrExt { get; set; }
         public int QtaMin { get; set; }
         public int QtaBatch { get; set; }
-        public decimal Value { get; set; }
+        public decimal CurrValue { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<Stock> Stock { get; set; }
+        public virtual ICollection<ItemFlux> ItemFlux { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<ItemStock> ItemStock { get; set; }
     }
 }
diff --git a/StockManMVC/Models/StockMov.cs b/StockManMVC/Models/ItemFlux.cs
similarity index 73%
rename from StockManMVC/Models/StockMov.cs
rename to StockManMVC/Models/ItemFlux.cs
index 62f4f95..3d398a0 100644
--- a/StockManMVC/Models/StockMov.cs
+++ b/StockManMVC/Models/ItemFlux.cs
@@ -12,17 +12,22 @@ namespace StockManMVC.Models
     using System;
     using System.Collections.Generic;
     
-    public partial class StockMov
+    public partial class ItemFlux
     {
+        public int ID { get; set; }
         public int ItemID { get; set; }
         public string LocationID { get; set; }
+        public string MovTypeID { get; set; }
+        public string ExtLocationID { get; set; }
         public System.DateTime dtMov { get; set; }
         public int Qta { get; set; }
+        public decimal TotValue { get; set; }
+        public Nullable<decimal> UnitVal { get; set; }
         public string Note { get; set; }
         public Nullable<System.DateTime> dtExport { get; set; }
-        public string MovTypeID { get; set; }
     
+        public virtual Item Item { get; set; }
+        public virtual Location Location { get; set; }
         public virtual MovType MovType { get; set; }
-        public virtual Stock Stock { get; set; }
     }
 }
diff --git a/StockManMVC/Models/Stock.cs b/StockManMVC/Models/ItemStock.cs
similarity index 57%
rename from StockManMVC/Models/Stock.cs
rename to StockManMVC/Models/ItemStock.cs
index 1a77407..d08a1d2 100644
--- a/StockManMVC/Models/Stock.cs
+++ b/StockManMVC/Models/ItemStock.cs
@@ -12,23 +12,16 @@ namespace StockManMVC.Models
     using System;
     using System.Collections.Generic;
     
-    public partial class Stock
+    public partial class ItemStock
     {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public Stock()
-        {
-            this.StockMov = new HashSet<StockMov>();
-        }
-    
+        public int ID { get; set; }
         public int ItemID { get; set; }
         public string LocationID { get; set; }
         public int QtyConf { get; set; }
         public string Note { get; set; }
-        public Nullable<System.DateTime> dtLastUpd { get; set; }
+        public System.DateTime dtLastUpd { get; set; }
     
-        public virtual Items Items { get; set; }
+        public virtual Item Item { get; set; }
         public virtual Location Location { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<StockMov> StockMov { get; set; }
     }
 }
diff --git a/StockManMVC/Models/LocType.cs b/StockManMVC/Models/LocType.cs
index c5dc916..e2c13d7 100644
--- a/StockManMVC/Models/LocType.cs
+++ b/StockManMVC/Models/LocType.cs
@@ -22,6 +22,9 @@ namespace StockManMVC.Models
     
         public string ID { get; set; }
         public string Descr { get; set; }
+        public bool IsStock { get; set; }
+        public bool IsCli { get; set; }
+        public bool IsFor { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<Location> Location { get; set; }
diff --git a/StockManMVC/Models/Location.cs b/StockManMVC/Models/Location.cs
index 662bf6b..399a0fd 100644
--- a/StockManMVC/Models/Location.cs
+++ b/StockManMVC/Models/Location.cs
@@ -17,15 +17,18 @@ namespace StockManMVC.Models
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public Location()
         {
-            this.Stock = new HashSet<Stock>();
+            this.ItemFlux = new HashSet<ItemFlux>();
+            this.ItemStock = new HashSet<ItemStock>();
         }
     
         public string ID { get; set; }
         public string Descr { get; set; }
         public string LocTypeID { get; set; }
     
-        public virtual LocType LocType { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<Stock> Stock { get; set; }
+        public virtual ICollection<ItemFlux> ItemFlux { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<ItemStock> ItemStock { get; set; }
+        public virtual LocType LocType { get; set; }
     }
 }
diff --git a/StockManMVC/Models/Metadata.cs b/StockManMVC/Models/Metadata.cs
new file mode 100644
index 0000000..0ce1072
--- /dev/null
+++ b/StockManMVC/Models/Metadata.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Web;
+
+namespace StockManMVC.Models
+{
+    public class ItemsMetadata
+    {
+        [StringLength(250)]
+        [Display(Name = "Descrizione Articolo")]
+        public string Descr;
+
+        [StringLength(50)]
+        [Display(Name = "Famiglia Articolo")]
+        public string Family;
+
+        [StringLength(250)]
+        [Display(Name = "Descrizione Articolo Ext")]
+        public string DescrExt;
+
+        [StringLength(250)]
+        [Display(Name = "Cod Articolo Ext")]
+        public string CodExt;
+
+        [StringLength(50)]
+        [Display(Name = "Cod Articolo Int")]
+        public string CodInt;
+
+    }
+
+    public class StocksMetadata
+    {
+        [DisplayFormat(DataFormatString = "{0:yyyy-MM-dd}", ApplyFormatInEditMode = true)]
+        [DataType(DataType.Date)]
+        public Nullable<System.DateTime> dtLastUpd;
+    }
+
+    //public class EnrollmentMetadata 
+    //{ 
+    //    [Range(0, 4)] 
+    //    public Nullable<decimal> Grade; 
+    //} 
+}
diff --git a/StockManMVC/Models/MovType.cs b/StockManMVC/Models/MovType.cs
index 98f3f7e..347eec1 100644
--- a/StockManMVC/Models/MovType.cs
+++ b/StockManMVC/Models/MovType.cs
@@ -17,13 +17,13 @@ namespace StockManMVC.Models
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public MovType()
         {
-            this.StockMov = new HashSet<StockMov>();
+            this.ItemFlux = new HashSet<ItemFlux>();
         }
     
         public string ID { get; set; }
         public string Descr { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<StockMov> StockMov { get; set; }
+        public virtual ICollection<ItemFlux> ItemFlux { get; set; }
     }
 }
diff --git a/StockManMVC/Models/PartialClasses.cs b/StockManMVC/Models/PartialClasses.cs
new file mode 100644
index 0000000..0f581f1
--- /dev/null
+++ b/StockManMVC/Models/PartialClasses.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Web;
+
+namespace StockManMVC.Models
+{
+    [MetadataType(typeof(ItemsMetadata))]
+    public partial class Items
+    {
+    }
+    [MetadataType(typeof(StocksMetadata))]
+    public partial class Stocks
+    {
+    }
+
+    //[MetadataType(typeof(EnrollmentMetadata))] 
+    //public partial class Enrollment 
+    //{ 
+    //} 
+}
\ No newline at end of file
diff --git a/StockManMVC/Models/SMModel.Context.cs b/StockManMVC/Models/SMModel.Context.cs
index 4e01a61..6f24c0e 100644
--- a/StockManMVC/Models/SMModel.Context.cs
+++ b/StockManMVC/Models/SMModel.Context.cs
@@ -25,11 +25,13 @@ namespace StockManMVC.Models
             throw new UnintentionalCodeFirstException();
         }
     
+        public virtual DbSet<Item> Item { get; set; }
+        public virtual DbSet<ItemFlux> ItemFlux { get; set; }
+        public virtual DbSet<ItemStock> ItemStock { get; set; }
         public virtual DbSet<Location> Location { get; set; }
         public virtual DbSet<LocType> LocType { get; set; }
         public virtual DbSet<MovType> MovType { get; set; }
-        public virtual DbSet<Items> Items { get; set; }
-        public virtual DbSet<Stock> Stock { get; set; }
-        public virtual DbSet<StockMov> StockMov { get; set; }
+        public virtual DbSet<vItemFlux2Save> vItemFlux2Save { get; set; }
+        public virtual DbSet<vLocationVal> vLocationVal { get; set; }
     }
 }
diff --git a/StockManMVC/Models/SMModel.edmx b/StockManMVC/Models/SMModel.edmx
index a994c33..94c4878 100644
--- a/StockManMVC/Models/SMModel.edmx
+++ b/StockManMVC/Models/SMModel.edmx
@@ -5,19 +5,46 @@
     <!-- SSDL content -->
     <edmx:StorageModels>
     <Schema Namespace="StockManModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
-        <EntityType Name="Items">
+        <EntityType Name="Item">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="Descr" Type="nvarchar" MaxLength="250" Nullable="false" />
-          <Property Name="Family" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="DescrExt" Type="nvarchar" MaxLength="250" Nullable="false" />
-          <Property Name="CodExt" Type="nvarchar" MaxLength="250" Nullable="false" />
           <Property Name="CodInt" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="Family" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="CodExt" Type="nvarchar" MaxLength="250" Nullable="false" />
+          <Property Name="DescrExt" Type="nvarchar" MaxLength="250" Nullable="false" />
           <Property Name="QtaMin" Type="int" Nullable="false" />
           <Property Name="QtaBatch" Type="int" Nullable="false" />
-          <Property Name="Value" Type="decimal" Precision="18" Scale="6" Nullable="false" />
+          <Property Name="CurrValue" Type="decimal" Precision="18" Scale="6" Nullable="false" />
+        </EntityType>
+        <EntityType Name="ItemFlux">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="ItemID" Type="int" Nullable="false" />
+          <Property Name="LocationID" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="MovTypeID" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="ExtLocationID" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="dtMov" Type="datetime" Nullable="false" />
+          <Property Name="Qta" Type="int" Nullable="false" />
+          <Property Name="TotValue" Type="decimal" Precision="18" Scale="6" Nullable="false" />
+          <Property Name="UnitVal" Type="decimal" Precision="29" Scale="17" StoreGeneratedPattern="Computed" />
+          <Property Name="Note" Type="nvarchar" MaxLength="250" Nullable="false" />
+          <Property Name="dtExport" Type="datetime" />
+        </EntityType>
+        <EntityType Name="ItemStock">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="ItemID" Type="int" Nullable="false" />
+          <Property Name="LocationID" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="QtyConf" Type="int" Nullable="false" />
+          <Property Name="Note" Type="nvarchar(max)" Nullable="false" />
+          <Property Name="dtLastUpd" Type="datetime" Nullable="false" />
         </EntityType>
         <EntityType Name="Location">
           <Key>
@@ -32,7 +59,10 @@
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="varchar" MaxLength="50" Nullable="false" />
-          <Property Name="Descr" Type="nvarchar" MaxLength="250" />
+          <Property Name="Descr" Type="nvarchar" MaxLength="250" Nullable="false" />
+          <Property Name="IsStock" Type="bit" Nullable="false" />
+          <Property Name="IsCli" Type="bit" Nullable="false" />
+          <Property Name="IsFor" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="MovType">
           <Key>
@@ -41,31 +71,49 @@
           <Property Name="ID" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="Descr" Type="nvarchar" MaxLength="250" Nullable="false" />
         </EntityType>
-        <EntityType Name="Stock">
+        <!--Errors Found During Generation:
+warning 6002: The table/view 'StockMan.dbo.vItemFlux2Save' does not have a primary key defined. The key has been inferred and the definition was created as a read-only table/view.-->
+        <EntityType Name="vItemFlux2Save">
           <Key>
             <PropertyRef Name="ItemID" />
-            <PropertyRef Name="LocationID" />
           </Key>
           <Property Name="ItemID" Type="int" Nullable="false" />
-          <Property Name="LocationID" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="QtyConf" Type="int" Nullable="false" />
-          <Property Name="Note" Type="nvarchar(max)" Nullable="false" />
-          <Property Name="dtLastUpd" Type="datetime" />
+          <Property Name="TotQta" Type="int" />
+          <Property Name="TotVal" Type="decimal" Precision="38" Scale="6" />
         </EntityType>
-        <EntityType Name="StockMov">
+        <!--Errors Found During Generation:
+warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary key defined. The key has been inferred and the definition was created as a read-only table/view.-->
+        <EntityType Name="vLocationVal">
           <Key>
-            <PropertyRef Name="ItemID" />
             <PropertyRef Name="LocationID" />
-            <PropertyRef Name="dtMov" />
           </Key>
-          <Property Name="ItemID" Type="int" Nullable="false" />
           <Property Name="LocationID" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="dtMov" Type="datetime" Nullable="false" />
-          <Property Name="Qta" Type="int" Nullable="false" />
-          <Property Name="Note" Type="nvarchar" MaxLength="250" Nullable="false" />
-          <Property Name="dtExport" Type="datetime" />
-          <Property Name="MovTypeID" Type="nvarchar" MaxLength="50" />
+          <Property Name="TotVal" Type="decimal" Precision="38" Scale="6" />
         </EntityType>
+        <Association Name="FK_ItemFlux_Item">
+          <End Role="Item" Type="Self.Item" Multiplicity="1" />
+          <End Role="ItemFlux" Type="Self.ItemFlux" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Item">
+              <PropertyRef Name="ID" />
+            </Principal>
+            <Dependent Role="ItemFlux">
+              <PropertyRef Name="ItemID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ItemFlux_Location">
+          <End Role="Location" Type="Self.Location" Multiplicity="1" />
+          <End Role="ItemFlux" Type="Self.ItemFlux" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Location">
+              <PropertyRef Name="ID" />
+            </Principal>
+            <Dependent Role="ItemFlux">
+              <PropertyRef Name="LocationID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_Location_LocType1">
           <End Role="LocType" Type="Self.LocType" Multiplicity="1" />
           <End Role="Location" Type="Self.Location" Multiplicity="*" />
@@ -79,81 +127,84 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_Stock_Items">
-          <End Role="Items" Type="Self.Items" Multiplicity="1" />
-          <End Role="Stock" Type="Self.Stock" Multiplicity="*" />
+          <End Role="Item" Type="Self.Item" Multiplicity="1" />
+          <End Role="ItemStock" Type="Self.ItemStock" Multiplicity="*" />
           <ReferentialConstraint>
-            <Principal Role="Items">
+            <Principal Role="Item">
               <PropertyRef Name="ID" />
             </Principal>
-            <Dependent Role="Stock">
+            <Dependent Role="ItemStock">
               <PropertyRef Name="ItemID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_Stock_Location1">
           <End Role="Location" Type="Self.Location" Multiplicity="1" />
-          <End Role="Stock" Type="Self.Stock" Multiplicity="*" />
+          <End Role="ItemStock" Type="Self.ItemStock" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Location">
               <PropertyRef Name="ID" />
             </Principal>
-            <Dependent Role="Stock">
+            <Dependent Role="ItemStock">
               <PropertyRef Name="LocationID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_StockMov_MovType">
-          <End Role="MovType" Type="Self.MovType" Multiplicity="0..1" />
-          <End Role="StockMov" Type="Self.StockMov" Multiplicity="*" />
+          <End Role="MovType" Type="Self.MovType" Multiplicity="1" />
+          <End Role="ItemFlux" Type="Self.ItemFlux" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="MovType">
               <PropertyRef Name="ID" />
             </Principal>
-            <Dependent Role="StockMov">
+            <Dependent Role="ItemFlux">
               <PropertyRef Name="MovTypeID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_StockMov_Stock">
-          <End Role="Stock" Type="Self.Stock" Multiplicity="1" />
-          <End Role="StockMov" Type="Self.StockMov" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="Stock">
-              <PropertyRef Name="ItemID" />
-              <PropertyRef Name="LocationID" />
-            </Principal>
-            <Dependent Role="StockMov">
-              <PropertyRef Name="ItemID" />
-              <PropertyRef Name="LocationID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <EntityContainer Name="StockManModelStoreContainer">
-          <EntitySet Name="Items" EntityType="Self.Items" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="Item" EntityType="Self.Item" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="ItemFlux" EntityType="Self.ItemFlux" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="ItemStock" EntityType="Self.ItemStock" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Location" EntityType="Self.Location" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="LocType" EntityType="Self.LocType" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MovType" EntityType="Self.MovType" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="Stock" EntityType="Self.Stock" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="StockMov" EntityType="Self.StockMov" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="vItemFlux2Save" EntityType="Self.vItemFlux2Save" store:Type="Views" store:Schema="dbo">
+            <DefiningQuery>SELECT 
+    [vItemFlux2Save].[ItemID] AS [ItemID], 
+    [vItemFlux2Save].[TotQta] AS [TotQta], 
+    [vItemFlux2Save].[TotVal] AS [TotVal]
+    FROM [dbo].[vItemFlux2Save] AS [vItemFlux2Save]</DefiningQuery>
+          </EntitySet>
+          <EntitySet Name="vLocationVal" EntityType="Self.vLocationVal" store:Type="Views" store:Schema="dbo">
+            <DefiningQuery>SELECT 
+    [vLocationVal].[LocationID] AS [LocationID], 
+    [vLocationVal].[TotVal] AS [TotVal]
+    FROM [dbo].[vLocationVal] AS [vLocationVal]</DefiningQuery>
+          </EntitySet>
+          <AssociationSet Name="FK_ItemFlux_Item" Association="Self.FK_ItemFlux_Item">
+            <End Role="Item" EntitySet="Item" />
+            <End Role="ItemFlux" EntitySet="ItemFlux" />
+          </AssociationSet>
+          <AssociationSet Name="FK_ItemFlux_Location" Association="Self.FK_ItemFlux_Location">
+            <End Role="Location" EntitySet="Location" />
+            <End Role="ItemFlux" EntitySet="ItemFlux" />
+          </AssociationSet>
           <AssociationSet Name="FK_Location_LocType1" Association="Self.FK_Location_LocType1">
             <End Role="LocType" EntitySet="LocType" />
             <End Role="Location" EntitySet="Location" />
           </AssociationSet>
           <AssociationSet Name="FK_Stock_Items" Association="Self.FK_Stock_Items">
-            <End Role="Items" EntitySet="Items" />
-            <End Role="Stock" EntitySet="Stock" />
+            <End Role="Item" EntitySet="Item" />
+            <End Role="ItemStock" EntitySet="ItemStock" />
           </AssociationSet>
           <AssociationSet Name="FK_Stock_Location1" Association="Self.FK_Stock_Location1">
             <End Role="Location" EntitySet="Location" />
-            <End Role="Stock" EntitySet="Stock" />
+            <End Role="ItemStock" EntitySet="ItemStock" />
           </AssociationSet>
           <AssociationSet Name="FK_StockMov_MovType" Association="Self.FK_StockMov_MovType">
             <End Role="MovType" EntitySet="MovType" />
-            <End Role="StockMov" EntitySet="StockMov" />
-          </AssociationSet>
-          <AssociationSet Name="FK_StockMov_Stock" Association="Self.FK_StockMov_Stock">
-            <End Role="Stock" EntitySet="Stock" />
-            <End Role="StockMov" EntitySet="StockMov" />
+            <End Role="ItemFlux" EntitySet="ItemFlux" />
           </AssociationSet>
         </EntityContainer>
       </Schema></edmx:StorageModels>
@@ -161,33 +212,87 @@
     <edmx:ConceptualModels>
       <Schema Namespace="StockManModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
         <EntityContainer Name="StockManEntities" annotation:LazyLoadingEnabled="true" >
+          <EntitySet Name="Item" EntityType="StockManModel.Item" />
+          <EntitySet Name="ItemFlux" EntityType="StockManModel.ItemFlux" />
+          <EntitySet Name="ItemStock" EntityType="StockManModel.ItemStock" />
           <EntitySet Name="Location" EntityType="StockManModel.Location" />
           <EntitySet Name="LocType" EntityType="StockManModel.LocType" />
           <EntitySet Name="MovType" EntityType="StockManModel.MovType" />
-          <AssociationSet Name="FK_Location_LocType" Association="StockManModel.FK_Location_LocType">
-            <End Role="LocType" EntitySet="LocType" />
-            <End Role="Location" EntitySet="Location" />
+          <EntitySet Name="vItemFlux2Save" EntityType="StockManModel.vItemFlux2Save" />
+          <EntitySet Name="vLocationVal" EntityType="StockManModel.vLocationVal" />
+          <AssociationSet Name="FK_ItemFlux_Item" Association="StockManModel.FK_ItemFlux_Item">
+            <End Role="Item" EntitySet="Item" />
+            <End Role="ItemFlux" EntitySet="ItemFlux" />
           </AssociationSet>
-          <EntitySet Name="Items" EntityType="StockManModel.Items" />
-          <EntitySet Name="Stock" EntityType="StockManModel.Stock" />
-          <EntitySet Name="StockMov" EntityType="StockManModel.StockMov" />
           <AssociationSet Name="FK_Stock_Items" Association="StockManModel.FK_Stock_Items">
-            <End Role="Items" EntitySet="Items" />
-            <End Role="Stock" EntitySet="Stock" />
+            <End Role="Item" EntitySet="Item" />
+            <End Role="ItemStock" EntitySet="ItemStock" />
           </AssociationSet>
-          <AssociationSet Name="FK_Stock_Location1" Association="StockManModel.FK_Stock_Location1">
+          <AssociationSet Name="FK_ItemFlux_Location" Association="StockManModel.FK_ItemFlux_Location">
             <End Role="Location" EntitySet="Location" />
-            <End Role="Stock" EntitySet="Stock" />
+            <End Role="ItemFlux" EntitySet="ItemFlux" />
           </AssociationSet>
           <AssociationSet Name="FK_StockMov_MovType" Association="StockManModel.FK_StockMov_MovType">
             <End Role="MovType" EntitySet="MovType" />
-            <End Role="StockMov" EntitySet="StockMov" />
+            <End Role="ItemFlux" EntitySet="ItemFlux" />
           </AssociationSet>
-          <AssociationSet Name="FK_StockMov_Stock" Association="StockManModel.FK_StockMov_Stock">
-            <End Role="Stock" EntitySet="Stock" />
-            <End Role="StockMov" EntitySet="StockMov" />
+          <AssociationSet Name="FK_Stock_Location1" Association="StockManModel.FK_Stock_Location1">
+            <End Role="Location" EntitySet="Location" />
+            <End Role="ItemStock" EntitySet="ItemStock" />
+          </AssociationSet>
+          <AssociationSet Name="FK_Location_LocType1" Association="StockManModel.FK_Location_LocType1">
+            <End Role="LocType" EntitySet="LocType" />
+            <End Role="Location" EntitySet="Location" />
           </AssociationSet>
         </EntityContainer>
+        <EntityType Name="Item">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="Descr" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
+          <Property Name="CodInt" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="Family" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="CodExt" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
+          <Property Name="DescrExt" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
+          <Property Name="QtaMin" Type="Int32" Nullable="false" />
+          <Property Name="QtaBatch" Type="Int32" Nullable="false" />
+          <Property Name="CurrValue" Type="Decimal" Nullable="false" Precision="18" Scale="6" />
+          <NavigationProperty Name="ItemFlux" Relationship="StockManModel.FK_ItemFlux_Item" FromRole="Item" ToRole="ItemFlux" />
+          <NavigationProperty Name="ItemStock" Relationship="StockManModel.FK_Stock_Items" FromRole="Item" ToRole="ItemStock" />
+        </EntityType>
+        <EntityType Name="ItemFlux">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="ItemID" Type="Int32" Nullable="false" />
+          <Property Name="LocationID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="MovTypeID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="ExtLocationID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="dtMov" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="Qta" Type="Int32" Nullable="false" />
+          <Property Name="TotValue" Type="Decimal" Nullable="false" Precision="18" Scale="6" />
+          <Property Name="UnitVal" Type="Decimal" Precision="29" Scale="17" annotation:StoreGeneratedPattern="Computed" />
+          <Property Name="Note" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
+          <Property Name="dtExport" Type="DateTime" Precision="3" />
+          <NavigationProperty Name="Item" Relationship="StockManModel.FK_ItemFlux_Item" FromRole="ItemFlux" ToRole="Item" />
+          <NavigationProperty Name="Location" Relationship="StockManModel.FK_ItemFlux_Location" FromRole="ItemFlux" ToRole="Location" />
+          <NavigationProperty Name="MovType" Relationship="StockManModel.FK_StockMov_MovType" FromRole="ItemFlux" ToRole="MovType" />
+        </EntityType>
+        <EntityType Name="ItemStock">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="ItemID" Type="Int32" Nullable="false" />
+          <Property Name="LocationID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="QtyConf" Type="Int32" Nullable="false" />
+          <Property Name="Note" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="dtLastUpd" Type="DateTime" Nullable="false" Precision="3" />
+          <NavigationProperty Name="Item" Relationship="StockManModel.FK_Stock_Items" FromRole="ItemStock" ToRole="Item" />
+          <NavigationProperty Name="Location" Relationship="StockManModel.FK_Stock_Location1" FromRole="ItemStock" ToRole="Location" />
+        </EntityType>
         <EntityType Name="Location">
           <Key>
             <PropertyRef Name="ID" />
@@ -195,16 +300,20 @@
           <Property Name="ID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="Descr" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="LocTypeID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
-          <NavigationProperty Name="LocType" Relationship="StockManModel.FK_Location_LocType" FromRole="Location" ToRole="LocType" />
-          <NavigationProperty Name="Stock" Relationship="StockManModel.FK_Stock_Location1" FromRole="Location" ToRole="Stock" />
-          </EntityType>
+          <NavigationProperty Name="ItemFlux" Relationship="StockManModel.FK_ItemFlux_Location" FromRole="Location" ToRole="ItemFlux" />
+          <NavigationProperty Name="ItemStock" Relationship="StockManModel.FK_Stock_Location1" FromRole="Location" ToRole="ItemStock" />
+          <NavigationProperty Name="LocType" Relationship="StockManModel.FK_Location_LocType1" FromRole="Location" ToRole="LocType" />
+        </EntityType>
         <EntityType Name="LocType">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="Descr" Type="String" MaxLength="250" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="Location" Relationship="StockManModel.FK_Location_LocType" FromRole="LocType" ToRole="Location" />
+          <Property Name="Descr" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
+          <Property Name="IsStock" Type="Boolean" Nullable="false" />
+          <Property Name="IsCli" Type="Boolean" Nullable="false" />
+          <Property Name="IsFor" Type="Boolean" Nullable="false" />
+          <NavigationProperty Name="Location" Relationship="StockManModel.FK_Location_LocType1" FromRole="LocType" ToRole="Location" />
         </EntityType>
         <EntityType Name="MovType">
           <Key>
@@ -212,9 +321,84 @@
           </Key>
           <Property Name="ID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="Descr" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="StockMov" Relationship="StockManModel.FK_StockMov_MovType" FromRole="MovType" ToRole="StockMov" />
+          <NavigationProperty Name="ItemFlux" Relationship="StockManModel.FK_StockMov_MovType" FromRole="MovType" ToRole="ItemFlux" />
         </EntityType>
-        <Association Name="FK_Location_LocType">
+        <EntityType Name="vItemFlux2Save">
+          <Key>
+            <PropertyRef Name="ItemID" />
+          </Key>
+          <Property Name="ItemID" Type="Int32" Nullable="false" />
+          <Property Name="TotQta" Type="Int32" />
+          <Property Name="TotVal" Type="Decimal" Precision="38" Scale="6" />
+        </EntityType>
+        <EntityType Name="vLocationVal">
+          <Key>
+            <PropertyRef Name="LocationID" />
+          </Key>
+          <Property Name="LocationID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="TotVal" Type="Decimal" Precision="38" Scale="6" />
+        </EntityType>
+        <Association Name="FK_ItemFlux_Item">
+          <End Type="StockManModel.Item" Role="Item" Multiplicity="1" />
+          <End Type="StockManModel.ItemFlux" Role="ItemFlux" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Item">
+              <PropertyRef Name="ID" />
+            </Principal>
+            <Dependent Role="ItemFlux">
+              <PropertyRef Name="ItemID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_Stock_Items">
+          <End Type="StockManModel.Item" Role="Item" Multiplicity="1" />
+          <End Type="StockManModel.ItemStock" Role="ItemStock" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Item">
+              <PropertyRef Name="ID" />
+            </Principal>
+            <Dependent Role="ItemStock">
+              <PropertyRef Name="ItemID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_ItemFlux_Location">
+          <End Type="StockManModel.Location" Role="Location" Multiplicity="1" />
+          <End Type="StockManModel.ItemFlux" Role="ItemFlux" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Location">
+              <PropertyRef Name="ID" />
+            </Principal>
+            <Dependent Role="ItemFlux">
+              <PropertyRef Name="LocationID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_StockMov_MovType">
+          <End Type="StockManModel.MovType" Role="MovType" Multiplicity="1" />
+          <End Type="StockManModel.ItemFlux" Role="ItemFlux" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="MovType">
+              <PropertyRef Name="ID" />
+            </Principal>
+            <Dependent Role="ItemFlux">
+              <PropertyRef Name="MovTypeID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_Stock_Location1">
+          <End Type="StockManModel.Location" Role="Location" Multiplicity="1" />
+          <End Type="StockManModel.ItemStock" Role="ItemStock" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Location">
+              <PropertyRef Name="ID" />
+            </Principal>
+            <Dependent Role="ItemStock">
+              <PropertyRef Name="LocationID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_Location_LocType1">
           <End Type="StockManModel.LocType" Role="LocType" Multiplicity="1" />
           <End Type="StockManModel.Location" Role="Location" Multiplicity="*" />
           <ReferentialConstraint>
@@ -226,107 +410,56 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityType Name="Items">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="Descr" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
-          <Property Name="Family" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="DescrExt" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
-          <Property Name="CodExt" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
-          <Property Name="CodInt" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="QtaMin" Type="Int32" Nullable="false" />
-          <Property Name="QtaBatch" Type="Int32" Nullable="false" />
-          <Property Name="Value" Type="Decimal" Nullable="false" Precision="18" Scale="6" />
-          <NavigationProperty Name="Stock" Relationship="StockManModel.FK_Stock_Items" FromRole="Items" ToRole="Stock" />
-        </EntityType>
-        <EntityType Name="Stock">
-          <Key>
-            <PropertyRef Name="ItemID" />
-            <PropertyRef Name="LocationID" />
-          </Key>
-          <Property Name="ItemID" Type="Int32" Nullable="false" />
-          <Property Name="LocationID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="QtyConf" Type="Int32" Nullable="false" />
-          <Property Name="Note" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="dtLastUpd" Type="DateTime" Precision="3" />
-          <NavigationProperty Name="Items" Relationship="StockManModel.FK_Stock_Items" FromRole="Stock" ToRole="Items" />
-          <NavigationProperty Name="Location" Relationship="StockManModel.FK_Stock_Location1" FromRole="Stock" ToRole="Location" />
-          <NavigationProperty Name="StockMov" Relationship="StockManModel.FK_StockMov_Stock" FromRole="Stock" ToRole="StockMov" />
-        </EntityType>
-        <EntityType Name="StockMov">
-          <Key>
-            <PropertyRef Name="ItemID" />
-            <PropertyRef Name="LocationID" />
-            <PropertyRef Name="dtMov" />
-          </Key>
-          <Property Name="ItemID" Type="Int32" Nullable="false" />
-          <Property Name="LocationID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="dtMov" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="Qta" Type="Int32" Nullable="false" />
-          <Property Name="Note" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
-          <Property Name="dtExport" Type="DateTime" Precision="3" />
-          <Property Name="MovTypeID" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="MovType" Relationship="StockManModel.FK_StockMov_MovType" FromRole="StockMov" ToRole="MovType" />
-          <NavigationProperty Name="Stock" Relationship="StockManModel.FK_StockMov_Stock" FromRole="StockMov" ToRole="Stock" />
-        </EntityType>
-        <Association Name="FK_Stock_Items">
-          <End Type="StockManModel.Items" Role="Items" Multiplicity="1" />
-          <End Type="StockManModel.Stock" Role="Stock" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="Items">
-              <PropertyRef Name="ID" />
-            </Principal>
-            <Dependent Role="Stock">
-              <PropertyRef Name="ItemID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_Stock_Location1">
-          <End Type="StockManModel.Location" Role="Location" Multiplicity="1" />
-          <End Type="StockManModel.Stock" Role="Stock" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="Location">
-              <PropertyRef Name="ID" />
-            </Principal>
-            <Dependent Role="Stock">
-              <PropertyRef Name="LocationID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_StockMov_MovType">
-          <End Type="StockManModel.MovType" Role="MovType" Multiplicity="0..1" />
-          <End Type="StockManModel.StockMov" Role="StockMov" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="MovType">
-              <PropertyRef Name="ID" />
-            </Principal>
-            <Dependent Role="StockMov">
-              <PropertyRef Name="MovTypeID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_StockMov_Stock">
-          <End Type="StockManModel.Stock" Role="Stock" Multiplicity="1" />
-          <End Type="StockManModel.StockMov" Role="StockMov" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="Stock">
-              <PropertyRef Name="ItemID" />
-              <PropertyRef Name="LocationID" />
-            </Principal>
-            <Dependent Role="StockMov">
-              <PropertyRef Name="ItemID" />
-              <PropertyRef Name="LocationID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-      </Schema>
+        </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
     <edmx:Mappings>
       <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
         <EntityContainerMapping StorageEntityContainer="StockManModelStoreContainer" CdmEntityContainer="StockManEntities" >
+          <EntitySetMapping Name="Item">
+            <EntityTypeMapping TypeName="StockManModel.Item">
+              <MappingFragment StoreEntitySet="Item">
+                <ScalarProperty Name="CurrValue" ColumnName="CurrValue" />
+                <ScalarProperty Name="QtaBatch" ColumnName="QtaBatch" />
+                <ScalarProperty Name="QtaMin" ColumnName="QtaMin" />
+                <ScalarProperty Name="DescrExt" ColumnName="DescrExt" />
+                <ScalarProperty Name="CodExt" ColumnName="CodExt" />
+                <ScalarProperty Name="Family" ColumnName="Family" />
+                <ScalarProperty Name="CodInt" ColumnName="CodInt" />
+                <ScalarProperty Name="Descr" ColumnName="Descr" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="ItemFlux">
+            <EntityTypeMapping TypeName="StockManModel.ItemFlux">
+              <MappingFragment StoreEntitySet="ItemFlux">
+                <ScalarProperty Name="dtExport" ColumnName="dtExport" />
+                <ScalarProperty Name="Note" ColumnName="Note" />
+                <ScalarProperty Name="UnitVal" ColumnName="UnitVal" />
+                <ScalarProperty Name="TotValue" ColumnName="TotValue" />
+                <ScalarProperty Name="Qta" ColumnName="Qta" />
+                <ScalarProperty Name="dtMov" ColumnName="dtMov" />
+                <ScalarProperty Name="ExtLocationID" ColumnName="ExtLocationID" />
+                <ScalarProperty Name="MovTypeID" ColumnName="MovTypeID" />
+                <ScalarProperty Name="LocationID" ColumnName="LocationID" />
+                <ScalarProperty Name="ItemID" ColumnName="ItemID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="ItemStock">
+            <EntityTypeMapping TypeName="StockManModel.ItemStock">
+              <MappingFragment StoreEntitySet="ItemStock">
+                <ScalarProperty Name="dtLastUpd" ColumnName="dtLastUpd" />
+                <ScalarProperty Name="Note" ColumnName="Note" />
+                <ScalarProperty Name="QtyConf" ColumnName="QtyConf" />
+                <ScalarProperty Name="LocationID" ColumnName="LocationID" />
+                <ScalarProperty Name="ItemID" ColumnName="ItemID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="Location">
             <EntityTypeMapping TypeName="StockManModel.Location">
               <MappingFragment StoreEntitySet="Location">
@@ -339,6 +472,9 @@
           <EntitySetMapping Name="LocType">
             <EntityTypeMapping TypeName="StockManModel.LocType">
               <MappingFragment StoreEntitySet="LocType">
+                <ScalarProperty Name="IsFor" ColumnName="IsFor" />
+                <ScalarProperty Name="IsCli" ColumnName="IsCli" />
+                <ScalarProperty Name="IsStock" ColumnName="IsStock" />
                 <ScalarProperty Name="Descr" ColumnName="Descr" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
               </MappingFragment>
@@ -352,42 +488,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="Items">
-            <EntityTypeMapping TypeName="StockManModel.Items">
-              <MappingFragment StoreEntitySet="Items">
-                <ScalarProperty Name="Value" ColumnName="Value" />
-                <ScalarProperty Name="QtaBatch" ColumnName="QtaBatch" />
-                <ScalarProperty Name="QtaMin" ColumnName="QtaMin" />
-                <ScalarProperty Name="CodInt" ColumnName="CodInt" />
-                <ScalarProperty Name="CodExt" ColumnName="CodExt" />
-                <ScalarProperty Name="DescrExt" ColumnName="DescrExt" />
-                <ScalarProperty Name="Family" ColumnName="Family" />
-                <ScalarProperty Name="Descr" ColumnName="Descr" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="Stock">
-            <EntityTypeMapping TypeName="StockManModel.Stock">
-              <MappingFragment StoreEntitySet="Stock">
-                <ScalarProperty Name="dtLastUpd" ColumnName="dtLastUpd" />
-                <ScalarProperty Name="Note" ColumnName="Note" />
-                <ScalarProperty Name="QtyConf" ColumnName="QtyConf" />
-                <ScalarProperty Name="LocationID" ColumnName="LocationID" />
+          <EntitySetMapping Name="vItemFlux2Save">
+            <EntityTypeMapping TypeName="StockManModel.vItemFlux2Save">
+              <MappingFragment StoreEntitySet="vItemFlux2Save">
+                <ScalarProperty Name="TotVal" ColumnName="TotVal" />
+                <ScalarProperty Name="TotQta" ColumnName="TotQta" />
                 <ScalarProperty Name="ItemID" ColumnName="ItemID" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="StockMov">
-            <EntityTypeMapping TypeName="StockManModel.StockMov">
-              <MappingFragment StoreEntitySet="StockMov">
-                <ScalarProperty Name="MovTypeID" ColumnName="MovTypeID" />
-                <ScalarProperty Name="dtExport" ColumnName="dtExport" />
-                <ScalarProperty Name="Note" ColumnName="Note" />
-                <ScalarProperty Name="Qta" ColumnName="Qta" />
-                <ScalarProperty Name="dtMov" ColumnName="dtMov" />
+          <EntitySetMapping Name="vLocationVal">
+            <EntityTypeMapping TypeName="StockManModel.vLocationVal">
+              <MappingFragment StoreEntitySet="vLocationVal">
+                <ScalarProperty Name="TotVal" ColumnName="TotVal" />
                 <ScalarProperty Name="LocationID" ColumnName="LocationID" />
-                <ScalarProperty Name="ItemID" ColumnName="ItemID" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
diff --git a/StockManMVC/Models/SMModel.edmx.diagram b/StockManMVC/Models/SMModel.edmx.diagram
index b551bdc..cf8331c 100644
--- a/StockManMVC/Models/SMModel.edmx.diagram
+++ b/StockManMVC/Models/SMModel.edmx.diagram
@@ -5,18 +5,21 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="90fba38c44f34d7a9b6bcfa5e573a90c" Name="Diagram1" >
-        <EntityTypeShape EntityType="StockManModel.Location" Width="1.5" PointX="3" PointY="1.375" />
-        <EntityTypeShape EntityType="StockManModel.LocType" Width="1.5" PointX="0.75" PointY="1.5" />
-        <EntityTypeShape EntityType="StockManModel.MovType" Width="1.5" PointX="5.25" PointY="5.5" />
-        <AssociationConnector Association="StockManModel.FK_Location_LocType" />
-        <EntityTypeShape EntityType="StockManModel.Items" Width="1.5" PointX="1.125" PointY="4.875" />
-        <EntityTypeShape EntityType="StockManModel.Stock" Width="1.5" PointX="5.25" PointY="1.375" />
-        <EntityTypeShape EntityType="StockManModel.StockMov" Width="1.5" PointX="7.5" PointY="2.875" />
+        <EntityTypeShape EntityType="StockManModel.Item" Width="1.5" PointX="3.25" PointY="0.5" />
+        <EntityTypeShape EntityType="StockManModel.ItemFlux" Width="1.5" PointX="5.5" PointY="4.375" />
+        <EntityTypeShape EntityType="StockManModel.ItemStock" Width="1.5" PointX="1" PointY="1.75" />
+        <EntityTypeShape EntityType="StockManModel.Location" Width="1.5" PointX="3.25" PointY="5.125" />
+        <EntityTypeShape EntityType="StockManModel.LocType" Width="1.5" PointX="1" PointY="5.125" />
+        <EntityTypeShape EntityType="StockManModel.MovType" Width="1.5" PointX="3.25" PointY="7.75" />
+        <EntityTypeShape EntityType="StockManModel.vItemFlux2Save" Width="1.5" PointX="10.375" PointY="4" />
+        <EntityTypeShape EntityType="StockManModel.vLocationVal" Width="1.5" PointX="10.375" PointY="2.25" />
+        <AssociationConnector Association="StockManModel.FK_ItemFlux_Item" />
         <AssociationConnector Association="StockManModel.FK_Stock_Items" />
-        <AssociationConnector Association="StockManModel.FK_Stock_Location1" />
+        <AssociationConnector Association="StockManModel.FK_ItemFlux_Location" />
         <AssociationConnector Association="StockManModel.FK_StockMov_MovType" />
-        <AssociationConnector Association="StockManModel.FK_StockMov_Stock" />
-        </Diagram>
+        <AssociationConnector Association="StockManModel.FK_Stock_Location1" />
+        <AssociationConnector Association="StockManModel.FK_Location_LocType1" />
+      </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
 </edmx:Edmx>
\ No newline at end of file
diff --git a/StockManMVC/Models/vItemFlux2Save.cs b/StockManMVC/Models/vItemFlux2Save.cs
new file mode 100644
index 0000000..82d0184
--- /dev/null
+++ b/StockManMVC/Models/vItemFlux2Save.cs
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace StockManMVC.Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class vItemFlux2Save
+    {
+        public int ItemID { get; set; }
+        public Nullable<int> TotQta { get; set; }
+        public Nullable<decimal> TotVal { get; set; }
+    }
+}
diff --git a/StockManMVC/Models/vLocationVal.cs b/StockManMVC/Models/vLocationVal.cs
new file mode 100644
index 0000000..e2c4769
--- /dev/null
+++ b/StockManMVC/Models/vLocationVal.cs
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace StockManMVC.Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class vLocationVal
+    {
+        public string LocationID { get; set; }
+        public Nullable<decimal> TotVal { get; set; }
+    }
+}
diff --git a/StockManMVC/Properties/PublishProfiles/IIS01.pubxml b/StockManMVC/Properties/PublishProfiles/IIS01.pubxml
new file mode 100644
index 0000000..c3192e8
--- /dev/null
+++ b/StockManMVC/Properties/PublishProfiles/IIS01.pubxml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <PrecompileBeforePublish>True</PrecompileBeforePublish>
+    <EnableUpdateable>True</EnableUpdateable>
+    <DebugSymbols>False</DebugSymbols>
+    <WDPMergeOption>DonotMerge</WDPMergeOption>
+    <ExcludeApp_Data>True</ExcludeApp_Data>
+    <MSDeployServiceURL>https://IIS01:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/StockMan</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>True</EnableMSDeployBackup>
+    <UserName>steamw\administrator</UserName>
+    <_SavePWD>True</_SavePWD>
+    <PublishDatabaseSettings>
+      <Objects xmlns="">
+        <ObjectGroup Name="StockManEntities" Order="1" Enabled="False">
+          <Destination Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+          <Object Type="DbCodeFirst">
+            <Source Path="DBContext" DbContext="StockManMVC.Models.StockManEntities, StockManMVC" Origin="Configuration" />
+          </Object>
+        </ObjectGroup>
+      </Objects>
+    </PublishDatabaseSettings>
+  </PropertyGroup>
+  <ItemGroup>
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)StockManEntities-Web.config Connection String">
+      <ParameterValue>metadata=res://*/Models.SMModel.csdl|res://*/Models.SMModel.ssdl|res://*/Models.SMModel.msl;provider=System.Data.SqlClient;provider connection string="Data Source=SQL-STEAM\SQL2012;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer"</ParameterValue>
+      <UpdateDestWebConfig>False</UpdateDestWebConfig>
+    </MSDeployParameterValue>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/StockManMVC/Properties/PublishProfiles/IIS01.pubxml.user b/StockManMVC/Properties/PublishProfiles/IIS01.pubxml.user
new file mode 100644
index 0000000..4e81284
--- /dev/null
+++ b/StockManMVC/Properties/PublishProfiles/IIS01.pubxml.user
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAAB0wAoouI5mFgpqPdW4WAs0AAAAAASAAACgAAAAEAAAAFgxGx8deTa0Rn4f7A3EOkAYAAAADATKYJM6fsjZYxcUxK0WU3LwspmiSZ0tFAAAAM1F/OQsTPYeJEHDZD6ydW+CPv1a</EncryptedPassword>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/StockManMVC/Properties/PublishProfiles/IIS02.pubxml b/StockManMVC/Properties/PublishProfiles/IIS02.pubxml
new file mode 100644
index 0000000..3f3cd9d
--- /dev/null
+++ b/StockManMVC/Properties/PublishProfiles/IIS02.pubxml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>True</ExcludeApp_Data>
+    <MSDeployServiceURL>https://IIS02:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/StockMan</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>True</EnableMSDeployBackup>
+    <UserName>steamw\administrator</UserName>
+    <_SavePWD>True</_SavePWD>
+    <PublishDatabaseSettings>
+      <Objects xmlns="">
+        <ObjectGroup Name="StockManEntities" Order="1" Enabled="False">
+          <Destination Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer" />
+          <Object Type="DbCodeFirst">
+            <Source Path="DBContext" DbContext="StockManMVC.Models.StockManEntities, StockManMVC" Origin="Configuration" />
+          </Object>
+        </ObjectGroup>
+      </Objects>
+    </PublishDatabaseSettings>
+    <PrecompileBeforePublish>True</PrecompileBeforePublish>
+    <EnableUpdateable>True</EnableUpdateable>
+    <DebugSymbols>False</DebugSymbols>
+    <WDPMergeOption>DonotMerge</WDPMergeOption>
+  </PropertyGroup>
+  <ItemGroup>
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)StockManEntities-Web.config Connection String">
+      <ParameterValue>metadata=res://*/Models.SMModel.csdl|res://*/Models.SMModel.ssdl|res://*/Models.SMModel.msl;provider=System.Data.SqlClient;provider connection string="Data Source=SQL-STEAM\SQL2012;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer"</ParameterValue>
+      <UpdateDestWebConfig>False</UpdateDestWebConfig>
+    </MSDeployParameterValue>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/StockManMVC/Properties/PublishProfiles/IIS02.pubxml.user b/StockManMVC/Properties/PublishProfiles/IIS02.pubxml.user
new file mode 100644
index 0000000..c900ae5
--- /dev/null
+++ b/StockManMVC/Properties/PublishProfiles/IIS02.pubxml.user
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAAAL4ykoVZpq6VvJoOMfqTDMAAAAAASAAACgAAAAEAAAAHXB2Qfiu7+Q1McLJF7uFbQYAAAAWLATeTGPoE9DeuieMmq4pfynUIyfYz/UFAAAAK9SNIIM14k0UnyiXT5Bgwp/AGYs</EncryptedPassword>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/StockManMVC/StockManMVC.csproj b/StockManMVC/StockManMVC.csproj
index 87652c8..bdf2fbf 100644
--- a/StockManMVC/StockManMVC.csproj
+++ b/StockManMVC/StockManMVC.csproj
@@ -153,17 +153,20 @@
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\ItemsController.cs" />
     <Compile Include="Controllers\LocationsController.cs" />
     <Compile Include="Controllers\LocTypesController.cs" />
     <Compile Include="Controllers\MovTypesController.cs" />
-    <Compile Include="Controllers\StockMovsController.cs" />
-    <Compile Include="Controllers\StocksController.cs" />
     <Compile Include="GlimpseSecurityPolicy.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
-    <Compile Include="Models\Items.cs">
+    <Compile Include="Models\Item.cs">
+      <DependentUpon>SMModel.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Models\ItemFlux.cs">
+      <DependentUpon>SMModel.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Models\ItemStock.cs">
       <DependentUpon>SMModel.tt</DependentUpon>
     </Compile>
     <Compile Include="Models\Location.cs">
@@ -190,10 +193,10 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>SMModel.edmx</DependentUpon>
     </Compile>
-    <Compile Include="Models\Stock.cs">
+    <Compile Include="Models\vItemFlux2Save.cs">
       <DependentUpon>SMModel.tt</DependentUpon>
     </Compile>
-    <Compile Include="Models\StockMov.cs">
+    <Compile Include="Models\vLocationVal.cs">
       <DependentUpon>SMModel.tt</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -234,6 +237,8 @@
     <Content Include="Models\SMModel.edmx.diagram">
       <DependentUpon>SMModel.edmx</DependentUpon>
     </Content>
+    <None Include="Properties\PublishProfiles\IIS01.pubxml" />
+    <None Include="Properties\PublishProfiles\IIS02.pubxml" />
     <None Include="Scripts\jquery-3.1.0.intellisense.js" />
     <Content Include="Scripts\jquery-3.1.0.js" />
     <Content Include="Scripts\jquery-3.1.0.min.js" />
@@ -266,36 +271,21 @@
     <Content Include="Views\Home\About.cshtml" />
     <Content Include="Views\Home\Contact.cshtml" />
     <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Views\LocTypes\Create.cshtml" />
-    <Content Include="Views\LocTypes\Delete.cshtml" />
-    <Content Include="Views\LocTypes\Details.cshtml" />
-    <Content Include="Views\LocTypes\Edit.cshtml" />
-    <Content Include="Views\LocTypes\Index.cshtml" />
     <Content Include="Views\Locations\Create.cshtml" />
     <Content Include="Views\Locations\Delete.cshtml" />
     <Content Include="Views\Locations\Details.cshtml" />
     <Content Include="Views\Locations\Edit.cshtml" />
     <Content Include="Views\Locations\Index.cshtml" />
+    <Content Include="Views\LocTypes\Create.cshtml" />
+    <Content Include="Views\LocTypes\Delete.cshtml" />
+    <Content Include="Views\LocTypes\Details.cshtml" />
+    <Content Include="Views\LocTypes\Edit.cshtml" />
+    <Content Include="Views\LocTypes\Index.cshtml" />
     <Content Include="Views\MovTypes\Create.cshtml" />
     <Content Include="Views\MovTypes\Delete.cshtml" />
     <Content Include="Views\MovTypes\Details.cshtml" />
     <Content Include="Views\MovTypes\Edit.cshtml" />
     <Content Include="Views\MovTypes\Index.cshtml" />
-    <Content Include="Views\Items\Create.cshtml" />
-    <Content Include="Views\Items\Delete.cshtml" />
-    <Content Include="Views\Items\Details.cshtml" />
-    <Content Include="Views\Items\Edit.cshtml" />
-    <Content Include="Views\Items\Index.cshtml" />
-    <Content Include="Views\Stocks\Create.cshtml" />
-    <Content Include="Views\Stocks\Delete.cshtml" />
-    <Content Include="Views\Stocks\Details.cshtml" />
-    <Content Include="Views\Stocks\Edit.cshtml" />
-    <Content Include="Views\Stocks\Index.cshtml" />
-    <Content Include="Views\StockMovs\Create.cshtml" />
-    <Content Include="Views\StockMovs\Delete.cshtml" />
-    <Content Include="Views\StockMovs\Details.cshtml" />
-    <Content Include="Views\StockMovs\Edit.cshtml" />
-    <Content Include="Views\StockMovs\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
diff --git a/StockManMVC/StockManMVC.csproj.user b/StockManMVC/StockManMVC.csproj.user
index a9216ea..eaf680a 100644
--- a/StockManMVC/StockManMVC.csproj.user
+++ b/StockManMVC/StockManMVC.csproj.user
@@ -12,6 +12,8 @@
     <WebStackScaffolding_DbContextTypeFullName>StockManMVC.Models.StockManEntities</WebStackScaffolding_DbContextTypeFullName>
     <WebStackScaffolding_IsViewGenerationSelected>True</WebStackScaffolding_IsViewGenerationSelected>
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
+    <ProjectView>ShowAllFiles</ProjectView>
+    <NameOfLastUsedPublishProfile>IIS01</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
diff --git a/StockManMVC/Views/Items/Create.cshtml b/StockManMVC/Views/Items/Create.cshtml
deleted file mode 100644
index 102ce0e..0000000
--- a/StockManMVC/Views/Items/Create.cshtml
+++ /dev/null
@@ -1,104 +0,0 @@
-@model StockManMVC.Models.Items
-
-@{
-    ViewBag.Title = "Create";
-}
-
-<h2>Create</h2>
-
-
-@using (Html.BeginForm()) 
-{
-    @Html.AntiForgeryToken()
-    
-    <div class="form-horizontal">
-        <h4>Items</h4>
-        <hr />
-        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-        <div class="form-group">
-            @Html.LabelFor(model => model.ID, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.ID, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.ID, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Descr, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Descr, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Descr, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Family, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Family, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Family, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.DescrExt, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.DescrExt, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.DescrExt, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.CodExt, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.CodExt, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.CodExt, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.CodInt, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.CodInt, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.CodInt, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.QtaMin, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.QtaMin, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.QtaMin, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.QtaBatch, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.QtaBatch, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.QtaBatch, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Value, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Value, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Value, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Create" class="btn btn-default" />
-            </div>
-        </div>
-    </div>
-}
-
-<div>
-    @Html.ActionLink("Back to List", "Index")
-</div>
-
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-}
diff --git a/StockManMVC/Views/Items/Delete.cshtml b/StockManMVC/Views/Items/Delete.cshtml
deleted file mode 100644
index 425f7d2..0000000
--- a/StockManMVC/Views/Items/Delete.cshtml
+++ /dev/null
@@ -1,88 +0,0 @@
-@model StockManMVC.Models.Items
-
-@{
-    ViewBag.Title = "Delete";
-}
-
-<h2>Delete</h2>
-
-<h3>Are you sure you want to delete this?</h3>
-<div>
-    <h4>Items</h4>
-    <hr />
-    <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Descr)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Descr)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Family)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Family)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.DescrExt)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.DescrExt)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.CodExt)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.CodExt)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.CodInt)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.CodInt)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.QtaMin)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.QtaMin)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.QtaBatch)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.QtaBatch)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Value)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Value)
-        </dd>
-
-    </dl>
-
-    @using (Html.BeginForm()) {
-        @Html.AntiForgeryToken()
-
-        <div class="form-actions no-color">
-            <input type="submit" value="Delete" class="btn btn-default" /> |
-            @Html.ActionLink("Back to List", "Index")
-        </div>
-    }
-</div>
diff --git a/StockManMVC/Views/Items/Details.cshtml b/StockManMVC/Views/Items/Details.cshtml
deleted file mode 100644
index f2ba8aa..0000000
--- a/StockManMVC/Views/Items/Details.cshtml
+++ /dev/null
@@ -1,116 +0,0 @@
-@model StockManMVC.Models.Items
-
-@{
-    ViewBag.Title = "Details";
-}
-
-<h2>Details</h2>
-
-<div>
-    <h4>Items</h4>
-    <hr />
-    <div class="row">
-        <div class="col-md-6">
-            <dl class="dl-horizontal">
-                <dt>
-                    @Html.DisplayNameFor(model => model.Descr)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.Descr)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.Family)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.Family)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.DescrExt)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.DescrExt)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.CodExt)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.CodExt)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.CodInt)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.CodInt)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.QtaMin)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.QtaMin)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.QtaBatch)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.QtaBatch)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.Value)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.Value)
-                </dd>
-
-            </dl>
-        </div>
-        <div class="col-md-6">
-            <table class="table">
-                <tr>
-                    <th>
-                        Location
-                    </th>
-                    <th>
-                        Qty
-                    </th>
-                    <th>
-                        Last upd.
-                    </th>
-                </tr>
-
-                @foreach (var item in Model.Stock)
-                {
-                    <tr>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.Location.Descr)
-                        </td>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.QtyConf)
-                        </td>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.dtLastUpd)
-                        </td>
-                    </tr>
-                }
-            </table>
-        </div>
-    </div>
-</div>
-<p>
-    @Html.ActionLink("Edit", "Edit", new { id = Model.ID }) |
-    @Html.ActionLink("Back to List", "Index")
-</p>
diff --git a/StockManMVC/Views/Items/Edit.cshtml b/StockManMVC/Views/Items/Edit.cshtml
deleted file mode 100644
index e98c3f6..0000000
--- a/StockManMVC/Views/Items/Edit.cshtml
+++ /dev/null
@@ -1,98 +0,0 @@
-@model StockManMVC.Models.Items
-
-@{
-    ViewBag.Title = "Edit";
-}
-
-<h2>Edit</h2>
-
-
-@using (Html.BeginForm())
-{
-    @Html.AntiForgeryToken()
-    
-    <div class="form-horizontal">
-        <h4>Items</h4>
-        <hr />
-        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-        @Html.HiddenFor(model => model.ID)
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Descr, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Descr, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Descr, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Family, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Family, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Family, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.DescrExt, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.DescrExt, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.DescrExt, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.CodExt, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.CodExt, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.CodExt, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.CodInt, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.CodInt, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.CodInt, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.QtaMin, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.QtaMin, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.QtaMin, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.QtaBatch, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.QtaBatch, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.QtaBatch, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Value, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Value, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Value, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Save" class="btn btn-default" />
-            </div>
-        </div>
-    </div>
-}
-
-<div>
-    @Html.ActionLink("Back to List", "Index")
-</div>
-
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-}
diff --git a/StockManMVC/Views/Items/Index.cshtml b/StockManMVC/Views/Items/Index.cshtml
deleted file mode 100644
index 6dc2998..0000000
--- a/StockManMVC/Views/Items/Index.cshtml
+++ /dev/null
@@ -1,75 +0,0 @@
-@model IEnumerable<StockManMVC.Models.Items>
-
-@{
-    ViewBag.Title = "Index";
-}
-
-<h2>Index</h2>
-
-<p>
-    @Html.ActionLink("Create New", "Create")
-</p>
-<table class="table">
-    <tr>
-        <th>
-            @Html.DisplayNameFor(model => model.Descr)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Family)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.DescrExt)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.CodExt)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.CodInt)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.QtaMin)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.QtaBatch)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Value)
-        </th>
-        <th></th>
-    </tr>
-
-@foreach (var item in Model) {
-    <tr>
-        <td>
-            @Html.DisplayFor(modelItem => item.Descr)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.Family)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.DescrExt)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.CodExt)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.CodInt)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.QtaMin)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.QtaBatch)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.Value)
-        </td>
-        <td>
-            @Html.ActionLink("Edit", "Edit", new { id=item.ID }) |
-            @Html.ActionLink("Details", "Details", new { id=item.ID }) |
-            @Html.ActionLink("Delete", "Delete", new { id=item.ID })
-        </td>
-    </tr>
-}
-
-</table>
diff --git a/StockManMVC/Views/LocTypes/Create.cshtml b/StockManMVC/Views/LocTypes/Create.cshtml
index 8a27464..1e23d3f 100644
--- a/StockManMVC/Views/LocTypes/Create.cshtml
+++ b/StockManMVC/Views/LocTypes/Create.cshtml
@@ -31,6 +31,36 @@
             </div>
         </div>
 
+        <div class="form-group">
+            @Html.LabelFor(model => model.IsStock, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                <div class="checkbox">
+                    @Html.EditorFor(model => model.IsStock)
+                    @Html.ValidationMessageFor(model => model.IsStock, "", new { @class = "text-danger" })
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.IsCli, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                <div class="checkbox">
+                    @Html.EditorFor(model => model.IsCli)
+                    @Html.ValidationMessageFor(model => model.IsCli, "", new { @class = "text-danger" })
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.IsFor, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                <div class="checkbox">
+                    @Html.EditorFor(model => model.IsFor)
+                    @Html.ValidationMessageFor(model => model.IsFor, "", new { @class = "text-danger" })
+                </div>
+            </div>
+        </div>
+
         <div class="form-group">
             <div class="col-md-offset-2 col-md-10">
                 <input type="submit" value="Create" class="btn btn-default" />
diff --git a/StockManMVC/Views/LocTypes/Delete.cshtml b/StockManMVC/Views/LocTypes/Delete.cshtml
index 66cf8e9..4ae576b 100644
--- a/StockManMVC/Views/LocTypes/Delete.cshtml
+++ b/StockManMVC/Views/LocTypes/Delete.cshtml
@@ -19,6 +19,30 @@
             @Html.DisplayFor(model => model.Descr)
         </dd>
 
+        <dt>
+            @Html.DisplayNameFor(model => model.IsStock)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.IsStock)
+        </dd>
+
+        <dt>
+            @Html.DisplayNameFor(model => model.IsCli)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.IsCli)
+        </dd>
+
+        <dt>
+            @Html.DisplayNameFor(model => model.IsFor)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.IsFor)
+        </dd>
+
     </dl>
 
     @using (Html.BeginForm()) {
diff --git a/StockManMVC/Views/LocTypes/Details.cshtml b/StockManMVC/Views/LocTypes/Details.cshtml
index 927cb03..44bb5a5 100644
--- a/StockManMVC/Views/LocTypes/Details.cshtml
+++ b/StockManMVC/Views/LocTypes/Details.cshtml
@@ -18,6 +18,30 @@
             @Html.DisplayFor(model => model.Descr)
         </dd>
 
+        <dt>
+            @Html.DisplayNameFor(model => model.IsStock)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.IsStock)
+        </dd>
+
+        <dt>
+            @Html.DisplayNameFor(model => model.IsCli)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.IsCli)
+        </dd>
+
+        <dt>
+            @Html.DisplayNameFor(model => model.IsFor)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.IsFor)
+        </dd>
+
     </dl>
 </div>
 <p>
diff --git a/StockManMVC/Views/LocTypes/Edit.cshtml b/StockManMVC/Views/LocTypes/Edit.cshtml
index 2091107..a111c31 100644
--- a/StockManMVC/Views/LocTypes/Edit.cshtml
+++ b/StockManMVC/Views/LocTypes/Edit.cshtml
@@ -25,6 +25,36 @@
             </div>
         </div>
 
+        <div class="form-group">
+            @Html.LabelFor(model => model.IsStock, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                <div class="checkbox">
+                    @Html.EditorFor(model => model.IsStock)
+                    @Html.ValidationMessageFor(model => model.IsStock, "", new { @class = "text-danger" })
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.IsCli, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                <div class="checkbox">
+                    @Html.EditorFor(model => model.IsCli)
+                    @Html.ValidationMessageFor(model => model.IsCli, "", new { @class = "text-danger" })
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.IsFor, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                <div class="checkbox">
+                    @Html.EditorFor(model => model.IsFor)
+                    @Html.ValidationMessageFor(model => model.IsFor, "", new { @class = "text-danger" })
+                </div>
+            </div>
+        </div>
+
         <div class="form-group">
             <div class="col-md-offset-2 col-md-10">
                 <input type="submit" value="Save" class="btn btn-default" />
diff --git a/StockManMVC/Views/LocTypes/Index.cshtml b/StockManMVC/Views/LocTypes/Index.cshtml
index e904831..14258d1 100644
--- a/StockManMVC/Views/LocTypes/Index.cshtml
+++ b/StockManMVC/Views/LocTypes/Index.cshtml
@@ -14,6 +14,15 @@
         <th>
             @Html.DisplayNameFor(model => model.Descr)
         </th>
+        <th>
+            @Html.DisplayNameFor(model => model.IsStock)
+        </th>
+        <th>
+            @Html.DisplayNameFor(model => model.IsCli)
+        </th>
+        <th>
+            @Html.DisplayNameFor(model => model.IsFor)
+        </th>
         <th></th>
     </tr>
 
@@ -22,6 +31,15 @@
         <td>
             @Html.DisplayFor(modelItem => item.Descr)
         </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.IsStock)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.IsCli)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.IsFor)
+        </td>
         <td>
             @Html.ActionLink("Edit", "Edit", new { id=item.ID }) |
             @Html.ActionLink("Details", "Details", new { id=item.ID }) |
diff --git a/StockManMVC/Views/Locations/Index.cshtml b/StockManMVC/Views/Locations/Index.cshtml
index c69bfa1..3b3aae8 100644
--- a/StockManMVC/Views/Locations/Index.cshtml
+++ b/StockManMVC/Views/Locations/Index.cshtml
@@ -9,7 +9,7 @@
 <p>
     @Html.ActionLink("Create New", "Create")
 </p>
-<table class="table">
+<table class="table table-condensed table-responsive table-striped table-hover">
     <tr>
         <th>
             @Html.DisplayNameFor(model => model.Descr)
diff --git a/StockManMVC/Views/Shared/_Layout.cshtml b/StockManMVC/Views/Shared/_Layout.cshtml
index f712a5f..b53a7d5 100644
--- a/StockManMVC/Views/Shared/_Layout.cshtml
+++ b/StockManMVC/Views/Shared/_Layout.cshtml
@@ -24,8 +24,8 @@
                     @*<li>@Html.ActionLink("About", "About", "Home")</li>
                     <li>@Html.ActionLink("Contact", "Contact", "Home")</li>*@
                     <li>@Html.ActionLink("Items", "Index", "Items")</li>
-                    <li>@Html.ActionLink("Stock", "Index", "Stocks")</li>
-                    <li>@Html.ActionLink("Stock Movs", "Index", "StockMovs")</li>
+                    <li>@Html.ActionLink("Stock", "Index", "ItemStocks")</li>
+                    <li>@Html.ActionLink("Flux", "Index", "ItemFluxs")</li>
                     <li>@Html.ActionLink("Locations", "Index", "Locations")</li>
                     <li>@Html.ActionLink("Location Type", "Index", "LocTypes")</li>
                     <li>@Html.ActionLink("Move Type", "Index", "MovTypes")</li>
diff --git a/StockManMVC/Views/StockMovs/Create.cshtml b/StockManMVC/Views/StockMovs/Create.cshtml
deleted file mode 100644
index 18921e0..0000000
--- a/StockManMVC/Views/StockMovs/Create.cshtml
+++ /dev/null
@@ -1,88 +0,0 @@
-@model StockManMVC.Models.StockMov
-
-@{
-    ViewBag.Title = "Create";
-}
-
-<h2>Create</h2>
-
-
-@using (Html.BeginForm()) 
-{
-    @Html.AntiForgeryToken()
-    
-    <div class="form-horizontal">
-        <h4>StockMov</h4>
-        <hr />
-        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-        <div class="form-group">
-            @Html.LabelFor(model => model.ItemID, "ItemID", htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.DropDownList("ItemID", null, htmlAttributes: new { @class = "form-control" })
-                @Html.ValidationMessageFor(model => model.ItemID, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.LocationID, "LocationID", htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.DropDownList("LocationID", null, htmlAttributes: new { @class = "form-control" })
-                @Html.ValidationMessageFor(model => model.LocationID, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.dtMov, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.dtMov, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.dtMov, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Qta, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Qta, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Qta, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Note, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Note, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Note, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.dtExport, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.dtExport, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.dtExport, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.MovTypeID, "MovTypeID", htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.DropDownList("MovTypeID", null, htmlAttributes: new { @class = "form-control" })
-                @Html.ValidationMessageFor(model => model.MovTypeID, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Create" class="btn btn-default" />
-            </div>
-        </div>
-    </div>
-}
-
-<div>
-    @Html.ActionLink("Back to List", "Index")
-</div>
-
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-}
diff --git a/StockManMVC/Views/StockMovs/Delete.cshtml b/StockManMVC/Views/StockMovs/Delete.cshtml
deleted file mode 100644
index 82665f2..0000000
--- a/StockManMVC/Views/StockMovs/Delete.cshtml
+++ /dev/null
@@ -1,64 +0,0 @@
-@model StockManMVC.Models.StockMov
-
-@{
-    ViewBag.Title = "Delete";
-}
-
-<h2>Delete</h2>
-
-<h3>Are you sure you want to delete this?</h3>
-<div>
-    <h4>StockMov</h4>
-    <hr />
-    <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Qta)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Qta)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Note)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Note)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.dtExport)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.dtExport)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.MovType.Descr)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.MovType.Descr)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Stock.Note)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Stock.Note)
-        </dd>
-
-    </dl>
-
-    @using (Html.BeginForm()) {
-        @Html.AntiForgeryToken()
-
-        <div class="form-actions no-color">
-            <input type="submit" value="Delete" class="btn btn-default" /> |
-            @Html.ActionLink("Back to List", "Index")
-        </div>
-    }
-</div>
diff --git a/StockManMVC/Views/StockMovs/Details.cshtml b/StockManMVC/Views/StockMovs/Details.cshtml
deleted file mode 100644
index c97c383..0000000
--- a/StockManMVC/Views/StockMovs/Details.cshtml
+++ /dev/null
@@ -1,58 +0,0 @@
-@model StockManMVC.Models.StockMov
-
-@{
-    ViewBag.Title = "Details";
-}
-
-<h2>Details</h2>
-
-<div>
-    <h4>StockMov</h4>
-    <hr />
-    <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Qta)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Qta)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Note)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Note)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.dtExport)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.dtExport)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.MovType.Descr)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.MovType.Descr)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Stock.Note)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Stock.Note)
-        </dd>
-
-    </dl>
-</div>
-<p>
-    @Html.ActionLink("Edit", "Edit", new { /* id = Model.PrimaryKey */ }) |
-    @Html.ActionLink("Back to List", "Index")
-</p>
diff --git a/StockManMVC/Views/StockMovs/Edit.cshtml b/StockManMVC/Views/StockMovs/Edit.cshtml
deleted file mode 100644
index 6fffd2a..0000000
--- a/StockManMVC/Views/StockMovs/Edit.cshtml
+++ /dev/null
@@ -1,70 +0,0 @@
-@model StockManMVC.Models.StockMov
-
-@{
-    ViewBag.Title = "Edit";
-}
-
-<h2>Edit</h2>
-
-
-@using (Html.BeginForm())
-{
-    @Html.AntiForgeryToken()
-    
-    <div class="form-horizontal">
-        <h4>StockMov</h4>
-        <hr />
-        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-        @Html.HiddenFor(model => model.ItemID)
-
-        @Html.HiddenFor(model => model.LocationID)
-
-        @Html.HiddenFor(model => model.dtMov)
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Qta, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Qta, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Qta, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Note, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Note, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Note, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.dtExport, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.dtExport, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.dtExport, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.MovTypeID, "MovTypeID", htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.DropDownList("MovTypeID", null, htmlAttributes: new { @class = "form-control" })
-                @Html.ValidationMessageFor(model => model.MovTypeID, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Save" class="btn btn-default" />
-            </div>
-        </div>
-    </div>
-}
-
-<div>
-    @Html.ActionLink("Back to List", "Index")
-</div>
-
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-}
diff --git a/StockManMVC/Views/StockMovs/Index.cshtml b/StockManMVC/Views/StockMovs/Index.cshtml
deleted file mode 100644
index 2a1358f..0000000
--- a/StockManMVC/Views/StockMovs/Index.cshtml
+++ /dev/null
@@ -1,57 +0,0 @@
-@model IEnumerable<StockManMVC.Models.StockMov>
-
-@{
-    ViewBag.Title = "Index";
-}
-
-<h2>Index</h2>
-
-<p>
-    @Html.ActionLink("Create New", "Create")
-</p>
-<table class="table">
-    <tr>
-        <th>
-            @Html.DisplayNameFor(model => model.Qta)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Note)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.dtExport)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.MovType.Descr)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Stock.Note)
-        </th>
-        <th></th>
-    </tr>
-
-@foreach (var item in Model) {
-    <tr>
-        <td>
-            @Html.DisplayFor(modelItem => item.Qta)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.Note)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.dtExport)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.MovType.Descr)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.Stock.Note)
-        </td>
-        <td>
-            @Html.ActionLink("Edit", "Edit", new { /* id=item.PrimaryKey */ }) |
-            @Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) |
-            @Html.ActionLink("Delete", "Delete", new { /* id=item.PrimaryKey */ })
-        </td>
-    </tr>
-}
-
-</table>
diff --git a/StockManMVC/Views/Stocks/Create.cshtml b/StockManMVC/Views/Stocks/Create.cshtml
deleted file mode 100644
index 895307b..0000000
--- a/StockManMVC/Views/Stocks/Create.cshtml
+++ /dev/null
@@ -1,72 +0,0 @@
-@model StockManMVC.Models.Stock
-
-@{
-    ViewBag.Title = "Create";
-}
-
-<h2>Create</h2>
-
-
-@using (Html.BeginForm()) 
-{
-    @Html.AntiForgeryToken()
-    
-    <div class="form-horizontal">
-        <h4>Stock</h4>
-        <hr />
-        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-        <div class="form-group">
-            @Html.LabelFor(model => model.ItemID, "ItemID", htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.DropDownList("ItemID", null, htmlAttributes: new { @class = "form-control" })
-                @Html.ValidationMessageFor(model => model.ItemID, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.LocationID, "LocationID", htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.DropDownList("LocationID", null, htmlAttributes: new { @class = "form-control" })
-                @Html.ValidationMessageFor(model => model.LocationID, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.QtyConf, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.QtyConf, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.QtyConf, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Note, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Note, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Note, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.dtLastUpd, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.dtLastUpd, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.dtLastUpd, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Create" class="btn btn-default" />
-            </div>
-        </div>
-    </div>
-}
-
-<div>
-    @Html.ActionLink("Back to List", "Index")
-</div>
-
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-}
diff --git a/StockManMVC/Views/Stocks/Delete.cshtml b/StockManMVC/Views/Stocks/Delete.cshtml
deleted file mode 100644
index 7c7772b..0000000
--- a/StockManMVC/Views/Stocks/Delete.cshtml
+++ /dev/null
@@ -1,64 +0,0 @@
-@model StockManMVC.Models.Stock
-
-@{
-    ViewBag.Title = "Delete";
-}
-
-<h2>Delete</h2>
-
-<h3>Are you sure you want to delete this?</h3>
-<div>
-    <h4>Stock</h4>
-    <hr />
-    <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.QtyConf)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.QtyConf)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Note)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Note)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.dtLastUpd)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.dtLastUpd)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Location.Descr)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Location.Descr)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Items.Descr)
-        </dt>
-
-        <dd>
-            @Html.DisplayFor(model => model.Items.Descr)
-        </dd>
-
-    </dl>
-
-    @using (Html.BeginForm()) {
-        @Html.AntiForgeryToken()
-
-        <div class="form-actions no-color">
-            <input type="submit" value="Delete" class="btn btn-default" /> |
-            @Html.ActionLink("Back to List", "Index")
-        </div>
-    }
-</div>
diff --git a/StockManMVC/Views/Stocks/Details.cshtml b/StockManMVC/Views/Stocks/Details.cshtml
deleted file mode 100644
index 3a2f45d..0000000
--- a/StockManMVC/Views/Stocks/Details.cshtml
+++ /dev/null
@@ -1,98 +0,0 @@
-@model StockManMVC.Models.Stock
-
-@{
-    ViewBag.Title = "Details";
-}
-
-<h2>Details</h2>
-
-<div>
-    <h4>Stock</h4>
-    <hr />
-    <div class="row">
-        <div class="col-md-6">
-            <dl class="dl-horizontal">
-                <dt>
-                    @Html.DisplayNameFor(model => model.QtyConf)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.QtyConf)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.Note)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.Note)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.dtLastUpd)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.dtLastUpd)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.Location.Descr)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.Location.Descr)
-                </dd>
-
-                <dt>
-                    @Html.DisplayNameFor(model => model.Items.Descr)
-                </dt>
-
-                <dd>
-                    @Html.DisplayFor(model => model.Items.Descr)
-                </dd>
-
-            </dl>
-        </div>
-        <div class="col-md-6">
-            <table class="table">
-                <tr>
-                    <th>
-                        Data Mov
-                    </th>
-                    <th>
-                        Type
-                    </th>
-                    <th>
-                        Qty
-                    </th>
-                    <th>
-                        Note
-                    </th>
-                </tr>
-
-                @foreach (var item in Model.StockMov)
-                {
-                    <tr>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.dtMov)
-                        </td>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.MovType.Descr)
-                        </td>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.Qta)
-                        </td>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.Note)
-                        </td>
-                    </tr>
-                }
-            </table>
-        </div>
-    </div>
-</div>
-        <p>
-            @Html.ActionLink("Edit", "Edit", new { /* id = Model.PrimaryKey */ }) |
-            @Html.ActionLink("Back to List", "Index")
-        </p>
diff --git a/StockManMVC/Views/Stocks/Edit.cshtml b/StockManMVC/Views/Stocks/Edit.cshtml
deleted file mode 100644
index c05201b..0000000
--- a/StockManMVC/Views/Stocks/Edit.cshtml
+++ /dev/null
@@ -1,60 +0,0 @@
-@model StockManMVC.Models.Stock
-
-@{
-    ViewBag.Title = "Edit";
-}
-
-<h2>Edit</h2>
-
-
-@using (Html.BeginForm())
-{
-    @Html.AntiForgeryToken()
-    
-    <div class="form-horizontal">
-        <h4>Stock</h4>
-        <hr />
-        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
-        @Html.HiddenFor(model => model.ItemID)
-
-        @Html.HiddenFor(model => model.LocationID)
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.QtyConf, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.QtyConf, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.QtyConf, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.Note, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.Note, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Note, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            @Html.LabelFor(model => model.dtLastUpd, htmlAttributes: new { @class = "control-label col-md-2" })
-            <div class="col-md-10">
-                @Html.EditorFor(model => model.dtLastUpd, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.dtLastUpd, "", new { @class = "text-danger" })
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Save" class="btn btn-default" />
-            </div>
-        </div>
-    </div>
-}
-
-<div>
-    @Html.ActionLink("Back to List", "Index")
-</div>
-
-@section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
-}
diff --git a/StockManMVC/Views/Stocks/Index.cshtml b/StockManMVC/Views/Stocks/Index.cshtml
deleted file mode 100644
index fadbe95..0000000
--- a/StockManMVC/Views/Stocks/Index.cshtml
+++ /dev/null
@@ -1,57 +0,0 @@
-@model IEnumerable<StockManMVC.Models.Stock>
-
-@{
-    ViewBag.Title = "Index";
-}
-
-<h2>Index</h2>
-
-<p>
-    @Html.ActionLink("Create New", "Create")
-</p>
-<table class="table">
-    <tr>
-        <th>
-            @Html.DisplayNameFor(model => model.QtyConf)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Note)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.dtLastUpd)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Location.Descr)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Items.Descr)
-        </th>
-        <th></th>
-    </tr>
-
-@foreach (var item in Model) {
-    <tr>
-        <td>
-            @Html.DisplayFor(modelItem => item.QtyConf)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.Note)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.dtLastUpd)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.Location.Descr)
-        </td>
-        <td>
-            @Html.DisplayFor(modelItem => item.Items.Descr)
-        </td>
-        <td>
-            @Html.ActionLink("Edit", "Edit", new { /* id=item.PrimaryKey */ }) |
-            @Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) |
-            @Html.ActionLink("Delete", "Delete", new { /* id=item.PrimaryKey */ })
-        </td>
-    </tr>
-}
-
-</table>
diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll
index 2d92521..9b0a6ff 100644
Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ
diff --git a/VersGen/obj/Release/TempPE/VersGen.cs.dll b/VersGen/obj/Release/TempPE/VersGen.cs.dll
new file mode 100644
index 0000000..be39f58
Binary files /dev/null and b/VersGen/obj/Release/TempPE/VersGen.cs.dll differ
diff --git a/VersGen/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/VersGen/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
new file mode 100644
index 0000000..e69de29
diff --git a/VersGen/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/VersGen/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
new file mode 100644
index 0000000..e69de29
diff --git a/VersGen/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/VersGen/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
new file mode 100644
index 0000000..e69de29