Skip to content

Commit

Permalink
[MERGE] forward port branch saas-11.3 up to 372ecf4
Browse files Browse the repository at this point in the history
  • Loading branch information
KangOl committed Apr 9, 2019
2 parents 742fa44 + 372ecf4 commit c1c322d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion addons/calendar/models/res_partner.py
Expand Up @@ -11,7 +11,7 @@
class Partner(models.Model):
_inherit = 'res.partner'

calendar_last_notif_ack = fields.Datetime('Last notification marked as read from base Calendar')
calendar_last_notif_ack = fields.Datetime('Last notification marked as read from base Calendar', default=fields.Datetime.now)

@api.multi
def get_attendee_detail(self, meeting_id):
Expand Down
3 changes: 3 additions & 0 deletions addons/survey/static/src/js/survey.js
Expand Up @@ -97,6 +97,9 @@ if(!the_form.length) {
}

// checkboxes and radios
the_form.find("input[name^='" + key + "_'][type='checkbox']").each(function(){
$(this).val(value);
});
the_form.find("input[name=" + key + "][type!='text']").each(function(){
$(this).val(value);
});
Expand Down

0 comments on commit c1c322d

Please sign in to comment.