diff --git a/fetchmail_thread_default/__manifest__.py b/fetchmail_thread_default/__manifest__.py index 5e012ebc0..f1078eaa0 100644 --- a/fetchmail_thread_default/__manifest__.py +++ b/fetchmail_thread_default/__manifest__.py @@ -5,7 +5,7 @@ "summary": "Post unkonwn messages to an existing thread", "version": "13.0.1.0.0", "category": "Discuss", - "website": "https://www.github.com/social", + "website": "https://github.com/OCA/social", "author": "Tecnativa, Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, diff --git a/mail_activity_done/__manifest__.py b/mail_activity_done/__manifest__.py index 3a9a26ed0..52ac64322 100644 --- a/mail_activity_done/__manifest__.py +++ b/mail_activity_done/__manifest__.py @@ -6,6 +6,7 @@ "author": "ForgeFlow, Odoo Community Association (OCA)", "license": "LGPL-3", "category": "Discuss", + "website": "https://github.com/OCA/social", "depends": ["mail"], "data": ["views/templates.xml", "views/mail_activity_views.xml"], "pre_init_hook": "pre_init_hook", diff --git a/mail_activity_done/static/src/js/mail_activity.js b/mail_activity_done/static/src/js/mail_activity.js index 061424596..38f77f0a5 100644 --- a/mail_activity_done/static/src/js/mail_activity.js +++ b/mail_activity_done/static/src/js/mail_activity.js @@ -23,25 +23,20 @@ odoo.define("mail.Activity.done", function(require) { var diff = deadline.diff(today, "days", true); if (diff === 0) { to_display = _t("Today"); - } else { + } else if (diff < 0) { // This block is for overdue - if (diff < 0) { - // eslint-disable-line no-lonely-if - if (diff === -1) { - to_display = _t("Yesterday"); - } else { - to_display = _.str.sprintf( - _t("%d days overdue"), - Math.abs(diff) - ); - } - // This block is for due - } else if (diff === 1) { - // eslint-disable-line no-lonely-if - to_display = _t("Tomorrow"); + // eslint-disable-line no-lonely-if + if (diff === -1) { + to_display = _t("Yesterday"); } else { - to_display = _.str.sprintf(_t("Due in %d days"), Math.abs(diff)); + to_display = _.str.sprintf(_t("%d days overdue"), Math.abs(diff)); } + // This block is for due + } else if (diff === 1) { + // eslint-disable-line no-lonely-if + to_display = _t("Tomorrow"); + } else { + to_display = _.str.sprintf(_t("Due in %d days"), Math.abs(diff)); } activity.label_delay = to_display; }); diff --git a/mail_activity_done/views/templates.xml b/mail_activity_done/views/templates.xml index 8211773c4..4a27f38da 100644 --- a/mail_activity_done/views/templates.xml +++ b/mail_activity_done/views/templates.xml @@ -1,12 +1,19 @@ - + -