Skip to content
Permalink
Browse files

[MERGE] forward port branch 11.0 up to 492c5b6

  • Loading branch information...
KangOl committed Apr 9, 2019
2 parents 4c61621 + 492c5b6 commit 372ecf4c09672ee088ec2d61e9555e70ce2cde3b
Showing with 4 additions and 1 deletion.
  1. +1 −1 addons/calendar/models/res_partner.py
  2. +3 −0 addons/survey/static/src/js/survey.js
@@ -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):
@@ -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);
});

0 comments on commit 372ecf4

Please sign in to comment.
You can’t perform that action at this time.