From d9012c90a9eb77b11a113987915c9a5cecc18e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Apr 2013 12:27:22 +0200 Subject: [PATCH 1/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 8e6a7b8b14..d9290f1109 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.0 +version=2.8.1 depends: account company From 0581ddfa97db68a9bf5693b311a3fd9fe374cc9f Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Thu, 6 Jun 2013 15:40:12 +0200 Subject: [PATCH 2/9] Prevent exception if doesn't exist any payment_term. issue3237 review917002 (transplanted from 64a62ed35a409e44326b9b7f93d0658ffedcb913) --- opportunity.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/opportunity.py b/opportunity.py index f88c6ba50a..238e906c0d 100644 --- a/opportunity.py +++ b/opportunity.py @@ -198,8 +198,9 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView): self.party.customer_payment_term.rec_name if not res['payment_term']: res['payment_term'] = self.default_payment_term() - res['payment_term.rec_name'] = PaymentTerm( - res['payment_term']).rec_name + if res['payment_term']: + res['payment_term.rec_name'] = PaymentTerm( + res['payment_term']).rec_name return res def _get_sale_line_opportunity_line(self, sale): From d477143d8dc1b62757628f635f4dc7a5f2ed51eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 12:04:39 +0200 Subject: [PATCH 3/9] Prepare release 2.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 1e123aa745..767b5913a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.8.1 - 2013-07-22 +* Bug fixes (see mercurial logs for details) + Version 2.8.0 - 2013-04-22 * Bug fixes (see mercurial logs for details) From 2e3056ea8d13dda69731d55193504d5bfd05787f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 12:04:39 +0200 Subject: [PATCH 4/9] Added tag 2.8.1 for changeset 6b8a36845698 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ac018b8de3..e207bdf512 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ ab0f0de52d17ccca323a8b88185d460c168486b8 2.2.0 b883df5cada60b8fb8885da6a09805ebd82b93ab 2.4.0 1cf3fa4815060810f3d7da1f011e6b9d104bf2b7 2.6.0 31409c9f2ef35ddf938d8a75edaa7fb531b2b24b 2.8.0 +6b8a3684569825737d4aec9dadea6204cbc80e85 2.8.1 From 5a764a358189d66053142d90a41858e61d5c6bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 12:05:14 +0200 Subject: [PATCH 5/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index d9290f1109..1336cbf76a 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.1 +version=2.8.2 depends: account company From 28f62eb4504949aa3c72fc024448857241f876d4 Mon Sep 17 00:00:00 2001 From: Vincent van der Leun Date: Tue, 16 Jul 2013 11:17:30 +0200 Subject: [PATCH 6/9] Fix typo on state 'cancelled' in delete issue3303 review942002 (transplanted from 3d064c98434e733508cb8d2986a464ab82b2e756) --- opportunity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opportunity.py b/opportunity.py index 238e906c0d..c26cc16b0e 100644 --- a/opportunity.py +++ b/opportunity.py @@ -264,7 +264,7 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView): # Cancel before delete cls.cancel(opportunities) for opportunity in opportunities: - if opportunity.state != 'cancel': + if opportunity.state != 'cancelled': cls.raise_user_error('delete_cancel', opportunity.rec_name) super(SaleOpportunity, cls).delete(opportunities) From 29453e57e3e650c72a4b4806aaf7ffeaf37cb364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:56:01 +0200 Subject: [PATCH 7/9] Prepare release 2.8.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 767b5913a1..633ca6c997 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.8.2 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.8.1 - 2013-07-22 * Bug fixes (see mercurial logs for details) From c258a82f440283c2aef139eef2623e3223844a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:56:02 +0200 Subject: [PATCH 8/9] Added tag 2.8.2 for changeset a36d26fa5a80 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e207bdf512..ad95780cef 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ b883df5cada60b8fb8885da6a09805ebd82b93ab 2.4.0 1cf3fa4815060810f3d7da1f011e6b9d104bf2b7 2.6.0 31409c9f2ef35ddf938d8a75edaa7fb531b2b24b 2.8.0 6b8a3684569825737d4aec9dadea6204cbc80e85 2.8.1 +a36d26fa5a8033429086d2ba1409ac7fa45826af 2.8.2 From 1d13c78519e5987f5996799ef68d12f352262771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:56:59 +0200 Subject: [PATCH 9/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 1336cbf76a..2f41b48710 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.2 +version=2.8.3 depends: account company