Merge lp:~openerp-dev/openerp-web/7.0-opw-584359-cbi into lp:openerp-web/7.0

[Chris Biersbach (OpenERP)]

Forwardport of 6.1 merge proposal by msh: Fixed the issue of Calendar responsible label not translated when there is selection field on responsible.

=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js	2013-04-02 10:47:52 +0000
+++ addons/web_calendar/static/src/js/calendar.js	2013-04-03 13:30:08 +0000
@@ -265,6 +265,12 @@
         //To parse Events we have to convert date Format
         var res_events = [],
             sidebar_items = {};
+        var selection_label = {};
+        if(this.fields[this.color_field].selection) {
+            _(this.fields[this.color_field].selection).each(function(value){
+                selection_label[value[0]] = value[1];
+            });
+        }
         for (var e = 0; e < events.length; e++) {
             var evt = events[e];
             if (!evt[this.date_start]) {
@@ -274,6 +280,9 @@
             if (this.color_field) {
                 var filter = evt[this.color_field];
                 if (filter) {
+                    if(this.fields[this.color_field].selection) {
+                        filter = selection_label[filter];
+                    }
                     var filter_value = (typeof filter === 'object') ? filter[0] : filter;
                     if (typeof(fn_filter) === 'function' && !fn_filter(filter_value)) {
                         continue;