Merge lp:~openerp-dev/openerp-web/7.0-opw-port-575841-vja into lp:openerp-web/7.0

Proposed by Vishmita Jadeja (openerp)
Status: Merged
Merge reported by: Christophe Matthieu (OpenERP)
Merged at revision: not available
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-port-575841-vja
Merge into: lp:openerp-web/7.0
Diff against target: 16 lines (+5/-1)
1 file modified
addons/web_calendar/static/src/js/calendar.js (+5/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-port-575841-vja
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+144243@code.launchpad.net

Description of the change

Hello,

From calendar view create customer or supplier invoice, when select partner it gives error.

Step to reproduce:
1. Go to partner (Ex."Axelor") and set payment term.
2. Go to customer invoice OR supplier invoice
open calender view, Double click to create new invoice.
select the partner (Ex."Axelor") which you have set payment term.

Thanks.

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 2012-12-18 15:16:57 +0000
3+++ addons/web_calendar/static/src/js/calendar.js 2013-01-22 08:54:21 +0000
4@@ -341,7 +341,11 @@
5 var data = {
6 name: event_obj.text
7 };
8- data[this.date_start] = instance.web.datetime_to_str(event_obj.start_date);
9+ if (this.fields[this.date_start].type == 'date') {
10+ data[this.date_start] = instance.web.date_to_str(event_obj.start_date)
11+ }else {
12+ data[this.date_start] = instance.web.datetime_to_str(event_obj.start_date)
13+ }
14 if (this.date_stop) {
15 data[this.date_stop] = instance.web.datetime_to_str(event_obj.end_date);
16 }