| 
					
				 | 
			
			
				@@ -9,36 +9,36 @@ using InABox.Clients; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 namespace Comal.Classes 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public class ProductInstanceFreeStockAggregate : CoreAggregate<ProductInstance, StockMovement, double> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public class ProductInstanceFreeStockAggregate : CoreAggregate<ProductInstance, StockHolding, double> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        public override Expression<Func<StockMovement, double>> Aggregate => x => x.Units; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        public override Expression<Func<StockHolding, double>> Aggregate => x => x.Units; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.Job).NotLinkValid(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        public override Filter<StockHolding> Filter => new Filter<StockHolding>(x => x.Job).NotLinkValid(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        public override Dictionary<Expression<Func<StockMovement, object?>>, Expression<Func<ProductInstance, object?>>> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        public override Dictionary<Expression<Func<StockHolding, object?>>, Expression<Func<ProductInstance, object?>>> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Links => 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            new Dictionary<Expression<Func<StockMovement, object?>>, Expression<Func<ProductInstance, object?>>>() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            new Dictionary<Expression<Func<StockHolding, object?>>, Expression<Func<ProductInstance, object?>>>() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { StockMovement => StockMovement.Product.ID, Instance => Instance.Product.ID }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { StockMovement => StockMovement.Style.ID, Instance => Instance.Style.ID }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }.AddRange(Dimensions.GetLinks<StockMovement, ProductInstance>(x => x.Dimensions, x => x.Dimensions)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { StockHolding => StockHolding.Product.ID, Instance => Instance.Product.ID }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { StockHolding => StockHolding.Style.ID, Instance => Instance.Style.ID }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }.AddRange(Dimensions.GetLinks<StockHolding, ProductInstance>(x => x.Dimensions, x => x.Dimensions)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         public override AggregateCalculation Calculation => AggregateCalculation.Sum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public class ProductInstanceFreeStockValueAggregate : CoreAggregate<ProductInstance, StockMovement, double> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public class ProductInstanceFreeStockValueAggregate : CoreAggregate<ProductInstance, StockHolding, double> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        public override Expression<Func<StockMovement, double>> Aggregate => x => x.Value; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        public override Expression<Func<StockHolding, double>> Aggregate => x => x.Value; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.Job).NotLinkValid(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        public override Filter<StockHolding> Filter => new Filter<StockHolding>(x => x.Job).NotLinkValid(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        public override Dictionary<Expression<Func<StockMovement, object?>>, Expression<Func<ProductInstance, object?>>> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        public override Dictionary<Expression<Func<StockHolding, object?>>, Expression<Func<ProductInstance, object?>>> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Links => 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            new Dictionary<Expression<Func<StockMovement, object?>>, Expression<Func<ProductInstance, object?>>>() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            new Dictionary<Expression<Func<StockHolding, object?>>, Expression<Func<ProductInstance, object?>>>() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { StockMovement => StockMovement.Product.ID, Instance => Instance.Product.ID }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { StockMovement => StockMovement.Style.ID, Instance => Instance.Style.ID }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }.AddRange(Dimensions.GetLinks<StockMovement, ProductInstance>(x => x.Dimensions, x => x.Dimensions)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { StockHolding => StockHolding.Product.ID, Instance => Instance.Product.ID }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { StockHolding => StockHolding.Style.ID, Instance => Instance.Style.ID }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }.AddRange(Dimensions.GetLinks<StockHolding, ProductInstance>(x => x.Dimensions, x => x.Dimensions)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         public override AggregateCalculation Calculation => AggregateCalculation.Sum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |