Mohammed Shekha(Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/6.1-opw-584359-msh into lp:openerp-web/6.1.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-opw-584359-msh/+merge/143656
Hello,
Fixed the issue of Calendar responsible label not translated when there is
selection field on responsible.
Demo :- Install any other language and open Sale order calendar view, see
responsible filter in sidebar, the labels are database value of selection field
not the actual value which should be displayed.
As OpenERP server itself provides translation for selection field so, just
problem was that value which should be displayed were not shown.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-opw-584359-msh/+merge/143656
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/6.1-opw-584359-msh.
=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js 2012-08-31 13:22:48 +0000
+++ addons/web_calendar/static/src/js/calendar.js 2013-01-17 10:06:24 +0000
@@ -239,6 +239,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]) {
@@ -248,6 +254,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;
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
