Explorar el Código

Consignment PO links finished

Kenric Nugteren hace 1 año
padre
commit
c761e6df36

+ 1 - 1
prs.desktop/Panels/Consignments/ConsignmentItemGrid.cs

@@ -119,7 +119,7 @@ public class ConsignmentItemGrid : DynamicDataGrid<PurchaseOrderItem>
         {
             Progress.Show("Adding Order Items");
 
-            var items = dialog.Items();
+            var items = dialog.Items(new Columns<PurchaseOrderItem>(x => x.ID).Add(x => x.Consignment.ID));
             foreach (var item in items)
                 item.Consignment.ID = ConsignmentID;
             Progress.SetMessage("Updating Items");

+ 5 - 5
prs.desktop/Panels/Consignments/ConsignmentsPanel.xaml.cs

@@ -48,7 +48,7 @@ namespace PRSDesktop
             {
                 var row = e.Rows?.FirstOrDefault();
                 ConsignmentItems.ConsignmentID = row != null ? row.Get<Consignment, Guid>(x => x.ID) : CoreUtils.FullGuid;
-                ConsignmentItems.Completed = row == null || row.Get<Consignment, DateTime>(x => x.Closed).IsEmpty();
+                ConsignmentItems.Completed = row == null || !row.Get<Consignment, DateTime>(x => x.Closed).IsEmpty();
                 LoadConsigmment(row);
                 ConsignmentItems.Refresh(false, true);
             };
@@ -58,7 +58,7 @@ namespace PRSDesktop
 
         public bool IsReady { get; set; }
 
-        public event DataModelUpdateEvent OnUpdateDataModel;
+        public event DataModelUpdateEvent? OnUpdateDataModel;
 
         public void CreateToolbarButtons(IPanelHost host)
         {
@@ -136,10 +136,10 @@ namespace PRSDesktop
         {
         }
 
-        private void ConsignmentItemsChanged(object sender, EventArgs args)
+        private void ConsignmentItemsChanged(object? sender, EventArgs args)
         {
             var consrow = Consignments.Data.Rows.FirstOrDefault(r => r.Get<Consignment, Guid>(c => c.ID).Equals(ConsignmentItems.ConsignmentID));
-            if (consrow != null)
+            if (consrow is null)
             {
                 MessageBox.Show("Cannot find Consignment");
                 return;
@@ -183,7 +183,7 @@ namespace PRSDesktop
             return date.IsEmpty() ? "" : date.ToShortDateString();
         }
 
-        private void LoadConsigmment(CoreRow row)
+        private void LoadConsigmment(CoreRow? row)
         {
             SupplierCode.Text = row == null ? "" : row.Get<Consignment, string>(x => x.Supplier.Code);
             SupplierName.Text = row == null ? "" : row.Get<Consignment, string>(x => x.Supplier.Name);

+ 1 - 2
prs.desktop/Panels/Suppliers/PurchaseOrders/SupplierPurchaseOrderItemOneToMany.cs

@@ -203,8 +203,7 @@ namespace PRSDesktop
                 var popupList = new PopupList(typeof(Consignment), Guid.Empty, Array.Empty<string>());
                 popupList.OnDefineFilter += type =>
                 {
-                    return new Filter<Consignment>(x => x.Closed).IsNotEqualTo(DateTime.MinValue)
-                        .Or(x => x.ActualWarehouseArrival).IsNotEqualTo(DateTime.MinValue);
+                    return new Filter<Consignment>(x => x.Closed).IsNotEqualTo(DateTime.MinValue);
                 };
                 if (popupList.ShowDialog() == true)
                 {