From cc6fcce7d6c40614b435bc1bf25aec60eb2b944b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 20 Oct 2009 19:47:28 +0200 Subject: [PATCH 01/34] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 0a4c6e7178..676b2be7fe 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.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 0f975dd5465e61292bddd23075ba419765f7d283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Nov 2009 19:19:39 +0100 Subject: [PATCH 02/34] Fix company context domain when company is not in context (transplanted from bd5b84915e07ee15f66015464d9952f81d5fa5d9) --- sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sale.py b/sale.py index 34120241ca..5d1e74b564 100644 --- a/sale.py +++ b/sale.py @@ -18,7 +18,8 @@ class Sale(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', readonly=True, select=1) description = fields.Char('Description', states={ 'readonly': "state != 'draft'", From c9f489d26ff80f3b37b7b50396adbd8a8bb6c398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:06:57 +0100 Subject: [PATCH 03/34] Prepare release 1.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index fa9582ade5..5fddd5b731 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) From dc70361fdcd99286ee8a670a731b2b403ae25619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:07:03 +0100 Subject: [PATCH 04/34] Added tag 1.4.1 for changeset 6be63b967249 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0ee49ddb7b..7dc23c4550 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ a10cbe150870d184b9a520b155de9cbc87ecc2f2 1.0.0 cad9154b8847193dff951b9c4c0a4fa16c66d550 1.2.0 107d9341d8067b074c60250a15e6cede4f038f7e 1.4.0 +6be63b967249f19a05dd6dd9c6070c8222567af8 1.4.1 From 7ba42f19e6032a7c948b092a925ef9c5cc41a7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:08:20 +0100 Subject: [PATCH 05/34] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 676b2be7fe..ce69276390 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.4.1', + 'version': '1.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 922aa5f9e97143e1846011f8334a594f5f095bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 21 Jan 2010 21:04:54 +0100 Subject: [PATCH 06/34] Writing move on sale line require to bypass rules (transplanted from d361e987fae591860d2252491bf1a1b0a9cf41f8) --- sale.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sale.py b/sale.py index 5d1e74b564..776cb5fdeb 100644 --- a/sale.py +++ b/sale.py @@ -883,9 +883,9 @@ class Sale(ModelWorkflow, ModelSQL, ModelView): vals = moves[line_id] vals['shipment_out'] = shipment_id move_id = move_obj.create(cursor, 0, vals, context=ctx) - sale_line_obj.write(cursor, user, line_id, { + sale_line_obj.write(cursor, 0, line_id, { 'moves': [('add', move_id)], - }, context=context) + }, context=ctx) shipment_obj.workflow_trigger_validate(cursor, 0, shipment_id, 'waiting', context=ctx) return shipment_id From 21599bc9d7d2e320d3eb1e4ce401eac718593401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:33:34 +0100 Subject: [PATCH 07/34] 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 c38e83a4b31fcad4b76cd0e2bc09c215f459740c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 17 Feb 2010 16:32:52 +0100 Subject: [PATCH 08/34] Prepare release 1.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 5fddd5b731..0d17f00105 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 68270fae973b9a2dcca5f667d0c41e3fd5e18a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 17 Feb 2010 16:32:56 +0100 Subject: [PATCH 09/34] Added tag 1.4.2 for changeset de96b5637862 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 7dc23c4550..e24b0380bb 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ a10cbe150870d184b9a520b155de9cbc87ecc2f2 1.0.0 cad9154b8847193dff951b9c4c0a4fa16c66d550 1.2.0 107d9341d8067b074c60250a15e6cede4f038f7e 1.4.0 6be63b967249f19a05dd6dd9c6070c8222567af8 1.4.1 +de96b5637862e5a8c01865d23f465bd01e217c34 1.4.2 From fcd01c2feee6339c43d49d222d91057e0de03b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 17 Feb 2010 16:34:23 +0100 Subject: [PATCH 10/34] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index ce69276390..e8a66aa59e 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.4.2', + 'version': '1.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 00a362e324a5c32aba07fa6a7b2a45a78446269d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 13 May 2010 10:11:02 +0200 Subject: [PATCH 11/34] Don't include .pyc from tests (transplanted from 9144ce9d11556e6a282d2bdc8b5edac28963a7ff) --- 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 1f3fb9b3ad18be73bd91f18e8fa725bb016adf4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 21 Aug 2010 12:33:52 +0200 Subject: [PATCH 12/34] Fix wrong context for call of tax compute for issue1645 (transplanted from 0b436b131d56f08ea97b03eb716532f02643c83e) --- sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale.py b/sale.py index 776cb5fdeb..5a2a0aa039 100644 --- a/sale.py +++ b/sale.py @@ -355,7 +355,7 @@ class Sale(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, 'out_invoice', context=context) if not key in taxes: From 6893f276a17827b4496a81b982e48faaac3791d7 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:48 +0100 Subject: [PATCH 13/34] Prepare release 1.4.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0d17f00105..6af19c76a6 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 f33fa2bd013ac3e4286e3a9de37c1c13863c2508 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:49 +0100 Subject: [PATCH 14/34] Added tag 1.4.3 for changeset 126e2868e50b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e24b0380bb..6d94a99478 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ cad9154b8847193dff951b9c4c0a4fa16c66d550 1.2.0 107d9341d8067b074c60250a15e6cede4f038f7e 1.4.0 6be63b967249f19a05dd6dd9c6070c8222567af8 1.4.1 de96b5637862e5a8c01865d23f465bd01e217c34 1.4.2 +126e2868e50b524e1b05cce8197617dcc598a4a5 1.4.3 From 5c84a9d2334d56702438025bef102cb4caa8b06c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:49 +0100 Subject: [PATCH 15/34] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index e8a66aa59e..1391419270 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.4.3', + 'version': '1.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 018317ef028d9dab144db24ca6f2c4066f7159ad 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 16/34] 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 5a2a0aa039..d92965b26d 100644 --- a/sale.py +++ b/sale.py @@ -1286,8 +1286,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( cursor, user, invoice_line.unit, invoice_line.quantity, line.unit, context=context) From b9651d31cdf52dd509a9eabb01bebabeb4fb0da1 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 16:40:46 +0100 Subject: [PATCH 17/34] 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 59fbe8ce73629f448cc62516e8fe0fdd07a66506 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:29:02 +0100 Subject: [PATCH 18/34] Prepare release 1.4.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6af19c76a6..e0879eebfa 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 775d0f8f5e7a7f7a1e545330e535ee5c1eea7ec8 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:29:02 +0100 Subject: [PATCH 19/34] Added tag 1.4.4 for changeset 98c191a22093 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6d94a99478..d0d0617e7b 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ cad9154b8847193dff951b9c4c0a4fa16c66d550 1.2.0 6be63b967249f19a05dd6dd9c6070c8222567af8 1.4.1 de96b5637862e5a8c01865d23f465bd01e217c34 1.4.2 126e2868e50b524e1b05cce8197617dcc598a4a5 1.4.3 +98c191a22093013328dcc758b9dc384f1614a062 1.4.4 From d28c283b2508f8e3d4ffe14ccfb040129974ece2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:29:10 +0100 Subject: [PATCH 20/34] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1391419270..1941fdf7ec 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.4.4', + 'version': '1.4.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 7ce4c7a46274565354d5fe4a59365532a41a1ff0 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 21/34] 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 d92965b26d..f236a333be 100644 --- a/sale.py +++ b/sale.py @@ -1286,7 +1286,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( From c9dc7576c81440acf8630eda055df3c4f5493f21 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 22/34] 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 f236a333be..4cdb2bec92 100644 --- a/sale.py +++ b/sale.py @@ -730,7 +730,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView): :param sale: the BrowseRecord of the sale :param context: the context - :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') @@ -810,12 +810,14 @@ class Sale(ModelWorkflow, ModelSQL, ModelView): vals = self._get_invoice_sale(cursor, user, sale, 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 sale.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) - sale_line_obj.write(cursor, user, line_id, { + sale_line_obj.write(cursor, user, line.id, { 'invoice_lines': [('add', invoice_line_id)], }, context=context) From c5d0cdf8232a6b555364c962aa3120624ebcba8d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:16:01 +0200 Subject: [PATCH 23/34] Prepare release 1.4.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e0879eebfa..2ea557d9c2 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 41e53b779e0a1a3796b2420f241903d169793e5c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:16:01 +0200 Subject: [PATCH 24/34] Added tag 1.4.5 for changeset de9d6d9affa5 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d0d0617e7b..11e86a8338 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ cad9154b8847193dff951b9c4c0a4fa16c66d550 1.2.0 de96b5637862e5a8c01865d23f465bd01e217c34 1.4.2 126e2868e50b524e1b05cce8197617dcc598a4a5 1.4.3 98c191a22093013328dcc758b9dc384f1614a062 1.4.4 +de9d6d9affa5defb7686f2fab23fb9441b3272b1 1.4.5 From 61d7a5307bda95a7f73a3fc8c9669eee9e64337a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:16:05 +0200 Subject: [PATCH 25/34] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1941fdf7ec..6a2792ffae 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.4.5', + 'version': '1.4.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 952b82b37eb4647945a1b44c8e4b44fbaed8eb0a 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 26/34] 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 4cdb2bec92..b271f64f05 100644 --- a/sale.py +++ b/sale.py @@ -1276,7 +1276,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 1cc2eb6c8d378e9cb5cc4e24a2562d6563992ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:24:48 +0200 Subject: [PATCH 27/34] Prepare release 1.4.6 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2ea557d9c2..28dddbdeb1 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 ff0a9f18e238a6a5b644a32f7d6ed95f0d78a558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:24:51 +0200 Subject: [PATCH 28/34] Added tag 1.4.6 for changeset cf514272a4b3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 11e86a8338..d4a577a05b 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ de96b5637862e5a8c01865d23f465bd01e217c34 1.4.2 126e2868e50b524e1b05cce8197617dcc598a4a5 1.4.3 98c191a22093013328dcc758b9dc384f1614a062 1.4.4 de9d6d9affa5defb7686f2fab23fb9441b3272b1 1.4.5 +cf514272a4b343c87a4c22dc713b80ea83bdccba 1.4.6 From a083077b51640846fedf211a84bd8ebcbc165aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 23:25:51 +0200 Subject: [PATCH 29/34] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6a2792ffae..28d291bb8a 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.4.6', + 'version': '1.4.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 020f5f7a53489fe9ba82b9734503e01a72318965 Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Wed, 21 Mar 2012 08:37:56 +0100 Subject: [PATCH 30/34] 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 b271f64f05..9e55d52e4a 100644 --- a/sale.py +++ b/sale.py @@ -991,7 +991,7 @@ class SaleLine(ModelSQL, ModelView): states={ 'invisible': "type not in ('line', 'subtotal')", 'readonly': "not globals().get('_parent_sale')", - }, on_change_with=['type', 'quantity', 'unit_price', + }, on_change_with=['type', 'quantity', 'unit_price', 'unit', '_parent_sale.currency']) description = fields.Text('Description', size=None, required=True) note = fields.Text('Note') From f67e91b6eb77de54f9077e4f25310eb31918f7dd 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 31/34] 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 9e55d52e4a..8ceaa27015 100644 --- a/sale.py +++ b/sale.py @@ -1290,6 +1290,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 83433eb1e6488ca950127471cf69e18e3b86d948 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:02:57 +0200 Subject: [PATCH 32/34] Prepare release 1.4.7 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 28dddbdeb1..92e050ca52 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.7 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.4.6 - 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 3491adf7279d13bc4fb65f878f27f2a6a1e781cd Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:02:57 +0200 Subject: [PATCH 33/34] Added tag 1.4.7 for changeset ca008baa80ed --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d4a577a05b..bee7599ce5 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ de96b5637862e5a8c01865d23f465bd01e217c34 1.4.2 98c191a22093013328dcc758b9dc384f1614a062 1.4.4 de9d6d9affa5defb7686f2fab23fb9441b3272b1 1.4.5 cf514272a4b343c87a4c22dc713b80ea83bdccba 1.4.6 +ca008baa80ed47d0c74ab5d1f90f4c6fd45f291d 1.4.7 From 525c4a9eafdcbd556eaadc6b18f9bf2b735a73ad Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:03:02 +0200 Subject: [PATCH 34/34] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 28d291bb8a..cd3c42b6e3 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.4.7', + 'version': '1.4.8', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',