J008 - 'Open'-ing job from this screen may not set the expiration date properly

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -35,17 +35,17 @@ public class SaveJobFP extends SaveFP
 
         Job oldJob  = (Job) job.getEarliestBackup();
         
+        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && (job.getJobStatus() == JobStatus.OPEN || openJob==Boolean.TRUE))
+        {
+            job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
+            job.setOpenDate(new Date());
+            
             if(openJob==Boolean.TRUE)
             {
                 job.setJobStatus(JobStatus.OPEN);
 
                 LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"Job status changed as Open. ", job );
             }
-        
-        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && job.getJobStatus() == JobStatus.OPEN)
-        {
-            job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
-            job.setOpenDate(new Date());
         }
         
         if(job.getJobStatus() == JobStatus.OPEN && job.getShortenedURL() == null)