Merge commit '1f5684a879a6b51ee318659048033d16f00ae70a' into frank

prs.classes/Entities/Manufacturing/ManufacturingPacket/ManufacturingPacketStage.cs

@@ -150,12 +150,12 @@ namespace Comal.Classes
 
         public UserLink FormCompletedBy { get; set; }
 
-        public IDigitalFormDataModel CreateDataModel(Entity? parent = null)
+        public IDigitalFormDataModel CreateDataModel(DigitalFormVariable[] variables, Entity? parent = null)
         {
             var t = typeof(DigitalFormDataModel<,,>).MakeGenericType(typeof(ManufacturingPacket), typeof(ManufacturingPacketLink), GetType());
             if (parent != null)
-                return (Activator.CreateInstance(t, parent, this) as IDigitalFormDataModel)!;
-            return (Activator.CreateInstance(t, Parent.ID, ID) as IDigitalFormDataModel)!;
+                return (Activator.CreateInstance(t, parent, this, variables) as IDigitalFormDataModel)!;
+            return (Activator.CreateInstance(t, Parent.ID, ID, variables) as IDigitalFormDataModel)!;
         }
 
         [NullEditor]

prs.desktop/Panels/LeaveRequests/LeaveCalendar.xaml.cs

@@ -597,8 +597,7 @@ namespace PRSDesktop
                             leaveform.Form.Synchronise(activityform.Form);
 
                             var model =
-                                new DigitalFormDataModel<LeaveRequest, LeaveRequestLink, LeaveRequestForm>(leave,
-                                    leaveform);
+                                new DigitalFormDataModel<LeaveRequest, LeaveRequestLink, LeaveRequestForm>(leave, leaveform, []);
                             leaveform.Description = model.EvaluateExpression(activityform.Form.DescriptionExpression) ?? activityform.Form.Description;
                             updates.Add(leaveform);
                         }