From a81d7beb642e9b1c360d0ea56b2030c14bcb0359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 18:30:34 +0100 Subject: [PATCH 01/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f5476cd339..7494524f74 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Einkauf', 'name_fr_FR': 'Achat', 'name_es_ES': 'Compras', - 'version': '1.0.0', + 'version': '1.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b05898cb706d2fdadc1f9baab887d17ec3307674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 18:30:45 +0100 Subject: [PATCH 02/26] Allow egg installation --- CHANGELOG | 2 ++ setup.py | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index eacaaefa7d..44de11f380 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,4 @@ +* Allow egg installation + Version 1.0.0 - 2008-11-17 * Initial release diff --git a/setup.py b/setup.py index 1bbcd408d4..2da658d608 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,8 @@ setup(name='trytond_purchase', author=info.get('author', ''), author_email=info.get('email', ''), url=info.get('website', ''), + download_url="http://downloads.tryton.org/" + \ + info.get('version', '0.0.1').rsplit('.', 1)[0] + '/', package_dir={'trytond.modules.purchase': '.'}, packages=[ 'trytond.modules.purchase', @@ -54,4 +56,9 @@ setup(name='trytond_purchase', ], license='GPL-3', install_requires=requires, + zip_safe=False, + entry_points=""" + [trytond.modules] + purchase = trytond.modules.purchase + """, ) From 130209ea3783ad8d788849fd270362fcb391dd37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 14:00:03 +0100 Subject: [PATCH 03/26] Prepare changelog for release 1.0.1 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 44de11f380..9801fce04d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +Version 1.0.1 - 2008-12-01 * Allow egg installation Version 1.0.0 - 2008-11-17 From 556b69175410dad4501954588e5b9a7c9b5a019e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 14:00:07 +0100 Subject: [PATCH 04/26] Added tag 1.0.1 for changeset 2c4b5f4fbb00 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d5bdee8940..7d19752497 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ 28f5e05376cda70f569743e695369f3dcb5462d0 1.0.0 +2c4b5f4fbb004472c61e939c3fa960fef873944e 1.0.1 From 8296a92fc66f6cd28658b67bdcced71c3e9312ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 14:01:01 +0100 Subject: [PATCH 05/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 7494524f74..021437ed07 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Einkauf', 'name_fr_FR': 'Achat', 'name_es_ES': 'Compras', - 'version': '1.0.1', + 'version': '1.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 619b52f71a1f2faecc289b1762cae4c03cdae29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Dec 2008 17:59:05 +0100 Subject: [PATCH 06/26] Fix get_purchase_price if the user has no company --- purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index 57eb0c15ac..9266a7183a 100644 --- a/purchase.py +++ b/purchase.py @@ -1233,7 +1233,7 @@ class Product(OSV): res[product.id] = uom_obj.compute_price(cursor, user, product.default_uom, res[product.id], uom, context=context) - if currency: + if currency and user2.company: if user2.company.currency.id != currency.id: res[product.id] = currency_obj.compute(cursor, user, user2.company.currency, res[product.id], From 87af7a42871ff834ab110f91f05fdb3a4c05dc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 18 Dec 2008 23:35:58 +0100 Subject: [PATCH 07/26] Handle default purchasable value for issue671 --- purchase.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index 9266a7183a..693b734835 100644 --- a/purchase.py +++ b/purchase.py @@ -765,7 +765,8 @@ class PurchaseLine(OSV): }, on_change=['product', 'unit', 'quantity', 'description', '_parent_purchase.party', '_parent_purchase.currency'], context="{'locations': [_parent_purchase.warehouse], " \ - "'stock_date_end': _parent_purchase.purchase_date}") + "'stock_date_end': _parent_purchase.purchase_date, " \ + "'purchasable': True}") unit_price = fields.Numeric('Unit Price', digits=(16, 4), states={ 'invisible': "type != 'line'", @@ -1150,6 +1151,10 @@ class Template(OSV): on_change_with=['default_uom', 'purchase_uom']) def default_purchasable(self, cursor, user, context=None): + if context is None: + context = {} + if context.get('purchasable'): + return True return False def on_change_with_purchase_uom(self, cursor, user, ids, vals, From 66583cc84a084ce60234b8c99c398f9cfe28631f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 6 Jan 2009 13:47:18 +0100 Subject: [PATCH 08/26] Prepare changelog for release 1.0.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9801fce04d..bf8a718dae 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.2 - 2009-01-06 +* Some bug fixes (see mercurial logs for details) + Version 1.0.1 - 2008-12-01 * Allow egg installation From 6357f4a43cfa0ba76fbaed01e674e7e56c9a9552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 6 Jan 2009 13:47:26 +0100 Subject: [PATCH 09/26] Added tag 1.0.2 for changeset 4c01a8a1e35f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 7d19752497..4d557d6105 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 28f5e05376cda70f569743e695369f3dcb5462d0 1.0.0 2c4b5f4fbb004472c61e939c3fa960fef873944e 1.0.1 +4c01a8a1e35f1a16639e1e71ca729c21b46754d7 1.0.2 From f1bfd5541a9e40b0aa1239a5dcebe7f9ef33f5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 6 Jan 2009 13:48:10 +0100 Subject: [PATCH 10/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 021437ed07..2288f05941 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Einkauf', 'name_fr_FR': 'Achat', 'name_es_ES': 'Compras', - 'version': '1.0.2', + 'version': '1.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 563ad55680ec4a92bd6fa0f28de23a5f1554f806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 13 Mar 2009 16:17:30 +0100 Subject: [PATCH 11/26] Set invisible product_suppliers on product if the use is not in a company for issue859 --- purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index 693b734835..3425d48085 100644 --- a/purchase.py +++ b/purchase.py @@ -1139,7 +1139,7 @@ class Template(OSV): product_suppliers = fields.One2Many('purchase.product_supplier', 'product', 'Suppliers', states={ 'readonly': "active == False", - 'invisible': "not purchasable", + 'invisible': "(not purchasable) or (not company)", }) purchase_uom = fields.Many2One('product.uom', 'Purchase UOM', states={ 'readonly': "active == False", From 2a457e8aef24dfb7b1526096ce4500e479ee029a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 31 Mar 2009 14:22:45 +0200 Subject: [PATCH 12/26] Call workflow of purchase when deleting moves Improve workflow test on write of move --- purchase.py | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/purchase.py b/purchase.py index 3425d48085..3a5e839335 100644 --- a/purchase.py +++ b/purchase.py @@ -1556,15 +1556,39 @@ class Move(OSV): res = super(Move, self).write(cursor, user, ids, vals, context=context) if 'state' in vals and vals['state'] in ('cancel',): - purchase_ids = [] + if isinstance(ids, (int, long)): + ids = [ids] + purchase_ids = set() purchase_line_ids = purchase_line_obj.search(cursor, user, [ ('moves', 'in', ids), ], context=context) if purchase_line_ids: for purchase_line in purchase_line_obj.browse(cursor, user, purchase_line_ids, context=context): - if purchase_line.purchase.id not in purchase_ids: - purchase_ids.append(purchase_line.purchase.id) + purchase_ids.add(purchase_line.purchase.id) + for purchase_id in purchase_ids: + workflow_service.trg_validate(user, 'purchase.purchase', + purchase_id, 'packing_update', cursor, context=context) + return res + + def delete(self, cursor, user, ids, context=None): + purchase_obj = self.pool.get('purchase.purchase') + purchase_line_obj = self.pool.get('purchase.line') + + if isinstance(ids, (int, long)): + ids = [ids] + + purchase_ids = set() + purchase_line_ids = purchase_line_obj.search(cursor, user, [ + ('moves', 'in', ids), + ], context=context) + + res = super(Move, self).delete(cursor, user, ids, context=context) + + if purchase_line_ids: + for purchase_line in purchase_line_obj.browse(cursor, user, + purchase_line_ids, context=context): + purchase_ids.add(purchase_line.purchase.id) for purchase_id in purchase_ids: workflow_service.trg_validate(user, 'purchase.purchase', purchase_id, 'packing_update', cursor, context=context) From cb57ada2082cc40f1000e56159e6e66f2e9eabd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 5 Apr 2009 14:08:58 +0200 Subject: [PATCH 13/26] Fix context on purchase line if there is no warehouse for issue929 --- purchase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index 3a5e839335..d68414dfda 100644 --- a/purchase.py +++ b/purchase.py @@ -764,7 +764,9 @@ class PurchaseLine(OSV): 'invisible': "type != 'line'", }, on_change=['product', 'unit', 'quantity', 'description', '_parent_purchase.party', '_parent_purchase.currency'], - context="{'locations': [_parent_purchase.warehouse], " \ + context="{'locations': " \ + "_parent_purchase.warehouse and " \ + "[_parent_purchase.warehouse] or False, " \ "'stock_date_end': _parent_purchase.purchase_date, " \ "'purchasable': True}") unit_price = fields.Numeric('Unit Price', digits=(16, 4), From ba1065e7046d154aa41c4661373bb9af8c6e082b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 8 Apr 2009 17:22:05 +0200 Subject: [PATCH 14/26] Prevent to modify incoming_moves.add_remove for other database for issue953 --- purchase.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/purchase.py b/purchase.py index d68414dfda..fa154e83e4 100644 --- a/purchase.py +++ b/purchase.py @@ -8,6 +8,7 @@ import datetime from trytond.netsvc import LocalService from trytond.report import CompanyReport from trytond.wizard import Wizard +import copy _STATES = { 'readonly': "state != 'draft'", @@ -1358,9 +1359,12 @@ class PackingIn(OSV): def __init__(self): super(PackingIn, self).__init__() - self.incoming_moves.add_remove = "[" + \ - self.incoming_moves.add_remove + ", " \ - "('supplier', '=', supplier)]" + self.incoming_moves = copy.copy(self.incoming_moves) + if "('supplier', '=', supplier)" not in self.incoming_moves.add_remove: + self.incoming_moves.add_remove = "[" + \ + self.incoming_moves.add_remove + ", " \ + "('supplier', '=', supplier)]" + self._reset_columns() def write(self, cursor, user, ids, vals, context=None): workflow_service = LocalService('workflow') From 7d0a543b63dbf913b65531782a0a93cc151add5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:19:47 +0200 Subject: [PATCH 15/26] Prepare changelog for release 1.0.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bf8a718dae..53467d9eec 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.3 - 2009-05-11 +* Some bug fixes (see mercurial logs for details) + Version 1.0.2 - 2009-01-06 * Some bug fixes (see mercurial logs for details) From abb37e44598b5840209ac8f39e814a2f4e72a304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:19:52 +0200 Subject: [PATCH 16/26] Added tag 1.0.3 for changeset fde04266786d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4d557d6105..1452824432 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 28f5e05376cda70f569743e695369f3dcb5462d0 1.0.0 2c4b5f4fbb004472c61e939c3fa960fef873944e 1.0.1 4c01a8a1e35f1a16639e1e71ca729c21b46754d7 1.0.2 +fde04266786d5c84294ad200b70baae586ce50f3 1.0.3 From 0c357e910b2d0d4a398dd92257caa9dc426608e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:20:24 +0200 Subject: [PATCH 17/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 2288f05941..50fe6e554c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Einkauf', 'name_fr_FR': 'Achat', 'name_es_ES': 'Compras', - 'version': '1.0.3', + 'version': '1.0.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a681eb5314088a673a24d990bf3b42fb30e15eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 16 Jun 2009 22:48:05 +0200 Subject: [PATCH 18/26] Round tax amounts in the same way than for invoice --- purchase.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/purchase.py b/purchase.py index fa154e83e4..5dd0c96711 100644 --- a/purchase.py +++ b/purchase.py @@ -248,6 +248,8 @@ class Purchase(OSV): def on_change_lines(self, cursor, user, ids, vals, context=None): currency_obj = self.pool.get('currency.currency') tax_obj = self.pool.get('account.tax') + invoice_obj = self.pool.get('account.invoice') + if context is None: context = {} res = { @@ -263,6 +265,7 @@ class Purchase(OSV): ctx = context.copy() ctx.update(self.get_tax_context(cursor, user, vals, context=context)) + taxes = {} for line in vals['lines']: if line.get('type', 'line') != 'line': continue @@ -271,7 +274,16 @@ class Purchase(OSV): for tax in tax_obj.compute(cursor, user, line.get('taxes', []), line.get('unit_price', Decimal('0.0')), line.get('quantity', 0.0), context=context): - res['tax_amount'] += tax['amount'] + key, val = invoice_obj._compute_tax(cursor, user, tax, + 'in_invoice', context=context) + if not key in taxes: + taxes[key] = val['amount'] + else: + taxes[key] += val['amount'] + if currency: + for key in taxes: + res['tax_amount'] += currency_obj.round(cursor, user, + currency, taxes[key]) if currency: res['untaxed_amount'] = currency_obj.round(cursor, user, currency, res['untaxed_amount']) @@ -388,6 +400,8 @@ class Purchase(OSV): ''' currency_obj = self.pool.get('currency.currency') tax_obj = self.pool.get('account.tax') + invoice_obj = self.pool.get('account.invoice') + if context is None: context = {} res = {} @@ -396,6 +410,7 @@ class Purchase(OSV): ctx.update(self.get_tax_context(cursor, user, purchase, context=context)) res.setdefault(purchase.id, Decimal('0.0')) + taxes = {} for line in purchase.lines: if line.type != 'line': continue @@ -403,7 +418,15 @@ class Purchase(OSV): for tax in tax_obj.compute( cursor, user, [t.id for t in line.taxes], line.unit_price, line.quantity, context=ctx): - res[purchase.id] += tax['amount'] + key, val = invoice_obj._compute_tax(cursor, user, tax, + 'in_invoice', context=context) + if not key in taxes: + taxes[key] = val['amount'] + else: + taxes[key] += val['amount'] + for key in taxes: + res[purchase.id] += currency_obj.round(cursor, user, + purchase.currency, taxes[key]) res[purchase.id] = currency_obj.round(cursor, user, purchase.currency, res[purchase.id]) return res From d0db2367d1dad96a5273416f8ab8b5dd7f8f61b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 6 Jul 2009 10:38:58 +0200 Subject: [PATCH 19/26] Prepare changelog for release 1.0.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 53467d9eec..0cde2bfb09 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.4 - 2009-07-06 +* Some bug fixes (see mercurial logs for details) + Version 1.0.3 - 2009-05-11 * Some bug fixes (see mercurial logs for details) From 5e4670f24478fd8f624292b070ca20a1737b7abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 6 Jul 2009 10:39:05 +0200 Subject: [PATCH 20/26] Added tag 1.0.4 for changeset 0883784f37cf --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1452824432..ef4999055e 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ 2c4b5f4fbb004472c61e939c3fa960fef873944e 1.0.1 4c01a8a1e35f1a16639e1e71ca729c21b46754d7 1.0.2 fde04266786d5c84294ad200b70baae586ce50f3 1.0.3 +0883784f37cf87cf7d523329b4971e96387379c2 1.0.4 From 27dd8f216b38b9db62df6149d31a409dc1af5600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 6 Jul 2009 10:39:40 +0200 Subject: [PATCH 21/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 50fe6e554c..2ee4454eab 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Einkauf', 'name_fr_FR': 'Achat', 'name_es_ES': 'Compras', - 'version': '1.0.4', + 'version': '1.0.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 063129b65092844295588ea1151a12fcfed6c804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 21 Jan 2010 21:08:29 +0100 Subject: [PATCH 22/26] Writing move on purchase line require to bypass rules (transplanted from 3d3cc958d09233314c87a1b7cbd1cdc479b88507) --- purchase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/purchase.py b/purchase.py index 5dd0c96711..9fc7c6b9f7 100644 --- a/purchase.py +++ b/purchase.py @@ -1132,9 +1132,9 @@ class PurchaseLine(OSV): ctx['user'] = user move_id = move_obj.create(cursor, 0, vals, context=ctx) - self.write(cursor, user, line.id, { + self.write(cursor, 0, line.id, { 'moves': [('add', move_id)], - }, context=context) + }, context=ctx) return move_id def ignore_move_exception(self, cursor, user, line, context=None): From 4b81a71303887612fa5054cc65ac1c271da65abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:53:52 +0100 Subject: [PATCH 23/26] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 37fef2d645..94a43fbe61 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008 Cédric Krier. -Copyright (C) 2008 Bertrand Chenal. -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 35dba8f58a113992ad8f381615972162354b4e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 21 Feb 2010 15:26:52 +0100 Subject: [PATCH 24/26] Prepare for release 1.0.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0cde2bfb09..f96b035a80 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.5 - 2010-02-21 +* Some bug fixes (see mercurial logs for details) + Version 1.0.4 - 2009-07-06 * Some bug fixes (see mercurial logs for details) From e0ade8a980050433f569cc30affb8a92b700ebfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 21 Feb 2010 15:26:56 +0100 Subject: [PATCH 25/26] Added tag 1.0.5 for changeset fafc4826ffaa --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ef4999055e..12b292d6d3 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ 4c01a8a1e35f1a16639e1e71ca729c21b46754d7 1.0.2 fde04266786d5c84294ad200b70baae586ce50f3 1.0.3 0883784f37cf87cf7d523329b4971e96387379c2 1.0.4 +fafc4826ffaa281590d08a3ae2838da498822216 1.0.5 From b9691f8f3c97ba21f52aa32959041aadd72bd6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 21 Feb 2010 15:28:14 +0100 Subject: [PATCH 26/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 2ee4454eab..60d0eeb34c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Einkauf', 'name_fr_FR': 'Achat', 'name_es_ES': 'Compras', - 'version': '1.0.5', + 'version': '1.0.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',