[MERGE] forward port of branch saas-9 up to 87a01c7

2 files changed, 11 insertions, 2 deletions

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 3f7c9a0630a..bb37fc95569 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -630,7 +630,7 @@ var CalendarView = View.extend({
                 r.className = 'o_calendar_color_'+ this.get_color(color_key);
             }
         } else { // if form all, get color -1
-            r.className = 'o_calendar_color_'+ self.all_filters[-1] ? self.all_filters[-1].color : 1;
+            r.className = 'o_calendar_color_'+ (self.all_filters[-1] ? self.all_filters[-1].color : 1);
         }
         return r;
     },
@@ -834,6 +834,15 @@ var CalendarView = View.extend({
     },
 
     /**
+     * Get all_filters ordered by label
+     */
+    get_all_filters_ordered: function() {
+        return _.values(this.all_filters).sort(function(f1,f2) {
+            return _.string.naturalCmp(f1.label, f2.label);
+        });
+    },
+
+    /**
      * Updates record identified by ``id`` with values in object ``data``
      */
     update_record: function(id, data) {
diff --git a/addons/web_calendar/static/src/js/widgets.js b/addons/web_calendar/static/src/js/widgets.js
index e5d0f5ae4b8..39324d3caf0 100644
--- a/addons/web_calendar/static/src/js/widgets.js
+++ b/addons/web_calendar/static/src/js/widgets.js
@@ -222,7 +222,7 @@ var SidebarFilter = Widget.extend({
         var self = this;
         if (!filters) {
             filters = [];
-            _.forEach(self.view.all_filters, function(o) {
+            _.forEach(self.view.get_all_filters_ordered(), function(o) {
                 if (_.contains(self.view.now_filter_ids, o.value)) {
                     filters.push(o);
                 }