From d83b369e1f08d5e7a9e762d8fce18d7d803e737f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 25 Oct 2011 11:18:10 +0200 Subject: [PATCH 01/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index be9715a638..6f35cd9baf 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.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a775136ffefa62be25ff40547c53008b07a73044 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 02/14] 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 b1413874fe..717f758ed2 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -2,6 +2,7 @@ #this repository contains the full copyright notices and license terms. import datetime import operator +from decimal import Decimal from trytond.model import ModelView, ModelSQL, fields from trytond.wizard import Wizard from trytond.pyson import If, In, Eval, Get @@ -668,6 +669,7 @@ class CreatePurchase(Wizard): party_obj = pool.get('party.party') product_obj = pool.get('product.product') tax_rule_obj = pool.get('account.tax.rule') + line_obj = pool.get('purchase.line') line = { 'product': request.product.id, @@ -683,6 +685,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 fb1bb8ba37d3ed93831724715f335729d1efa9fa Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:26 +0200 Subject: [PATCH 03/14] Prepare release 2.2.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4816d836d4..666050729e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-25 * Bug fixes (see mercurial logs for details) * Add wizard to create purchase requests 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 01b8b8a0b10be42664761ed333f6639d0cd018df Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:27 +0200 Subject: [PATCH 04/14] Added tag 2.2.1 for changeset a4bea1ca2103 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0c30b7fd38..783651d232 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ b44aa993ce24453fdb2362187e201a9375bcaa09 1.6.0 f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 354dfc672c4b3ee2609a4051f6d8d431dd087231 2.0.0 0881ad5cb82f3f00ec1eea276fa100a957691982 2.2.0 +a4bea1ca2103ad0d5c5ab73d7c138f875f7d146e 2.2.1 From 3e65eb50d34eb4933af7fa1ed3d9e0cef13602a2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:10:32 +0200 Subject: [PATCH 05/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6f35cd9baf..a0814dd1b9 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.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 7e6c7392ee2abb24adab40cab2d173a21f43fda1 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 06/14] 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 717f758ed2..8ac90f09fd 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -697,10 +697,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 40c0e8f772d8afe67b3663629a38f163e5a0aef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:56:36 +0200 Subject: [PATCH 07/14] Prepare release 2.2.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 666050729e..bfbc3f51e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.2 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.2.1 - 2012-05-07 * Bug fixes (see mercurial logs for details) From d2ba612b95c2c17aa5e51024d2d8df6700455150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:56:37 +0200 Subject: [PATCH 08/14] Added tag 2.2.2 for changeset aafb14337ed3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 783651d232..c69fec8aed 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 354dfc672c4b3ee2609a4051f6d8d431dd087231 2.0.0 0881ad5cb82f3f00ec1eea276fa100a957691982 2.2.0 a4bea1ca2103ad0d5c5ab73d7c138f875f7d146e 2.2.1 +aafb14337ed39c48fd9e14d02020f2ee6990747d 2.2.2 From b8b555d312ff6e08df19a6d50007661d7b3c1d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:56:44 +0200 Subject: [PATCH 09/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a0814dd1b9..f09c2fcca8 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.2.2', + 'version': '2.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 5b964c792095f95869eae25f30dc0dba32597efe 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 10/14] 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 89a73ee97a..0ec99d3de5 100644 --- a/shipment.py +++ b/shipment.py @@ -54,8 +54,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 @@ -68,8 +68,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 ae32a4f76ee3e8e0fc510916534501563c3cca58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:43:21 +0200 Subject: [PATCH 11/14] Prepare release 2.2.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bfbc3f51e2..fa2c165d36 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.3 - 2013-06-09 +* Bug fixes (see mercurial logs for details) + Version 2.2.2 - 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 0ff294edfbd3bc2cabb35ef8988b20345d45963d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:43:22 +0200 Subject: [PATCH 12/14] Added tag 2.2.3 for changeset c51c0d91fc89 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c69fec8aed..f8f38c5fc0 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f76056df60f581f803c7a7e4cec81397e4bbbb9c 1.8.0 0881ad5cb82f3f00ec1eea276fa100a957691982 2.2.0 a4bea1ca2103ad0d5c5ab73d7c138f875f7d146e 2.2.1 aafb14337ed39c48fd9e14d02020f2ee6990747d 2.2.2 +c51c0d91fc89700adea97bebfc72883f843243e0 2.2.3 From 1164c3fad98d071da441ab22bd9be1230088c26f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:43:32 +0200 Subject: [PATCH 13/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f09c2fcca8..1c08bf4b27 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.2.3', + 'version': '2.2.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From aaa1e2818953af71e7e2fede3ff1f38cb638d4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=B6ftner?= Date: Wed, 22 Jan 2014 15:00:29 +0100 Subject: [PATCH 14/14] check for same product in constraint for internal oderpoints issue3591 review2721002 (transplanted from 203cecdea47d9daf7e53bf7d7070a3aa60806004) --- order_point.py | 1 + 1 file changed, 1 insertion(+) diff --git a/order_point.py b/order_point.py index 4e50523f20..fe9f6b6120 100644 --- a/order_point.py +++ b/order_point.py @@ -130,6 +130,7 @@ class OrderPoint(ModelSQL, ModelView): query = ['OR'] for op in self.browse(internal_ids): arg = ['AND', + ('product', '=', op.product.id), ('provisioning_location', '=', op.storage_location.id), ('storage_location', '=', op.provisioning_location.id), ('company', '=', op.company.id),