From e5075147cf007a2a81363f8dc150394caea9627f Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Mon, 4 Dec 2017 09:57:18 +0100 Subject: [PATCH 1/2] [FIX] web: pie chart Mixing positive and negative values in a pie chart is not possible. However, in this case, a crash occurs instead of displaying an error message. opw-786137 --- addons/web/static/src/js/views/graph_widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js index d1452fed2b1..0af4ea9f362 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -99,7 +99,7 @@ return Widget.extend({ })); } else { var chart = this['display_' + this.mode](); - if (chart) { + if (chart && chart.tooltip.chartContainer) { chart.tooltip.chartContainer(this.$el[0]); } } From 62fcf6a9fe835093bb0d962e8a398d9262340daa Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 4 Dec 2017 15:07:49 +0100 Subject: [PATCH 2/2] [FIX] project: only copy tasks when not explicitly set --- addons/project/project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index f6c8c1ef4b2..c28bb84f876 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -257,7 +257,8 @@ class project(osv.osv): res = super(project, self).copy(cr, uid, id, default, context) for follower in proj.message_follower_ids: self.message_subscribe(cr, uid, res, partner_ids=[follower.partner_id.id], subtype_ids=[subtype.id for subtype in follower.subtype_ids]) - self.map_tasks(cr, uid, id, res, context=context) + if 'tasks' not in default: + self.map_tasks(cr, uid, id, res, context=context) return res def duplicate_template(self, cr, uid, ids, context=None):