Improvements to stock summary screen

prs.classes/Entities/Job/Materials/JobMaterials.cs

@@ -244,12 +244,12 @@ namespace Comal.Classes
         [Formula(typeof(JobMaterialBalanceRequiredFormula))]
         public double BalanceRequired { get; set; }
 
-        [EditorSequence(11)]
+        [EditorSequence(12)]
         [Aggregate(typeof(JobMaterialReservedStockAggregate))]
         [DoubleEditor(Editable = Editable.Hidden)]
         public double ReservedStock { get; set; }
 
-        [EditorSequence(12)]
+        [EditorSequence(13)]
         [Aggregate(typeof(JobMaterialFreeStockAggregate))]
         [DoubleEditor(Editable = Editable.Hidden)]
         public double FreeStock { get; set; }

prs.classes/Entities/Product/ProductLink.cs

@@ -63,6 +63,9 @@ namespace Comal.Classes
         [NullEditor]
         public bool NonStock { get; set; }
 
+        [IntegerEditor]
+        public int MinimumStockLevel { get; set; }
+
         [NullEditor]
         public ImageDocumentLink Image { get; set; }
 

prs.classes/Entities/Stock/StockSummary.cs

@@ -7,257 +7,212 @@ using InABox.Core;
 
 namespace Comal.Classes
 {
-    // public class StockSummaryBOMAggregate : CoreAggregate<StockSummary, JobBillOfMaterialsItem, double>
-    // {
-    //     public override Expression<Func<JobBillOfMaterialsItem, double>> Aggregate => x => x.Quantity;
-    //
-    //     public override AggregateCalculation Calculation => AggregateCalculation.Sum;
-    //
-    //     public override Dictionary<Expression<Func<JobBillOfMaterialsItem, object>>, Expression<Func<StockSummary, object>>> Links =>
-    //         new Dictionary<Expression<Func<JobBillOfMaterialsItem, object>>, Expression<Func<StockSummary, object>>>()
-    //         {
-    //             { JobBillOfMaterialsItem => JobBillOfMaterialsItem.Product.ID, StockSummary => StockSummary.Product.ID },
-    //             { JobBillOfMaterialsItem => JobBillOfMaterialsItem.Style.ID, StockSummary => StockSummary.Style.ID },
-    //             { JobBillOfMaterialsItem => JobBillOfMaterialsItem.Dimensions.UnitSize, StockSummary => StockSummary.Dimensions.UnitSize }
-    //         };
-    //
-    //     public override Filter<JobBillOfMaterialsItem> Filter =>
-    //         new Filter<JobBillOfMaterialsItem>(x => x.BillOfMaterials.Approved).IsNotEqualTo(DateTime.MinValue);
-    // }
-    //
-    // public class StockSummaryTotalRequiredAggregate : CoreAggregate<StockSummary, JobRequisitionItem, double>
-    // {
-    //     public override Expression<Func<JobRequisitionItem, double>> Aggregate => x => x.Qty;
-    //
-    //     public override AggregateCalculation Calculation => AggregateCalculation.Sum;
-    //
-    //     public override Dictionary<Expression<Func<JobRequisitionItem, object>>, Expression<Func<StockSummary, object>>> Links =>
-    //         new Dictionary<Expression<Func<JobRequisitionItem, object>>, Expression<Func<StockSummary, object>>>()
-    //         {
-    //             { StockSummaryRequisitionItem => StockSummaryRequisitionItem.Product.ID, StockSummary => StockSummary.Product.ID },
-    //             { StockSummaryRequisitionItem => StockSummaryRequisitionItem.Style.ID, StockSummary => StockSummary.Style.ID },
-    //             { StockSummaryRequisitionItem => StockSummaryRequisitionItem.Dimensions.UnitSize, StockSummary => StockSummary.Dimensions.UnitSize }
-    //         };
-    //     
-    //     public override Filter<JobRequisitionItem> Filter =>
-    //         new Filter<JobRequisitionItem>(x => x.Requisition.Approved).IsNotEqualTo(DateTime.MinValue);
-    //
-    // }
-    //
-    // public class StockSummaryOrderAggregate : CoreAggregate<StockSummary, PurchaseOrderItem, double>
-    // {
-    //     public override Expression<Func<PurchaseOrderItem, double>> Aggregate => x => x.Qty;
-    //
-    //     public override AggregateCalculation Calculation => AggregateCalculation.Sum;
-    //
-    //     public override Dictionary<Expression<Func<PurchaseOrderItem, object>>, Expression<Func<StockSummary, object>>> Links =>
-    //         new Dictionary<Expression<Func<PurchaseOrderItem, object>>, Expression<Func<StockSummary, object>>>()
-    //         {
-    //             { PurchaseOrderItem => PurchaseOrderItem.Product.ID, StockSummary => StockSummary.Product.ID },
-    //             { PurchaseOrderItem => PurchaseOrderItem.Style.ID, StockSummary => StockSummary.Style.ID },
-    //             { PurchaseOrderItem => PurchaseOrderItem.Dimensions.UnitSize, StockSummary => StockSummary.Dimensions.UnitSize }
-    //         };
-    //
-    //     public override Filter<PurchaseOrderItem> Filter => new Filter<PurchaseOrderItem>(x => x.ReceivedDate).IsEqualTo(DateTime.MinValue);
-    // }
-    //
-    // public class StockSummaryOrderValue : CoreAggregate<StockSummary, PurchaseOrderItem, double>
-    // {
-    //     public override Expression<Func<PurchaseOrderItem, double>> Aggregate => x => x.ExTax;
-    //
-    //     public override AggregateCalculation Calculation => AggregateCalculation.Sum;
-    //
-    //     public override Dictionary<Expression<Func<PurchaseOrderItem, object>>, Expression<Func<StockSummary, object>>> Links =>
-    //         new Dictionary<Expression<Func<PurchaseOrderItem, object>>, Expression<Func<StockSummary, object>>>()
-    //         {
-    //             { PurchaseOrderItem => PurchaseOrderItem.Product.ID, StockSummary => StockSummary.Product.ID },
-    //             { PurchaseOrderItem => PurchaseOrderItem.Style.ID, StockSummary => StockSummary.Style.ID },
-    //             { PurchaseOrderItem => PurchaseOrderItem.Dimensions.UnitSize, StockSummary => StockSummary.Dimensions.UnitSize }
-    //         };
-    //
-    //     public override Filter<PurchaseOrderItem> Filter => new Filter<PurchaseOrderItem>(x => x.ReceivedDate).IsEqualTo(DateTime.MinValue);
-    // }
-    //
-    // public class StockSummaryReceivedAggregate : CoreAggregate<StockSummary, StockMovement, double>
-    // {
-    //     public override Expression<Func<StockMovement, double>> Aggregate => x => x.Received;
-    //
-    //     public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.IsTransfer).IsEqualTo(false);
-    //
-    //     public override AggregateCalculation Calculation => AggregateCalculation.Sum;
-    //
-    //     public override Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>> Links =>
-    //         new Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>>()
-    //         {
-    //             { StockMovement => StockMovement.Product.ID, StockSummary => StockSummary.Product.ID },
-    //             { StockMovement => StockMovement.Style.ID, StockSummary => StockSummary.Style.ID },
-    //             { StockMovement => StockMovement.Dimensions.UnitSize, StockSummary => StockSummary.Dimensions.UnitSize }
-    //         };
-    // }
-    //
-    // public class StockSummaryIssuedAggregate : CoreAggregate<StockSummary, StockMovement, double>
-    // {
-    //     public override Expression<Func<StockMovement, double>> Aggregate => x => x.Issued;
-    //
-    //     public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.IsTransfer).IsEqualTo(false);
-    //
-    //     public override AggregateCalculation Calculation => AggregateCalculation.Sum;
-    //
-    //     public override Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>> Links =>
-    //         new Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>>()
-    //         {
-    //             { StockMovement => StockMovement.Product.ID, StockSummary => StockSummary.Product.ID },
-    //             { StockMovement => StockMovement.Style.ID, StockSummary => StockSummary.Style.ID },
-    //             { StockMovement => StockMovement.Dimensions.UnitSize, StockSummary => StockSummary.Dimensions.UnitSize }
-    //         };
-    // }
-    //
-    // public class StockSummaryBalanceRequiredFormula : IFormula<StockSummary, double>
-    // {
-    //     public Expression<Func<StockSummary, double>> Value => x => x.TotalRequired;
-    //     public Expression<Func<StockSummary, double>>[] Modifiers => new Expression<Func<StockSummary, double>>[] { x => x.Issued };
-    //     public FormulaOperator Operator => FormulaOperator.Subtract;
-    //     public FormulaType Type => FormulaType.Virtual;
-    // }
-    //
-    // public class StockSummaryReservedStockAggregate : CoreAggregate<StockSummary, StockMovement, double>
-    // {
-    //     public override Expression<Func<StockMovement, double>> Aggregate => x => x.Units;
-    //
-    //     public override AggregateCalculation Calculation => AggregateCalculation.Sum;
-    //
-    //     public override Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>> Links =>
-    //         new Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>>()
-    //         {
-    //             { StockMovement => StockMovement.Product.ID, StockSummary => StockSummary.Product.ID },
-    //             { StockMovement => StockMovement.Style.ID, StockSummary => StockSummary.Style.ID },
-    //             { StockMovement => StockMovement.Dimensions.UnitSize, StockSummary => StockSummary.Dimensions.UnitSize }
-    //         };
-    // }
-    //
-    // public class StockSummaryFreeStockAggregate : CoreAggregate<StockSummary, StockMovement, double>
-    // {
-    //     public override Expression<Func<StockMovement, double>> Aggregate => x => x.Units;
-    //
-    //     public override AggregateCalculation Calculation => AggregateCalculation.Sum;
-    //
-    //     public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.Job).NotLinkValid().Or(x=>x.Job.JobStatus.Active).IsEqualTo(false);
-    //
-    //     public override Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>> Links =>
-    //         new Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>>()
-    //         {
-    //             { StockMovement => StockMovement.Product.ID, StockSummary => StockSummary.Product.ID },
-    //             //{ StockMovement => StockMovement.Style.ID, StockSummary => StockSummary.Style.ID },
-    //             //{ StockMovement => StockMovement.Dimensions.UnitSize, StockSummary => StockSummary.Dimensions.UnitSize }
-    //         };
-    // }
-    //
-    // public interface IStockSummary
-    // {
-    //     
-    //     ProductLink Product { get; set; }
-    //
-    //     ProductStyleLink Style { get; set; }
-    //
-    //     StockDimensions Dimensions { get; set; }
-    // }
-    //
-    // public class StockSummaryUnionGenerator : AutoEntityUnionGenerator<IStockSummary>
-    // {
-    //     protected override void Configure()
-    //     {
-    //         AddTable<StockMovement>(new Filter<StockMovement>(x=>x.Job.JobStatus.Active).IsEqualTo(true));
-    //         AddTable<JobBillOfMaterialsItem>(new Filter<JobBillOfMaterialsItem>(x=>x.Job.JobStatus.Active).IsEqualTo(true));
-    //         AddTable<JobRequisitionItem>(new Filter<JobRequisitionItem>(x=>x.Job.JobStatus.Active).IsEqualTo(true));
-    //         AddTable<PurchaseOrderItem>(new Filter<PurchaseOrderItem>(x=>x.Job.JobStatus.Active).IsEqualTo(true));
-    //     }
-    //
-    //     public override bool Distinct => true;
-    //
-    //     public override Column<IStockSummary>[] IDColumns => new Column<IStockSummary>[]
-    //     {
-    //         new Column<IStockSummary>(x => x.Product.ID),
-    //         new Column<IStockSummary>(x => x.Style.ID),
-    //         new Column<IStockSummary>(x => x.Dimensions.Unit.ID),
-    //         new Column<IStockSummary>(x => x.Dimensions.Quantity),
-    //         new Column<IStockSummary>(x => x.Dimensions.Length),
-    //         new Column<IStockSummary>(x => x.Dimensions.Width),
-    //         new Column<IStockSummary>(x => x.Dimensions.Height),
-    //         new Column<IStockSummary>(x => x.Dimensions.Weight)
-    //     };
-    // }    
-    //
-    //
-    // [UserTracking(typeof(Product))]
-    // [AutoEntity(typeof(StockSummaryUnionGenerator))]
-    // public class StockSummary : StockEntity, IStockSummary, IRemotable, IPersistent, ILicense<ProductManagementLicense>/* , IDimensioned */
-    // {
-    //
-    //     [EditorSequence(1)]
-    //     public override ProductLink Product { get; set; }
-    //
-    //     [EditorSequence(2)]
-    //     public ProductStyleLink Style { get; set; }
-    //
-    //     [NullEditor]
-    //     [Obsolete("Replaced with Dimensions", true)]
-    //     public double UnitSize { get; set; }
-    //
-    //     [EditorSequence(3)]
-    //     [RequiredColumn]
-    //     [DimensionsEditor(typeof(StockDimensions), AllowEditingUnit = false)]
-    //     public override StockDimensions Dimensions { get; set; }
-    //     
-    //     [EditorSequence(4)]
-    //     [DoubleEditor]
-    //     [Aggregate(typeof(StockSummaryBOMAggregate))]
-    //     public double BillOfMaterials { get; set; }
-    //
-    //     [EditorSequence(5)]
-    //     [DoubleEditor]
-    //     [Aggregate(typeof(StockSummaryTotalRequiredAggregate))]
-    //     public double TotalRequired { get; set; }
-    //
-    //     [EditorSequence(6)]
-    //     [DoubleEditor]
-    //     [Aggregate(typeof(StockSummaryOrderAggregate))]
-    //     public double OnOrder { get; set; }
-    //
-    //     [EditorSequence(7)]
-    //     [DoubleEditor]
-    //     [Aggregate(typeof(StockSummaryOrderValue))]
-    //     public double OrderValue { get; set; }
-    //
-    //     [EditorSequence(8)]
-    //     [Aggregate(typeof(StockSummaryReceivedAggregate))]
-    //     [DoubleEditor(Editable = Editable.Hidden)]
-    //     public double Received { get; set; }
-    //
-    //     [EditorSequence(9)]
-    //     [Aggregate(typeof(StockSummaryIssuedAggregate))]
-    //     [DoubleEditor(Editable = Editable.Hidden)]
-    //     public double Issued { get; set; }
-    //
-    //     [EditorSequence(10)]
-    //     [DoubleEditor]
-    //     [Formula(typeof(StockSummaryBalanceRequiredFormula))]
-    //     public double BalanceRequired { get; set; }
-    //
-    //     [EditorSequence(11)]
-    //     [Aggregate(typeof(StockSummaryReservedStockAggregate))]
-    //     [DoubleEditor(Editable = Editable.Hidden)]
-    //     public double ReservedStock { get; set; }
-    //
-    //     [EditorSequence(12)]
-    //     [Aggregate(typeof(StockSummaryFreeStockAggregate))]
-    //     [DoubleEditor(Editable = Editable.Hidden)]
-    //     public double FreeStock { get; set; }
-    //     
-    //     protected override void Init()
-    //     {
-    //         base.Init();
-    //         Style = new ProductStyleLink();
-    //     }
-    //     
-    // }
+    public class StockSummaryBOMAggregate : CoreAggregate<StockSummary, JobBillOfMaterialsItem, double>
+    {
+        public override Expression<Func<JobBillOfMaterialsItem, double>> Aggregate => x => x.Quantity;
+
+        public override AggregateCalculation Calculation => AggregateCalculation.Sum;
+
+        public override Dictionary<Expression<Func<JobBillOfMaterialsItem, object>>, Expression<Func<StockSummary, object>>> Links =>
+            new Dictionary<Expression<Func<JobBillOfMaterialsItem, object>>, Expression<Func<StockSummary, object>>>()
+            {
+                { JobBillOfMaterialsItem => JobBillOfMaterialsItem.Job.ID, summary => summary.Job.ID },
+                { JobBillOfMaterialsItem => JobBillOfMaterialsItem.Product.ID, summary => summary.Product.ID },
+                { JobBillOfMaterialsItem => JobBillOfMaterialsItem.Style.ID, summary => summary.Style.ID },
+                { JobBillOfMaterialsItem => JobBillOfMaterialsItem.Dimensions.UnitSize, summary => summary.Dimensions.UnitSize }
+            };
+
+        public override Filter<JobBillOfMaterialsItem> Filter =>
+            new Filter<JobBillOfMaterialsItem>(x => x.BillOfMaterials.Approved).IsNotEqualTo(DateTime.MinValue);
+    }
+    public class StockSummaryIssuedAggregate : CoreAggregate<StockSummary, StockMovement, double>
+    {
+        public override Expression<Func<StockMovement, double>> Aggregate => x => x.Issued;
+
+        public override Filter<StockMovement> Filter => new Filter<StockMovement>(x => x.IsTransfer).IsEqualTo(false);
+
+        public override AggregateCalculation Calculation => AggregateCalculation.Sum;
+
+        public override Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>> Links =>
+            new Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>>()
+            {
+                { StockMovement => StockMovement.Job.ID, summary => summary.Job.ID },
+                { StockMovement => StockMovement.Product.ID, summary => summary.Product.ID },
+                { StockMovement => StockMovement.Style.ID, summary => summary.Style.ID },
+                { StockMovement => StockMovement.Dimensions.UnitSize, summary => summary.Dimensions.UnitSize }
+            };
+    }
+    public class StockSummaryAllStockAggregate : CoreAggregate<StockSummary, StockMovement, double>
+    {
+        public override Expression<Func<StockMovement, double>> Aggregate => x => x.Units;
+
+        public override AggregateCalculation Calculation => AggregateCalculation.Sum;
+
+        public override Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>> Links =>
+            new Dictionary<Expression<Func<StockMovement, object>>, Expression<Func<StockSummary, object>>>()
+            {
+                { StockMovement => StockMovement.Job.ID, summary => summary.Job.ID },
+                { StockMovement => StockMovement.Product.ID, summary => summary.Product.ID },
+                { StockMovement => StockMovement.Style.ID, summary => summary.Style.ID },
+                { StockMovement => StockMovement.Dimensions.UnitSize, summary => summary.Dimensions.UnitSize }
+            };
+    }
+
+    public class StockSummaryOrderAggregate : CoreAggregate<StockSummary, PurchaseOrderItem, double>
+    {
+        public override Expression<Func<PurchaseOrderItem, double>> Aggregate => x => x.Qty;
+
+        public override AggregateCalculation Calculation => AggregateCalculation.Sum;
+
+        public override Dictionary<Expression<Func<PurchaseOrderItem, object>>, Expression<Func<StockSummary, object>>> Links =>
+            new Dictionary<Expression<Func<PurchaseOrderItem, object>>, Expression<Func<StockSummary, object>>>()
+            {
+                { PurchaseOrderItem => PurchaseOrderItem.Job.ID, summary => summary.Job.ID },
+                { PurchaseOrderItem => PurchaseOrderItem.Product.ID, summary => summary.Product.ID },
+                { PurchaseOrderItem => PurchaseOrderItem.Style.ID, summary => summary.Style.ID },
+                { PurchaseOrderItem => PurchaseOrderItem.Dimensions.UnitSize, summary => summary.Dimensions.UnitSize }
+            };
+
+        public override Filter<PurchaseOrderItem> Filter => new Filter<PurchaseOrderItem>(x => x.ReceivedDate).IsEqualTo(DateTime.MinValue);
+    }
+
+    public class StockSummaryTotalRequiredFormula : IFormula<StockSummary, double>
+    {
+        public Expression<Func<StockSummary, double>> Value => x => x.Product.MinimumStockLevel;
+
+        public Expression<Func<StockSummary, double>>[] Modifiers => new Expression<Func<StockSummary, double>>[]
+        {
+            x => x.BillOfMaterials
+        };
+
+        public FormulaOperator Operator => FormulaOperator.Add;
+
+        public FormulaType Type => FormulaType.Virtual;
+    }
+
+    public class StockSummaryTotalStockFormula : IFormula<StockSummary, double>
+    {
+        public Expression<Func<StockSummary, double>> Value => x => x.Issued;
+
+        public Expression<Func<StockSummary, double>>[] Modifiers => new Expression<Func<StockSummary, double>>[]
+        {
+            x => x.AllStock,
+            x => x.OnOrder
+        };
+
+        public FormulaOperator Operator => FormulaOperator.Add;
+
+        public FormulaType Type => FormulaType.Virtual;
+    }
+
+    public class StockSummaryBalanceAvailableFormula : IFormula<StockSummary, double>
+    {
+        public Expression<Func<StockSummary, double>> Value => x => x.TotalStock;
+
+        public Expression<Func<StockSummary, double>>[] Modifiers => new Expression<Func<StockSummary, double>>[]
+        {
+            x => x.TotalRequired
+        };
+
+        public FormulaOperator Operator => FormulaOperator.Subtract;
+
+        public FormulaType Type => FormulaType.Virtual;
+    }
+
+    public class StockSummaryUnionGenerator : AutoEntityUnionGenerator<IStockSummary>
+    {
+        protected override void Configure()
+        {
+            AddTable<StockMovement>();
+            AddTable<JobBillOfMaterialsItem>();
+            AddTable<JobRequisitionItem>();
+            AddTable<PurchaseOrderItem>();
+        }
+
+        public override bool Distinct => true;
+
+        public override Column<IStockSummary>[] IDColumns => new Column<IStockSummary>[]
+        {
+            new Column<IStockSummary>(x => x.Job.ID),
+            new Column<IStockSummary>(x => x.Product.ID),
+            new Column<IStockSummary>(x => x.Style.ID),
+            new Column<IStockSummary>(x => x.Dimensions.Unit.ID),
+            new Column<IStockSummary>(x => x.Dimensions.Quantity),
+            new Column<IStockSummary>(x => x.Dimensions.Length),
+            new Column<IStockSummary>(x => x.Dimensions.Width),
+            new Column<IStockSummary>(x => x.Dimensions.Height),
+            new Column<IStockSummary>(x => x.Dimensions.Weight)
+        };
+    }
+
+    public interface IStockSummary
+    {
+        JobLink Job { get; set; }
+
+        ProductLink Product { get; set; }
+
+        ProductStyleLink Style { get; set; }
+
+        StockDimensions Dimensions { get; set; }
+    }
+
+    [UserTracking(typeof(Product))]
+    [AutoEntity(typeof(StockSummaryUnionGenerator))]
+    public class StockSummary : StockEntity, IStockSummary, IRemotable, IPersistent
+    {
+
+        [NullEditor]
+        public JobLink Job { get; set; }
+
+        [EditorSequence(1)]
+        public override ProductLink Product { get; set; }
+
+        [EditorSequence(2)]
+        public ProductStyleLink Style { get; set; }
+
+        [EditorSequence(3)]
+        [RequiredColumn]
+        [DimensionsEditor(typeof(StockDimensions), AllowEditingUnit = false)]
+        public override StockDimensions Dimensions { get; set; }
+
+        [EditorSequence(4)]
+        [DoubleEditor]
+        [Aggregate(typeof(StockSummaryBOMAggregate))]
+        public double BillOfMaterials { get; set; }
+
+        [EditorSequence(5)]
+        [Aggregate(typeof(StockSummaryIssuedAggregate))]
+        [DoubleEditor(Editable = Editable.Hidden)]
+        public double Issued { get; set; }
+
+        [EditorSequence(6)]
+        [Aggregate(typeof(StockSummaryAllStockAggregate))]
+        [DoubleEditor(Editable = Editable.Hidden)]
+        public double AllStock { get; set; }
+
+        [EditorSequence(7)]
+        [DoubleEditor]
+        [Aggregate(typeof(StockSummaryOrderAggregate))]
+        public double OnOrder { get; set; }
+
+        [NullEditor]
+        [Formula(typeof(StockSummaryTotalRequiredFormula))]
+        public double TotalRequired { get; set; }
+
+        [NullEditor]
+        [Formula(typeof(StockSummaryTotalStockFormula))]
+        public double TotalStock { get; set; }
+
+        [EditorSequence(8)]
+        [DoubleEditor]
+        [Formula(typeof(StockSummaryBalanceAvailableFormula))]
+        public double BalanceAvailable { get; set; }
+
+        protected override void Init()
+        {
+            base.Init();
+            Job = new JobLink();
+            Style = new ProductStyleLink();
+        }
+    }
 }

