Merge commit '0a04384570848eb24e2d3936bf7e47c60688bc4a' into frank

prs.classes/Entities/Job/Requisitions/JobRequisitionItemPurchaseOrderItem.cs

@@ -7,51 +7,6 @@ using System.Text;
 namespace Comal.Classes
 {
     
-    public class JobRequisitionItemPurchaseOrderLink : EntityLink<PurchaseOrder>
-    {
-        
-        [NullEditor]
-        public override Guid ID { get; set; }
-        
-        [NullEditor]
-        public string PONumber { get; set; }
-        
-        [NullEditor]
-        public DateTime ClosedDate { get; set; }
-        
-    }
-    
-    public class JobRequisitionItemProductLink : EntityLink<Product>
-    {
-        [NullEditor]
-        public override Guid ID { get; set; }
-        
-        [NullEditor]
-        public String Code { get; set; }
-    }
-    
-    public class JobRequisitionItemPurchaseOrderItemLink : EntityLink<PurchaseOrderItem>
-    {
-        [NullEditor]
-        public override Guid ID { get; set; }
-        
-        [NullEditor]
-        public JobRequisitionItemPurchaseOrderLink PurchaseOrderLink { get; set; }
-        
-        [NullEditor]
-        public JobRequisitionItemProductLink Product { get; set; }
-
-        [NullEditor]
-        public StockDimensions Dimensions { get; set; }
-
-        [NullEditor]
-        public double Qty { get; set; }
-
-        [NullEditor]
-        public DateTime ReceivedDate { get; set; }
-        
-    }
-    
     public class JobRequisitionItemPurchaseOrderItem : Entity, IRemotable, IPersistent, IOneToMany<JobRequisitionItem>, ILicense<ProjectManagementLicense>
     {
         [NullEditor]
@@ -80,6 +35,6 @@ namespace Comal.Classes
         }
         [LookupDefinition(typeof(PurchaseOrderItemLookup))]
         [EntityRelationship(DeleteAction.Cascade)]
-        public JobRequisitionItemPurchaseOrderItemLink PurchaseOrderItem { get; set; }
+        public PurchaseOrderItemLink PurchaseOrderItem { get; set; }
     }
 }

prs.classes/Entities/PurchaseOrder/PurchaseOrderItemLink.cs

@@ -34,6 +34,8 @@ namespace Comal.Classes
         public string ReceivedReference { get; set; }
 
         public ProductLink Product { get; set; }
+
+        public StockDimensions Dimensions { get; set; }
         
         public PurchaseOrderLink PurchaseOrderLink { get; set; }
         

prs.desktop/Panels/Stock Forecast/StockForecastGrid.cs

@@ -247,7 +247,6 @@ public class StockForecastGrid : DynamicDataGrid<ProductInstance>, IDataModelSou
             Position = DynamicActionColumnPosition.End, 
             Tag = tag,
             HeaderText = header,
-            Filters = [""],
             FilterRecord = (row, filters) =>
             {
                 if (filters.Length == 1 && filters[0].Length == 0) return true;
@@ -581,7 +580,7 @@ public class StockForecastGrid : DynamicDataGrid<ProductInstance>, IDataModelSou
 
     private string[] GetColumnFilterItems(ColumnTag tag)
     {
-        var selectedIDs = FilterRows(Data.Rows).Select(x => x.Get<ProductInstance, Guid>(x => x.ID));
+        var selectedIDs = Data.Rows.Select(x => x.Get<ProductInstance, Guid>(x => x.ID));
 
         var items = new HashSet<string>();
         foreach(var id in selectedIDs)

prs.shared/Posters/MYOB/SupplierMYOBPoster.cs

@@ -287,10 +287,31 @@ public class SupplierMYOBPoster : IMYOBPoster<Supplier, SupplierMYOBPosterSettin
                         myobSupplier = myobSuppliers.Items[0];
                         isNew = false;
                     }
+                    else if(service.Query(
+                        ConnectionData,
+                        new Filter<MYOBSupplier>(x => x.CompanyName).IsEqualTo(supplier.Name)
+                            .And(new Filter<MYOBSupplier>(x => x.DisplayID).IsEqualTo(null)
+                                .Or(x => x.DisplayID).IsEqualTo("")
+                                .Or(x => x.DisplayID).IsEqualTo("*None")),
+                        top: 1).Get(out myobSuppliers, out error))
+                    {
+                        if(myobSuppliers.Items.Length > 0)
+                        {
+                            myobSupplier = myobSuppliers.Items[0];
+                            myobSupplier.DisplayID = supplier.Code;
+                            isNew = false;
+                        }
+                        else
+                        {
+                            myobSupplier = new MYOBSupplier();
+                            isNew = true;
+                        }
+                    }
                     else
                     {
-                        myobSupplier = new MYOBSupplier();
-                        isNew = true;
+                        CoreUtils.LogException("", error);
+                        results.AddFailed(supplier, error.Message);
+                        continue;
                     }
                 }
                 else

prs.stores/RequisitionStore.cs

@@ -52,6 +52,7 @@ namespace Comal.Stores
                         .Add(x => x.Location.ID)
                         .Add(x => x.Style.ID)
                         .Add(x => x.Product.ID)
+                        .Add(x => x.Product.NonStock)
                         .Add(x => x.JobRequisitionItem.ID)
                         .Add(x =>x.JobLink.ID)
                         .AddDimensionsColumns(x => x.Dimensions, Dimensions.ColumnsType.Local)
@@ -274,6 +275,8 @@ namespace Comal.Stores
             var updates = new List<StockMovement>();
             foreach (var item in items)
             {
+                if (item.Product.NonStock) continue;
+
                 var holdingQty = 0.0;
                 if(item.JobLink.ID != Guid.Empty)
                 {