Order Supply - validation issue fix