From 17321b715ea5b562c5761385e6ffdab1569f4842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:43:02 +0100 Subject: [PATCH 01/28] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 45f8593a67..20b9af5ec9 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compras', 'name_es_ES': 'Compras', 'name_fr_FR': 'Achat', - 'version': '1.8.0', + 'version': '1.8.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ea8dbdf6dccea6dfe3d86cc8ba71af4d3c1cca8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Feb 2011 20:45:49 +0100 Subject: [PATCH 02/28] Test if invoice line is linked to an invoice for issue1839 (transplanted from c2002e41452a58613cddc7c7e8e72ef7a7487937) --- purchase.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/purchase.py b/purchase.py index e65096bcf4..ff1b60505f 100644 --- a/purchase.py +++ b/purchase.py @@ -1088,8 +1088,9 @@ class PurchaseLine(ModelSQL, ModelView): else: ignored_ids = () for invoice_line in line.invoice_lines: - if invoice_line.invoice.state != 'cancel' or \ - invoice_line.id in ignored_ids: + if ((invoice_line.invoice and + invoice_line.invoice.state != 'cancel') or + invoice_line.id in ignored_ids): quantity -= uom_obj.compute_qty(invoice_line.unit, invoice_line.quantity, line.unit) res['quantity'] = quantity From 0de14eced351fd79b5d631a6a7cb0309b44b80f8 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 16:32:03 +0100 Subject: [PATCH 03/28] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 94a43fbe61..97eff54014 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008-2010 Cédric Krier. -Copyright (C) 2008-2010 Bertrand Chenal. -Copyright (C) 2008-2010 B2CK SPRL. +Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2011 Bertrand Chenal. +Copyright (C) 2008-2011 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 ef8587379c3abb1ace8dba83a8e5f799c8317db6 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:08 +0100 Subject: [PATCH 04/28] Prepare release 1.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index dca930e1e7..2d479a637f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.1 - 2011-02-13 +* Bug fixes (see mercurial logs for details) + Version 1.8.0 - 2010-11-01 * Bug fixes (see mercurial logs for details) From 87f9902f57ce479f3ca1fe311de5e83e2f33ce1e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:09 +0100 Subject: [PATCH 05/28] Added tag 1.8.1 for changeset 67afcd5f3483 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e89c5f21d0..67077d3b66 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ 821a4e526a660debd9e815f866edeaef93026535 1.4.0 eaeea51fd310f387cc5593ac03caa0a7926ed377 1.6.0 c5a5d252430911794635b127796bb69727c4c50f 1.8.0 +67afcd5f3483d6b26e36d22d2f8b90c3694a7cc4 1.8.1 From f071c5339bcdf13f76dcacd2d65e0e3e52c5cd84 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:14 +0100 Subject: [PATCH 06/28] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 20b9af5ec9..9cd5071a74 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compras', 'name_es_ES': 'Compras', 'name_fr_FR': 'Achat', - 'version': '1.8.1', + 'version': '1.8.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From fc49f163fac0995c4e201d5f5b40e128e391f354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Tue, 17 May 2011 15:37:34 +0200 Subject: [PATCH 07/28] Preserver purchase line order in invoice (transplanted from b268b0a90674cf72302423cf550836a14b248a67) --- purchase.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/purchase.py b/purchase.py index ff1b60505f..dd1c7c63ba 100644 --- a/purchase.py +++ b/purchase.py @@ -609,8 +609,8 @@ class Purchase(ModelWorkflow, ModelSQL, ModelView): Return invoice line values for each purchase lines :param purchase: a BrowseRecord of the purchase - :return: a dictionary with line id as key and a list - of invoice line values as value + :return: a dictionary with invoiced purchase line id as key + and a list of invoice line values as value ''' line_obj = self.pool.get('purchase.line') res = {} @@ -675,12 +675,14 @@ class Purchase(ModelWorkflow, ModelSQL, ModelView): with Transaction().set_user(0, set_context=True): invoice_id = invoice_obj.create(vals) - for line_id in invoice_lines: - for vals in invoice_lines[line_id]: + for line in purchase.lines: + if line.id not in invoice_lines: + continue + for vals in invoice_lines[line.id]: vals['invoice'] = invoice_id with Transaction().set_user(0, set_context=True): invoice_line_id = invoice_line_obj.create(vals) - purchase_line_obj.write(line_id, { + purchase_line_obj.write(line.id, { 'invoice_lines': [('add', invoice_line_id)], }) From 1fdfd45c80f1cc542903d09e09913fdabb48f07e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:31 +0200 Subject: [PATCH 08/28] Prepare release 1.8.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2d479a637f..e9bd55cdb6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.2 - 2011-05-29 +* Bug fixes (see mercurial logs for details) + Version 1.8.1 - 2011-02-13 * Bug fixes (see mercurial logs for details) From ed5b2f799b759750a370d954c08f03e59e8acab2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:31 +0200 Subject: [PATCH 09/28] Added tag 1.8.2 for changeset b876a730e2a9 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 67077d3b66..d3f9d42f1c 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ eaeea51fd310f387cc5593ac03caa0a7926ed377 1.6.0 c5a5d252430911794635b127796bb69727c4c50f 1.8.0 67afcd5f3483d6b26e36d22d2f8b90c3694a7cc4 1.8.1 +b876a730e2a9a6f694f50799a5c3d20d3fcf2756 1.8.2 From d10823c3aa1e27fc538481a7df4b2dd958c865f5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:35 +0200 Subject: [PATCH 10/28] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9cd5071a74..2acbfa349e 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compras', 'name_es_ES': 'Compras', 'name_fr_FR': 'Achat', - 'version': '1.8.2', + 'version': '1.8.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 66142d85e0d7b1dbb81bada10d0300b67c020bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 31 May 2011 09:06:05 +0200 Subject: [PATCH 11/28] Fix invoiced quantity of service products (transplanted from e4e464750b8d89a65d2258044b65b11e2b65182c) --- purchase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index dd1c7c63ba..5cba53ee94 100644 --- a/purchase.py +++ b/purchase.py @@ -1075,7 +1075,9 @@ class PurchaseLine(ModelSQL, ModelView): res['note'] = line.note if line.type != 'line': return [res] - if line.purchase.invoice_method == 'order': + if (line.purchase.invoice_method == 'order' + and not line.product + or line.product.type == 'service'): quantity = line.quantity else: quantity = 0.0 From f1b3a8e7646c6da917621c36269d5dd5657b364e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:00:43 +0200 Subject: [PATCH 12/28] Prepare release 1.8.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e9bd55cdb6..0ebc8ae389 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.3 - 2011-09-10 +* Bug fixes (see mercurial logs for details) + Version 1.8.2 - 2011-05-29 * Bug fixes (see mercurial logs for details) From 988e8bab5895a24f2ea1280bb34fb06fd04b6a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:02:25 +0200 Subject: [PATCH 13/28] Added tag 1.8.3 for changeset a3825c65105a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d3f9d42f1c..dd74cf3cdb 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ eaeea51fd310f387cc5593ac03caa0a7926ed377 1.6.0 c5a5d252430911794635b127796bb69727c4c50f 1.8.0 67afcd5f3483d6b26e36d22d2f8b90c3694a7cc4 1.8.1 b876a730e2a9a6f694f50799a5c3d20d3fcf2756 1.8.2 +a3825c65105a9ab4d13fcf3e2caa04f12d209e7d 1.8.3 From 4edb2bef7c2cbeb5454c67557264d20d6025b1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:02:35 +0200 Subject: [PATCH 14/28] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 2acbfa349e..a359f94763 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compras', 'name_es_ES': 'Compras', 'name_fr_FR': 'Achat', - 'version': '1.8.3', + 'version': '1.8.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 16206defc595d1860e52bc873f58b8a2e77e40be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 12 Sep 2011 14:46:50 +0200 Subject: [PATCH 15/28] Fix typo introduced in changeset e4e464750b8d (transplanted from ccaabfecbfe0e4bad11e77080dd4aebd998824c9) --- purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index 5cba53ee94..be93ef9230 100644 --- a/purchase.py +++ b/purchase.py @@ -1076,7 +1076,7 @@ class PurchaseLine(ModelSQL, ModelView): if line.type != 'line': return [res] if (line.purchase.invoice_method == 'order' - and not line.product + or not line.product or line.product.type == 'service'): quantity = line.quantity else: From c3215756607a5c344d2774f2fe122fb4662c6425 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:26 +0200 Subject: [PATCH 16/28] Prepare release 1.8.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0ebc8ae389..c11683a3e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.4 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.8.3 - 2011-09-10 * Bug fixes (see mercurial logs for details) From ed6fd6414aed48630a6cb91d703efdbf7dc90c0c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:27 +0200 Subject: [PATCH 17/28] Added tag 1.8.4 for changeset fe22d7e395f1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index dd74cf3cdb..7102a167f6 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ c5a5d252430911794635b127796bb69727c4c50f 1.8.0 67afcd5f3483d6b26e36d22d2f8b90c3694a7cc4 1.8.1 b876a730e2a9a6f694f50799a5c3d20d3fcf2756 1.8.2 a3825c65105a9ab4d13fcf3e2caa04f12d209e7d 1.8.3 +fe22d7e395f1e3a4fe96e9c92610f1ccbba10a1e 1.8.4 From b9919cb96e59db58d232679f51b03189798141c7 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:34 +0200 Subject: [PATCH 18/28] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a359f94763..1ddd1f96f0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compras', 'name_es_ES': 'Compras', 'name_fr_FR': 'Achat', - 'version': '1.8.4', + 'version': '1.8.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ab256ae951f0b1e41005198ac9aac0d951125933 Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Wed, 21 Mar 2012 08:47:42 +0100 Subject: [PATCH 19/28] Change purchase line with amount issue2465 review257001 (transplanted from 48478a0cb31264c5fdaa3e174c23403b40179836) --- purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index be93ef9230..e053a11408 100644 --- a/purchase.py +++ b/purchase.py @@ -812,7 +812,7 @@ class PurchaseLine(ModelSQL, ModelView): states={ 'invisible': Not(In(Eval('type'), ['line', 'subtotal'])), 'readonly': Not(Bool(Eval('_parent_purchase'))), - }, on_change_with=['type', 'quantity', 'unit_price', + }, on_change_with=['type', 'quantity', 'unit_price', 'unit', '_parent_purchase.currency']), 'get_amount') description = fields.Text('Description', size=None, required=True) note = fields.Text('Note') From 8f7c86b4668c967c666630d5d0f886b7dc585c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 13 Apr 2012 13:17:58 +0200 Subject: [PATCH 20/28] Skip invoice line not type "line" when compute invoiced quantities review322002 (transplanted from bbd264311886bffbb50cde8749cc9b8b588f2143) --- purchase.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/purchase.py b/purchase.py index e053a11408..7ed18c3ddc 100644 --- a/purchase.py +++ b/purchase.py @@ -1092,6 +1092,8 @@ class PurchaseLine(ModelSQL, ModelView): else: ignored_ids = () for invoice_line in line.invoice_lines: + if invoice_line.type != 'line': + continue if ((invoice_line.invoice and invoice_line.invoice.state != 'cancel') or invoice_line.id in ignored_ids): From baf111ec03c0082b398ec0d973c74fec93edd8ff Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:54 +0200 Subject: [PATCH 21/28] Prepare release 1.8.5 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c11683a3e2..9d7afaddfe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.5 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.8.4 - 2011-10-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 97eff54014..c646d008b8 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2012 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2011 B2CK SPRL. +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 From 8850a329f0db6908eb34f8de51a451868dbc7e67 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:54 +0200 Subject: [PATCH 22/28] Added tag 1.8.5 for changeset 77af96e9b9db --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 7102a167f6..fdf290f897 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ c5a5d252430911794635b127796bb69727c4c50f 1.8.0 b876a730e2a9a6f694f50799a5c3d20d3fcf2756 1.8.2 a3825c65105a9ab4d13fcf3e2caa04f12d209e7d 1.8.3 fe22d7e395f1e3a4fe96e9c92610f1ccbba10a1e 1.8.4 +77af96e9b9db778caaee6d3f9ba75c11ae713aba 1.8.5 From 5d8a489b81a13fda81b6840170c79184350f6f7b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:59 +0200 Subject: [PATCH 23/28] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1ddd1f96f0..593adef57c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compras', 'name_es_ES': 'Compras', 'name_fr_FR': 'Achat', - 'version': '1.8.5', + 'version': '1.8.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 0acc14d7cc9b7bfd92ffae89f442e4572a8b4828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 4 Sep 2012 22:56:49 +0200 Subject: [PATCH 24/28] Add missing purchase_date on some on_change (transplanted from 77f83b533286699cd46d3a9b8471fa5ab75633f2) --- purchase.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/purchase.py b/purchase.py index 7ed18c3ddc..967361a758 100644 --- a/purchase.py +++ b/purchase.py @@ -768,7 +768,8 @@ class PurchaseLine(ModelSQL, ModelView): 'required': Equal(Eval('type'), 'line'), 'readonly': Not(Bool(Eval('_parent_purchase'))), }, on_change=['product', 'quantity', 'unit', - '_parent_purchase.currency', '_parent_purchase.party']) + '_parent_purchase.currency', '_parent_purchase.party', + '_parent_purchase.purchase_date']) unit = fields.Many2One('product.uom', 'Unit', states={ 'required': Bool(Eval('product')), @@ -791,7 +792,8 @@ class PurchaseLine(ModelSQL, ModelView): 'invisible': Not(Equal(Eval('type'), 'line')), 'readonly': Not(Bool(Eval('_parent_purchase'))), }, on_change=['product', 'unit', 'quantity', 'description', - '_parent_purchase.party', '_parent_purchase.currency'], + '_parent_purchase.party', '_parent_purchase.currency', + '_parent_purchase.purchase_date'], context={ 'locations': If(Bool(Get(Eval('_parent_purchase', {}), 'warehouse')), From 498bb9f84fce7d62f4093021be6d60eec57cd48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 4 Sep 2012 22:56:05 +0200 Subject: [PATCH 25/28] Ensure clause concatination works with tuple vs list (transplanted from 3d76a745fddda78eea54f5c75824e78dc4e7d1f0) --- purchase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/purchase.py b/purchase.py index 967361a758..5850d6834b 100644 --- a/purchase.py +++ b/purchase.py @@ -1605,7 +1605,7 @@ class Move(ModelSQL, ModelView): return res def search_purchase(self, name, clause): - return [('purchase_line.' + name,) + clause[1:]] + return [('purchase_line.' + name,) + tuple(clause[1:])] def get_purchase_fields(self, ids, names): res = {} @@ -1663,7 +1663,7 @@ class Move(ModelSQL, ModelView): return res def search_supplier(self, name, clause): - return [('purchase_line.purchase.party',) + clause[1:]] + return [('purchase_line.purchase.party',) + tuple(clause[1:])] def write(self, ids, vals): purchase_obj = self.pool.get('purchase.purchase') From e4e319c8559d26df02f3f61b16836573da47d6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:13:37 +0100 Subject: [PATCH 26/28] Prepare release 1.8.6 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9d7afaddfe..d8378fe1c1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.6 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 1.8.5 - 2012-05-07 * Bug fixes (see mercurial logs for details) From 8007dc76126878df0068c31d29b31cea3f1bc0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:13:38 +0100 Subject: [PATCH 27/28] Added tag 1.8.6 for changeset d911ba582845 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index fdf290f897..a00821e466 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ b876a730e2a9a6f694f50799a5c3d20d3fcf2756 1.8.2 a3825c65105a9ab4d13fcf3e2caa04f12d209e7d 1.8.3 fe22d7e395f1e3a4fe96e9c92610f1ccbba10a1e 1.8.4 77af96e9b9db778caaee6d3f9ba75c11ae713aba 1.8.5 +d911ba5828452332a3eda80600103b81e7a4046d 1.8.6 From a1255c21c39b61181dce5ca152970931e96075c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:13:52 +0100 Subject: [PATCH 28/28] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 593adef57c..f1c54848fb 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compras', 'name_es_ES': 'Compras', 'name_fr_FR': 'Achat', - 'version': '1.8.6', + 'version': '1.8.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',