[tryton-debian-vcs] tryton-modules-project-revenue branch debian-wheezy-2.2 created. 7540e11ca6c840f9ea3b387c10c3228dec304a17
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:07:13 UTC 2013
The following commit has been merged in the debian-wheezy-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-revenue.git;a=commitdiff;h=7540e11ca6c840f9ea3b387c10c3228dec304a17
commit 7540e11ca6c840f9ea3b387c10c3228dec304a17
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:27 2013 +0100
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 83e767f..033aff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project-revenue (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 24 Feb 2013 22:12:31 +0100
+
tryton-modules-project-revenue (2.2.1-2) unstable; urgency=low
[ Mathias Behrle ]
commit 76709c0d3d830394a3a1e8565e0caf27ec33e8cf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:09:31 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index a0e91b5..be61e41 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2008 Cedric Krier
- 2008 B2CK SPRL
+Copyright: 2008-2012 Cédric Krier
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 935e6d39dee6469ba2c88b0233f8bf05bf4fc54a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:47 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index 9ced465..3ac2e25 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit c5322e2a297d1d987df5d42227bf8c92783b911e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:09 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 46decee..9ced465 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project-revenue.git
commit 1d8032428ec48f5e02e461285ef04d9c555b0a98
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:19 2013 +0100
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index f9faa83..9be758a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-11-05
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2011-12-26
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index bd93e8d..d3682c5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 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 ed9cb51..8776ea9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_revenue
-Version: 2.2.1
+Version: 2.2.2
Summary: Add product on timesheet lines.
Define allowed services for each employees.
diff --git a/__tryton__.py b/__tryton__.py
index 2d1b3e9..f28fc57 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Ingresos por proyectos',
'name_es_ES': 'Beneficio de proyecto',
'name_fr_FR': 'Revenu des projets',
- 'version': '2.2.1',
+ 'version': '2.2.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/service.py b/service.py
index fcf6892..5fa0a32 100644
--- a/service.py
+++ b/service.py
@@ -57,6 +57,7 @@ class Employee(ModelSQL, ModelView, Cacheable):
for edate, ecost in employee_costs:
if date >= edate:
cost = ecost
+ else:
break
return cost
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index d47e23c..3d75b9f 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.2.1
+Version: 2.2.2
Summary: Add product on timesheet lines.
Define allowed services for each employees.
diff --git a/work.py b/work.py
index c5c419b..c70e333 100644
--- a/work.py
+++ b/work.py
@@ -60,10 +60,11 @@ class Work(ModelSQL, ModelView):
('parent', 'child_of', ids),
('active', '=', True)]) + ids
all_ids = list(set(all_ids))
+ works = set(self.browse(all_ids))
res = {}
id2work = {}
leafs = set()
- for work in self.browse(all_ids):
+ for work in works:
id2work[work.id] = work
if not work.children:
leafs.add(work.id)
@@ -73,20 +74,20 @@ class Work(ModelSQL, ModelView):
res[work.id] += timesheet_line_obj.compute_cost(ts_line)
while leafs:
- parents = set()
for work_id in leafs:
work = id2work[work_id]
+ works.remove(work)
if not work.active:
continue
if work.parent and work.parent.id in res:
res[work.parent.id] += res[work_id]
- parents.add(work.parent.id)
- leafs = parents
-
- for id in all_ids:
- if id not in ids:
- del res[id]
-
+ next_leafs = set(w.id for w in works)
+ for work in works:
+ if not work.parent:
+ continue
+ if work.parent.id in next_leafs and work.parent in works:
+ next_leafs.remove(work.parent.id)
+ leafs = next_leafs
return res
def get_revenue(self, ids, name):
@@ -94,10 +95,11 @@ class Work(ModelSQL, ModelView):
('parent', 'child_of', ids),
('active', '=', True)]) + ids
all_ids = list(set(all_ids))
+ works = set(self.browse(all_ids))
res = {}
id2work = {}
leafs = set()
- for work in self.browse(all_ids):
+ for work in works:
id2work[work.id] = work
if not work.children:
leafs.add(work.id)
@@ -108,20 +110,20 @@ class Work(ModelSQL, ModelView):
res[work.id] = Decimal('0')
while leafs:
- parents = set()
for work_id in leafs:
work = id2work[work_id]
+ works.remove(work)
if not work.active:
continue
if work.parent and work.parent.id in res:
res[work.parent.id] += res[work_id]
- parents.add(work.parent.id)
- leafs = parents
-
- for id in all_ids:
- if id not in ids:
- del res[id]
-
+ next_leafs = set(w.id for w in works)
+ for work in works:
+ if not work.parent:
+ continue
+ if work.parent.id in next_leafs and work.parent in works:
+ next_leafs.remove(work.parent.id)
+ leafs = next_leafs
return res
def get_currency_digits(self, ids, name):
commit e1b6cdaece6bd5037503876f806568d97d6fb7b9
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:27:10 2012 +0200
Releasing debian version 2.2.1-2.
diff --git a/debian/changelog b/debian/changelog
index a6d3ac9..83e767f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+tryton-modules-project-revenue (2.2.1-2) unstable; urgency=low
+
+ [ Mathias Behrle ]
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 30 Jun 2012 18:27:00 +0200
+
tryton-modules-project-revenue (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit 1201bafb57f6dd7617edaa0f39c5cfd16eeee32e
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 8bb2aef..46decee 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
commit 2c3c5fa39c27e7ff7fdd159d17061490962813dc
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 775226b9693670d1bf93d5bc08dcc6efdb7ca8a6
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index da0f275..a0e91b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,14 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2008 Cedric Krier
- (C) 2008 B2CK SPRL
+ 2008 Cedric Krier
+ 2008 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit e29369aa5740f80de5149d4877d4509cf3054ace
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 6af9940..8bb2aef 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-revenue.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-revenue.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-revenue.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project-revenue.git
X-Python-Version: >= 2.6
Package: tryton-modules-project-revenue
commit 7d3de7b29f1da8440930a78afcd5ce8955cbeaf1
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:31 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 756058c..6af9940 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-project-revenue
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
--
tryton-modules-project-revenue
More information about the tryton-debian-vcs
mailing list