Merge branch '6055-the-calendar-must-be-replaced-by-classic-fields-in-template-so-we-can-use-macros' into '1.4-dev'

Resolve "The calendar must be replaced by classic fields in template so we can use macros"

See merge request fusiondirectory/fd!726