From ce149f5ef798f44851566e1c52b1a5eef497b2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:34 +0200 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 99a454c1f1..b1ba926a51 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_es_ES': 'Stocks', 'name_fr_FR': 'Gestion des stocks', 'name_ru_RU': 'Управление складами', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From e079cac0e142e323a60350e8d61ce2f6c3db6456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 22 May 2012 14:31:56 +0200 Subject: [PATCH 02/32] Fix cost computation when date is before product creation When product_cost_history is installed, the cost_price could be None review373002 (transplanted from 49823d8bd5f844444dccfe20519acace6d8b8ff0) --- location.py | 8 ++++++-- product.py | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/location.py b/location.py index cc185dd5c7..8d626935df 100644 --- a/location.py +++ b/location.py @@ -191,8 +191,12 @@ class Location(ModelSQL, ModelView): with Transaction().set_context(context): product = product_obj.browse(product_id) for location in self.browse(ids): - cost_values[location.id] = (Decimal(str(location.quantity)) - * product.cost_price) + # The date could be before the product creation + if not isinstance(product.cost_price, Decimal): + cost_values[location.id] = None + else: + cost_values[location.id] = (Decimal(str(location.quantity)) + * product.cost_price) return cost_values def _set_warehouse_parent(self, locations): diff --git a/product.py b/product.py index f3d36d71b1..6e01df60eb 100644 --- a/product.py +++ b/product.py @@ -164,8 +164,12 @@ class Product(ModelSQL, ModelView): context['_datetime'] = trans_context['stock_date_end'] with Transaction().set_context(context): for product in self.browse(ids): - cost_values[product.id] = (Decimal(str(product.quantity)) - * product.cost_price) + # The date could be before the product creation + if not isinstance(product.cost_price, Decimal): + cost_values[product.id] = None + else: + cost_values[product.id] = (Decimal(str(product.quantity)) + * product.cost_price) return cost_values def products_by_location(self, location_ids, product_ids=None, From e06ae71eaced2222460321061846c544d0bd9c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 10 Jul 2012 13:12:14 +0200 Subject: [PATCH 03/32] Add missing transition from cancel to draft for internal shipment issue2675 review417001 (transplanted from fd1293f0b0f433533fe9ec5db85d1a34996c8d56) --- shipment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/shipment.py b/shipment.py index 98620509fc..1aede63250 100644 --- a/shipment.py +++ b/shipment.py @@ -1834,6 +1834,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView): ('draft', 'cancel'), ('waiting', 'cancel'), ('assigned', 'cancel'), + ('cancel', 'draft'), )) self._buttons.update({ 'cancel': { From f97de1a8fef339546b144334dc43cef02ef3c830 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 04/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 8d626935df..7797d65640 100644 --- a/location.py +++ b/location.py @@ -144,7 +144,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 = Pool().get('product.product') From 5c1107cf1c193bdb6c2d0c632325f37dee8ec064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:51:10 +0200 Subject: [PATCH 05/32] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ada0be3dfa..84d5b028c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-04-24 * Bug fixes (see mercurial logs for details) * Remove special to_location_warehouse search clause From 044cc14d623737afab6820603959c430922bdb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:51:11 +0200 Subject: [PATCH 06/32] Added tag 2.4.1 for changeset 289d7f720c24 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 67f07fa313..6d83bc8b0f 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f1d720635a60692c9abeb972734482e01ebc4b87 1.2.0 c2e3b9e568b73f262ebf0b69c2ca98f97cbb886e 2.0.0 3babec8ed968fa95e07a7d90351de0e23a1125bf 2.2.0 6217a989c27b4780c99ae09ee8cd1bd99807f857 2.4.0 +289d7f720c24b110e9c31b5bf81cf2c88b078add 2.4.1 From fee9edce324ffcbc29ad176dc6b534e1d2b5b305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:51:26 +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 b1ba926a51..9c856fcdd1 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_es_ES': 'Stocks', 'name_fr_FR': 'Gestion des stocks', 'name_ru_RU': 'Управление складами', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From efa89cdb9cbff6c73785591c63bfb9a2586eb0a2 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 08/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 6e01df60eb..959ab3eb71 100644 --- a/product.py +++ b/product.py @@ -508,16 +508,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 6b31e13a59b5f3b279a89a6463b41f710c206836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:08:53 +0100 Subject: [PATCH 09/32] Prepare release 2.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 84d5b028c5..cec28e9f93 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.2 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.4.1 - 2012-09-02 * Bug fixes (see mercurial logs for details) From c07180e42584884d5e65fad8cc62b72bac02217d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:08:54 +0100 Subject: [PATCH 10/32] Added tag 2.4.2 for changeset 90a20e1e7e7c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6d83bc8b0f..0e4a967a7c 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ c2e3b9e568b73f262ebf0b69c2ca98f97cbb886e 2.0.0 3babec8ed968fa95e07a7d90351de0e23a1125bf 2.2.0 6217a989c27b4780c99ae09ee8cd1bd99807f857 2.4.0 289d7f720c24b110e9c31b5bf81cf2c88b078add 2.4.1 +90a20e1e7e7c1a72deb9a44ba14913a87ffdd5c5 2.4.2 From 07d3bab3f6109091237500a3139bd89ed52f4ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:09:18 +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 9c856fcdd1..5b6eee9537 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_es_ES': 'Stocks', 'name_fr_FR': 'Gestion des stocks', 'name_ru_RU': 'Управление складами', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 6415fabf3833c9dc0e5ed2db5efe321c7054e3f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Jan 2013 22:23:32 +0100 Subject: [PATCH 12/32] Fix test on consumable in complete_lines (transplanted from e77faf01ac6412844f2a17b7160682e7ea7e2b11) --- inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.py b/inventory.py index bde1835cb6..e4866fcb48 100644 --- a/inventory.py +++ b/inventory.py @@ -205,7 +205,7 @@ class Inventory(Workflow, ModelSQL, ModelView): # Create lines if needed for product_id in product_qty: if (product2type[product_id] != 'goods' - and not product2consumable[product_id]): + or product2consumable[product_id]): continue quantity, uom_id = product_qty[product_id] values = line_obj.create_values4complete(product_id, inventory, From e7f762b8c1c031cba7f7d94cf5ec17efc29b1c38 Mon Sep 17 00:00:00 2001 From: Ian Wilson Date: Wed, 16 Jan 2013 12:24:27 -0800 Subject: [PATCH 13/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 7797d65640..a83d38c6a3 100644 --- a/location.py +++ b/location.py @@ -215,11 +215,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 8c895fb11f0b7850fdfcf027975e144b1991edca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 18:16:50 +0100 Subject: [PATCH 14/32] Prepare release 2.4.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cec28e9f93..a5581fb5ca 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.3 - 2013-02-12 +* Bug fixes (see mercurial logs for details) + Version 2.4.2 - 2012-11-05 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 2eaddc3007..5d0e16a6ef 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2012 Openlabs Technologies & Consulting (P) LTD. -Copyright (C) 2008-2012 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2012 Bertrand Chenal. -Copyright (C) 2008-2012 B2CK SPRL. +Copyright (C) 2008-2013 B2CK SPRL. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify From e9e057c22c228258c6d990fddcc8e662d66c5db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 18:16:51 +0100 Subject: [PATCH 15/32] Added tag 2.4.3 for changeset eb67978327e5 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0e4a967a7c..64d23ea101 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ c2e3b9e568b73f262ebf0b69c2ca98f97cbb886e 2.0.0 6217a989c27b4780c99ae09ee8cd1bd99807f857 2.4.0 289d7f720c24b110e9c31b5bf81cf2c88b078add 2.4.1 90a20e1e7e7c1a72deb9a44ba14913a87ffdd5c5 2.4.2 +eb67978327e5e2049fa694939bb384e75812264f 2.4.3 From 3826b82040accd4d3b85d3fff5934ef85e906ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 18:17:09 +0100 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 5b6eee9537..850b5fa864 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_es_ES': 'Stocks', 'name_fr_FR': 'Gestion des stocks', 'name_ru_RU': 'Управление складами', - 'version': '2.4.3', + 'version': '2.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 93d9aa861a1dc002e2c0de177ec1d936387e75e3 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 17/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 959ab3eb71..65bf99acca 100644 --- a/product.py +++ b/product.py @@ -285,9 +285,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 '\ '(' \ @@ -303,7 +303,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 1ebaaa6f4c3e95432d8f79fdcbf3e83d5d3d1daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:14:35 +0200 Subject: [PATCH 18/32] Prepare release 2.4.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a5581fb5ca..2aab37f47c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.4 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.3 - 2013-02-12 * Bug fixes (see mercurial logs for details) From 81b4909f1f97c3d4015fa91836dd0a56b7bf8549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:14:36 +0200 Subject: [PATCH 19/32] Added tag 2.4.4 for changeset 62e2591e059e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 64d23ea101..35aef963de 100644 --- a/.hgtags +++ b/.hgtags @@ -9,3 +9,4 @@ c2e3b9e568b73f262ebf0b69c2ca98f97cbb886e 2.0.0 289d7f720c24b110e9c31b5bf81cf2c88b078add 2.4.1 90a20e1e7e7c1a72deb9a44ba14913a87ffdd5c5 2.4.2 eb67978327e5e2049fa694939bb384e75812264f 2.4.3 +62e2591e059ee9bca0c225bf91f5295d36695b43 2.4.4 From a5d49d36a27e6a8717586dd279373a1a61b9f77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:14:47 +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 850b5fa864..6f410f6e82 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_es_ES': 'Stocks', 'name_fr_FR': 'Gestion des stocks', 'name_ru_RU': 'Управление складами', - 'version': '2.4.4', + 'version': '2.4.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From c317e07491ad687988530aa9e3700c9020b100dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 22 May 2013 19:18:43 +0200 Subject: [PATCH 21/32] Use root to search on period and search on closed periods products_by_location can be called by users without read access to period. And only closed period has cache. review875002 (transplanted from 09d5333339c1d345dae85e5f3180d8a240bf5848) --- product.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/product.py b/product.py index 65bf99acca..b08ca27f3d 100644 --- a/product.py +++ b/product.py @@ -386,16 +386,18 @@ class Product(ModelSQL, ModelView): context['stock_date_start'], today, ]) else: - period_ids = period_obj.search([ - ('date', '<', context['stock_date_end']), - ], order=[('date', 'DESC')], limit=1) - if period_ids: - period_id, = period_ids - period = period_obj.browse(period_id) - state_date_clause += (' AND ' - '(COALESCE(effective_date, planned_date) > %s)') - state_date_vals.append(period.date) - period_vals[0] = period.id + with Transaction().set_user(0, set_context=True): + period_ids = period_obj.search([ + ('date', '<', context['stock_date_end']), + ('state', '=', 'closed'), + ], order=[('date', 'DESC')], limit=1) + if period_ids: + period_id, = period_ids + period = period_obj.browse(period_id) + state_date_clause += (' AND ' + '(COALESCE(effective_date, planned_date) > %s)') + state_date_vals.append(period.date) + period_vals[0] = period.id if with_childs: query, args = location_obj.search([ From cc3745e259f6b2bd335d8765dab7f19370d6b2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:45:25 +0200 Subject: [PATCH 22/32] Prepare release 2.4.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2aab37f47c..c869acd45f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.5 - 2013-06-09 +* Bug fixes (see mercurial logs for details) + Version 2.4.4 - 2013-05-02 * Bug fixes (see mercurial logs for details) From d401b744efe14327cc79d7c98ece24778614f27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:45:25 +0200 Subject: [PATCH 23/32] Added tag 2.4.5 for changeset 5ad314e8aa4b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 35aef963de..bf3ba57895 100644 --- a/.hgtags +++ b/.hgtags @@ -10,3 +10,4 @@ c2e3b9e568b73f262ebf0b69c2ca98f97cbb886e 2.0.0 90a20e1e7e7c1a72deb9a44ba14913a87ffdd5c5 2.4.2 eb67978327e5e2049fa694939bb384e75812264f 2.4.3 62e2591e059ee9bca0c225bf91f5295d36695b43 2.4.4 +5ad314e8aa4b4fa86cb96b7cdef605eb5742b636 2.4.5 From 6ea515ebfad9c651785a4607d29256c2bd6e7893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:45:36 +0200 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 6f410f6e82..e490c1ba0b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_es_ES': 'Stocks', 'name_fr_FR': 'Gestion des stocks', 'name_ru_RU': 'Управление складами', - 'version': '2.4.5', + 'version': '2.4.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 7367873fa5ad8110cdfaff798824d7d05aa99060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 6 Jun 2013 20:41:29 +0200 Subject: [PATCH 25/32] Fix date selection when using period in products_by_location effective_date and planned_date could be both NULL so they must be considered as date.max to be included. review897003 (transplanted from 880fcffdafa24b42dc163309b6b24eb3ad5528e4) --- product.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product.py b/product.py index b08ca27f3d..2af267b627 100644 --- a/product.py +++ b/product.py @@ -395,8 +395,8 @@ class Product(ModelSQL, ModelView): period_id, = period_ids period = period_obj.browse(period_id) state_date_clause += (' AND ' - '(COALESCE(effective_date, planned_date) > %s)') - state_date_vals.append(period.date) + '(COALESCE(effective_date, planned_date, %s) > %s)') + state_date_vals.extend([datetime.date.max, period.date]) period_vals[0] = period.id if with_childs: From 7b628aeef73f0fa42c0b9eec8bd3b4812f25c771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 11:43:18 +0200 Subject: [PATCH 26/32] Prepare release 2.4.6 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c869acd45f..f4b2d24e17 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.6 - 2013-07-22 +* Bug fixes (see mercurial logs for details) + Version 2.4.5 - 2013-06-09 * Bug fixes (see mercurial logs for details) From ed01d110d6afe6cbf672c73e2d62f8866e9a8a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 11:43:19 +0200 Subject: [PATCH 27/32] Added tag 2.4.6 for changeset 11c5e6d591dd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index bf3ba57895..278c050ef5 100644 --- a/.hgtags +++ b/.hgtags @@ -11,3 +11,4 @@ c2e3b9e568b73f262ebf0b69c2ca98f97cbb886e 2.0.0 eb67978327e5e2049fa694939bb384e75812264f 2.4.3 62e2591e059ee9bca0c225bf91f5295d36695b43 2.4.4 5ad314e8aa4b4fa86cb96b7cdef605eb5742b636 2.4.5 +11c5e6d591dd98229fcd918902b719779b1f324e 2.4.6 From 532b08bfc01deb34e1818359cfdb5d04ade5dc88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 11:43:42 +0200 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 e490c1ba0b..4e68abe8bc 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_es_ES': 'Stocks', 'name_fr_FR': 'Gestion des stocks', 'name_ru_RU': 'Управление складами', - 'version': '2.4.6', + 'version': '2.4.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d1eb17499cb4c8b80bbe35e4562e9b5bb0718567 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:44:19 +0200 Subject: [PATCH 29/32] Fix domain concatenation between list and tuple issue3386 review1099002 (transplanted from b1a0217d8c1b506db8a29d3bad6bda2a7b6af250) --- move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/move.py b/move.py index 066af7b922..06db350865 100644 --- a/move.py +++ b/move.py @@ -352,7 +352,7 @@ class Move(ModelSQL, ModelView): return res def search_rec_name(self, name, clause): - return [('product',) + clause[1:]] + return [('product',) + tuple(clause[1:])] def _update_product_cost_price(self, product_id, quantity, uom, unit_price, currency, company, date): From 4fe346a236b0cd60256087ceb154c7fccb108314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:04:52 +0100 Subject: [PATCH 30/32] Prepare release 2.4.7 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f4b2d24e17..8d11e83921 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.7 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.4.6 - 2013-07-22 * Bug fixes (see mercurial logs for details) From 3a8ffc20718b26fb14cdfa6653fa34f31f161a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:04:53 +0100 Subject: [PATCH 31/32] Added tag 2.4.7 for changeset 95e3bef46e89 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 278c050ef5..79568346d8 100644 --- a/.hgtags +++ b/.hgtags @@ -12,3 +12,4 @@ eb67978327e5e2049fa694939bb384e75812264f 2.4.3 62e2591e059ee9bca0c225bf91f5295d36695b43 2.4.4 5ad314e8aa4b4fa86cb96b7cdef605eb5742b636 2.4.5 11c5e6d591dd98229fcd918902b719779b1f324e 2.4.6 +95e3bef46e8948172cbb27dd99f4b8ac5e8c958e 2.4.7 From 8f3631d5053df516e88a56d05d5bc37ff1e0e52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:20:22 +0100 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 4e68abe8bc..b290393fbb 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_es_ES': 'Stocks', 'name_fr_FR': 'Gestion des stocks', 'name_ru_RU': 'Управление складами', - 'version': '2.4.7', + 'version': '2.4.8', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',