pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Checked value with Date format re.

Browse Source 
bzr revid: vda@tinyerp.com-20111018115316-he9fdqs3d72avpgv
This commit is contained in:
Vaibhav (OpenERP)
2011-10-18 17:23:16 +05:30
parent 2f7fa8d2c1
commit 5dd738e2f5
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_calendar/static/src/js/calendar.js
+2 -7
View File
@@ -180,13 +180,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
}
}
if (this.fields[this.date_start]['type'] == 'date') {
try {
evt[this.date_start] = openerp.web.str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
} catch(e) {}
try {
evt[this.date_start] = openerp.web.str_to_datetime(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
} catch(e) {}
if (this.fields[this.date_start]['type'] == 'date' && /^\d\d\d\d-\d\d-\d\d$/.exec(evt[this.date_start])) {
evt[this.date_start] = openerp.web.str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
}
if (this.date_stop && evt[this.date_stop] && this.fields[this.date_stop]['type'] == 'date') {
evt[this.date_stop] = openerp.web.str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');