summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-04-09 20:34:03 +0200
committerChristophe Simonis <chs@odoo.com>2019-04-09 20:34:03 +0200
commit372ecf4c09672ee088ec2d61e9555e70ce2cde3b (patch)
treed41c79e66a12f82f7690259ceda8fff1a51d5c17 /addons
parent4c61621efbb079a4298db99d5c0b30b90e072bb9 (diff)
parent492c5b6e17d709e2a58cc7595816a29c1b242033 (diff)
[MERGE] forward port branch 11.0 up to 492c5b6e17d
Diffstat (limited to 'addons')
-rw-r--r--addons/calendar/models/res_partner.py2
-rw-r--r--addons/survey/static/src/js/survey.js3
2 files changed, 4 insertions, 1 deletions
diff --git a/addons/calendar/models/res_partner.py b/addons/calendar/models/res_partner.py
index 403d70b18fc..261b955fc8f 100644
--- a/addons/calendar/models/res_partner.py
+++ b/addons/calendar/models/res_partner.py
@@ -11,7 +11,7 @@ from odoo.addons.calendar.models.calendar import get_real_ids
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):
diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
index e8d4972abcd..8158ce75da5 100644
--- a/addons/survey/static/src/js/survey.js
+++ b/addons/survey/static/src/js/survey.js
@@ -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);
});