prs.desktop/Panels/StockSummary/StockSummaryGrid.cs

@@ -9,12 +9,13 @@ using InABox.Core;
 using InABox.DynamicGrid;
 using PRSDesktop.WidgetGroups;
 using Syncfusion.Data.Extensions;
+using static org.sqlite.Function;
 
 namespace PRSDesktop
 {
 
     
-    public class StockSummaryGrid : DynamicDataGrid<JobMaterial>, IDataModelSource
+    public class StockSummaryGrid : DynamicDataGrid<StockSummary>, IDataModelSource
     {
         
         public Guid[] GroupIDs { get; set; }
@@ -42,101 +43,134 @@ namespace PRSDesktop
             
             HiddenColumns.Add(x => x.Product.Image.ID);
             HiddenColumns.Add(x => x.Product.Image.FileName);
-            ActionColumns.Add(new DynamicImagePreviewColumn<JobMaterial>(x => x.Product.Image)
+            ActionColumns.Add(new DynamicImagePreviewColumn<StockSummary>(x => x.Product.Image)
                 { Position = DynamicActionColumnPosition.Start });
             
             OnCellDoubleClick += StockSummaryGrid_OnCellDoubleClick;
         }
 
-        private void StockSummaryGrid_OnCellDoubleClick(object sender, DynamicGridCellClickEventArgs args)
+        protected override void GenerateColumns(DynamicGridColumns columns)
         {
-            if(args.Column.ColumnName == "BillOfMaterials"
-                || args.Column.ColumnName == "TotalRequired"
-                || args.Column.ColumnName == "ReservedStock"
-                || args.Column.ColumnName == "OnOrder"
-                || args.Column.ColumnName == "Issued"
-                || args.Column.ColumnName == "Received"
-                || args.Column.ColumnName == "FreeStock")
-            {
-                if(DatabaseSchema.Property(typeof(JobMaterial), args.Column.ColumnName) is StandardProperty property)
-                {
-                    var aggregate = property.Property.GetCustomAttribute<AggregateAttribute>();
-                    if(aggregate is not null)
-                    {
-                        var entityType = aggregate.Source;
-                        var filter = Filter.Create(entityType).All();
-                        
-                        var aggFilter = aggregate.Filter;
-                        if (aggFilter is not null)
-                            filter.And(aggFilter);
+            columns.Add<StockSummary, string>(x => x.Product.Code, 120, "Product Code", "", Alignment.MiddleCenter);
+            columns.Add<StockSummary, string>(x => x.Style.Code, 120, "Style Code", "", Alignment.MiddleCenter);
+            columns.Add<StockSummary, string>(x => x.Dimensions.UnitSize, 120, "Unit Size", "", Alignment.MiddleCenter);
+            columns.Add<StockSummary, int>(x => x.Product.MinimumStockLevel, 120, "Minimum Stock Level", "", Alignment.MiddleCenter);
+            columns.Add<StockSummary, double>(x => x.BillOfMaterials, 120, "BOM", "", Alignment.MiddleCenter);
+            columns.Add<StockSummary, double>(x => x.Issued, 120, "Issued", "", Alignment.MiddleCenter);
+            columns.Add<StockSummary, double>(x => x.AllStock, 120, "Stock", "", Alignment.MiddleCenter);
+            columns.Add<StockSummary, double>(x => x.OnOrder, 120, "On Order", "", Alignment.MiddleCenter);
+            columns.Add<StockSummary, double>(x => x.BalanceAvailable, 120, "Balance Available", "", Alignment.MiddleCenter);
+        }
 
-                        var links = aggregate.Links;
+        private void ShowAggregateScreen(CoreRow row, DynamicGridColumn column, AggregateAttribute aggregate)
+        {
+            var entityType = aggregate.Source;
+            var filter = Filter.Create(entityType).All();
 
-                        foreach (var (pLeft, pStockSummary) in aggregate.Links)
-                        {
-                            var value = args.Row[pStockSummary];
-                            filter.And(pLeft).IsEqualTo(value);
-                        }
+            var aggFilter = aggregate.Filter;
+            if (aggFilter is not null)
+                filter.And(aggFilter);
+
+            var links = aggregate.Links;
 
-                        var grid = (Activator.CreateInstance(typeof(DynamicDataGrid<>).MakeGenericType(entityType)) as IDynamicDataGrid)!;
-                        grid.ColumnsTag = $"StockSummaryAggregate.{args.Column.ColumnName}";
-                        //DynamicGridUtils.CreateDynamicGrid(typeof(DynamicDataGrid<>), entityType);
-                        grid.Options.BeginUpdate().Clear().AddRange(DynamicGridOption.FilterRows, DynamicGridOption.SelectColumns).EndUpdate();
-                        grid.OnDefineFilter += t =>
-                        {
-                            return filter;
-                        };
 
-                        var window = DynamicGridUtils.CreateGridWindow($"Viewing {CoreUtils.Neatify(args.Column.ColumnName)} Calculation", (grid as BaseDynamicGrid)!);
-                        window.ShowDialog();
+            foreach (var (pLeft, pStockSummary) in aggregate.Links)
+            {
+                if(string.Equals(pStockSummary, CoreUtils.GetFullPropertyName<StockSummary, Guid>(x => x.Job.ID, ".")))
+                {
+                    var jobFilter = filter.And(pLeft);
+                    if (!JobIDs.Any())
+                    {
+                        jobFilter.None();
+                    }
+                    else if (!JobIDs.Contains(CoreUtils.FullGuid))
+                    {
+                        jobFilter.InList(JobIDs);
+                    }
+                }
+                else if (string.Equals(pStockSummary, CoreUtils.GetFullPropertyName<StockSummary, Guid>(x => x.Style.ID, ".")))
+                {
+                    if (HasStyle())
+                    {
+                        var value = row[pStockSummary];
+                        filter.And(pLeft).IsEqualTo(value);
                     }
                 }
+                else
+                {
+                    var value = row[pStockSummary];
+                    filter.And(pLeft).IsEqualTo(value);
+                }
             }
-            else if(args.Column.ColumnName == "BalanceRequired")
+
+            var grid = (Activator.CreateInstance(typeof(DynamicDataGrid<>).MakeGenericType(entityType)) as IDynamicDataGrid)!;
+            grid.ColumnsTag = $"StockSummaryAggregate.{column.ColumnName}";
+            //DynamicGridUtils.CreateDynamicGrid(typeof(DynamicDataGrid<>), entityType);
+            grid.Options.BeginUpdate().Clear().AddRange(DynamicGridOption.FilterRows, DynamicGridOption.SelectColumns).EndUpdate();
+            grid.OnDefineFilter += t =>
+            {
+                return filter;
+            };
+
+            var window = DynamicGridUtils.CreateGridWindow($"Viewing {CoreUtils.Neatify(column.ColumnName)} Calculation", (grid as BaseDynamicGrid)!);
+            window.ShowDialog();
+        }
+
+        private void StockSummaryGrid_OnCellDoubleClick(object sender, DynamicGridCellClickEventArgs args)
+        {
+            if(DatabaseSchema.Property(typeof(StockSummary), args.Column.ColumnName) is StandardProperty property)
             {
-                var totalRequired = (double)(args.Row["TotalRequired"] ?? 0.0);
-                var issued = (double)(args.Row["Issued"] ?? 0.0);
-                var balance = (double)(args.Row["BalanceRequired"] ?? 0.0);
-                MessageBox.Show($"BalanceRequired\n    = TotalRequired - Issued\n    = {totalRequired:F2} - {issued:F2} = {balance:F2}");
+                var aggregate = property.Property.GetCustomAttribute<AggregateAttribute>();
+                if(aggregate is not null)
+                {
+                    ShowAggregateScreen(args.Row, args.Column, aggregate);
+                }
             }
         }
-        
-        protected override void Reload(Filters<JobMaterial> criteria, Columns<JobMaterial> columns, ref SortOrder<JobMaterial>? sort,
-            Action<CoreTable?, Exception?> action)
+
+        private bool HasStyle()
+        {
+            return DataColumns().ColumnNames().Any(x => x.StartsWith("Style.") && !x.Equals("Style.ID"));
+        }
+
+        private Filters<StockSummary> GetFilters()
         {
+            var filters = new Filters<StockSummary>();
 
-            Filter<JobMaterial>? _groupfilter = !GroupIDs.Any()
-                ? new Filter<JobMaterial>().None()
+            Filter<StockSummary>? _groupfilter = !GroupIDs.Any()
+                ? new Filter<StockSummary>().None()
                 : !GroupIDs.Contains(CoreUtils.FullGuid)
-                    ? new Filter<JobMaterial>(x => x.Product.Group.ID).InList(GroupIDs)
-                    : null; 
-                               
-            Filter<JobMaterial>? _jobfilter = !JobIDs.Any()
-                ? new Filter<JobMaterial>().None()
+                    ? new Filter<StockSummary>(x => x.Product.Group.ID).InList(GroupIDs)
+                    : null;
+            filters.Add(_groupfilter);
+
+            var jobFilter = !JobIDs.Any()
+                ? new Filter<StockSummary>().None()
                 : !JobIDs.Contains(CoreUtils.FullGuid)
-                    ? new Filter<JobMaterial>(x => x.Job.ID).InList(JobIDs)
+                    ? new Filter<StockSummary>(x => x.Job.ID).InList(JobIDs)
                     : null;
+            filters.Add(jobFilter);
 
-            Filter<JobMaterial> _productfilter = new Filter<JobMaterial>(x => x.Product.ID).IsNotEqualTo(Guid.Empty);
-            
-            Filter<JobMaterial>? filter = _groupfilter == null
-                ? _jobfilter
-                : _jobfilter == null
-                    ? _groupfilter
-                    : _groupfilter.And(_jobfilter);
-            
-            filter = (filter == null)
-                ? _productfilter
-                : filter.And(_productfilter);
+            Filter<StockSummary> _productfilter = new Filter<StockSummary>(x => x.Product.ID).IsNotEqualTo(Guid.Empty);
+            filters.Add(_productfilter);
+
+            return filters;
+        }
+        
+        protected override void Reload(Filters<StockSummary> criteria, Columns<StockSummary> columns, ref SortOrder<StockSummary>? sort,
+            Action<CoreTable?, Exception?> action)
+        {
+            var filters = GetFilters();
+            var filter = filters.Combine();
             
-            var orderby = sort != null ? Serialization.Deserialize<SortOrder<JobMaterial>>(Serialization.Serialize(sort)) : null;
+            var orderby = sort != null ? Serialization.Deserialize<SortOrder<StockSummary>>(Serialization.Serialize(sort)) : null;
 
-            bool bHasStyle  = columns.ColumnNames().Any(x => x.StartsWith("Style.") && !x.Equals("Style.ID"));
+            bool bHasStyle = HasStyle();
             
-            new Client<JobMaterial>().Query(filter,columns,orderby, (o,e) =>
+            new Client<StockSummary>().Query(filter,columns,orderby, (o,e) =>
             {
                 
-                void UpdateColumn(CoreRow srcrow, CoreRow tgtrow, int colno)
+                static void UpdateColumn(CoreRow srcrow, CoreRow tgtrow, int colno)
                 {
                     if (colno != -1)
                         tgtrow.Set(colno, tgtrow.Get<double>(colno) + (double)(srcrow.Values[colno] ?? default(double)));
@@ -151,15 +185,14 @@ namespace PRSDesktop
                     int productcol = columns.IndexOf(x => x.Product.ID);
                     int stylecol = columns.IndexOf(x => x.Style.ID);
                     int unitcol = columns.IndexOf(x => x.Dimensions.UnitSize);
-                    
-                    int bomcol = columns.IndexOf(x => x.BillOfMaterials);
-                    int requiredcol = columns.IndexOf(x => x.TotalRequired);
-                    int reservedcol = columns.IndexOf(x => x.ReservedStock);
-                    int orderedcol = columns.IndexOf(x => x.OnOrder);
-                    int receivedcol = columns.IndexOf(x => x.Received);
-                    int issuedcol = columns.IndexOf(x => x.Issued);
-                    int balancecol = columns.IndexOf(x => x.BalanceRequired);
 
+                    int[] updateColumns = new int[]
+                    {
+                        columns.IndexOf(x => x.BillOfMaterials),
+                        columns.IndexOf(x => x.Issued),
+                        columns.IndexOf(x => x.AllStock),
+                        columns.IndexOf(x => x.OnOrder)
+                    };
 
                     Tuple<Guid, Guid, String>[] keys = o.Rows
                         .Select(r => new Tuple<Guid, Guid, String>(
@@ -172,11 +205,11 @@ namespace PRSDesktop
                     {
                         var rows = o.Rows.Where(r =>
                             Guid.Equals(r.Values[productcol], key.Item1) 
-                            && (bHasStyle ? Guid.Equals(r.Values[stylecol], key.Item2) : true)
+                            && (!bHasStyle || Guid.Equals(r.Values[stylecol], key.Item2))
                             && String.Equals(r.Values[unitcol], key.Item3)
                         ).ToArray();
                         
-                        CoreRow newrow = null;
+                        CoreRow? newrow = null;
                         foreach (var row in rows)
                         {
                             if (newrow == null)
@@ -186,13 +219,10 @@ namespace PRSDesktop
                             }
                             else
                             {
-                                UpdateColumn(row, newrow, bomcol);
-                                UpdateColumn(row, newrow, requiredcol);
-                                UpdateColumn(row, newrow, orderedcol);
-                                UpdateColumn(row, newrow, receivedcol);
-                                UpdateColumn(row, newrow, issuedcol);
-                                UpdateColumn(row, newrow, balancecol);
-                                UpdateColumn(row, newrow, reservedcol);
+                                foreach(var column in updateColumns)
+                                {
+                                    UpdateColumn(row, newrow, column);
+                                }
                             }
                         }
 
@@ -210,13 +240,10 @@ namespace PRSDesktop
         {
             var result = base.FilterRecord(row);
             if (result)
-                result = (result && row.Get<JobMaterial, double>(x => x.BillOfMaterials) != 0.0F) ||
-                         row.Get<JobMaterial, double>(x => x.TotalRequired) != 0.0F ||
-                         row.Get<JobMaterial, double>(x => x.BalanceRequired) != 0.0F ||
-                         row.Get<JobMaterial, double>(x => x.OnOrder) != 0.0F ||
-                         row.Get<JobMaterial, double>(x => x.Issued) != 0.0F ||
-                         row.Get<JobMaterial, double>(x => x.Received) != 0.0F ||
-                         row.Get<JobMaterial, double>(x => x.ReservedStock) != 0.0F;
+                result = (result && row.Get<StockSummary, double>(x => x.BillOfMaterials) != 0.0F) ||
+                         row.Get<StockSummary, double>(x => x.Issued) != 0.0F ||
+                         row.Get<StockSummary, double>(x => x.AllStock) != 0.0F ||
+                         row.Get<StockSummary, double>(x => x.OnOrder) != 0.0F;
             return result;
         }
         
@@ -228,7 +255,7 @@ namespace PRSDesktop
 
         public DataModel DataModel(Selection selection)
         {
-            return new AutoDataModel<JobMaterial>(null);
+            return new AutoDataModel<StockSummary>(null);
         }
         
         #endregion