CalendarWeek Edit and Products adaptation

new