Merge remote-tracking branch 'origin/nick' into kenric

prs.classes/SecurityDescriptors/Logistics_Descriptors.cs

@@ -78,4 +78,9 @@ namespace Comal.Classes
     public class CanReceiveConsignments : DisabledSecurityDescriptor<LogisticsLicense, Consignment>
     {
     }
+
+    [Caption("View Deliveries Module")]
+    public class CanViewDeliveriesModule : EnabledSecurityDescriptor<LogisticsLicense, Delivery>
+    {
+    }
 }

prs.desktop/MainWindow.xaml.cs

@@ -712,7 +712,7 @@ namespace PRSDesktop
                             ClientFactory.IsSupported<DeliveryItem>() && Security.IsAllowed<CanViewLogisticsReadyToGo>());
                         SetVisibility(DispatchButton, Security.CanView<Shipment>() && Security.CanView<DeliveryItem>());
                         SetVisibility(RequisitionsButton, Security.CanView<Requisition>());
-                        SetVisibility(DeliveriesButton, Security.CanView<Delivery>());
+                        SetVisibility(DeliveriesButton, Security.IsAllowed<CanViewDeliveriesModule>());
                         SetVisibility(DeliveredItemsButton,
                             ClientFactory.IsSupported<DeliveryItem>() && Security.IsAllowed<CanViewDeliveredOnSite>());
 

prs.scheduler/Scheduler.cs

@@ -20,8 +20,8 @@ namespace Comal.TaskScheduler.Shared
             CoreUtils.RegisterClasses();
             ComalUtils.RegisterClasses();
 
-            // Set the Interval to 1 hour
-            Interval = new TimeSpan(1, 0, 0);
+            // Set the Interval to 1 minute
+            Interval = new TimeSpan(0, 1, 0);
 			timer = new System.Timers.Timer(Interval.TotalMilliseconds);
 			timer.Elapsed += new ElapsedEventHandler(CheckSchedules);            
         }