issue #22067: account for differences between invoice and return date widget