From 0fd04b219890d6c29a171ad8b960d0bf22ac739b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:48:51 +0200 Subject: [PATCH 01/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f253b6b763..a0c1dcaf8b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.0.0', + 'version': '2.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4f8d6a09bb3a41dc2b3f0f6a73d24626f27a3dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 21 Aug 2011 11:16:20 +0200 Subject: [PATCH 02/17] Use the warehouse quantity to compute requests review88001 (transplanted from 79574743abba802e8de00f93fc0c66520390c504) --- purchase_request.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/purchase_request.py b/purchase_request.py index 16295d3904..4030d4efd0 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -147,8 +147,7 @@ class PurchaseRequest(ModelSQL, ModelView): for min_date in date2products: product_ids = [x[0].id for x in date2products[min_date]] with Transaction().set_context(forecast=True, - stock_date_end=min_date or datetime.date.max, - stock_skip_warehouse=True): + stock_date_end=min_date or datetime.date.max): pbl = product_obj.products_by_location(warehouse_ids, product_ids, with_childs=True, skip_zero=False) for product, max_date in date2products[min_date]: From 6d8a200870256c80d43be2b323972822ab48ceba Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:18:12 +0200 Subject: [PATCH 03/17] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f74f0b3dd2..f6b8709141 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.0.0 - 2011-04-27 * Bug fixes (see mercurial logs for details) From 41b9ca535a9fce5c2f2ce3d4c2f5c50a81edaec7 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:18:12 +0200 Subject: [PATCH 04/17] Added tag 2.0.1 for changeset 68e5568a2971 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f3e5136eba..f86093828d 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ bb2bb6af62f06218b0c8c689b24dd16f43307ca1 1.0.0 b44aa993ce24453fdb2362187e201a9375bcaa09 1.6.0 f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 354dfc672c4b3ee2609a4051f6d8d431dd087231 2.0.0 +68e5568a29715250e1f0289b315d953d834a73e8 2.0.1 From 0e8fc69d46646fde04f31e514951dbef88804db4 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:18:17 +0200 Subject: [PATCH 05/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a0c1dcaf8b..e8237e241a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.0.1', + 'version': '2.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4306726045747b199735686035cd6b1253b0f4ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 29 Jan 2012 16:33:00 +0100 Subject: [PATCH 06/17] Round get_purchase_price according to unit_price digits issue2094 review226007 (transplanted from 4d47bbcd5826e49339fbf0e31ec85af141671445) --- purchase_request.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/purchase_request.py b/purchase_request.py index 4030d4efd0..ca46797092 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -2,6 +2,7 @@ #this repository contains the full copyright notices and license terms. from __future__ import with_statement import datetime +from decimal import Decimal from trytond.model import ModelView, ModelSQL, fields from trytond.wizard import Wizard from trytond.pyson import If, In, Eval, Get @@ -594,6 +595,7 @@ class CreatePurchase(Wizard): party_obj = self.pool.get('party.party') product_obj = self.pool.get('product.product') tax_rule_obj = self.pool.get('account.tax.rule') + line_obj = self.pool.get('purchase.line') line = { 'product': request.product.id, @@ -609,6 +611,8 @@ class CreatePurchase(Wizard): currency=request.company.currency.id): product_price = product_obj.get_purchase_price( [request.product.id], request.quantity)[request.product.id] + product_price = product_price.quantize( + Decimal(1) / 10 ** line_obj.unit_price.digits[1]) if not product_price: self.raise_user_error('missing_price', (request.product.name, From fe33343599ed6b6f735e0f33f049cbd0002fdb05 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:08:15 +0200 Subject: [PATCH 07/17] Prepare release 2.0.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f6b8709141..8259842416 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2011-10-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 3d2324bfb3..26f578f363 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. 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 2ac8fe7436544bdd0779a7cf26ef309611ed28bc Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:08:16 +0200 Subject: [PATCH 08/17] Added tag 2.0.2 for changeset 79c48ed9a4cd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f86093828d..1451cb68a7 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ b44aa993ce24453fdb2362187e201a9375bcaa09 1.6.0 f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 354dfc672c4b3ee2609a4051f6d8d431dd087231 2.0.0 68e5568a29715250e1f0289b315d953d834a73e8 2.0.1 +79c48ed9a4cd994200639a78d117f45cda71ac50 2.0.2 From 3d6438c9841960a99a2b5a0ef84ae807d181d79b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:08:21 +0200 Subject: [PATCH 09/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index e8237e241a..131f74d90b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.0.2', + 'version': '2.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 200d02c9638d0f04f722e868b48d51ff5201feac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 29 May 2012 17:24:13 +0200 Subject: [PATCH 10/17] Tax rule apply method return a list of tax ids (transplanted from 228576b60e223e126580b46020fa913e7b01a6c8) --- purchase_request.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/purchase_request.py b/purchase_request.py index ca46797092..71352f7e1c 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -623,10 +623,10 @@ class CreatePurchase(Wizard): for tax in request.product.supplier_taxes_used: if request.party and request.party.supplier_tax_rule: pattern = self._get_tax_rule_pattern(request) - tax_id = tax_rule_obj.apply(request.party.supplier_tax_rule, + tax_ids = tax_rule_obj.apply(request.party.supplier_tax_rule, tax, pattern) - if tax_id: - taxes.append(tax_id) + if tax_ids: + taxes.extend(tax_ids) continue taxes.append(tax.id) line['taxes'] = [('add', taxes)] From 6150721afe80e6a37e18938d637fecfd19d2a956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:57:14 +0200 Subject: [PATCH 11/17] Prepare release 2.0.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8259842416..eed35ad86a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.3 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.0.2 - 2012-05-07 * Bug fixes (see mercurial logs for details) From 614576a96d43a9e1b03f17cc9aec9648d165c83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:57:15 +0200 Subject: [PATCH 12/17] Added tag 2.0.3 for changeset f28154c3c7f7 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1451cb68a7..8eac7bf012 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 354dfc672c4b3ee2609a4051f6d8d431dd087231 2.0.0 68e5568a29715250e1f0289b315d953d834a73e8 2.0.1 79c48ed9a4cd994200639a78d117f45cda71ac50 2.0.2 +f28154c3c7f7e080426809da429f3ba0579c90e5 2.0.3 From b6ab826d1fec4199d9f09d5821313a6d7c5e377d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:57:22 +0200 Subject: [PATCH 13/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 131f74d90b..a37da97eb2 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.0.3', + 'version': '2.0.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d0648c3b9d8d3451214989dd899d72ce7f6c121d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 23 May 2013 19:06:21 +0200 Subject: [PATCH 14/17] Fix creation of internal shipment from order point review837003 (transplanted from b495bb2ca2257cbb8a5f5799fbf8cbf0d0a17785) --- shipment.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shipment.py b/shipment.py index 6e73bc364f..40417c91ca 100644 --- a/shipment.py +++ b/shipment.py @@ -53,8 +53,8 @@ class ShipmentInternal(ModelSQL, ModelView): for op in order_points: qty = pbl.get((op.storage_location.id, op.product.id), 0) if qty < op.min_quantity: - key = (op.storage_location.id, - op.provisioning_location.id, + key = (op.provisioning_location.id, + op.storage_location.id, op.product.id) moves[key] = op.max_quantity - qty @@ -67,8 +67,8 @@ class ShipmentInternal(ModelSQL, ModelView): ]) for shipment in self.browse(shipment_ids): for move in shipment.moves: - key = (shipment.to_location.id, - shipment.from_location.id, + key = (shipment.from_location.id, + shipment.to_location.id, move.product.id) if key not in moves: continue From b3fa9c947b5b9fafa09b5a7da7a818070ac0e098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:41:55 +0200 Subject: [PATCH 15/17] Prepare release 2.0.4 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index eed35ad86a..a7ab23203d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.4 - 2013-06-09 +* Bug fixes (see mercurial logs for details) + Version 2.0.3 - 2012-09-02 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 26f578f363..da9ef80516 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -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 de527224ccd2bf04727a1819f7ce2a86e9a880dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:41:56 +0200 Subject: [PATCH 16/17] Added tag 2.0.4 for changeset e746de687cdf --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8eac7bf012..7972691127 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 68e5568a29715250e1f0289b315d953d834a73e8 2.0.1 79c48ed9a4cd994200639a78d117f45cda71ac50 2.0.2 f28154c3c7f7e080426809da429f3ba0579c90e5 2.0.3 +e746de687cdf670f59e27f251558dcec817e329c 2.0.4 From 72ea3eebace2064c95769c0cb146429c5e3b2baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:42:05 +0200 Subject: [PATCH 17/17] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a37da97eb2..be233d256e 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Gestión de pedidos de inventario', 'name_es_ES': 'Gestión de suministro de existencias', 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.0.4', + 'version': '2.0.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',