[tryton-debian-vcs] tryton-modules-project-revenue branch debian-jessie-2.8 updated. debian/2.8.0-3-4-g4d3495c

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Mar 26 20:35:20 UTC 2014


The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-revenue.git;a=commitdiff;h=debian/2.8.0-3-4-g4d3495c

commit 4d3495cadb371998ed56e98dc029574bf4a5e12e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:35:00 2014 +0100

    Releasing debian version 2.8.1-1.

diff --git a/debian/changelog b/debian/changelog
index 292bc94..8b7690f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project-revenue (2.8.1-1) unstable; urgency=medium
+
+  * Fixing the branch version in the watch file.
+  * Merging upstream version 2.8.1.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 26 Mar 2014 21:31:24 +0100
+
 tryton-modules-project-revenue (2.8.0-3) unstable; urgency=low
 
   * Adapting the rules file to work also with git-buildpackage.
commit 2b9079b5ed6c3d6117ec9d7e3880244a40e5b16a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:26:44 2014 +0100

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 43ff1f9..d20d0e2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2008-2013 Cédric Krier
-           2008-2013 B2CK SPRL
+Copyright: 2008-2014 Cédric Krier
+           2008-2014 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 9e839604b91ce8b50c46f43cdc0d51642b853c3e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:23:25 2014 +0100

    Merging upstream version 2.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index ef04e90..8b417b6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index cf5f3f9..8d7bc43 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2013 Cédric Krier.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-2014 Cédric Krier.
+Copyright (C) 2008-2014 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 9a033cc..071d285 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_revenue
-Version: 2.8.0
+Version: 2.8.1
 Summary: Tryton module to add cost/revenue on project
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 3f2e6cb..3a28452 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=2.8.1
 depends:
     ir
     project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 04b4256..469b646 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: 2.8.0
+Version: 2.8.1
 Summary: Tryton module to add cost/revenue on project
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/work.py b/work.py
index b280929..f054802 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)
 
-- 
tryton-modules-project-revenue



More information about the tryton-debian-vcs mailing list