فهرست منبع

Bugfixes for 8.13a

frogsoftware 11 ماه پیش
والد
کامیت
5614bc909c

+ 2 - 6
prs.classes/Entities/Manufacturing/ManufacturingPacket/ManufacturingPacketStage.cs

@@ -74,16 +74,12 @@ namespace Comal.Classes
 
         public double PercentageComplete { get; set; }
 
-        [DoNotPersist]
-        [DoNotSerialize]
         [NullEditor]
-        //[Formula(typeof(ManufacturingPacketStagePercentageRemaining))]
+        [Formula(typeof(ManufacturingPacketStagePercentageRemaining))]
         public double PercentageRemaining { get; set; }
 
-        [DoNotPersist]
-        [DoNotSerialize]
         [TimeOfDayEditor(Editable = Editable.Hidden)]
-        //[Formula(typeof(ManufacturingPacketStageTimeRemaining))]
+        [Formula(typeof(ManufacturingPacketStageTimeRemaining))]
         public TimeSpan TimeRemaining { get; set; }
 
         public SequenceType SequenceType { get; set; }

+ 6 - 2
prs.desktop/Panels/Jobs/Requisitions/JobRequisitionItemGrid.cs

@@ -85,8 +85,12 @@ internal class JobRequisitionItemGrid : DynamicDataGrid<JobRequisitionItem>, IMa
         }
 
         var picklist = new Requisition();
-        picklist.JobLink.ID = Job.ID;
-        picklist.JobLink.Synchronise(Job);
+        
+        if (Job != null)
+            picklist.JobLink.CopyFrom(Job);
+        else
+            picklist.JobLink.CopyFrom(Master?.Job ?? new JobLink());
+
         if (new RequisitionGrid().EditItems(new Requisition[] { picklist }))
         {
             Progress.ShowModal("Creating Picking List", (progress) =>