From 0f5c10e6e9efb10ac3d4e10d76f05a0aaae833fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Apr 2013 12:27:17 +0200 Subject: [PATCH 1/2] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 3f2e6cb5da..3a2845241a 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.0 +version=2.8.1 depends: ir project From e7ba28dbf758d576f75d7b700d3e1b566710ae38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 26 Jan 2014 22:15:20 +0100 Subject: [PATCH 2/2] Use work effort instead of total to compute revenue total_effort contains the effort of the children but sum_tree needs only the value of the work without the children. review2931003 (transplanted from ce55336d85d1d81e1117ace09f851edbac98f228) --- work.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/work.py b/work.py index b2809298a4..f0548022f8 100644 --- a/work.py +++ b/work.py @@ -68,7 +68,7 @@ class Work: def getter(work): if work.list_price: - return work.list_price * Decimal(str(work.total_effort)) + return work.list_price * Decimal(str(work.effort)) else: return Decimal(0)