From ed29b5039d4a3c03f9e88d9225e5bdb6e8e50802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 18:35:37 +0100 Subject: [PATCH 01/12] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f6fbf4226b..c8dccc8424 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Lagerverwaltung Beschaffung', 'name_fr_FR': 'Gestion des approvisionnements de stock', 'name_es_ES': 'Gestión de pedidos de inventario', - 'version': '1.0.0', + 'version': '1.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d0161cdf9f1aeca0a1c1c5a82f3defef697428b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 18:36:40 +0100 Subject: [PATCH 02/12] Allow egg installation --- CHANGELOG | 2 ++ setup.py | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index eacaaefa7d..44de11f380 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,4 @@ +* Allow egg installation + Version 1.0.0 - 2008-11-17 * Initial release diff --git a/setup.py b/setup.py index 13d10843b6..8aac50520f 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,8 @@ setup(name='trytond_stock_supply', author=info.get('author', ''), author_email=info.get('email', ''), url=info.get('website', ''), + download_url="http://downloads.tryton.org/" + \ + info.get('version', '0.0.1').rsplit('.', 1)[0] + '/', package_dir={'trytond.modules.stock_supply': '.'}, packages=[ 'trytond.modules.stock_supply', @@ -53,4 +55,9 @@ setup(name='trytond_stock_supply', ], license='GPL-3', install_requires=requires, + zip_safe=False, + entry_points=""" + [trytond.modules] + stock_supply = trytond.modules.stock_supply + """, ) From b898398e109419a26ad2115f8878568005a4ecad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 14:04:32 +0100 Subject: [PATCH 03/12] Prepare changelog for release 1.0.1 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 44de11f380..9801fce04d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +Version 1.0.1 - 2008-12-01 * Allow egg installation Version 1.0.0 - 2008-11-17 From 9d4523bfda5c91f19cdb8b193748dfc5dfa499e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 14:04:37 +0100 Subject: [PATCH 04/12] Added tag 1.0.1 for changeset e6c14397ecdd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 17ac632b52..6514254c93 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 +e6c14397ecdd949a28225c9b8f2e586e271d4642 1.0.1 From ebb0412e35fabdcc52c640cc98043dbce72ed8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 14:05:12 +0100 Subject: [PATCH 05/12] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c8dccc8424..d7b8ba800d 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Lagerverwaltung Beschaffung', 'name_fr_FR': 'Gestion des approvisionnements de stock', 'name_es_ES': 'Gestión de pedidos de inventario', - 'version': '1.0.1', + 'version': '1.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4d538d20d380320b6df1599831f8928a776de6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 3 Dec 2008 00:26:54 +0100 Subject: [PATCH 06/12] Rename index_en into index --- doc/{index_en.rst => index.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{index_en.rst => index.rst} (100%) diff --git a/doc/index_en.rst b/doc/index.rst similarity index 100% rename from doc/index_en.rst rename to doc/index.rst From 4faa8d3b59f185b078aba556cd74ce07fcfd0008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 3 Dec 2008 00:43:04 +0100 Subject: [PATCH 07/12] Add bullet in doc --- doc/index.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/index.rst b/doc/index.rst index 0656cafb3d..a9ca03bde8 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -13,22 +13,22 @@ is linked to a warehouse and eventually a supplier, it contains a ideal purchase date and an expected supply date. A purchase request can be in one of these states: -Draft +* Draft A draft purchase request is a request that is not linked to a purchase. -Purchased +* Purchased A Purchased request is a request that is linked to a purchase which is not in state Done or Cancel. -Done +* Done A purchase request is in state Done if it is linked to a Purchase which is in state Done. -Cancel +* Cancel A purchase request is in state Cancel if it is linked to a Purchase which is cancelled. @@ -49,14 +49,14 @@ a location. The minimum quantity is the quantity that should be always be reached when re-ordering. An order point also define a type which can be: -Internal +* Internal An Internal order point is defined on a Storage location, it also define a provisioning location. If the minimum quantity is reached it will result in the creation of an internal packing between the provisioning location and the Storage location. -Purchase +* Purchase A Purchase order point is defined on a warehouse location. If the minimal quantity is reached on the warehouse it will result in a From 7ca811db5add667ebb63de27a31cd980ae047387 Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Tue, 13 Jan 2009 17:06:16 +0100 Subject: [PATCH 08/12] Fix product domain on order point (issue745) --- order_point.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/order_point.py b/order_point.py index f49df9ce5b..ff3c3ad7ca 100644 --- a/order_point.py +++ b/order_point.py @@ -15,7 +15,9 @@ class OrderPoint(OSV): product = fields.Many2One( 'product.product', 'Product', required=True, select=1, - domain=[('type', '=', 'stockable')]) + domain="type == 'purchase' "\ + "and [('type', '=', 'stockable'), ('purchasable', '=', True)] "\ + "or [('type', '=', 'stockable')]") warehouse_location = fields.Many2One( 'stock.location', 'Warehouse Location', select=1, domain="[('type', '=', 'warehouse')]", From f1e4068519530296b580cef9fa88fb0bce224287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 13 Jan 2009 23:03:40 +0100 Subject: [PATCH 09/12] Use more standard way for string domain --- order_point.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/order_point.py b/order_point.py index ff3c3ad7ca..c3ad04ec03 100644 --- a/order_point.py +++ b/order_point.py @@ -15,9 +15,8 @@ class OrderPoint(OSV): product = fields.Many2One( 'product.product', 'Product', required=True, select=1, - domain="type == 'purchase' "\ - "and [('type', '=', 'stockable'), ('purchasable', '=', True)] "\ - "or [('type', '=', 'stockable')]") + domain="[('type', '=', 'stockable'), ('purchasable', 'in', " \ + "type == 'purchase' and [True] or [True, False])]") warehouse_location = fields.Many2One( 'stock.location', 'Warehouse Location', select=1, domain="[('type', '=', 'warehouse')]", From 26a926906a656a4ae6a6c880c226ffab1f1b9d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Mar 2009 10:28:18 +0100 Subject: [PATCH 10/12] Prepare changelog for release 1.0.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9801fce04d..2521948763 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.2 - 2009-03-02 +* Some bug fixes (see mercurial logs for details) + Version 1.0.1 - 2008-12-01 * Allow egg installation From a9d7fcf3d13f91a5c26c1ebdb23063f3b7573fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Mar 2009 10:28:22 +0100 Subject: [PATCH 11/12] Added tag 1.0.2 for changeset a4dc8a505e57 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6514254c93..152a0b61b9 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 e6c14397ecdd949a28225c9b8f2e586e271d4642 1.0.1 +a4dc8a505e576000b036dda6d98f0ffc3e7cbbd6 1.0.2 From b3f20f78b9cf80d545c1e92604269952a1944154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Mar 2009 10:28:59 +0100 Subject: [PATCH 12/12] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d7b8ba800d..b9a21df8c2 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Lagerverwaltung Beschaffung', 'name_fr_FR': 'Gestion des approvisionnements de stock', 'name_es_ES': 'Gestión de pedidos de inventario', - 'version': '1.0.2', + 'version': '1.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',