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

[IMP] Set default group by from xml when no group by is selected.

Browse Source 
bzr revid: cpa@tinyerp.com-20110609095705-x3pobn8zdle44luk
This commit is contained in:
cpa-openerp
2011-06-09 15:27:05 +05:30
parent d95ce66175
commit 83aaefec5b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_gantt/static/src/js/gantt.js
+9 -6
View File
@@ -160,6 +160,10 @@ init: function(view_manager, session, element_id, dataset, view_id) {
if (duration == false)
duration = 0
if (self.grp.length == 0){
self.grp.push({'group_by' : this.parent})
}
if (self.grp != undefined){
for (j in self.grp){
var grp_key = res[self.grp[j]['group_by']];
@@ -220,7 +224,7 @@ init: function(view_manager, session, element_id, dataset, view_id) {
var evt_date = "";
var evt_duration = "";
var evt_end_date = "";
for (i in final_events){
evt_id = final_events[i];
evt_date = all_events[evt_id]['evt'][2];
@@ -253,7 +257,6 @@ init: function(view_manager, session, element_id, dataset, view_id) {
prt = project.getTaskById(res['parent']);
prt.addChildTask(task);
}
}
ganttChartControl.create("GanttDiv");
@@ -286,10 +289,10 @@ init: function(view_manager, session, element_id, dataset, view_id) {
var date2_ms = date2.getTime();
var difference_ms = Math.abs(date1_ms - date2_ms);
d = Math.round(difference_ms / ONE_DAY);
h = Math.round((difference_ms % ONE_DAY)/(1000 * 60 * 60));
return (d * this.day_length) + h;
d = 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));
},