[UNREVIEWED][IMP] Replace delivery_date by two fields date_from date_to