From 344a48ab55e29e5bcef33273403da079cdf3c64f Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Fri, 15 Jul 2011 18:35:40 +0530 Subject: [PATCH] [FIX] Fixed DATA_ERROR, dhtmlx is not supported datetime formate, Then when render parent task it reduce the hours. bzr revid: sma@tinyerp.com-20110715130540-y7par5uca2xxmlpp --- addons/base_gantt/static/src/js/gantt.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index cf0ce449d60..6d8db18b5bd 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -246,7 +246,7 @@ init: function(view_manager, session, element_id, dataset, view_id) { for (i in all_events){ res = all_events[i]; if ((typeof(res['evt'][3])) == "object"){ - res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3]); + res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3], true); } k = res['evt'][0].toString().indexOf('_'); @@ -356,14 +356,14 @@ init: function(view_manager, session, element_id, dataset, view_id) { return dat; }, - hours_between: function(date1, date2) { + hours_between: function(date1, date2, parent_task) { var ONE_DAY = 1000 * 60 * 60 * 24; var date1_ms = date1.getTime(); var date2_ms = date2.getTime(); var difference_ms = Math.abs(date1_ms - date2_ms); - d = Math.floor(difference_ms / ONE_DAY); + d = parent_task? Math.ceil(difference_ms / ONE_DAY) : Math.floor(difference_ms / ONE_DAY); h = (difference_ms % ONE_DAY)/(1000 * 60 * 60); num = (d * this.day_length) + h; return parseFloat(num.toFixed(2));