summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-01-29 18:35:14 +0100
committerChristophe Simonis <chs@odoo.com>2019-01-29 18:35:14 +0100
commitbdfef60d60d78c5e7360fdabe80e70ea208e6078 (patch)
treed6487cd949033dfa7a1f75a5458993336a6e8501 /addons/mail/static/src/js
parent95ef46096110512117a7b7dd9bc797732be36b26 (diff)
parentcd5c8a02f9560b2a8b5c39182adee7ade1bf595c (diff)
[MERGE] forward port branch saas-11.3 up to cd5c8a02f95
Diffstat (limited to 'addons/mail/static/src/js')
-rw-r--r--addons/mail/static/src/js/activity.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index b1f43e495c7..d99abb11e7d 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -273,7 +273,7 @@ var BasicActivity = AbstractField.extend({
var self = this;
var $markDoneBtn = $(ev.currentTarget);
var activityID = $markDoneBtn.data('activity-id');
- var previousActivityTypeID = $markDoneBtn.data('previous-activity-type-id');
+ var previousActivityTypeID = $markDoneBtn.data('previous-activity-type-id') || false;
var forceNextActivity = $markDoneBtn.data('force-next-activity');
if ($markDoneBtn.data('toggle') == 'collapse') {