From e50c2f9046bb9c144af5b64086c20f099a164af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:30 +0200 Subject: [PATCH 01/11] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 0ad225a18a..a41baf9039 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_fr_FR': 'Coût des expéditions fournisseur', 'name_es_AR': 'Compras: Costo de envíos', 'name_es_ES': 'Coste de envío en las compras', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d331df3046461f75b492583572e985ae9ff1204f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 22 Sep 2012 21:41:40 +0200 Subject: [PATCH 02/11] Fix currency -> cost_currency in on_change_with_cost_currency_digits (transplanted from 623b1e0a0127cd53c4441f00e7e0a8d43ed4c0e7) --- stock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock.py b/stock.py index 29ae68e989..d3b0c30775 100644 --- a/stock.py +++ b/stock.py @@ -51,8 +51,8 @@ class ShipmentIn(Model): def on_change_with_cost_currency_digits(self, values): currency_obj = Pool().get('currency.currency') - if values.get('currency'): - currency = currency_obj.browse(values['currency']) + if values.get('cost_currency'): + currency = currency_obj.browse(values['cost_currency']) return currency.digits return 2 From fba2eb3087a9d613fd8c1e833894a197dd4cadd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:06:00 +0100 Subject: [PATCH 03/11] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bf61ce4651..00b9cf9956 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,5 @@ +Version 2.4.1 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-04-24 * Initial release From fe02ab65f9e0c230534d37d3946f645caa1aa835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:06:01 +0100 Subject: [PATCH 04/11] Added tag 2.4.1 for changeset 0dab58473edd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ab3552f693..a66eda0794 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ 6b4b291f70b6ad9ead4cbe9f8c2da88b5c324c8b 2.4.0 +0dab58473edd7e8019bc9a5a05493278e5ad695d 2.4.1 From b861469e7a5ea48f64acc0ea580856047bb543f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:06:08 +0100 Subject: [PATCH 05/11] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a41baf9039..6df38ce730 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_fr_FR': 'Coût des expéditions fournisseur', 'name_es_AR': 'Compras: Costo de envíos', 'name_es_ES': 'Coste de envío en las compras', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From c3e9ba5e8965ecd87c4599e779211309fe4e0d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 31 Mar 2013 23:34:11 +0200 Subject: [PATCH 06/11] Use unit_shipment_cost converted to write on move issue3101 review741003 (transplanted from ce5d031022cdc417ddc334a76f8e4c3b1def9636) --- stock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock.py b/stock.py index d3b0c30775..657f81c80e 100644 --- a/stock.py +++ b/stock.py @@ -151,8 +151,8 @@ class ShipmentIn(Model): unit_shipment_cost = unit_shipment_cost.quantize( exp, rounding=ROUND_HALF_EVEN) move_obj.write(move.id, { - 'unit_price': move.unit_price + cost['unit_shipment_cost'], - 'unit_shipment_cost': cost['unit_shipment_cost'], + 'unit_price': move.unit_price + unit_shipment_cost, + 'unit_shipment_cost': unit_shipment_cost, }) @ModelView.button From 55d67ce5e91c97159fe4020ee04cc0f265b8b3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 31 Mar 2013 23:35:47 +0200 Subject: [PATCH 07/11] Fix difference split issue3101 review741003 (transplanted from c86514d3c5297ee51e25c358035357c0afab8d93) --- stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock.py b/stock.py index 657f81c80e..6554d4b78b 100644 --- a/stock.py +++ b/stock.py @@ -138,7 +138,7 @@ class ShipmentIn(Model): move = cost['move'] quantity = Decimal(str(move.quantity)) if exp * quantity < difference: - cost['unit_shipment_cost'] = unit_shipment_cost + exp + cost['unit_shipment_cost'] += exp difference -= exp * quantity if difference < exp: break From c7ba851224363148ca9349ec46a377eec6461e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 31 Mar 2013 23:35:12 +0200 Subject: [PATCH 08/11] Add missing currency convertion in _get_account_stock_move_lines issue3101 review741003 (transplanted from b1c782391a83e360f5bde6b85c3d784822f7161a) --- stock.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stock.py b/stock.py index 6554d4b78b..3fe403fb9a 100644 --- a/stock.py +++ b/stock.py @@ -187,8 +187,9 @@ class Move(Model): and move.unit_shipment_cost and move.shipment_in and move.shipment_in.carrier): - shipment_cost = currency_obj.round(move.company.currency, - Decimal(str(move.quantity)) * move.unit_shipment_cost) + shipment_cost = currency_obj.compute(move.currency, + Decimal(str(move.quantity)) * move.unit_shipment_cost, + move.company.currency) shipment_cost_account = \ move.shipment_in.carrier.carrier_product.account_expense_used account_id = move.product.account_stock_supplier_used.id From ccb0ffba20b4148214826f43085b4aa15a67ffc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:10:27 +0200 Subject: [PATCH 09/11] Prepare release 2.4.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 00b9cf9956..2bed932705 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.2 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.1 - 2012-11-05 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 7fcb680002..87a90a4dfd 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ -Copyright (C) 2011-2012 Cédric Krier. +Copyright (C) 2011-2013 Cédric Krier. Copyright (C) 2011-2012 Bertrand Chenal. Copyright (C) 2011 Nicolas Évrard. -Copyright (C) 2011-2012 B2CK SPRL. +Copyright (C) 2011-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 1c50cffe3022dcaf75f0698fccf612b6425ed8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:10:28 +0200 Subject: [PATCH 10/11] Added tag 2.4.2 for changeset 433ffd187e4c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a66eda0794..2aa2e62319 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 6b4b291f70b6ad9ead4cbe9f8c2da88b5c324c8b 2.4.0 0dab58473edd7e8019bc9a5a05493278e5ad695d 2.4.1 +433ffd187e4c1c71f2c9838f1cb9cc69d6bb8840 2.4.2 From 50a6c55247e5aeb297dd13f6546515cdb0a5c3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:10:38 +0200 Subject: [PATCH 11/11] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6df38ce730..78b3f8c5d6 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_fr_FR': 'Coût des expéditions fournisseur', 'name_es_AR': 'Compras: Costo de envíos', 'name_es_ES': 'Coste de envío en las compras', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',