From fc8c10db6679504308e8569c325780c5afb92a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 13 May 2010 13:14:57 +0200 Subject: [PATCH 01/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 4dacfb93da..4c48582584 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.6.0', + 'version': '1.6.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a11563260baedf654658b7ba82687323c5577d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 21 Aug 2010 12:35:30 +0200 Subject: [PATCH 02/32] Fix wrong context for call of tax compute for issue1645 --- purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index 6e09c44df0..cc51bc969d 100644 --- a/purchase.py +++ b/purchase.py @@ -308,7 +308,7 @@ class Purchase(ModelWorkflow, ModelSQL, ModelView): 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): + line.get('quantity', 0.0), context=ctx): key, val = invoice_obj._compute_tax(cursor, user, tax, 'in_invoice', context=context) if not key in taxes: From 2baa9fecbe1e611b4bc28b9ba6042fb135c4fc52 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:24 +0100 Subject: [PATCH 03/32] Prepare release 1.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 62723b3c57..04a5861643 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.1 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.6.0 - 2010-05-13 * Bug fixes (see mercurial logs for details) * Use model singleton to define which purchase sequence to use From 9a0a89987e8199db603ed693c488b97193b76668 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:24 +0100 Subject: [PATCH 04/32] Added tag 1.6.1 for changeset c10e712a248e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a3317c5440..d352cd633e 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ 8411703acab8ab25c5b6a34cedbaa65d8edfb74d 1.2.0 821a4e526a660debd9e815f866edeaef93026535 1.4.0 eaeea51fd310f387cc5593ac03caa0a7926ed377 1.6.0 +c10e712a248e60c16b11ad3a310195030067fad3 1.6.1 From 3e8b4ed2e75e37b0bf78d405d1cc20b1fd35be85 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:25 +0100 Subject: [PATCH 05/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 4c48582584..57878405b5 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.6.1', + 'version': '1.6.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From e497b753f66701a5628c58b9e2fe9f3ccd97b6ac 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 06/32] 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 cc51bc969d..047ec91410 100644 --- a/purchase.py +++ b/purchase.py @@ -1196,8 +1196,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( cursor, user, invoice_line.unit, invoice_line.quantity, line.unit, context=context) From 8ca9d1626756533219cfe7e1bb3583b9d846bb49 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 16:38:03 +0100 Subject: [PATCH 07/32] 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 4df959bcbbe60e51e1c7ccbc02cbb91aa755ae18 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:30:37 +0100 Subject: [PATCH 08/32] Prepare release 1.6.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 04a5861643..c4477ac565 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.2 - 2011-02-13 +* Bug fixes (see mercurial logs for details) + Version 1.6.1 - 2010-11-02 * Bug fixes (see mercurial logs for details) From 194fde4c8ce1d7eb9b3d74721383ddd0d6c2ce7e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:30:37 +0100 Subject: [PATCH 09/32] Added tag 1.6.2 for changeset 15fcdfdee792 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d352cd633e..262ca0b34e 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ 821a4e526a660debd9e815f866edeaef93026535 1.4.0 eaeea51fd310f387cc5593ac03caa0a7926ed377 1.6.0 c10e712a248e60c16b11ad3a310195030067fad3 1.6.1 +15fcdfdee7929d827e4a63f6e0f6cd481681a7ed 1.6.2 From b4bfe4e56890c5a8b9b042bd494c8ee83a290171 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:30:42 +0100 Subject: [PATCH 10/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 57878405b5..846ff5a615 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.6.2', + 'version': '1.6.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4673f93e0b4a7f840f4d93e7058b9ace8ee2cc31 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 11/32] Preserver purchase line order in invoice (transplanted from b268b0a90674cf72302423cf550836a14b248a67) --- purchase.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/purchase.py b/purchase.py index 047ec91410..a3ed16de46 100644 --- a/purchase.py +++ b/purchase.py @@ -768,12 +768,14 @@ class Purchase(ModelWorkflow, ModelSQL, ModelView): vals = self._get_invoice_purchase(cursor, user, purchase, context=context) invoice_id = invoice_obj.create(cursor, 0, vals, context=ctx) - 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 invoice_line_id = invoice_line_obj.create(cursor, 0, vals, context=ctx) - purchase_line_obj.write(cursor, user, line_id, { + purchase_line_obj.write(cursor, user, line.id, { 'invoice_lines': [('add', invoice_line_id)], }, context=context) From 6f6c02eff4b01f02b1cb03d976ea0ff315d48a77 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:17:10 +0200 Subject: [PATCH 12/32] Prepare release 1.6.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c4477ac565..7bce4d6b66 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.3 - 2011-05-29 +* Bug fixes (see mercurial logs for details) + Version 1.6.2 - 2011-02-13 * Bug fixes (see mercurial logs for details) From 797e3b55379e7c42a6d722d4ca198f57a51041a0 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:17:10 +0200 Subject: [PATCH 13/32] Added tag 1.6.3 for changeset 314b6da6cfd4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 262ca0b34e..c2fc478f6b 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ eaeea51fd310f387cc5593ac03caa0a7926ed377 1.6.0 c10e712a248e60c16b11ad3a310195030067fad3 1.6.1 15fcdfdee7929d827e4a63f6e0f6cd481681a7ed 1.6.2 +314b6da6cfd460185ab3b8eff5e903a1d0755d9c 1.6.3 From 4d358d074572a62dfc41d3fbdd99a3363117e734 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:17:14 +0200 Subject: [PATCH 14/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 846ff5a615..1bdfdaf62a 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.6.3', + 'version': '1.6.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From fdf053c6f77b426bc172973c0ffcd280ee95b000 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 15/32] 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 a3ed16de46..52ae137d33 100644 --- a/purchase.py +++ b/purchase.py @@ -1183,7 +1183,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 fb294ca46c37437c8b1a03184cf92e257098bfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:13:53 +0200 Subject: [PATCH 16/32] Prepare release 1.6.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7bce4d6b66..91dc56b4d5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.4 - 2011-09-10 +* Bug fixes (see mercurial logs for details) + Version 1.6.3 - 2011-05-29 * Bug fixes (see mercurial logs for details) From bb3603730a7ce9f534f7395a0aa441808504da80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:13:57 +0200 Subject: [PATCH 17/32] Added tag 1.6.4 for changeset 606f777e8393 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c2fc478f6b..574b9e902f 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ eaeea51fd310f387cc5593ac03caa0a7926ed377 1.6.0 c10e712a248e60c16b11ad3a310195030067fad3 1.6.1 15fcdfdee7929d827e4a63f6e0f6cd481681a7ed 1.6.2 314b6da6cfd460185ab3b8eff5e903a1d0755d9c 1.6.3 +606f777e8393a308cb734874de3be8d0d225165d 1.6.4 From b4d4ca28af9bbd1be401f068a43db154a3aaf71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:14:48 +0200 Subject: [PATCH 18/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1bdfdaf62a..afafcf18dd 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.6.4', + 'version': '1.6.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a433e32c8f902841672cad89901768f6f419bc12 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 19/32] 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 52ae137d33..7e963c9033 100644 --- a/purchase.py +++ b/purchase.py @@ -1184,7 +1184,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 99be20b416b91fd783de2990f8d4e59bb4664233 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:14:55 +0200 Subject: [PATCH 20/32] Prepare release 1.6.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 91dc56b4d5..497ae6c5b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.5 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.6.4 - 2011-09-10 * Bug fixes (see mercurial logs for details) From a62d509f478250704e8f988b390825caa85682bf Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:14:55 +0200 Subject: [PATCH 21/32] Added tag 1.6.5 for changeset 1685988b8b38 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 574b9e902f..8d4e269acd 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ c10e712a248e60c16b11ad3a310195030067fad3 1.6.1 15fcdfdee7929d827e4a63f6e0f6cd481681a7ed 1.6.2 314b6da6cfd460185ab3b8eff5e903a1d0755d9c 1.6.3 606f777e8393a308cb734874de3be8d0d225165d 1.6.4 +1685988b8b38946de58fb6bd39bd6a262f1ee704 1.6.5 From 0137ece0b843fa7d81f6cfa2d02f4968a196089f Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:15:00 +0200 Subject: [PATCH 22/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index afafcf18dd..3b8d04dab7 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.6.5', + 'version': '1.6.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a4e3994c1f651aff3270f316e4581e436e11dffc Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Wed, 21 Mar 2012 08:47:42 +0100 Subject: [PATCH 23/32] 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 7e963c9033..ce6a1ad5c0 100644 --- a/purchase.py +++ b/purchase.py @@ -904,7 +904,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 d97385048bd3f87316c46abb5a2b80636d50488a 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 24/32] 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 ce6a1ad5c0..9a0213a224 100644 --- a/purchase.py +++ b/purchase.py @@ -1200,6 +1200,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 d62c575c556cddfa48d0456a6dbe8ed0cb47a827 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:11 +0200 Subject: [PATCH 25/32] Prepare release 1.6.6 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 497ae6c5b2..bb27adb696 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.6 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.6.5 - 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 23980a966fc91833124c271821fdc0171116e83c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:12 +0200 Subject: [PATCH 26/32] Added tag 1.6.6 for changeset 12a9fd5c6078 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8d4e269acd..67a652efb2 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ c10e712a248e60c16b11ad3a310195030067fad3 1.6.1 314b6da6cfd460185ab3b8eff5e903a1d0755d9c 1.6.3 606f777e8393a308cb734874de3be8d0d225165d 1.6.4 1685988b8b38946de58fb6bd39bd6a262f1ee704 1.6.5 +12a9fd5c6078af329775a050dc188f72895bb7aa 1.6.6 From 39448f91ca7a9b5d6ea4470c55b5b77b7e5c1bd2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:17 +0200 Subject: [PATCH 27/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 3b8d04dab7..69c98c276b 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.6.6', + 'version': '1.6.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b290d592eca405bab94f31c2dfd1648b2eaf6a80 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 28/32] 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 9a0213a224..a74214026f 100644 --- a/purchase.py +++ b/purchase.py @@ -860,7 +860,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')), @@ -883,7 +884,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 bebdede136f32e6ea167433bd1ffd5d7e44dd6c5 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 29/32] 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 a74214026f..217d2d791d 100644 --- a/purchase.py +++ b/purchase.py @@ -1756,7 +1756,7 @@ class Move(ModelSQL, ModelView): return res def search_purchase(self, cursor, user, name, clause, context=None): - return [('purchase_line.' + name,) + clause[1:]] + return [('purchase_line.' + name,) + tuple(clause[1:])] def get_purchase_fields(self, cursor, user, ids, names, context=None): res = {} @@ -1818,7 +1818,7 @@ class Move(ModelSQL, ModelView): return res def search_supplier(self, cursor, user, name, clause, context=None): - return [('purchase_line.purchase.party',) + clause[1:]] + return [('purchase_line.purchase.party',) + tuple(clause[1:])] def write(self, cursor, user, ids, vals, context=None): purchase_obj = self.pool.get('purchase.purchase') From 2dc33643e52b30a198da5b2430bc085f0f592651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:24:03 +0100 Subject: [PATCH 30/32] Prepare release 1.6.7 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bb27adb696..98f28d5aa3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.7 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 1.6.6 - 2012-05-07 * Bug fixes (see mercurial logs for details) From 9208a0886ea87406b08b8021b8fe6f8f985cb643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:24:04 +0100 Subject: [PATCH 31/32] Added tag 1.6.7 for changeset d82a6adc4d17 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 67a652efb2..fd8bbc2aca 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ c10e712a248e60c16b11ad3a310195030067fad3 1.6.1 606f777e8393a308cb734874de3be8d0d225165d 1.6.4 1685988b8b38946de58fb6bd39bd6a262f1ee704 1.6.5 12a9fd5c6078af329775a050dc188f72895bb7aa 1.6.6 +d82a6adc4d176bd3f33532190af01a50c150e820 1.6.7 From baacce5413c683b13405d96b9e02dae5711b9d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:24:15 +0100 Subject: [PATCH 32/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 69c98c276b..613f4ae88c 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.6.7', + 'version': '1.6.8', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',