From 3ff3c12c88a2657373eb8cbc3c0fe66187c51352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 11 May 2010 22:29:08 +0200 Subject: [PATCH 01/33] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 8dafe1d1ed..89bbb176fb 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Inventarios', 'name_es_ES': 'Gestión de existencias', 'name_fr_FR': 'Gestion des stocks', - 'version': '1.6.0', + 'version': '1.6.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9e27d1d321ded9cf2ad2493cbd9b6ff38a9bad6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 25 Jul 2010 15:02:45 +0200 Subject: [PATCH 02/33] Fix complete inventory for lines with product not in location for issue1633 (transplanted from 0486b028cec5504246ebb8dfc1d80502107745e5) --- inventory.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inventory.py b/inventory.py index 15259e72df..6331f19bbd 100644 --- a/inventory.py +++ b/inventory.py @@ -176,9 +176,12 @@ class Inventory(ModelWorkflow, ModelSQL, ModelView): line.product.type == 'stockable'): line_obj.delete(cursor, user, line.id, context=context) continue - quantity, uom_id = 0.0, product2uom[line.product.id] if line.product.id in product_qty: quantity, uom_id = product_qty.pop(line.product.id) + elif line.product.id in product2uom: + quantity, uom_id = 0.0, product2uom[line.product.id] + else: + quantity, uom_id = 0.0, line.product.default_uom.id values = line_obj.update_values4complete(cursor, user, line, quantity, uom_id, context=context) if values: From 3b0881f9ed865c440b00be79fba4572aec036ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 31 Aug 2010 19:11:48 +0200 Subject: [PATCH 03/33] Use safe_eval instead of eval for issue1640 (transplanted from b0760a09a50cdc3ab501ad3a710852d671ebfe30) --- product.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/product.py b/product.py index ad2e6c2586..df2aaba0eb 100644 --- a/product.py +++ b/product.py @@ -4,6 +4,7 @@ from trytond.model import ModelView, ModelSQL, fields from trytond.wizard import Wizard from trytond.pyson import PYSONEncoder import datetime +from trytond.tools import safe_eval class Template(ModelSQL, ModelView): @@ -105,7 +106,7 @@ class Product(ModelSQL, ModelView): return False if operator == "=": operator= "==" - return (eval(str(value) + operator + str(operand))) + return (safe_eval(str(value) + operator + str(operand))) def search_quantity(self, cursor, user, name, domain=None, context=None): date_obj = self.pool.get('ir.date') From d9468328be6abd3b6228f8277efe2dc7d083aa2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 31 Aug 2010 19:18:23 +0200 Subject: [PATCH 04/33] Prepare release 1.6.1 --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2673af6cee..14170ffef0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +Version 1.6.1 - 2010-08-31 +* Bug fixes (see mercurial logs for details) +* Security fix to use safe_eval instead of eval + Version 1.6.0 - 2010-05-11 * Bug fixes (see mercurial logs for details) * Use model singleton to define shipment sequences From 278b1d00209059ca21fdd4da45f916e3ef682523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 31 Aug 2010 19:18:37 +0200 Subject: [PATCH 05/33] Added tag 1.6.1 for changeset 213eb069ebfd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a1171f125e..c80e9a6fc5 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 0571f5c67623c43272e5fc05cc381554d6bf3db0 1.4.0 6a658c8f74a540a10272f5d7f311d6c61c04f3da 1.6.0 +213eb069ebfde00005a605b24dffe3f4a1c934da 1.6.1 From 210eed310f4441cc2d2bbc53df30ba54399ab6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 31 Aug 2010 20:43:18 +0200 Subject: [PATCH 06/33] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 89bbb176fb..e8f68f4dcd 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Inventarios', 'name_es_ES': 'Gestión de existencias', 'name_fr_FR': 'Gestion des stocks', - 'version': '1.6.1', + 'version': '1.6.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 08915f51c24462502d5878eb26a72732b3438ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 19 Sep 2010 18:39:29 +0200 Subject: [PATCH 07/33] Add missing super call in Product and Location to view_header_get for issue1695 (transplanted from f6edadcd6e752f47cbb8bff62b4c5e3196520354) --- location.py | 2 ++ product.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/location.py b/location.py index fb5f752441..e619fe8edc 100644 --- a/location.py +++ b/location.py @@ -173,6 +173,8 @@ class Location(ModelSQL, ModelView): product_obj = self.pool.get('product.product') if context is None: context = {} + value = super(Location, self).view_header_get(cursor, user, value, + view_type=view_type, context=context) ctx = context.copy() ctx['active_test'] = False if context.get('product') \ diff --git a/product.py b/product.py index df2aaba0eb..f5b2ce8fc2 100644 --- a/product.py +++ b/product.py @@ -522,6 +522,10 @@ class Product(ModelSQL, ModelView): def view_header_get(self, cursor, user, value, view_type='form', context=None): + if context is None: + context = {} + value = super(Product, self).view_header_get(cursor, user, value, + view_type=view_type, context=context) if not context.get('locations'): return value location_obj = self.pool.get('stock.location') From 17b9772961fe12683d9c0560f93e4eecbc2c05c4 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:29 +0100 Subject: [PATCH 08/33] Prepare release 1.6.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 14170ffef0..e9a653221a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.2 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.6.1 - 2010-08-31 * Bug fixes (see mercurial logs for details) * Security fix to use safe_eval instead of eval From 140202eb6204c526b545fac35ba1a0cf533c27cc Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:30 +0100 Subject: [PATCH 09/33] Added tag 1.6.2 for changeset 6aae8deacef9 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c80e9a6fc5..3841a4470b 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 0571f5c67623c43272e5fc05cc381554d6bf3db0 1.4.0 6a658c8f74a540a10272f5d7f311d6c61c04f3da 1.6.0 213eb069ebfde00005a605b24dffe3f4a1c934da 1.6.1 +6aae8deacef9575e47b44fb75823c299871654d9 1.6.2 From 99270f582089c87b232f2d016d9230328e68c09e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:30 +0100 Subject: [PATCH 10/33] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index e8f68f4dcd..454d2b5935 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Inventarios', 'name_es_ES': 'Gestión de existencias', 'name_fr_FR': 'Gestion des stocks', - 'version': '1.6.2', + 'version': '1.6.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From aa78a3a233122699a51edc6cacb915a243252a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 10 May 2011 15:03:54 +0200 Subject: [PATCH 11/33] Add missing rounding in creation of move of inventory for issue2007 (transplanted from 340658d14f23ab0baa35ca6e28ddf5c902f6cc0a) --- inventory.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/inventory.py b/inventory.py index 6331f19bbd..0069fb863b 100644 --- a/inventory.py +++ b/inventory.py @@ -281,7 +281,11 @@ class InventoryLine(ModelSQL, ModelView): :return: the stock.move id or None ''' move_obj = self.pool.get('stock.move') - delta_qty = line.expected_quantity - line.quantity + uom_obj = self.pool.get('product.uom') + + delta_qty = uom_obj.compute_qty(line.uom, + line.expected_quantity - line.quantity, + line.uom) if delta_qty == 0.0: return from_location = line.inventory.location.id From 86c152aa14e78d765fab835dfbb0f24a078f5cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 16 May 2011 11:45:05 +0200 Subject: [PATCH 12/33] Add missing cursor, user and context --- inventory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory.py b/inventory.py index 0069fb863b..12458cf52a 100644 --- a/inventory.py +++ b/inventory.py @@ -283,9 +283,9 @@ class InventoryLine(ModelSQL, ModelView): move_obj = self.pool.get('stock.move') uom_obj = self.pool.get('product.uom') - delta_qty = uom_obj.compute_qty(line.uom, + delta_qty = uom_obj.compute_qty(cursor, user, line.uom, line.expected_quantity - line.quantity, - line.uom) + line.uom, context=context) if delta_qty == 0.0: return from_location = line.inventory.location.id From 744d87ba251af433782b92864ba0d5645eaf433b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 10 May 2011 15:19:22 +0200 Subject: [PATCH 13/33] Missing currency and unit_price when creating inventory move on outgoing shipment (transplanted from 0376c1fec5ea1ca73e615e128200e4f98f0e5b57) --- shipment.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shipment.py b/shipment.py index acb4acf731..46dd271d9a 100644 --- a/shipment.py +++ b/shipment.py @@ -950,6 +950,8 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView): 'planned_date': move.planned_date, 'state': 'draft', 'company': move.company.id, + 'currency': move.currency.id, + 'unit_price': move.unit_price, }, context=context) def create(self, cursor, user, values, context=None): From e8b953679de6600a8d8a3fe0b80d1510e72e6725 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 13:18:11 +0200 Subject: [PATCH 14/33] 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 f4b899e9c5c44092cccdf0363b1338e5fd35a8cd Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:17:19 +0200 Subject: [PATCH 15/33] Prepare release 1.6.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e9a653221a..81e65326c6 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 - 2010-11-02 * Bug fixes (see mercurial logs for details) From bd8096b99cc0d79e4ae3ba965e3ece7e86aa5ec8 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:17:19 +0200 Subject: [PATCH 16/33] Added tag 1.6.3 for changeset 37d7d3182b35 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 3841a4470b..adbd05d5dd 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 6a658c8f74a540a10272f5d7f311d6c61c04f3da 1.6.0 213eb069ebfde00005a605b24dffe3f4a1c934da 1.6.1 6aae8deacef9575e47b44fb75823c299871654d9 1.6.2 +37d7d3182b357fbfa9aefb511e31d84ec4b8bf2e 1.6.3 From bc4f62a18676881391518166392abc32f1a1c98f Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:17:26 +0200 Subject: [PATCH 17/33] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 454d2b5935..088ae46881 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Inventarios', 'name_es_ES': 'Gestión de existencias', 'name_fr_FR': 'Gestion des stocks', - 'version': '1.6.3', + 'version': '1.6.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 58270d4d3542f36461a2f1f90b216f5c0fe042b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Oct 2011 09:57:45 +0200 Subject: [PATCH 18/33] Fix wrong required state on Move.currency (transplanted from 1f0505d6ad2788c370e68e6a628af6f3a953be14) --- move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/move.py b/move.py index 9c19daea11..1832532641 100644 --- a/move.py +++ b/move.py @@ -77,7 +77,7 @@ class Move(ModelSQL, ModelView): currency = fields.Many2One('currency.currency', 'Currency', states={ 'invisible': Not(Bool(Eval('unit_price_required'))), - 'required': Not(Bool(Eval('unit_price_required'))), + 'required': Bool(Eval('unit_price_required')), 'readonly': Not(Equal(Eval('state'), 'draft')), }) unit_price_required = fields.Function(fields.Boolean('Unit Price Required', From dac4851e097d4becd42edc46e711bf6db1e3b64a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:35:05 +0100 Subject: [PATCH 19/33] Prepare release 1.6.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 81e65326c6..06a38705fa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.4 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 1.6.3 - 2011-05-29 * Bug fixes (see mercurial logs for details) From f5dfe731f384b23b60d11ceb4e3b63d86b39e0f6 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:35:05 +0100 Subject: [PATCH 20/33] Added tag 1.6.4 for changeset 44490f39ff21 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index adbd05d5dd..fec666a4ff 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 213eb069ebfde00005a605b24dffe3f4a1c934da 1.6.1 6aae8deacef9575e47b44fb75823c299871654d9 1.6.2 37d7d3182b357fbfa9aefb511e31d84ec4b8bf2e 1.6.3 +44490f39ff21ea08dabf6991bd78c09241727a7f 1.6.4 From db3a6df22c1661fd1198bca62871af1dc2be2bf6 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:35:13 +0100 Subject: [PATCH 21/33] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 088ae46881..b3180cec82 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Inventarios', 'name_es_ES': 'Gestión de existencias', 'name_fr_FR': 'Gestion des stocks', - 'version': '1.6.4', + 'version': '1.6.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 7769b6c37095ba3adb7fad54462f5a6ff5ff97a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 24 Feb 2012 11:22:32 +0100 Subject: [PATCH 22/33] Use default values when updating cost price on creation (transplanted from 467122be397a9b12967c2448cf512c607a3e4a08) --- move.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/move.py b/move.py index 1832532641..118938df5c 100644 --- a/move.py +++ b/move.py @@ -438,6 +438,9 @@ class Move(ModelSQL, ModelView): if isinstance(uom, (int, long)): uom = uom_obj.browse(cursor, user, uom, context=context) + if isinstance(currency, (int, long)): + currency = currency_obj.browse(cursor, user, currency, + context=context) if isinstance(company, (int, long)): company = company_obj.browse(cursor, user, company, context=context) @@ -489,6 +492,10 @@ class Move(ModelSQL, ModelView): if not vals.get('effective_date'): vals['effective_date'] = date_obj.today(cursor, user, context=context) + currency_id = vals.get('currency', self.default_currency(cursor, + user, context=context)) + company_id = vals.get('company', self.default_company(cursor, user, + context=context)) from_location = location_obj.browse(cursor, user, vals['from_location'], context=context) to_location = location_obj.browse(cursor, user, @@ -499,14 +506,14 @@ class Move(ModelSQL, ModelView): and product.cost_price_method == 'average': self._update_product_cost_price( cursor, user, vals['product'], vals['quantity'], - vals['uom'], vals['unit_price'], vals['currency'], - vals['company'], context=context) + vals['uom'], vals['unit_price'], currency_id, + company_id, context=context) if to_location.type == 'supplier' \ and product.cost_price_method == 'average': self._update_product_cost_price( cursor, user, vals['product'], -vals['quantity'], - vals['uom'], vals['unit_price'], vals['currency'], - vals['company'], context=context) + vals['uom'], vals['unit_price'], currency_id, + company_id, context=context) if not vals.get('cost_price'): # Re-read product to get the updated cost_price product = product_obj.browse(cursor, user, vals['product'], From 6fbf43a71fc255ddd359a649c15fd84fb96fc610 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:24 +0200 Subject: [PATCH 23/33] Prepare release 1.6.5 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 06a38705fa..de28dc720c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.5 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.6.4 - 2011-12-26 * 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 f25902a8fddb63bd0dbbd4836362c8c241a24e18 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:25 +0200 Subject: [PATCH 24/33] Added tag 1.6.5 for changeset c61bf84d9702 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index fec666a4ff..55b888be3a 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 6aae8deacef9575e47b44fb75823c299871654d9 1.6.2 37d7d3182b357fbfa9aefb511e31d84ec4b8bf2e 1.6.3 44490f39ff21ea08dabf6991bd78c09241727a7f 1.6.4 +c61bf84d9702a4d5aae7bf2c00fde7db394472d5 1.6.5 From 7203591e33aace4649f13cb06983622bdac6bdcb Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:04:32 +0200 Subject: [PATCH 25/33] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b3180cec82..6a72d8280f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Inventarios', 'name_es_ES': 'Gestión de existencias', 'name_fr_FR': 'Gestion des stocks', - 'version': '1.6.5', + 'version': '1.6.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 35e93425872c8024e43b2eb72e8574f371b25ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 25 Jul 2012 15:31:03 +0200 Subject: [PATCH 26/33] Ensure clause concatination works with tuple vs list (transplanted from 7708c4aa14549fcb4f0aea1c3f7c807b35f53008) --- location.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/location.py b/location.py index e619fe8edc..306ede4aff 100644 --- a/location.py +++ b/location.py @@ -128,7 +128,7 @@ class Location(ModelSQL, ModelView): order=[], context=context) if ids: return [('id', 'in', ids)] - return [(self._rec_name,) + clause[1:]] + return [(self._rec_name,) + tuple(clause[1:])] def get_quantity(self, cursor, user, ids, name, context=None): product_obj = self.pool.get('product.product') From 4dcf89f28404378c7b674c3d91cba0af45233c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:54:04 +0200 Subject: [PATCH 27/33] Prepare release 1.6.6 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index de28dc720c..b63bbacd3f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.6 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 1.6.5 - 2012-05-07 * Bug fixes (see mercurial logs for details) From f433d600d331df9ce94046e961299d65498dee42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:54:06 +0200 Subject: [PATCH 28/33] Added tag 1.6.6 for changeset d7f95f3a1f1e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 55b888be3a..eba4b9919d 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 37d7d3182b357fbfa9aefb511e31d84ec4b8bf2e 1.6.3 44490f39ff21ea08dabf6991bd78c09241727a7f 1.6.4 c61bf84d9702a4d5aae7bf2c00fde7db394472d5 1.6.5 +d7f95f3a1f1e9875b0b87ebcf9c4e0aac55378a1 1.6.6 From d28190d451290bdd857226ba9c0fcc517c00750d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:54:17 +0200 Subject: [PATCH 29/33] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6a72d8280f..fbc97785e5 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Inventarios', 'name_es_ES': 'Gestión de existencias', 'name_fr_FR': 'Gestion des stocks', - 'version': '1.6.6', + 'version': '1.6.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 05ee500d60a9efb145cca04d66a5d72f37285d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 15 Oct 2012 23:16:29 +0200 Subject: [PATCH 30/33] Fix parent quantities computation issue2694 review558002 (transplanted from dc80f77b1c9448a40031a1bbd7c5111d7953da72) --- product.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/product.py b/product.py index f5b2ce8fc2..f9ade878ab 100644 --- a/product.py +++ b/product.py @@ -473,16 +473,21 @@ class Product(ModelSQL, ModelView): if location.parent.id in leafs: leafs.remove(location.parent.id) parent[location.id] = location.parent.id - + locations = set((l.id for l in locations)) while leafs: - next_leafs = set() for l in leafs: + locations.remove(l) if l not in parent: continue - next_leafs.add(parent[l]) for product in res_product_ids: res.setdefault((parent[l], product), 0) res[(parent[l], product)] += res.get((l,product), 0) + next_leafs = set(locations) + for l in locations: + if l not in parent: + continue + if parent[l] in next_leafs and parent[l] in locations: + next_leafs.remove(parent[l]) leafs = next_leafs # clean result From b94fe56e0d4ec58bdd1aef3724bd1b3abdf0304b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:25:18 +0100 Subject: [PATCH 31/33] Prepare release 1.6.7 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b63bbacd3f..c1ee64612d 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-09-02 * Bug fixes (see mercurial logs for details) From b6d64897586da0d4044522d50a9b7b50114b8151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:25:19 +0100 Subject: [PATCH 32/33] Added tag 1.6.7 for changeset 3cb466b4f7c7 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index eba4b9919d..45f2be42de 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 44490f39ff21ea08dabf6991bd78c09241727a7f 1.6.4 c61bf84d9702a4d5aae7bf2c00fde7db394472d5 1.6.5 d7f95f3a1f1e9875b0b87ebcf9c4e0aac55378a1 1.6.6 +3cb466b4f7c7378c816c3fd76be7796636014d65 1.6.7 From 6438c6ae6935aa33ecc8f7e1dc585e55b4b8337b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:25:40 +0100 Subject: [PATCH 33/33] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index fbc97785e5..dfe799b121 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Inventarios', 'name_es_ES': 'Gestión de existencias', 'name_fr_FR': 'Gestion des stocks', - 'version': '1.6.7', + 'version': '1.6.8', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',