From 0b8fe5f77a5f1d17acb3cf9dfa5d3ca1f919734d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:43:03 +0100 Subject: [PATCH 01/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 8edec3683a..07236715ee 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ventas', 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', - 'version': '1.8.0', + 'version': '1.8.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 657466eb54fd8a08f5b6abb1091a65f1e71f7f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Feb 2011 20:46:36 +0100 Subject: [PATCH 02/24] Test if invoice line is linked to an invoice for issue1839 (transplanted from c30406c50795ab572858ca5c7124f5baa5e503ac) --- sale.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sale.py b/sale.py index 44676809c5..f19dcec701 100644 --- a/sale.py +++ b/sale.py @@ -1165,8 +1165,9 @@ class SaleLine(ModelSQL, ModelView): ignored_ids = set( l.id for i in line.sale.invoices_ignored for l in i.lines) for invoice_line in line.invoice_lines: - if invoice_line.invoice.state != 'cancel' or \ - invoice_line.id in ignored_ids: + if ((invoice_lines.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 657e151947bf67f5702ace6d97fc388897a003de Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 16:32:04 +0100 Subject: [PATCH 03/24] 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 a45d9d9141e38046704eed9d8a2a02da3d9de0a3 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:14 +0100 Subject: [PATCH 04/24] Prepare release 1.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a7806e4966..0d7fab5474 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 d7ea9d959ea1d8ad7bc08e4adb8a995d9fa345d7 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:14 +0100 Subject: [PATCH 05/24] Added tag 1.8.1 for changeset 51cd287a718d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c94794dcf3..15155d3232 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ cad9154b8847193dff951b9c4c0a4fa16c66d550 1.2.0 107d9341d8067b074c60250a15e6cede4f038f7e 1.4.0 dd5101ebaec9f7d1d13071e0e1ffcf3958a6b0f1 1.6.0 13263ec7282b5a58dedd84cceb8e33de76a6952e 1.8.0 +51cd287a718d496c62a7534e789f01cfd5710d28 1.8.1 From 9d3efbe0821086e6d9f51c4dd880b2162ec84282 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:19 +0100 Subject: [PATCH 06/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 07236715ee..15b9abb8e6 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ventas', 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', - 'version': '1.8.1', + 'version': '1.8.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 0812e33924b3f1eb279b7e8b3909396b8b434a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 22 Feb 2011 20:36:32 +0100 Subject: [PATCH 07/24] Fix typo for issue1873 (transplanted from f230b8f4a105e1014beeee7bf7276af3b24f1f25) --- sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale.py b/sale.py index f19dcec701..a7ba704a4a 100644 --- a/sale.py +++ b/sale.py @@ -1165,7 +1165,7 @@ class SaleLine(ModelSQL, ModelView): ignored_ids = set( l.id for i in line.sale.invoices_ignored for l in i.lines) for invoice_line in line.invoice_lines: - if ((invoice_lines.invoice and + 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, From 05ec0aabcd4d39335040ce539da3e5d59cd64649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Tue, 17 May 2011 15:35:31 +0200 Subject: [PATCH 08/24] Preserve order of sale line in invoice (transplanted from 41ec52ac100e4174ad9c94d59d8c856c4f3b612c) --- sale.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sale.py b/sale.py index a7ba704a4a..8e5e6549f5 100644 --- a/sale.py +++ b/sale.py @@ -650,7 +650,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView): :param sale: the BrowseRecord of the sale - :return: a dictionary with invoice line as key + :return: a dictionary with invoiced sale line id as key and a list of invoice lines values as value ''' line_obj = self.pool.get('sale.line') @@ -718,12 +718,14 @@ class Sale(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 sale.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) - sale_line_obj.write(line_id, { + sale_line_obj.write(line.id, { 'invoice_lines': [('add', invoice_line_id)], }) From 86f66eeacc926308cb54f62300dc988d16274439 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:36 +0200 Subject: [PATCH 09/24] Prepare release 1.8.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0d7fab5474..3911dd0779 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 c712ff40747f974f0861246e7e653371624f830d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:36 +0200 Subject: [PATCH 10/24] Added tag 1.8.2 for changeset cfdac84183a6 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 15155d3232..fa180f730e 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ cad9154b8847193dff951b9c4c0a4fa16c66d550 1.2.0 dd5101ebaec9f7d1d13071e0e1ffcf3958a6b0f1 1.6.0 13263ec7282b5a58dedd84cceb8e33de76a6952e 1.8.0 51cd287a718d496c62a7534e789f01cfd5710d28 1.8.1 +cfdac84183a6e9c0dc81ac368689dc9fe9e36f34 1.8.2 From 1d39758ca783d3baccc600549706aa75caf74ed5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:40 +0200 Subject: [PATCH 11/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 15b9abb8e6..9392a69846 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ventas', 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', - 'version': '1.8.2', + 'version': '1.8.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b72f19fdf8801e3a888a8b3bed4e74a3d2314a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Mon, 30 May 2011 16:21:57 +0200 Subject: [PATCH 12/24] Fix invoiced quantity of service products (transplanted from bae282cbc06a46a076deee3ddf4cf52813eb9cce) --- sale.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sale.py b/sale.py index 8e5e6549f5..771472d6d1 100644 --- a/sale.py +++ b/sale.py @@ -1155,7 +1155,9 @@ class SaleLine(ModelSQL, ModelView): if line.type != 'line': return [res] - if line.sale.invoice_method == 'order': + if (line.sale.invoice_method == 'order' + or not line.product + or line.product.type == 'service'): quantity = line.quantity else: quantity = 0.0 From e9fa887c880cef7204e8e8e3adc28715d9e8e339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:09:35 +0200 Subject: [PATCH 13/24] Prepare release 1.8.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3911dd0779..e9b692d583 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 b1b52e951f30c610892ab27af71492213c49a3a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:09:40 +0200 Subject: [PATCH 14/24] Added tag 1.8.3 for changeset d558eba6742e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index fa180f730e..14b6b292d5 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ dd5101ebaec9f7d1d13071e0e1ffcf3958a6b0f1 1.6.0 13263ec7282b5a58dedd84cceb8e33de76a6952e 1.8.0 51cd287a718d496c62a7534e789f01cfd5710d28 1.8.1 cfdac84183a6e9c0dc81ac368689dc9fe9e36f34 1.8.2 +d558eba6742ed3e77244f0743af1bb41921726c3 1.8.3 From 2b71bf46f34e81ef977a53a5db5e4a1205b8c2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:10:37 +0200 Subject: [PATCH 15/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9392a69846..0a6131a5ca 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ventas', 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', - 'version': '1.8.3', + 'version': '1.8.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a4b7315cc5b75153a4956678f1d0f32553dfda59 Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Wed, 21 Mar 2012 08:37:56 +0100 Subject: [PATCH 16/24] Change sale line amount with unit issue2465 review257001 (transplanted from 9fdab254bc6e59c1a32fe2a841747dd75e26cb5b) --- sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale.py b/sale.py index 771472d6d1..ea1a5c727c 100644 --- a/sale.py +++ b/sale.py @@ -896,7 +896,7 @@ class SaleLine(ModelSQL, ModelView): states={ 'invisible': Not(In(Eval('type'), ['line', 'subtotal'])), 'readonly': Not(Bool(Eval('_parent_sale'))), - }, on_change_with=['type', 'quantity', 'unit_price', + }, on_change_with=['type', 'quantity', 'unit_price', 'unit', '_parent_sale.currency']), 'get_amount') description = fields.Text('Description', size=None, required=True) note = fields.Text('Note') From e93713d93dfe463392113afd18a027b19a0d6240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 13 Apr 2012 13:17:24 +0200 Subject: [PATCH 17/24] Skip invoice line not type "line" when compute invoiced quantities review322001 (transplanted from 1353e038f992f47bdd2b2a52ede3c072515e2cf0) --- sale.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sale.py b/sale.py index ea1a5c727c..38460fe5ca 100644 --- a/sale.py +++ b/sale.py @@ -1169,6 +1169,8 @@ class SaleLine(ModelSQL, ModelView): ignored_ids = set( l.id for i in line.sale.invoices_ignored for l in i.lines) 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 0b0628ca5535dfbbd9f7712ecaaf95686e1d79d0 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:06:00 +0200 Subject: [PATCH 18/24] Prepare release 1.8.4 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e9b692d583..39fdd9d2a7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.4 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.8.3 - 2011-09-10 * 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 cbc2af392cf379d0b12a080748dbb85dddf356bc Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:06:00 +0200 Subject: [PATCH 19/24] Added tag 1.8.4 for changeset d242945fd58b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 14b6b292d5..b0174bccaa 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ dd5101ebaec9f7d1d13071e0e1ffcf3958a6b0f1 1.6.0 51cd287a718d496c62a7534e789f01cfd5710d28 1.8.1 cfdac84183a6e9c0dc81ac368689dc9fe9e36f34 1.8.2 d558eba6742ed3e77244f0743af1bb41921726c3 1.8.3 +d242945fd58b361dde0d41f3df2aafa70c02944d 1.8.4 From 28bc2ef6cb5e2f180d434e742cf7a2d7c67f3bf7 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:06:05 +0200 Subject: [PATCH 20/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 0a6131a5ca..2e7196718b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ventas', 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', - 'version': '1.8.4', + 'version': '1.8.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From f938bd05d3c4d68db924229456475aba618ff977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:48:14 +0200 Subject: [PATCH 21/24] Fix typo in tests_require (transplanted from 73ce95a4c5acf619191264613b1afb2b91cd921f) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4f2ce202fe..9bc5df8bb5 100644 --- a/setup.py +++ b/setup.py @@ -61,5 +61,5 @@ setup(name='trytond_sale', sale = trytond.modules.sale """, test_suite='tests', - test_loader='trytond.test_loader:Loader', + tests_loader='trytond.test_loader:Loader', ) From 31a91fdb54de7ac49a6d3aa3ec6d8eea616fb7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:14:19 +0100 Subject: [PATCH 22/24] Prepare release 1.8.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 39fdd9d2a7..231ea4ff88 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.5 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 1.8.4 - 2012-05-07 * Bug fixes (see mercurial logs for details) From 2b6f8e284968502f14a6a7ab400d6f0f2437cd2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:14:20 +0100 Subject: [PATCH 23/24] Added tag 1.8.5 for changeset c3c5c0f6f5f0 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b0174bccaa..be97264eee 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ dd5101ebaec9f7d1d13071e0e1ffcf3958a6b0f1 1.6.0 cfdac84183a6e9c0dc81ac368689dc9fe9e36f34 1.8.2 d558eba6742ed3e77244f0743af1bb41921726c3 1.8.3 d242945fd58b361dde0d41f3df2aafa70c02944d 1.8.4 +c3c5c0f6f5f0e22c1afe471050225fd430f36e4b 1.8.5 From ef0c9847a0b737ae5a68e3b3859177393436e503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:14:35 +0100 Subject: [PATCH 24/24] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 2e7196718b..4677c4baf9 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Ventas', 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', - 'version': '1.8.5', + 'version': '1.8.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',