[tryton-debian-vcs] tryton-modules-project-revenue branch upstream updated. upstream/4.6.0-1-gfa611ab
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jan 7 12:58:36 UTC 2018
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-revenue.git;a=commitdiff;h=upstream/4.6.0-1-gfa611ab
commit fa611ab572e9a446473f9e30060cf64f4498ddcc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jan 6 12:06:07 2018 +0100
Adding upstream version 4.6.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 91d7d96..2d6ebda 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.6.1 - 2018-01-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.6.0 - 2017-10-30
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index e8acbad..b9b37f1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_revenue
-Version: 4.6.0
+Version: 4.6.1
Summary: Tryton module to add revenue on project
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index f3f6a46..cf904bc 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.6.0
+version=4.6.1
depends:
ir
project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index e3e4604..62b177e 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project-revenue
-Version: 4.6.0
+Version: 4.6.1
Summary: Tryton module to add revenue on project
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index 6a41b72..b78e98f 100644
--- a/work.py
+++ b/work.py
@@ -155,9 +155,14 @@ class Work:
@classmethod
def _get_revenue(cls, works):
- return {w.id: (w.list_price * Decimal(str(w.effort_hours))
- if w.list_price else Decimal(0))
- for w in works}
+ revenues = {}
+ for work in works:
+ if work.list_price:
+ revenues[work.id] = work.company.currency.round(
+ work.list_price * Decimal(str(work.effort_hours)))
+ else:
+ revenues[work.id] = Decimal(0)
+ return revenues
@fields.depends('company')
def on_change_with_currency_digits(self, name=None):
--
tryton-modules-project-revenue
More information about the tryton-debian-vcs
mailing list