Merge lp:~openerp-dev/openerp-web/7.0-opw-586536-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of responsible label for field type selection calendar sidebar.

Demo:- Go to Sale -> Sale Order -> Calendar view, sidebar responsible are not proper, the responsible field is selection field so for selection field Calendar view displays database value for the selection.

Changed the code and check specially for selectiuon field as we have did for many2one already.

Thanks.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

I fail to see any "responsible" in the sidebar, only a list of statuses. What are you talking about?

review: Needs Information

[Mohammed Shekha(Open ERP) (msh-openerp)]

Hello Xavier,

The thing I had descibed is mixed up with two calendar view so it might written responsible, actually it is Status, the thing I want to tell is these status comes as a database value, instead there should be display value of selection field not databasse value.

Thanks.

=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js	2013-02-04 14:38:04 +0000
+++ addons/web_calendar/static/src/js/calendar.js	2013-02-20 07:16:27 +0000
@@ -264,7 +264,13 @@
 
         //To parse Events we have to convert date Format
         var res_events = [],
-            sidebar_items = {};
+            sidebar_items = {},
+            selection_labels = {};
+            if(this.fields[this.color_field].type == 'selection') {
+                _(this.fields[this.color_field].selection).each(function(value){
+                    selection_labels[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].type == 'selection') {
+                        filter = selection_labels[filter];
+                    }
                     var filter_value = (typeof filter === 'object') ? filter[0] : filter;
                     if (typeof(fn_filter) === 'function' && !fn_filter(filter_value)) {
                         continue;