From cc01ee2ed069aba22e4f2c67cae4ae94ac27dfcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 20 Oct 2009 19:46:57 +0200 Subject: [PATCH 01/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 72be0ca285..ad4319fec4 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.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 2e7bee8052432092525045a680d069aab4f3ab07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Nov 2009 19:15:06 +0100 Subject: [PATCH 02/37] Fix company context domain when company is not in context (transplanted from b6f05a256391ecec4b830cee7260f9d432cc5228) --- purchase.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/purchase.py b/purchase.py index f671498994..83f875eedf 100644 --- a/purchase.py +++ b/purchase.py @@ -22,7 +22,8 @@ class Purchase(ModelWorkflow, ModelSQL, ModelView): company = fields.Many2One('company.company', 'Company', required=True, states={ 'readonly': "state != 'draft' or bool(lines)", - }, domain=["('id', '=', context.get('company', 0))"]) + }, domain=["('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))"]) reference = fields.Char('Reference', size=None, readonly=True, select=1) supplier_reference = fields.Char('Supplier Reference', select=1) description = fields.Char('Description', size=None, states=_STATES) @@ -1525,7 +1526,8 @@ class ProductSupplier(ModelSQL, ModelView): 'product_supplier', 'Prices') company = fields.Many2One('company.company', 'Company', required=True, ondelete='CASCADE', select=1, - domain=["('id', '=', context.get('company', 0))"]) + domain=["('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))"]) delivery_time = fields.Integer('Delivery Time', help="In number of days") From a19082adce519aa0990d3fea0ee2e2c8997431b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 17:59:38 +0100 Subject: [PATCH 03/37] Prepare release 1.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bad924f7ca..733cba3889 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.1 - 2009-11-24 +* Some bug fixes (see mercurial logs for details) + Version 1.4.0 - 2009-10-19 * Bug fixes (see mercurial logs for details) * Migrate packing* objects and tables to shipment* From 242ee94eaffb5095556b347af3f84c908e4fa39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 17:59:41 +0100 Subject: [PATCH 04/37] Added tag 1.4.1 for changeset a19f8d3eff64 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2eb5578036..de2641b52b 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 28f5e05376cda70f569743e695369f3dcb5462d0 1.0.0 8411703acab8ab25c5b6a34cedbaa65d8edfb74d 1.2.0 821a4e526a660debd9e815f866edeaef93026535 1.4.0 +a19f8d3eff648262f2ddd9fcfb6174abc2f99df1 1.4.1 From 7c05f045b8f9d2c00e74f478de2184b6055c9517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:01:27 +0100 Subject: [PATCH 05/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index ad4319fec4..b42ba6887c 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.4.1', + 'version': '1.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 889522b3e209d4d101e0ae1da0c622a2e8cc890e 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 06/37] 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 83f875eedf..d871a3b93d 100644 --- a/purchase.py +++ b/purchase.py @@ -1278,9 +1278,9 @@ class PurchaseLine(ModelSQL, ModelView): 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 PurchaseLine() From 0312e1acba76245237bb68c3829868c867c9c277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:32:40 +0100 Subject: [PATCH 07/37] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index da277a9b35..94a43fbe61 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008-2009 Cédric Krier. -Copyright (C) 2008-2009 Bertrand Chenal. -Copyright (C) 2008-2009 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 7fd0a464193334078c4fc1c9e857a2a6be309e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 17 Feb 2010 15:03:22 +0100 Subject: [PATCH 08/37] Prepare release 1.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 733cba3889..792a793ea5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.2 - 2010-02-17 +* Some bug fixes (see mercurial logs for details) + Version 1.4.1 - 2009-11-24 * Some bug fixes (see mercurial logs for details) From 0763819a7febe575be43358818b69737a8fdb156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 17 Feb 2010 15:03:28 +0100 Subject: [PATCH 09/37] Added tag 1.4.2 for changeset b02de1901644 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index de2641b52b..ef33be0ba9 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ 8411703acab8ab25c5b6a34cedbaa65d8edfb74d 1.2.0 821a4e526a660debd9e815f866edeaef93026535 1.4.0 a19f8d3eff648262f2ddd9fcfb6174abc2f99df1 1.4.1 +b02de1901644341c2b76dfb14c972e68c64df5ae 1.4.2 From dc6425133d5d87284383819a8c84861fb4fd46ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 17 Feb 2010 15:15:11 +0100 Subject: [PATCH 10/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b42ba6887c..f672f62020 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.4.2', + 'version': '1.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 691b07174eb13f79cb1aa606566c97bcb1908959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 13 May 2010 13:07:46 +0200 Subject: [PATCH 11/37] Don't include .pyc from tests (transplanted from 732f99f0ad7beba96d0f1b936ac3a4ff55be3c0b) --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index b2a140eeeb..dcb2afa6dc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,5 +7,4 @@ include LICENSE include *.xml include *.odt include *.csv -include tests/* include doc/* From 919a9d7583df84536570b8cfa69b8c35842a35cd 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 12/37] Fix wrong context for call of tax compute for issue1645 (transplanted from 48b860bd5387a43d27578754bdfa5baab73cd8fb) --- purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index d871a3b93d..4d35f5fb1d 100644 --- a/purchase.py +++ b/purchase.py @@ -300,7 +300,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 1524ee3096368e63f5e9267407c33808d7083505 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:47 +0100 Subject: [PATCH 13/37] Prepare release 1.4.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 792a793ea5..280aa4b4f5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.3 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.4.2 - 2010-02-17 * Some bug fixes (see mercurial logs for details) From aa5a16f55022b19665d6a7ac0cd2129c828d900b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:47 +0100 Subject: [PATCH 14/37] Added tag 1.4.3 for changeset cd18439bfda3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ef33be0ba9..d6dc2be675 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ 821a4e526a660debd9e815f866edeaef93026535 1.4.0 a19f8d3eff648262f2ddd9fcfb6174abc2f99df1 1.4.1 b02de1901644341c2b76dfb14c972e68c64df5ae 1.4.2 +cd18439bfda3d43ca001496a6a4cc34495fb3fac 1.4.3 From 303394138b17ffe66eeeea984e17d269baeb8188 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:48 +0100 Subject: [PATCH 15/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f672f62020..aa488e69c8 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.4.3', + 'version': '1.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 1dd1676729ad8f77b0f3a5bb350ca921c3d25bbe 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 16/37] 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 4d35f5fb1d..19d1f7de6c 100644 --- a/purchase.py +++ b/purchase.py @@ -1184,8 +1184,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 95d23bd4e2940787193be875b83010058828ed35 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 16:40:46 +0100 Subject: [PATCH 17/37] 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 bdb7b8e8f5b711065c539d7141f194a075766987 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:28:56 +0100 Subject: [PATCH 18/37] Prepare release 1.4.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 280aa4b4f5..b374d9cc62 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.4 - 2011-02-13 +* Bug fixes (see mercurial logs for details) + Version 1.4.3 - 2010-11-02 * Bug fixes (see mercurial logs for details) From a567bb1f28efe79a0558badd02a5c8204be8e6e0 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:28:56 +0100 Subject: [PATCH 19/37] Added tag 1.4.4 for changeset 892036195be5 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d6dc2be675..0bac873e07 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ a19f8d3eff648262f2ddd9fcfb6174abc2f99df1 1.4.1 b02de1901644341c2b76dfb14c972e68c64df5ae 1.4.2 cd18439bfda3d43ca001496a6a4cc34495fb3fac 1.4.3 +892036195be53bdbaa0f3334f818218545486cf5 1.4.4 From c5f18202cbc5f2c57cede29e5598c4b1e9730790 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:29:01 +0100 Subject: [PATCH 20/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index aa488e69c8..6207d8d31a 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.4.4', + 'version': '1.4.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a129fb960f1ceb45b2270474b7051213eed946e5 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 21/37] 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 19d1f7de6c..a44a3d629c 100644 --- a/purchase.py +++ b/purchase.py @@ -762,12 +762,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 8889de9f1bcb9793e55b07849b03d5d942ff0f30 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:15:56 +0200 Subject: [PATCH 22/37] Prepare release 1.4.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b374d9cc62..df53eae6f8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.5 - 2011-05-29 +* Bug fixes (see mercurial logs for details) + Version 1.4.4 - 2011-02-13 * Bug fixes (see mercurial logs for details) From a0796d1f56328054fcd4ad8cfa7e8a6e14e6ea9a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:15:57 +0200 Subject: [PATCH 23/37] Added tag 1.4.5 for changeset 4a2917272f1d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0bac873e07..831f49966e 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ a19f8d3eff648262f2ddd9fcfb6174abc2f99df1 1.4.1 b02de1901644341c2b76dfb14c972e68c64df5ae 1.4.2 cd18439bfda3d43ca001496a6a4cc34495fb3fac 1.4.3 892036195be53bdbaa0f3334f818218545486cf5 1.4.4 +4a2917272f1d889cc18a9fe9b090cda6a9e1dcd0 1.4.5 From 634edd3ec186c2f4fafb234927272e4f9570accc Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:16:01 +0200 Subject: [PATCH 24/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6207d8d31a..b9889f7a78 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.4.5', + 'version': '1.4.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From dce591073f07cb871f5809d6d3f0187d6800401a 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 25/37] 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 a44a3d629c..96a5d67a66 100644 --- a/purchase.py +++ b/purchase.py @@ -1171,7 +1171,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 ab99db1f849d815c0273f5fe4e5cde6de36e6bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:16:17 +0200 Subject: [PATCH 26/37] Prepare release 1.4.6 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index df53eae6f8..3b910d5d38 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.6 - 2011-09-10 +* Bug fixes (see mercurial logs for details) + Version 1.4.5 - 2011-05-29 * Bug fixes (see mercurial logs for details) From 9a28ecb35dd40b81204432299c26ff5e0924face Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:16:21 +0200 Subject: [PATCH 27/37] Added tag 1.4.6 for changeset a24fad58a5eb --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 831f49966e..9298a2b33d 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ b02de1901644341c2b76dfb14c972e68c64df5ae 1.4.2 cd18439bfda3d43ca001496a6a4cc34495fb3fac 1.4.3 892036195be53bdbaa0f3334f818218545486cf5 1.4.4 4a2917272f1d889cc18a9fe9b090cda6a9e1dcd0 1.4.5 +a24fad58a5eb26cd9e14f73e4353b42748a93ef4 1.4.6 From 04d30a8ea1d53eb11550d392d2a4ff9efa706751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:18:12 +0200 Subject: [PATCH 28/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b9889f7a78..58fb3ca2aa 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.4.6', + 'version': '1.4.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 2b0312502c384156063fefe0459c0e7a3c10c893 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 29/37] 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 96a5d67a66..282d9437cb 100644 --- a/purchase.py +++ b/purchase.py @@ -1172,7 +1172,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 6f01aec51341e4a578efe73e05196c02db31eafc Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:41 +0200 Subject: [PATCH 30/37] Prepare release 1.4.7 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3b910d5d38..019080debe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.7 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.4.6 - 2011-09-10 * Bug fixes (see mercurial logs for details) From f97041b8f1fbbe98a00fe102082dd003fe59d90c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:41 +0200 Subject: [PATCH 31/37] Added tag 1.4.7 for changeset ac410f5cf61b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9298a2b33d..3585db73cd 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ cd18439bfda3d43ca001496a6a4cc34495fb3fac 1.4.3 892036195be53bdbaa0f3334f818218545486cf5 1.4.4 4a2917272f1d889cc18a9fe9b090cda6a9e1dcd0 1.4.5 a24fad58a5eb26cd9e14f73e4353b42748a93ef4 1.4.6 +ac410f5cf61b39bdb11adcac866775a234856277 1.4.7 From ac309d7f2ae34905aa7f9440e7ddf43b75a31269 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:47 +0200 Subject: [PATCH 32/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 58fb3ca2aa..dbec2be9c7 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.4.7', + 'version': '1.4.8', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 6d1d66f8e8011a9c24a0a5e0d0d9b8b9473aa646 Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Wed, 21 Mar 2012 08:47:42 +0100 Subject: [PATCH 33/37] 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 282d9437cb..d93f739eef 100644 --- a/purchase.py +++ b/purchase.py @@ -890,7 +890,7 @@ class PurchaseLine(ModelSQL, ModelView): states={ 'invisible': "type not in ('line', 'subtotal')", 'readonly': "not globals().get('_parent_purchase')", - }, on_change_with=['type', 'quantity', 'unit_price', + }, on_change_with=['type', 'quantity', 'unit_price', 'unit', '_parent_purchase.currency']) description = fields.Text('Description', size=None, required=True) note = fields.Text('Note') From 0f34f86774d084f892a532978f79a0e66814cfec 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 34/37] 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 d93f739eef..c0a31d6407 100644 --- a/purchase.py +++ b/purchase.py @@ -1188,6 +1188,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 78d4d6e079fbd4fc454128f8cfb9c682030f1791 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:02:50 +0200 Subject: [PATCH 35/37] Prepare release 1.4.8 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 019080debe..efa9b3db95 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.8 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.4.7 - 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 e7656f6172b24092bbb4a9c2dc4c0d67c0616f46 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:02:51 +0200 Subject: [PATCH 36/37] Added tag 1.4.8 for changeset 13307089414b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 3585db73cd..0d7a4d3496 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ cd18439bfda3d43ca001496a6a4cc34495fb3fac 1.4.3 4a2917272f1d889cc18a9fe9b090cda6a9e1dcd0 1.4.5 a24fad58a5eb26cd9e14f73e4353b42748a93ef4 1.4.6 ac410f5cf61b39bdb11adcac866775a234856277 1.4.7 +13307089414be04b63e7392caf5483b79aa7c91d 1.4.8 From 117c775608f06057efacb45390c1f5d848d118be Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:02:56 +0200 Subject: [PATCH 37/37] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index dbec2be9c7..8589ed82a3 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.4.8', + 'version': '1.4.9', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',