diff --git a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_DocsData.sql b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_DocsData.sql
index 9958572..c30f8e6 100644
--- a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_DocsData.sql
+++ b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_DocsData.sql
@@ -28,11 +28,14 @@ WITH cteOrd AS
 			,SUM(ISNULL(f.Paid,0)) AS PaidSum
 	FROM	Orders o
 		LEFT OUTER JOIN dbo.AccMov AS f ON o.OrdId = f.OrdId
+	WHERE	f.IdxBillExt > 0
 	GROUP BY o.DocId
 )
 
 SELECT	 d.*
 		,n.BasketId
+		,bk.CodBasket
+		,bk.Descript as DescBasket
 		,c.RagSoc
 		,n.CodNegotiation
 		,n.Descript AS NegotDescript
@@ -42,10 +45,12 @@ SELECT	 d.*
 		,CAST(ISNULL(b.PaidSum,0) AS decimal(18,6)) AS Incassato
 FROM dbo.Docs AS d
 	INNER JOIN Negotiations AS n	ON n.NegotiationId	= d.NegotiationId
+	INNER JOIN Baskets AS bk			ON n.BasketId	= bk.BasketId
 	INNER JOIN Customers AS c		ON n.CustomerId		= c.CustomerId
 	LEFT OUTER JOIN cteOrd	AS o	ON d.DocId = o.DocId
 	LEFT OUTER JOIN cteRes	AS r	ON d.DocId = r.DocId
 	LEFT OUTER JOIN cteBill	AS b	ON d.DocId = b.DocId
+
 GO
 
 
diff --git a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
index d8ef235..1df0871 100644
--- a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
+++ b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
@@ -5,7 +5,6 @@
 CREATE OR ALTER VIEW [dbo].[v_ItemsData]
 AS
 
-
 WITH cteOrdRes AS
 (
 	SELECT	o.ItemId
diff --git a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_NegotData.sql b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_NegotData.sql
index b73e816..84c94b2 100644
--- a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_NegotData.sql
+++ b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_NegotData.sql
@@ -18,7 +18,9 @@ WITH cteDocs AS
 			,SUM(ISNULL(r.FinalPrice,0)) AS PriceSum
 	FROM	Docs d
 		LEFT OUTER JOIN	dbo.Resources AS r ON d.DocId = r.DocId
-	WHERE	d.IsActive = 1 AND IsDraft = 0
+	WHERE	d.IsActive	= 1 
+		AND d.IsDraft	= 0 
+		AND d.IsLocked	= 0
 	GROUP BY d.NegotiationId
 )
 , cteOrd AS
@@ -27,6 +29,7 @@ WITH cteDocs AS
 			,SUM(ISNULL(r.FinalPrice,0)) AS OrdSum
 	FROM	Orders o
 		LEFT OUTER JOIN	dbo.OrderRes AS r ON o.OrdId = r.OrdId
+	WHERE	o.OrdStatus >= 0
 	GROUP BY o.NegotiationId
 )
 , cteBill AS
@@ -42,6 +45,7 @@ SELECT	  t.NegotiationId
 		, b.CompanyId
 		, t.BasketId
 		, b.CodBasket
+		, cst.RagSoc
 		, b.Descript	AS BaskDescript
 		, t.CustomerId
 		, t.Anno
@@ -56,6 +60,7 @@ SELECT	  t.NegotiationId
 		,ISNULL(bl.PaidSum,0)		AS Incassato
 FROM Negotiations		AS t
 		INNER JOIN Baskets		AS b	ON b.BasketId = t.BasketId
+		INNER JOIN Customers	AS cst	ON t.CustomerId = cst.CustomerId
 	LEFT OUTER JOIN cteDocs		AS d	ON t.NegotiationId	= d.NegotiationId
 	LEFT OUTER JOIN cteOff		AS n	ON t.NegotiationId	= n.NegotiationId
 	LEFT OUTER JOIN cteOrd		AS o	ON t.NegotiationId	= o.NegotiationId
diff --git a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_OrderData.sql b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_OrderData.sql
index 28a879c..126d9d0 100644
--- a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_OrderData.sql
+++ b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_OrderData.sql
@@ -15,7 +15,7 @@ WITH cteRes AS
 ,cteBill AS
 (
 	SELECT	o.DocId
-			,SUM(ISNULL(f.Amount,0)) AS AmountSum
+			,SUM(CASE WHEN ISNULL(f.IdxBillExt,0) > 0 AND f.OrdId > 0 THEN ISNULL(f.Amount,0) ELSE 0 END) AS AmountSum
 			,SUM(ISNULL(f.Paid,0)) AS PaidSum
 			,COUNT(f.AccMovId) AS NumMov
 			,SUM(CASE WHEN f.IdxBillExt IS NULL AND f.OrdId > 0 THEN 1 ELSE 0 END) AS MovOpen
diff --git a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_TrendData.sql b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_TrendData.sql
index 4268deb..57b5b75 100644
--- a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_TrendData.sql
+++ b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_TrendData.sql
@@ -44,6 +44,7 @@ FROM	cteTratt t
 	LEFT OUTER JOIN cteOrd o ON t.YearRef = o.YearRef AND t.MonthRef = o.MonthRef
 	LEFT OUTER JOIN cteFatt f ON t.YearRef = f.YearRef AND t.MonthRef = f.MonthRef
 --ORDER BY YearRef, MonthRef
+
 GO
 
 
diff --git a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_YearData.sql b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_YearData.sql
index ba9b1bc..fb83e18 100644
--- a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_YearData.sql
+++ b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_YearData.sql
@@ -40,6 +40,7 @@ FROM	cteTratt t
 	LEFT OUTER JOIN cteOrd o ON t.YearRef = o.YearRef 
 	LEFT OUTER JOIN cteFatt f ON t.YearRef = f.YearRef
 --ORDER BY YearRef
+
 GO