Просмотр исходного кода

Fixed Delivery Panel "Blank Items" Issue
Added Version number to PRS Licensing GUI

frogsoftware 1 год назад
Родитель
Сommit
3bce21afb6

+ 1 - 1
prs.desktop/Panels/Delivery/DeliveryRackList.cs

@@ -74,7 +74,7 @@ internal class DeliveryRackList : DynamicDataGrid<Shipment>, IMasterDetailContro
                 shipment.Delivery.Synchronise(Master);
             }
 
-            var items = new Client<DeliveryItem>().Query(filter, new Columns<DeliveryItem>(x => x.Delivery.ID)).ToArray<DeliveryItem>();
+            var items = new Client<DeliveryItem>().Query(filter).ToArray<DeliveryItem>();
             foreach (var item in items)
             {
                 item.Delivery.ID = Master.ID;

+ 4 - 12
prs.desktop/Panels/Requisitions/RequisitionPanel.xaml.cs

@@ -500,18 +500,10 @@ public partial class RequisitionPanel : UserControl, IPanel<Requisition>
                     MessageBoxImage.Error);
                 return;
             }
-
-            if (!_requisition.Filled.IsEmpty() && !_requisition.Archived.IsEmpty())
-            {
-                if (MessageBox.Show("This will remove this requisition from this list.\nAre you sure you wish to continue?", "Close Requisition?",
-                        MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
-                    return;
-            }
-            else
-            {
-                if (MessageBox.Show("Update Stock Movements?", "Confirm", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
-                    return;
-            }
+            
+            if (MessageBox.Show("Update Stock Movements?", "Confirm", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+                return;
+            
 
             _requisition.StockUpdated = DateTime.Now;
         }

+ 1 - 1
prs.licensing/GUI/Console.xaml.cs

@@ -103,7 +103,7 @@ public partial class Console : Window, INotifyPropertyChanged
     
     private void Window_Loaded(object sender, RoutedEventArgs e)
     {
-        
+        Title = Title = $"PRS Licensing (Release {CoreUtils.GetVersion()})";
         var isUpdateAvailable = Update.CheckForUpdates(
             GetUpdateLocation, GetLatestVersion, GetReleaseNotes, null, null, false, "");