From b2f4f0a65f3321bb647e5fb9043bba5901e01356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 11 Mar 2010 15:58:45 +0100 Subject: [PATCH 1/6] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 39f197559a..d4d1199c37 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Escritorio', 'name_es_ES': 'Escritorio', 'name_fr_FR': 'Tableau de bord', - 'version': '1.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 85b590ec0a9e310221f0816383eb81dd71bb6970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 10 May 2010 19:39:41 +0200 Subject: [PATCH 2/6] Don't include .pyc from tests (transplanted from cdf8280edf4fb2424f3500a90d41226f9a9b5eb4) --- 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 9df13a03490051e45ae73106ea1f498dc44dcd9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 24 Jun 2010 20:10:32 +0200 Subject: [PATCH 3/6] Fix read override when ids is an int for issue1600 (transplanted from 20e6fa780d5c708c5037900339d91c42900da765) --- ir.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ir.py b/ir.py index 45450ce36f..ddd8e02deb 100644 --- a/ir.py +++ b/ir.py @@ -142,10 +142,10 @@ class View(Model): self.dashboard_id(cursor.dbname) if fields_names is None \ or 'arch' in fields_names: - if isinstance(ids, (int, long)) \ - and dashboard_id == ids: - res['arch'] = self.dashboard_view(cursor, user, res['arch'], - context=context) + if isinstance(ids, (int, long)): + if dashboard_id == ids: + res['arch'] = self.dashboard_view(cursor, user, + res['arch'], context=context) elif dashboard_id in ids: for res2 in res: if res2['id'] == dashboard_id: From 9acb2ed24e4121c97d9106c789e3384446a2ca41 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:30 +0100 Subject: [PATCH 4/6] Prepare release 1.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0d1d17eb97..e4fe761eac 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 - 2010-03-11 * Initial release From 46c8f5b56f3794e43c659f5e76e983c8ba710781 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:30 +0100 Subject: [PATCH 5/6] Added tag 1.4.1 for changeset 1d6951fca639 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 988ddeca6b..b67fca2e70 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ 8b795beb50bc941509c4d7457fbaf77a4a67d1e3 1.4.0 +1d6951fca6395a625847ab913e1389f311157ffc 1.4.1 From c21bd83b585d9141671690331fcd1df5bc7ed3a8 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:31 +0100 Subject: [PATCH 6/6] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d4d1199c37..baf906494c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Escritorio', 'name_es_ES': 'Escritorio', 'name_fr_FR': 'Tableau de bord', - 'version': '1.4.1', + 'version': '1.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',