Merge pull request #7524 from KanchanChauhan/date-fixes

Date fixes in Production Order