Restructure order point form in order to be coherent with field dependencies

issue4056
review9511002