Resolve "DateEditQuantity and TimeEditQuantity are removed from the app" Closes #2036 See merge request !1894