Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-opw-592449-psi into lp:openerp-web/7.0

  1. 7.0-opw-592449-psi
  2. Merge into 7.0
Proposed by Purnendu Singh (OpenERP)
Status: Merged
Merged at revision: 3926
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-592449-psi
Merge into: lp:openerp-web/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
addons/web_calendar/static/src/js/calendar.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-592449-psi
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+163929@code.launchpad.net

Description of the change

Hello,

Fixed Uncaught TypeError: Cannot call method 'toString' of undefined
Steps to reproduce this bug:
1) Go to Accounting --> Customers --> Customer Invoices menu.
2) Click on Calendar View.
3) Tick mark on Check box of Calendar sidebar.

Regards,
Purnendu Singh

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web_calendar/static/src/js/calendar.js'
2--- addons/web_calendar/static/src/js/calendar.js 2013-04-03 13:23:46 +0000
3+++ addons/web_calendar/static/src/js/calendar.js 2013-05-15 13:28:23 +0000
4@@ -281,7 +281,7 @@
5 var filter = evt[this.color_field];
6 if (filter) {
7 if(this.fields[this.color_field].selection) {
8- filter = selection_label[filter];
9+ filter = (typeof filter === 'object') ? selection_label[filter[0]] : selection_label[filter];
10 }
11 var filter_value = (typeof filter === 'object') ? filter[0] : filter;
12 if (typeof(fn_filter) === 'function' && !fn_filter(filter_value)) {