From 8fab1daab52570b77ab92d5d6cc3a24e6110547c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 20 Oct 2009 19:46:44 +0200 Subject: [PATCH 01/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 96ec65ef85..6c81c522a3 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ingresos por proyectos', 'name_es_ES': 'Beneficio de proyecto', 'name_fr_FR': 'Revenu des projets', - 'version': '1.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From c6539c9081b9914e4b552e1fea92b4d456f457e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:32:28 +0100 Subject: [PATCH 02/10] Update COPYRIGHT --- COPYRIGHT | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 2afd2a7ae6..cca7db9317 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,6 @@ -Copyright (C) 2008 Cédric Krier. -Copyright (C) 2008 B2CK SPRL. +Copyright (C) 2008-2010 Cédric Krier. +Copyright (C) 2008-2010 Bertrand Chenal. +Copyright (C) 2008-2010 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 From c8636e6fa97ac42cf00383e2533a434ea96aaad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 13 May 2010 12:41:03 +0200 Subject: [PATCH 03/10] Don't include .pyc from tests (transplanted from 8d53e187ca26d54c4675f80366ae9879b14d9afd) --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index b2a140eeeb..dcb2afa6dc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,5 +7,4 @@ include LICENSE include *.xml include *.odt include *.csv -include tests/* include doc/* From 5e1f049e885e7998cd385d21a60dae3489c6329d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:44 +0100 Subject: [PATCH 04/10] Prepare release 1.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 931601ea62..37cc247db7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,5 @@ +Version 1.4.1 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.4.0 - 2009-10-19 * Initial release From 56a165267d65f4fab5caeb1960404a96a1ebbbbf Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:44 +0100 Subject: [PATCH 05/10] Added tag 1.4.1 for changeset 38eff413d800 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 36ea86cc65..c96aefbec3 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ 2dd0180b1c6fa11d27451d4bbb723ef8130f3852 1.4.0 +38eff413d800a554cd05ce6d817a0e41dddc931c 1.4.1 From bf69d1dbfb6b9036766259c50cf0a292fcb7a496 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:46 +0100 Subject: [PATCH 06/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6c81c522a3..e483a77978 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ingresos por proyectos', 'name_es_ES': 'Beneficio de proyecto', 'name_fr_FR': 'Revenu des projets', - 'version': '1.4.1', + 'version': '1.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ca3556fb15f20e974a37a41e35d13211e7e712de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Fri, 28 Oct 2011 11:00:09 +0200 Subject: [PATCH 07/10] correctly name employee object (transplanted from 046ee99b347f4d188c90f616eca9c6279b67673a) --- service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.py b/service.py index 688ee4fd50..bcf3777c14 100644 --- a/service.py +++ b/service.py @@ -141,7 +141,7 @@ class EmployeeCostPrice(ModelSQL, ModelView): def on_change_with_currency_digits(self, cursor, user, ids, vals, context=None): - company_obj = self.pool.get('company.employee') + employee_obj = self.pool.get('company.employee') if vals.get('employee'): employee = employee_obj.browse(cursor, user, vals['employee'], context=context) From a27f61e79f0de6643573698cb64dc4b325230c1a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:33:40 +0100 Subject: [PATCH 08/10] Prepare release 1.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 37cc247db7..7147c6ffe0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.2 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 1.4.1 - 2010-11-02 * Bug fixes (see mercurial logs for details) From 5ff787c077aa2b9b9dc96e1992483b8ccdf8bedd Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:33:41 +0100 Subject: [PATCH 09/10] Added tag 1.4.2 for changeset bc3c93d23d3b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c96aefbec3..b08a84ae10 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 2dd0180b1c6fa11d27451d4bbb723ef8130f3852 1.4.0 38eff413d800a554cd05ce6d817a0e41dddc931c 1.4.1 +bc3c93d23d3b58063e77b9fb68ea2d3f18238d6c 1.4.2 From 0e7d87d84588a9ed9dc301007293a1179a8a2e83 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:33:45 +0100 Subject: [PATCH 10/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index e483a77978..a6c591182a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ingresos por proyectos', 'name_es_ES': 'Beneficio de proyecto', 'name_fr_FR': 'Revenu des projets', - 'version': '1.4.2', + 'version': '1.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',