From d0ddd1443590d05f8ccfac1d0c5847fa214c77d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:43:05 +0100 Subject: [PATCH 01/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c2f9bab76c..e4d16ae5b2 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.8.0', + 'version': '1.8.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a2393b7070b039675fe15eb7de8492dc003436a5 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 02/32] 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 ceeb1dfa03..518290d9ad 100644 --- a/inventory.py +++ b/inventory.py @@ -263,7 +263,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 97a60fb85d56bb13b26ec61539b332e82a706b0a 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 03/32] 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 46e30d1afd..ce5009c6d6 100644 --- a/shipment.py +++ b/shipment.py @@ -921,6 +921,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, }) def create(self, values): From 7314340af492c71b6efbdb449cf78e80eaec2e60 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 13:22:33 +0200 Subject: [PATCH 04/32] 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 90c9b88aa58dd8be343b2dfaf2f86dbf83de4de9 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:40 +0200 Subject: [PATCH 05/32] Prepare release 1.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a06290d3d7..f877d57337 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.1 - 2011-05-29 +* Bug fixes (see mercurial logs for details) + Version 1.8.0 - 2010-11-01 * Bug fixes (see mercurial logs for details) From f0de9c88cb8bbea5b9703eaf2fa1810642921af8 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:40 +0200 Subject: [PATCH 06/32] Added tag 1.8.1 for changeset 7f669519e6a9 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 402be13c2c..8b0dfd6f61 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 0571f5c67623c43272e5fc05cc381554d6bf3db0 1.4.0 6a658c8f74a540a10272f5d7f311d6c61c04f3da 1.6.0 902e4b31b9d56918b1e9eb6e9486f52d19820fa6 1.8.0 +7f669519e6a90c2416501fb15df15c44bbf2a616 1.8.1 From 83ab9af45f305fbdfe25b91457896f54ed61c5c2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:18:47 +0200 Subject: [PATCH 07/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index e4d16ae5b2..b73949a364 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.8.1', + 'version': '1.8.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ba712bdb979449f1d7179ead1b402d6ece60ede5 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 08/32] 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 ec5575de85..92f312fc93 100644 --- a/move.py +++ b/move.py @@ -78,7 +78,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 a93f8bd31353e07e8badd63d1b4a784d87ed61fb Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:36:49 +0100 Subject: [PATCH 09/32] Prepare release 1.8.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f877d57337..9294ffa062 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.2 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 1.8.1 - 2011-05-29 * Bug fixes (see mercurial logs for details) From 3cba083d4c33aa6749507a14be5fc0f99dad6e11 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:36:49 +0100 Subject: [PATCH 10/32] Added tag 1.8.2 for changeset 642dfb49af47 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8b0dfd6f61..eeba6d6894 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 6a658c8f74a540a10272f5d7f311d6c61c04f3da 1.6.0 902e4b31b9d56918b1e9eb6e9486f52d19820fa6 1.8.0 7f669519e6a90c2416501fb15df15c44bbf2a616 1.8.1 +642dfb49af47600413d8c5a0b7450f08c0b975cf 1.8.2 From da93f0df532c6eb64e9a598470fb533254d03d73 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:36:57 +0100 Subject: [PATCH 11/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b73949a364..7d2b9d1932 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.8.2', + 'version': '1.8.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 962f5483e506021f1b39800208fcc9294a77e25c 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 12/32] Use default values when updating cost price on creation (transplanted from 467122be397a9b12967c2448cf512c607a3e4a08) --- move.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/move.py b/move.py index 92f312fc93..3237ca2c14 100644 --- a/move.py +++ b/move.py @@ -386,6 +386,8 @@ class Move(ModelSQL, ModelView): if isinstance(uom, (int, long)): uom = uom_obj.browse(uom) + if isinstance(currency, (int, long)): + currency = currency_obj.browse(currency) if isinstance(company, (int, long)): company = company_obj.browse(company) @@ -435,6 +437,8 @@ class Move(ModelSQL, ModelView): if vals.get('state') == 'done': if not vals.get('effective_date'): vals['effective_date'] = date_obj.today() + currency_id = vals.get('currency', self.default_currency()) + company_id = vals.get('company', self.default_company()) from_location = location_obj.browse(vals['from_location']) to_location = location_obj.browse(vals['to_location']) product = product_obj.browse(vals['product']) @@ -442,12 +446,12 @@ class Move(ModelSQL, ModelView): and product.cost_price_method == 'average': self._update_product_cost_price(vals['product'], vals['quantity'], vals['uom'], vals['unit_price'], - vals['currency'], vals['company']) + currency_id, company_id) if to_location.type == 'supplier' \ and product.cost_price_method == 'average': self._update_product_cost_price(vals['product'], -vals['quantity'], vals['uom'], vals['unit_price'], - vals['currency'], vals['company']) + currency_id, company_id) if not vals.get('cost_price'): # Re-read product to get the updated cost_price product = product_obj.browse(vals['product']) From f3a21d83c1f8de6553c874c577e3123f555c6837 Mon Sep 17 00:00:00 2001 From: Sharoon Thomas Date: Fri, 2 Mar 2012 10:46:08 -0500 Subject: [PATCH 13/32] Fix corruption of outgoing_moves in packed state of stock.shipment.out The `move_obj.write` changes the value of `quantity` in the move, but the removed_qty computation used `move.quantity` from the browse record. The browse record gets the updated value and not the old value from browse_record cache. This fix just moves the computation before the move_obj.write and includes a scenario to confirm the behavior. issue2426 review254001 (transplanted from eedeb7ba47b1363919364b40a07862ccf012db97) --- shipment.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shipment.py b/shipment.py index ce5009c6d6..075abfbee1 100644 --- a/shipment.py +++ b/shipment.py @@ -860,12 +860,12 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView): if outgoing_qty.get(move.product.id, 0.0) > 0.0: exc_qty = uom_obj.compute_qty(move.product.default_uom, outgoing_qty[move.product.id], move.uom) - move_obj.write(move.id,{ - 'quantity': max(0.0, move.quantity-exc_qty), - }) removed_qty = uom_obj.compute_qty(move.uom, min(exc_qty, move.quantity), move.product.default_uom, round=False) + move_obj.write(move.id,{ + 'quantity': max(0.0, move.quantity-exc_qty), + }) outgoing_qty[move.product.id] -= removed_qty move_obj.write([x.id for x in shipment.outgoing_moves From 6b11d30ca137e0156a5352c52e03fb64bf45cd3d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:06:06 +0200 Subject: [PATCH 14/32] Prepare release 1.8.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9294ffa062..6a92838d03 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.3 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.8.2 - 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 f6d5c08b6dd41fcb1b73a7c26343695f93701e27 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:06:06 +0200 Subject: [PATCH 15/32] Added tag 1.8.3 for changeset 85a0a4c6b907 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index eeba6d6894..5f20b7e974 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 902e4b31b9d56918b1e9eb6e9486f52d19820fa6 1.8.0 7f669519e6a90c2416501fb15df15c44bbf2a616 1.8.1 642dfb49af47600413d8c5a0b7450f08c0b975cf 1.8.2 +85a0a4c6b90761609f5250f39f739316ce41eb58 1.8.3 From ab49804815e34802f666d87e642fc914375da3d4 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:06:14 +0200 Subject: [PATCH 16/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 7d2b9d1932..43bf035478 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.8.3', + 'version': '1.8.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 6e9643d4edb4a7f0b8b6624890c4681d9f67a8e4 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 17/32] 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 2a74b55bbd..b3b0dbc9cc 100644 --- a/location.py +++ b/location.py @@ -132,7 +132,7 @@ class Location(ModelSQL, ModelView): ], order=[]) if ids: return [('id', 'in', ids)] - return [(self._rec_name,) + clause[1:]] + return [(self._rec_name,) + tuple(clause[1:])] def get_quantity(self, ids, name): product_obj = self.pool.get('product.product') From c0fe6562c8887f68f87e483360389a26eaee2deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:53:20 +0200 Subject: [PATCH 18/32] Prepare release 1.8.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6a92838d03..4f1bc51cfd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.4 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 1.8.3 - 2012-05-07 * Bug fixes (see mercurial logs for details) From 9eb8752ff871f3ed5bf1227158fd30776d603fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:53:21 +0200 Subject: [PATCH 19/32] Added tag 1.8.4 for changeset 2a35180d7d28 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5f20b7e974..a9049ada90 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 7f669519e6a90c2416501fb15df15c44bbf2a616 1.8.1 642dfb49af47600413d8c5a0b7450f08c0b975cf 1.8.2 85a0a4c6b90761609f5250f39f739316ce41eb58 1.8.3 +2a35180d7d28fdbfc0dac3575c0befa1edc26de0 1.8.4 From 8fc72bb1a8907dc76788d19ae722390a002b92f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:53:32 +0200 Subject: [PATCH 20/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 43bf035478..a2aeecf7ae 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.8.4', + 'version': '1.8.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d5f278c074a91ffc46b0c423e75105f79b49b6b7 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 21/32] 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 b8688f0735..80826cbc9e 100644 --- a/product.py +++ b/product.py @@ -462,16 +462,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 ddb17f305215724ecebb9e64c8b5ef86759cda13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:16:26 +0100 Subject: [PATCH 22/32] Prepare release 1.8.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4f1bc51cfd..51761ef81f 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-09-02 * Bug fixes (see mercurial logs for details) From c825e8a8367ed7922ee5868ac7ffdfdcc7dc8411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:16:27 +0100 Subject: [PATCH 23/32] Added tag 1.8.5 for changeset a75d6ba98c56 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a9049ada90..4ac52cf308 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 642dfb49af47600413d8c5a0b7450f08c0b975cf 1.8.2 85a0a4c6b90761609f5250f39f739316ce41eb58 1.8.3 2a35180d7d28fdbfc0dac3575c0befa1edc26de0 1.8.4 +a75d6ba98c56ede487b3d8fc7e9422c73b96e4c8 1.8.5 From 16c0785d8f29fcb289fe8e21068ebb79a18540d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:16:47 +0100 Subject: [PATCH 24/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a2aeecf7ae..9ced203f9e 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.8.5', + 'version': '1.8.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 695e870ff74e32bda5cd37f5d389e2996a818c3a Mon Sep 17 00:00:00 2001 From: Ian Wilson Date: Wed, 16 Jan 2013 12:24:27 -0800 Subject: [PATCH 25/32] Fix logic error in _set_warehouse_parent method. The `if to_update:` conditional should be inside the for loop of the method _set_warehouse_parent on the Location model. Clear the set after write. issue2951 review629004 (transplanted from 1b315604e53eed2c10fdab06fd7e78f81e35aad5) --- location.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/location.py b/location.py index b3b0dbc9cc..b104f82bae 100644 --- a/location.py +++ b/location.py @@ -199,11 +199,11 @@ class Location(ModelSQL, ModelView): location_ids.add(location.output_location.id) if not location.storage_location.parent: location_ids.add(location.storage_location.id) - location_ids = list(location_ids) - if location_ids: - self.write(location_ids, { - 'parent': location.id, - }) + if location_ids: + self.write(list(location_ids), { + 'parent': location.id, + }) + location_ids.clear() def create(self, vals): res = super(Location, self).create(vals) From ae75ae6c23f2b8d129c993e97978035056148705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 18:20:25 +0100 Subject: [PATCH 26/32] Prepare release 1.8.6 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 51761ef81f..99d59284f6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.6 - 2013-02-12 +* Bug fixes (see mercurial logs for details) + Version 1.8.5 - 2012-11-05 * Bug fixes (see mercurial logs for details) From c50d401f9ec4cf42f07bbf3e87f8f185b697f966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 18:20:26 +0100 Subject: [PATCH 27/32] Added tag 1.8.6 for changeset 1342ec6d7c4f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4ac52cf308..597b806040 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 85a0a4c6b90761609f5250f39f739316ce41eb58 1.8.3 2a35180d7d28fdbfc0dac3575c0befa1edc26de0 1.8.4 a75d6ba98c56ede487b3d8fc7e9422c73b96e4c8 1.8.5 +1342ec6d7c4f46b01901fcc8882a58eb6eca5183 1.8.6 From 7d38a0171c46fc22013321103816eb8c338e3a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 18:20:41 +0100 Subject: [PATCH 28/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9ced203f9e..712bb25c79 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.8.6', + 'version': '1.8.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 358469d5978f32d3ae76b178481081eb726aa732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 16 Apr 2013 15:31:10 +0200 Subject: [PATCH 29/32] Include NULL planned_date with datetime.date.max review790002 (transplanted from 5b73bf2ce14b5e4c94d71b5db0b3d1f11c339a9d) --- product.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/product.py b/product.py index 80826cbc9e..cddf84f8a1 100644 --- a/product.py +++ b/product.py @@ -251,9 +251,9 @@ class Product(ModelSQL, ModelView): '(' \ '(effective_date IS NULL) '\ 'AND '\ - '(planned_date <= %s) '\ + '(COALESCE(planned_date, %s) <= %s) '\ 'AND '\ - '(planned_date >= %s)'\ + '(COALESCE(planned_date, %s) >= %s)'\ ')'\ 'OR '\ '(' \ @@ -269,7 +269,8 @@ class Product(ModelSQL, ModelView): 'done', context.get('stock_assign') and 'assigned' or 'done', today, today, 'done', 'assigned', 'draft', - context['stock_date_end'], today, + datetime.date.max, context['stock_date_end'], + datetime.date.max, today, context['stock_date_end'], today, ] From 70d32aa5c1aac41d647236e64fdf02f8c305eeaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:51:09 +0200 Subject: [PATCH 30/32] Prepare release 1.8.7 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 99d59284f6..a7d412f30c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.7 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 1.8.6 - 2013-02-12 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index c646d008b8..a493f24770 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008-2012 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2012 B2CK SPRL. +Copyright (C) 2008-2013 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 bdc520cc178d66df9417190a50414bcc2d396f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:51:10 +0200 Subject: [PATCH 31/32] Added tag 1.8.7 for changeset 02296ed4f9df --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 597b806040..8c3a14fb3b 100644 --- a/.hgtags +++ b/.hgtags @@ -9,3 +9,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 2a35180d7d28fdbfc0dac3575c0befa1edc26de0 1.8.4 a75d6ba98c56ede487b3d8fc7e9422c73b96e4c8 1.8.5 1342ec6d7c4f46b01901fcc8882a58eb6eca5183 1.8.6 +02296ed4f9df7facba6e0f8c5c740e4f87e49e0d 1.8.7 From b0fc660544052bad416965ea3c084d1235b9691c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:51:20 +0200 Subject: [PATCH 32/32] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 712bb25c79..7daa849a07 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.8.7', + 'version': '1.8.8', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',