From 514a5118f7d9243346ba7d3fd5a72698da7c2bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 22:59:47 +0200 Subject: [PATCH 01/18] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 1bd8331af4..675c575604 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: account account_invoice From 66de74903af72995531c445a6a3e96c098966764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 22 Nov 2012 23:17:54 +0100 Subject: [PATCH 02/18] Fix comment of compute_supply_date (transplanted from f6fdc27983ad6d968d22d48f2131393116cfa010) --- purchase.py | 1 - 1 file changed, 1 deletion(-) diff --git a/purchase.py b/purchase.py index b78c906bd1..6b1dce412e 100644 --- a/purchase.py +++ b/purchase.py @@ -1502,7 +1502,6 @@ class ProductSupplier(ModelSQL, ModelView): def compute_supply_date(self, date=None): ''' Compute the supply date for the Product Supplier at the given date - and the next supply date ''' Date = Pool().get('ir.date') From ff3174541a52737b635568cb6639b5564f33adf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:45:05 +0100 Subject: [PATCH 03/18] Prepare release 2.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 99fd87c7dd..7f55da7f09 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) * Manage negative amount in purchase From 5a723e7d970734c9dfe28258acfa2ccc882d724e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:45:06 +0100 Subject: [PATCH 04/18] Added tag 2.6.1 for changeset f2033866700e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4b29258634..2d74acdde6 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ cf37cf340aadf693703bb72cd9090349698f5eec 2.0.0 155968df100be420b04452a4a66bff26d9b09d9c 2.2.0 16f519261f4717b8311fab4525fe9b42624fb9d9 2.4.0 9aa18c79df9b40d85456d01bdc67ed599c49ed65 2.6.0 +f2033866700eb4fb527dcb4fd53bbfde762344bc 2.6.1 From 92c4b9f5ebdc7d2d0ea77a315fff802ff286f3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:45:15 +0100 Subject: [PATCH 05/18] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 675c575604..9ec5b0beb4 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: account account_invoice From 58765a961e045253627b55475ade7b2564f9673d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 6 Mar 2013 17:24:45 +0100 Subject: [PATCH 06/18] Purchase.process must be called with root As process write on purchase, it must be called with root from stock models. review667003 (transplanted from 329b62a81653dd6fbcf0707f5120d5bc2e94c1ae) --- purchase.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/purchase.py b/purchase.py index 6b1dce412e..111448048b 100644 --- a/purchase.py +++ b/purchase.py @@ -1586,7 +1586,7 @@ class ShipmentIn: with Transaction().set_user(0, set_context=True): purchases = Purchase.browse([p.id for p in purchases]) - Purchase.process(purchases) + Purchase.process(purchases) @classmethod @ModelView.button @@ -1634,7 +1634,7 @@ class ShipmentInReturn: with Transaction().set_user(0, set_context=True): purchases = Purchase.browse([p.id for p in purchases]) - Purchase.process(purchases) + Purchase.process(purchases) @classmethod @ModelView.button @@ -1753,7 +1753,7 @@ class Move(ModelSQL, ModelView): if purchases: with Transaction().set_user(0, set_context=True): purchases = Purchase.browse([p.id for p in purchases]) - Purchase.process(purchases) + Purchase.process(purchases) @classmethod def delete(cls, moves): @@ -1774,7 +1774,7 @@ class Move(ModelSQL, ModelView): if purchases: with Transaction().set_user(0, set_context=True): purchases = Purchase.browse([p.id for p in purchases]) - Purchase.process(purchases) + Purchase.process(purchases) class OpenSupplier(Wizard): From f7591f944d57f23730472e26d705f52fbbcacc69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:29:11 +0200 Subject: [PATCH 07/18] Prepare release 2.6.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7f55da7f09..0b606e469d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.2 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.6.1 - 2012-12-23 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index ede3facd44..6e948f6faf 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2012 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2012 Bertrand Chenal. -Copyright (C) 2008-2012 B2CK SPRL. +Copyright (C) 2008-2013 B2CK SPRL. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify From dc34c864a74a52456bc99675a3de3690128ff562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:29:12 +0200 Subject: [PATCH 08/18] Added tag 2.6.2 for changeset 817e2580c9f9 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2d74acdde6..566cef4bde 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ cf37cf340aadf693703bb72cd9090349698f5eec 2.0.0 16f519261f4717b8311fab4525fe9b42624fb9d9 2.4.0 9aa18c79df9b40d85456d01bdc67ed599c49ed65 2.6.0 f2033866700eb4fb527dcb4fd53bbfde762344bc 2.6.1 +817e2580c9f9b819f8bebaaf81d6492ed00fccab 2.6.2 From c4c76d44298ad2d761e97e020ff657d8aa2b83ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:29:21 +0200 Subject: [PATCH 09/18] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 9ec5b0beb4..ef5e959270 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.2 +version=2.6.3 depends: account account_invoice From aebf1742a44bba3ff72ea50dbdd0400e32db6a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Aug 2013 19:06:46 +0200 Subject: [PATCH 10/18] Fix wrong indentation on test for deletion of Invoice (transplanted from 4007a3630b27c15fbc89d52267e65edc54eff4ef) --- invoice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/invoice.py b/invoice.py index bf7c732dd1..3bf5f560f1 100644 --- a/invoice.py +++ b/invoice.py @@ -56,8 +56,8 @@ class Invoice: cursor.execute('SELECT id FROM purchase_invoices_rel ' \ 'WHERE invoice IN (' + ','.join(('%s',) * len(invoices)) + ')', [i.id for i in invoices]) - if cursor.fetchone(): - cls.raise_user_error('delete_purchase_invoice') + if cursor.fetchone(): + cls.raise_user_error('delete_purchase_invoice') super(Invoice, cls).delete(invoices) @classmethod From 5a6f260602d2be4cdaf3ab41c48581aee872abda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Sep 2013 11:21:19 +0200 Subject: [PATCH 11/18] Create invoice line for non-line only once issue3292 review1043003 (transplanted from 399d66f4e5262cffe86254af3f43074f2e43418d) --- purchase.py | 1 + 1 file changed, 1 insertion(+) diff --git a/purchase.py b/purchase.py index 111448048b..2e59ad9f8e 100644 --- a/purchase.py +++ b/purchase.py @@ -1120,6 +1120,7 @@ class PurchaseLine(ModelSQL, ModelView): invoice_line.note = self.note if self.type != 'line': if (self.purchase.invoice_method == 'order' + and not self.invoice_lines and ((all(l.quantity >= 0 for l in self.purchase.lines if l.type == 'line') and invoice_type == 'in_invoice') From 26a155d3716624ace5521c8fe6490ba73d15eb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:48:02 +0200 Subject: [PATCH 12/18] Prepare release 2.6.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0b606e469d..5ac8b2b4bc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.3 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.6.2 - 2013-05-02 * Bug fixes (see mercurial logs for details) From 079d44c99b3eed579c9ed63fb65dfddfc03b3327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:48:03 +0200 Subject: [PATCH 13/18] Added tag 2.6.3 for changeset b2f27a02fb70 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 566cef4bde..b2413d0d7f 100644 --- a/.hgtags +++ b/.hgtags @@ -9,3 +9,4 @@ cf37cf340aadf693703bb72cd9090349698f5eec 2.0.0 9aa18c79df9b40d85456d01bdc67ed599c49ed65 2.6.0 f2033866700eb4fb527dcb4fd53bbfde762344bc 2.6.1 817e2580c9f9b819f8bebaaf81d6492ed00fccab 2.6.2 +b2f27a02fb70ddab32c17f7b8bba4fda4b9b538c 2.6.3 From 07191b614c33e339fc26f082bac5e824d423fb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:48:25 +0200 Subject: [PATCH 14/18] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index ef5e959270..f564a49f78 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.3 +version=2.6.4 depends: account account_invoice From 91fe4ebb1b3341619d6dece7e0607887f6db941f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 7 Oct 2013 14:40:09 +0200 Subject: [PATCH 15/18] Add missing scenario test in package issue3408 (transplanted from e3302252f194cab723ec64a7022469e7129b3fc8) --- MANIFEST.in | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 97a95966de..478d5ff1cf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,3 +9,4 @@ include *.xml include *.odt include locale/*.po include doc/* +include tests/*.rst diff --git a/setup.py b/setup.py index 551b517036..3e6eb209e6 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ setup(name='trytond_purchase', ], package_data={ 'trytond.modules.purchase': info.get('xml', []) \ - + ['tryton.cfg', 'locale/*.po', 'purchase.odt'], + + ['tryton.cfg', 'locale/*.po', 'tests/*.rst', 'purchase.odt'], }, classifiers=[ 'Development Status :: 5 - Production/Stable', From d5fff728c9146e560f3e511bbf767511e8cbadd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:30:33 +0100 Subject: [PATCH 16/18] Prepare release 2.6.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 5ac8b2b4bc..afcd5fc1f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.4 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.6.3 - 2013-10-01 * Bug fixes (see mercurial logs for details) From 086ecb45330bee6bc67863e2349991a1f75e9cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:30:34 +0100 Subject: [PATCH 17/18] Added tag 2.6.4 for changeset 2c3326d0ab7e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b2413d0d7f..404fe08d87 100644 --- a/.hgtags +++ b/.hgtags @@ -10,3 +10,4 @@ cf37cf340aadf693703bb72cd9090349698f5eec 2.0.0 f2033866700eb4fb527dcb4fd53bbfde762344bc 2.6.1 817e2580c9f9b819f8bebaaf81d6492ed00fccab 2.6.2 b2f27a02fb70ddab32c17f7b8bba4fda4b9b538c 2.6.3 +2c3326d0ab7e85e815e15cc97789930f02b1d6f9 2.6.4 From 26db1d748284b4a0f7a77ab5071402962456c434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:31:14 +0100 Subject: [PATCH 18/18] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index f564a49f78..b9a2ac1b54 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.4 +version=2.6.5 depends: account account_invoice