[Openerp-community-reviewer] [Merge] lp:~hirt/ocb-server/6.1_ocb-server_gantt_progress into lp:ocb-server/6.1
Etienne Hirt has proposed merging lp:~hirt/ocb-server/6.1_ocb-server_gantt_progress into lp:ocb-server/6.1. Requested reviews: OpenERP Community Backports (ocb) For more details, see: https://code.launchpad.net/~hirt/ocb-server/6.1_ocb-server_gantt_progress/+merge/238845 Add the parameter 'progress' for the web-gantt that is missing for 6.1 and 7.0 Where can I report the bug for linking this and the additional web-gantt and addons/project branches? -- https://code.launchpad.net/~hirt/ocb-server/6.1_ocb-server_gantt_progress/+merge/238845 Your team OpenERP Community Backports is requested to review the proposed merge of lp:~hirt/ocb-server/6.1_ocb-server_gantt_progress into lp:ocb-server/6.1. === modified file 'openerp/addons/base/rng/view.rng' --- openerp/addons/base/rng/view.rng 2012-02-13 10:17:58 + +++ openerp/addons/base/rng/view.rng 2014-10-20 07:15:58 + @@ -358,6 +358,7 @@ rng:optionalrng:attribute name=date_string//rng:optional rng:optionalrng:attribute name=string//rng:optional rng:optionalrng:attribute name=default_group_by//rng:optional +rng:optionalrng:attribute name=progress//rng:optional rng:zeroOrMore rng:optionalrng:ref name=level//rng:optional rng:optionalrng:ref name=field//rng:optional -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~hirt/ocb-server/6.1_ocb-server_gantt_progress into lp:ocb-server/6.1
You can still put here in Launchpad bugs for OCB. This is not too much sense to report to upstream Odoo if it's solved on last version. Regards. -- https://code.launchpad.net/~hirt/ocb-server/6.1_ocb-server_gantt_progress/+merge/238845 Your team OpenERP Community Backports is requested to review the proposed merge of lp:~hirt/ocb-server/6.1_ocb-server_gantt_progress into lp:ocb-server/6.1. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~hirt/ocb-web/6.1_ocb-web_gantt_progress into lp:ocb-web/6.1
Etienne Hirt has proposed merging lp:~hirt/ocb-web/6.1_ocb-web_gantt_progress
into lp:ocb-web/6.1.
Requested reviews:
OpenERP Community Backports (ocb)
For more details, see:
https://code.launchpad.net/~hirt/ocb-web/6.1_ocb-web_gantt_progress/+merge/238849
make the progress visible in both the gantt bar and the tooltip
~hirt/ocb-server/6.1_ocb-server_gantt_progress should be merged before with
ocb-server backport
--
https://code.launchpad.net/~hirt/ocb-web/6.1_ocb-web_gantt_progress/+merge/238849
Your team OpenERP Community Backports is requested to review the proposed merge
of lp:~hirt/ocb-web/6.1_ocb-web_gantt_progress into lp:ocb-web/6.1.
=== modified file 'addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js'
--- addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js 2012-07-02 13:30:16 +
+++ addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js 2014-10-20 08:03:57 +
@@ -3142,7 +3142,7 @@
tblInfo.rows[0].cells[0].innerHTML += span class='st'Start Date:nbsp;/spanspan class='ut' + this.TaskInfo.EST.getDate() + . + (this.TaskInfo.EST.getMonth() + 1) + . + this.TaskInfo.EST.getFullYear() + /spanbr/;
// Hidden because currently misleading or unavailable:
// tblInfo.rows[0].cells[0].innerHTML += span class='st'Duration:nbsp;/spanspan class='ut' + this.TaskInfo.Duration + hours /spanbr/;
-// tblInfo.rows[0].cells[0].innerHTML += span class='st'Percent Complete:nbsp;/spanspan class='ut' + this.TaskInfo.PercentCompleted + % /spanbr/;
+tblInfo.rows[0].cells[0].innerHTML += span class='st'Percent Complete:nbsp;/spanspan class='ut' + this.TaskInfo.PercentCompleted + % /spanbr/;
//show predecessor task
if (this.predTask)
=== modified file 'addons/web_gantt/static/src/js/gantt.js'
--- addons/web_gantt/static/src/js/gantt.js 2012-01-27 16:06:45 +
+++ addons/web_gantt/static/src/js/gantt.js 2014-10-20 08:03:57 +
@@ -39,7 +39,7 @@
n_group_bys = group_bys;
}
// gather the fields to get
-var fields = _.compact(_.map([date_start, date_delay, date_stop], function(key) {
+var fields = _.compact(_.map([date_start, date_delay, date_stop, progress], function(key) {
return self.fields_view.arch.attrs[key] || '';
}));
fields = _.uniq(fields.concat(n_group_bys));
@@ -109,6 +109,11 @@
var task_ids = {};
// creation of the chart
var generate_task_info = function(task, plevel) {
+if (_.isNumber(task[self.fields_view.arch.attrs.progress])) {
+var percent = task[self.fields_view.arch.attrs.progress] || 0;
+} else {
+var percent = 100;
+}
var level = plevel || 0;
if (task.__is_group) {
var task_infos = _.compact(_.map(task.tasks, function(sub_task) {
@@ -131,7 +136,7 @@
});
return group;
} else {
-var group = new GanttTaskInfo(_.uniqueId(gantt_project_task_), group_name, task_start, duration, 100);
+var group = new GanttTaskInfo(_.uniqueId(gantt_project_task_), group_name, task_start, duration || 1, percent);
_.each(task_infos, function(el) {
group.addChildTask(el.task_info);
});
@@ -156,7 +161,7 @@
}
var duration = (task_stop.getTime() - task_start.getTime()) / (1000 * 60 * 60);
var id = _.uniqueId(gantt_task_);
-var task_info = new GanttTaskInfo(id, task_name, task_start, ((duration / 24) * 8), 100);
+var task_info = new GanttTaskInfo(id, task_name, task_start, ((duration / 24) * 8) || 1, percent);
task_info.internal_task = task;
task_ids[id] = task_info;
return {task_info: task_info, task_start: task_start, task_stop: task_stop};
--
Mailing list: https://launchpad.net/~openerp-community-reviewer
Post to : openerp-community-reviewer@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community-reviewer
More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~hirt/ocb-server/6.1_ocb-server_gantt_progress into lp:ocb-server/6.1
Pedro Thanks a lot Etienne On 20.10.2014 09:44, Pedro Manuel Baeza wrote: You can still put here in Launchpad bugs for OCB. This is not too much sense to report to upstream Odoo if it's solved on last version. Regards. -- https://code.launchpad.net/~hirt/ocb-server/6.1_ocb-server_gantt_progress/+merge/238845 Your team OpenERP Community Backports is requested to review the proposed merge of lp:~hirt/ocb-server/6.1_ocb-server_gantt_progress into lp:ocb-server/6.1. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Bug 1383171] Re: Gantt view has fixed coded progress instead of taking from task
** Also affects: ocb-addons Importance: Undecided Status: New ** Also affects: ocb-server Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenERP Community Backports, which is subscribed to OpenERP Community Backports (Web). https://bugs.launchpad.net/bugs/1383171 Title: Gantt view has fixed coded progress instead of taking from task Status in OpenERP Community Backports (Addons): New Status in OpenERP Community Backports (Server): New Status in OpenERP Community Backports (Web): New Bug description: Gantt view has fixed coded progress of 100 instead of taking from task. Proposed fix corrects this for both the task progress and tooltip In order to make it work it has to be fixed in: * server * web * and addon/project To manage notifications about this bug go to: https://bugs.launchpad.net/ocb-addons/+bug/1383171/+subscriptions -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-location into lp:stock-logistic-warehouse
I've finally resubmitted this as part of the pull request at https://github.com/OCA/stock-logistics-warehouse/pull/17. Please reject the merge proposal here to make it clear it won't be processed on Launchpad. -- https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-location/+merge/223880 Your team Stock and Logistic Core Editors is requested to review the proposed merge of lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-location into lp:stock-logistic-warehouse. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-location into lp:stock-logistic-warehouse
The proposal to merge lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-location into lp:stock-logistic-warehouse has been updated. Status: Needs review = Work in progress For more details, see: https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-location/+merge/223880 -- https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-location/+merge/223880 Your team Stock and Logistic Core Editors is requested to review the proposed merge of lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-location into lp:stock-logistic-warehouse. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-hierarchical into lp:stock-logistic-warehouse
I've finally resubmitted this as part of the pull request at https://github.com/OCA/stock-logistics-warehouse/pull/17. Please reject the merge proposal here to make it clear it won't be processed on Launchpad. -- https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-hierarchical/+merge/223882 Your team Stock and Logistic Core Editors is subscribed to branch lp:stock-logistic-warehouse. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-hierarchical into lp:stock-logistic-warehouse
The proposal to merge lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-hierarchical into lp:stock-logistic-warehouse has been updated. Status: Needs review = Work in progress For more details, see: https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-hierarchical/+merge/223882 -- https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-hierarchical/+merge/223882 Your team Stock and Logistic Core Editors is subscribed to branch lp:stock-logistic-warehouse. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/stock-logistic-warehouse/7.0-fix-decimal-precision into lp:stock-logistic-warehouse
The proposal to merge lp:~numerigraphe-team/stock-logistic-warehouse/7.0-fix-decimal-precision into lp:stock-logistic-warehouse has been updated. Status: Needs review = Work in progress For more details, see: https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-fix-decimal-precision/+merge/223881 -- https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-fix-decimal-precision/+merge/223881 Your team Stock and Logistic Core Editors is subscribed to branch lp:stock-logistic-warehouse. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~numerigraphe-team/stock-logistic-warehouse/7.0-fix-decimal-precision into lp:stock-logistic-warehouse
Pushed to github here: https://github.com/OCA/stock-logistics-warehouse/pull/18 Please reject the MP here to avoid confusion. -- https://code.launchpad.net/~numerigraphe-team/stock-logistic-warehouse/7.0-fix-decimal-precision/+merge/223881 Your team Stock and Logistic Core Editors is subscribed to branch lp:stock-logistic-warehouse. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~hirt/ocb-addons/6.1-ocb-addons_gantt_progress into lp:ocb-addons/6.1
Etienne Hirt has proposed merging lp:~hirt/ocb-addons/6.1-ocb-addons_gantt_progress into lp:ocb-addons/6.1. Requested reviews: OpenERP Community Backports (ocb) Related bugs: Bug #1383171 in OpenERP Community Backports (Addons): Gantt view has fixed coded progress instead of taking from task https://bugs.launchpad.net/ocb-addons/+bug/1383171 For more details, see: https://code.launchpad.net/~hirt/ocb-addons/6.1-ocb-addons_gantt_progress/+merge/238974 activates progress in task gantt view Requires corresponding server and web branch to be merged before: * lp:~hirt/ocb-server/6.1_ocb-server_gantt_progress * lp:~hirt/ocb-web/6.1_ocb-web_gantt_progress -- https://code.launchpad.net/~hirt/ocb-addons/6.1-ocb-addons_gantt_progress/+merge/238974 Your team OpenERP Community Backports is requested to review the proposed merge of lp:~hirt/ocb-addons/6.1-ocb-addons_gantt_progress into lp:ocb-addons/6.1. === modified file 'project/project_view.xml' --- project/project_view.xml 2013-09-10 15:12:35 + +++ project/project_view.xml 2014-10-20 21:06:41 + @@ -454,13 +454,14 @@ /field /record +!-- mode=year does not change anything -- record id=view_task_gantt model=ir.ui.view field name=nameproject.task.gantt/field field name=modelproject.task/field field name=typegantt/field field eval=2 name=priority/ field name=arch type=xml -gantt date_start=date_start date_stop=date_end string=Tasks default_group_by=project_id +gantt date_start=date_start date_stop=date_end progress=progress string=Tasks default_group_by=project_id /gantt /field /record -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
