PRS STORES - updates for Reservation Mgt screen

prs.stores/JobRequisitionItemStore.cs

@@ -34,6 +34,12 @@ namespace PRSStores
                 item.Status = JobRequisitionItemStatus.Cancelled;
             else if (item.Archived != DateTime.MinValue)
                 item.Status = JobRequisitionItemStatus.Archived;
+            //this can only get set from the "Create Treatment PO" custom module
+            else if (item.Status == JobRequisitionItemStatus.TreatmentOnOrder || item.Status == JobRequisitionItemStatus.TreatmentReceived)
+            {
+                if (item.PurchaseOrderItem.ReceivedDate != DateTime.MinValue)
+                    item.Status = JobRequisitionItemStatus.TreatmentReceived;
+            }
             else if (item.Ordered != DateTime.MinValue && item.PurchaseOrderItem.ReceivedDate == DateTime.MinValue)
                 item.Status = JobRequisitionItemStatus.OnOrder;
             else if (item.PurchaseOrderItem.ReceivedDate != DateTime.MinValue)
@@ -49,10 +55,15 @@ namespace PRSStores
             return item;
         }
 
+
+
         private static JobRequisitionItem CheckReservedOrTreatmentRequired(JobRequisitionItem item, CoreTable table)
         {
             if (!table.Rows.Any())
+            {
+                item.Status = JobRequisitionItemStatus.NotChecked;
                 return item;
+            }
 
             bool treatmentRequired = false;
             double total = 0;
@@ -65,7 +76,7 @@ namespace PRSStores
 
             if (total >= item.Qty)
             {
-                item.Status = JobRequisitionItemStatus.Reserved;
+                item.Status = JobRequisitionItemStatus.Allocated;
                 if (treatmentRequired)
                     item.Status = JobRequisitionItemStatus.TreatmentRequired;
             }

prs.stores/PurchaseOrderItemStore.cs

@@ -245,8 +245,11 @@ namespace Comal.Stores
         {
             base.AfterSave(entity);
 
-            if (entity.ReceivedDate.IsEmpty())
-                DeleteStockMovements(entity);
+            if (entity.ReceivedDate.IsEmpty() && entity.HasOriginalValue<PurchaseOrderItem>("RecievedDate"))
+            {                 
+                if(DateTime.Parse(entity.OriginalValues["RecievedDate"].ToString()) != entity.ReceivedDate)
+                    DeleteStockMovements(entity);
+            }            
             else
             {
                 UpdateStockMovements(entity);

prs.stores/StockMovementStore.cs

@@ -22,7 +22,8 @@ namespace PRSStores
                     x => x.PurchaseOrderItem.ReceivedDate, 
                     x => x.Ordered,
                     x => x.Qty,
-                    x => x.Style.ID
+                    x => x.Style.ID, 
+                    x => x.Status
                     )
                     );
                 var item = table.Rows.FirstOrDefault().ToObject<JobRequisitionItem>();