From 5da55f1fb701f544a78d7ea7958cf8b1bed83a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 25 Oct 2011 10:31:05 +0200 Subject: [PATCH 01/16] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c94a1be96c..f57b590b22 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', 'name_nl_NL': 'Verkoop', - 'version': '2.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 821fb42bbdb49d72d4bbd1ca72e9e592718fb4ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 2 Nov 2011 16:59:13 +0100 Subject: [PATCH 02/16] Set company on shipment since there is a field issue2247 review165009 (transplanted from e0ae701ab6d7deb003dcdc870bfcc7edeaf35a47) --- sale.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sale.py b/sale.py index 493221c31b..c817e99916 100644 --- a/sale.py +++ b/sale.py @@ -830,6 +830,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView): 'delivery_address': sale.shipment_address.id, 'reference': sale.reference, 'warehouse': sale.warehouse.id, + 'company': sale.company.id, } values.update(dict(key)) shipment_id = shipment_obj.create(values) From 9a8d88131408cbd283bc8bc2cc9bd97ed2cd3f88 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:40:55 +0100 Subject: [PATCH 03/16] Prepare release 2.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f16348bd0d..c07ac6e6c1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-25 * Bug fixes (see mercurial logs for details) * Add delivery time on product From a2cd62af9926b2c7afe14f7b1ac0a49a6dcff8b1 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:40:55 +0100 Subject: [PATCH 04/16] Added tag 2.2.1 for changeset 5cbbd44329b6 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 775be4fd9c..5b8b2b31b6 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ dd5101ebaec9f7d1d13071e0e1ffcf3958a6b0f1 1.6.0 13263ec7282b5a58dedd84cceb8e33de76a6952e 1.8.0 4a6f7eb2afa6f6aa315fac3148397a01b0d6ed8e 2.0.0 746ade947a1b66841722d5bfb4e50a3f87c18c9f 2.2.0 +5cbbd44329b62096520d3c5251fb556623b260ac 2.2.1 From 4d39983d4355b995dca06da779ca2ee02fb638ca Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:41:02 +0100 Subject: [PATCH 05/16] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f57b590b22..777bbcaf31 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', 'name_nl_NL': 'Verkoop', - 'version': '2.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From df4cadfcea559c7ca89faf164a3c567d99dff34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 1 Mar 2012 10:21:40 +0100 Subject: [PATCH 06/16] Don't link copied invoice to sale issue2466 review258001 (transplanted from 6ccf1335a9f52f5cf5675a54a3c13b55689217b1) --- invoice.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/invoice.py b/invoice.py index 447bcd0cde..b936a9a404 100644 --- a/invoice.py +++ b/invoice.py @@ -9,6 +9,13 @@ class Invoice(ModelSQL, ModelView): sales = fields.Many2Many('sale.sale-account.invoice', 'invoice', 'sale', 'Sales', readonly=True) + def copy(self, ids, default=None): + if default is None: + default = {} + default = default.copy() + default.setdefault('sales', False) + return super(Invoice, self).copy(ids, default=default) + Invoice() @@ -18,4 +25,11 @@ class InvoiceLine(ModelSQL, ModelView): sale_lines = fields.Many2Many('sale.line-account.invoice.line', 'invoice_line', 'sale_line', 'Sale Lines', readonly=True) + def copy(self, ids, default=None): + if default is None: + default = {} + default = default.copy() + default.setdefault('sale_lines', False) + return super(InvoiceLine, self).copy(ids, default=default) + InvoiceLine() From 5fc211ef044be9f30542f36d6d8f0c406f1df072 Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Wed, 21 Mar 2012 08:37:56 +0100 Subject: [PATCH 07/16] 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 c817e99916..f8101307c5 100644 --- a/sale.py +++ b/sale.py @@ -1088,7 +1088,7 @@ class SaleLine(ModelSQL, ModelView): states={ 'invisible': ~Eval('type').in_(['line', 'subtotal']), 'readonly': ~Eval('_parent_sale'), - }, on_change_with=['type', 'quantity', 'unit_price', + }, on_change_with=['type', 'quantity', 'unit_price', 'unit', '_parent_sale.currency'], depends=['type']), 'get_amount') description = fields.Text('Description', size=None, required=True) From a20744e705e725bf50baec248bf3258ce443217e 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 08/16] 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 f8101307c5..25c3151bf0 100644 --- a/sale.py +++ b/sale.py @@ -1370,6 +1370,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 3604fe2f393a0a1f4b7c9971b1e5737730f63079 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:04 +0200 Subject: [PATCH 09/16] Prepare release 2.2.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c07ac6e6c1..9c2d639678 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.2 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 2.2.1 - 2011-12-26 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index a9feb419c1..83c0f58495 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -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. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify From 47b13e3aad170c5c66be616fd628814e2ada91a4 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:04 +0200 Subject: [PATCH 10/16] Added tag 2.2.2 for changeset c884f2efc5de --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5b8b2b31b6..27b71219ff 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ dd5101ebaec9f7d1d13071e0e1ffcf3958a6b0f1 1.6.0 4a6f7eb2afa6f6aa315fac3148397a01b0d6ed8e 2.0.0 746ade947a1b66841722d5bfb4e50a3f87c18c9f 2.2.0 5cbbd44329b62096520d3c5251fb556623b260ac 2.2.1 +c884f2efc5ded9519955d818449d8a1250095db9 2.2.2 From 5e0b5a1ae6100705c2c791115860136551845b75 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:11 +0200 Subject: [PATCH 11/16] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 777bbcaf31..36b35aa444 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', 'name_nl_NL': 'Verkoop', - 'version': '2.2.2', + 'version': '2.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a3aaca48eb70feeb543629abf9ad76cbecc694ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 26 Aug 2012 15:56:53 +0200 Subject: [PATCH 12/16] Add missing sale_date on some on_change (transplanted from bbca949a7e284d74ea3578936539d3893f4a8a21) --- sale.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sale.py b/sale.py index 25c3151bf0..adf44cb283 100644 --- a/sale.py +++ b/sale.py @@ -1044,7 +1044,8 @@ class SaleLine(ModelSQL, ModelView): 'required': Eval('type') == 'line', 'readonly': ~Eval('_parent_sale', {}), }, on_change=['product', 'quantity', 'unit', - '_parent_sale.currency', '_parent_sale.party'], + '_parent_sale.currency', '_parent_sale.party', + '_parent_sale.sale_date'], depends=['type', 'unit_digits']) unit = fields.Many2One('product.uom', 'Unit', states={ @@ -1070,7 +1071,8 @@ class SaleLine(ModelSQL, ModelView): 'readonly': ~Eval('_parent_sale', {}), }, on_change=['product', 'unit', 'quantity', 'description', - '_parent_sale.party', '_parent_sale.currency'], + '_parent_sale.party', '_parent_sale.currency', + '_parent_sale.sale_date'], context={ 'locations': If(Bool(Eval('_parent_sale', {}).get( 'warehouse')), [Eval('_parent_sale', {}).get('warehouse', 0)], []), From bf8d3813491a66ca24c50cfcad517ff77cc1df0e 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 13/16] 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 721a34e9a9..e711ce0545 100644 --- a/setup.py +++ b/setup.py @@ -67,5 +67,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 53db2f2bdb269dff34d9043e03ec0e52b5be4eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:31:50 +0100 Subject: [PATCH 14/16] Prepare release 2.2.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9c2d639678..2a08e05ee8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.3 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.2.2 - 2012-05-07 * Bug fixes (see mercurial logs for details) From 594ef0115978b13d3e8b5b7585dbc030bf9034c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:31:51 +0100 Subject: [PATCH 15/16] Added tag 2.2.3 for changeset 8d020c5d0bbe --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 27b71219ff..16c9f39a32 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ dd5101ebaec9f7d1d13071e0e1ffcf3958a6b0f1 1.6.0 746ade947a1b66841722d5bfb4e50a3f87c18c9f 2.2.0 5cbbd44329b62096520d3c5251fb556623b260ac 2.2.1 c884f2efc5ded9519955d818449d8a1250095db9 2.2.2 +8d020c5d0bbe36f0534b9408151157be4a3cf34f 2.2.3 From e672eca2bf90ba0cbd45909765b08cc2af7efb98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:32:01 +0100 Subject: [PATCH 16/16] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 36b35aa444..17cb1c36ec 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', 'name_nl_NL': 'Verkoop', - 'version': '2.2.3', + 'version': '2.2.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',