From 1b357743b4597af2b25a48b7fd92533d4ffcb7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:33 +0200 Subject: [PATCH 1/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9fabbb6c8c..b2ab7f30b4 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_AR': 'Costo del método de envio', 'name_es_ES': 'Ventas: Coste de envío', 'name_fr_FR': "Coût d'expédition de vente", - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 8f75e8df6625941eb4b266cfaf0623927c8ff567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Mar 2013 22:45:15 +0100 Subject: [PATCH 2/5] Fix wrong depends on sale_shipment_cost_method (transplanted from 6454af59837665161b123e575ce790b70ae483e0) --- sale.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sale.py b/sale.py index 2775fb911d..44ef70a466 100644 --- a/sale.py +++ b/sale.py @@ -19,8 +19,7 @@ class Configuration(Model): ], 'Sale Shipment Cost Method', states={ 'required': Bool(Eval('context', {}).get('company', 0)), - }, - depends=['company'])) + })) def default_sale_shipment_cost_method(self): return 'shipment' From b51aa45de0694644ba2b278ad68a8d3553212f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:11:52 +0200 Subject: [PATCH 3/5] Prepare release 2.4.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7c4876c16b..efeba4eb71 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-04-24 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 36d37787aa..1b2e231b46 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ -Copyright (C) 2011-2012 Cédric Krier. +Copyright (C) 2011-2013 Cédric Krier. Copyright (C) 2011 Bertrand Chenal. Copyright (C) 2011-2012 Nicolas Évrard. -Copyright (C) 2011-2012 B2CK SPRL. +Copyright (C) 2011-2013 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 ffa09613ac7ac0462818d02451845719279ff28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:11:53 +0200 Subject: [PATCH 4/5] Added tag 2.4.1 for changeset 22c739c3f351 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0069aeb29b..ffa732284c 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 71a276c5d18a81476b1545a4d958cda80c4450ab 2.0.0 36b22ce15af6266455a7344bdb1b7708658a3918 2.2.0 8b23387948920fbc4acf986227a563387b1086f5 2.4.0 +22c739c3f351d9b32ce7214c80992111823259db 2.4.1 From 2e56001b8fdf88bf67145df286a578959b6baf3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:12:03 +0200 Subject: [PATCH 5/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b2ab7f30b4..d40b1db9e4 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_AR': 'Costo del método de envio', 'name_es_ES': 'Ventas: Coste de envío', 'name_fr_FR': "Coût d'expédition de vente", - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',