From 5f2c785509c90462f47926b04553bcfeff7b5e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:18:58 +0200 Subject: [PATCH 01/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 104a927901..faa880b04a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias Anglosajona', 'name_es_ES': 'Gestión de stock anglosajona', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From f40e7c693ddb054c78ba0772e175680f23a9db89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 Apr 2012 22:02:41 +0200 Subject: [PATCH 02/26] Restore es_AR translation (transplanted from 3fba04921a8f0d512ab757a8dae0882f48d5d4db) --- locale/es_AR.po | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/locale/es_AR.po b/locale/es_AR.po index 542f2921b5..ef6724bac2 100644 --- a/locale/es_AR.po +++ b/locale/es_AR.po @@ -1,3 +1,35 @@ # msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "error:stock.move:" +msgid "Anglo-Saxon quantity can not be greater than quantity!" +msgstr "¡La cantidad anglosajona no puede ser mayor que la cantidad!" + +msgctxt "field:product.category,account_cogs:" +msgid "Account Cost of Goods Sold" +msgstr "Cuenta de Costos de Mercaderías Vendidas" + +msgctxt "field:product.category,account_cogs_used:" +msgid "Account Cost of Goods Sold Used" +msgstr "Cuenta de Costos de Mercaderías Vendidas utilizada" + +msgctxt "field:product.template,account_cogs:" +msgid "Account Cost of Goods Sold" +msgstr "Cuenta de Costos de Mercaderías Vendidas" + +msgctxt "field:product.template,account_cogs_used:" +msgid "Account Cost of Goods Sold Used" +msgstr "Cuenta de Costos de Mercaderías Vendidas utilizada" + +msgctxt "field:stock.move,anglo_saxon_quantity:" +msgid "Anglo-Saxon Quantity" +msgstr "Cantidad Anglosajona" + +msgctxt "help:product.template,account_cogs:" +msgid "This account will be used instead of the one defined on the category." +msgstr "Esta cuenta se usará en lugar de la definida en la categoría." + +msgctxt "model:account.account.template,name:account_template_cogs" +msgid "COGS" +msgstr "CMV" From b9c412eff95828d53f3020c1bc7660a01b7bf4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:00:18 +0200 Subject: [PATCH 03/26] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 07a3a88279..6f5b2d83fd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2012-04-24 +* Restore es_AR translation + Version 2.4.0 - 2012-04-23 * Bug fixes (see mercurial logs for details) * Use cost price instead of unit price when cost method is "fixed" From c8923c94913277b5a0263011cbe156c8d8805d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:00:21 +0200 Subject: [PATCH 04/26] Added tag 2.4.1 for changeset f6a645a31a6b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d1c15f9dae..4f151c5e0b 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 3941e71cc08412948b8f927c7acbb8057908fbac 2.0.0 82fe8016c9c5c5399895d2344a3128943a842020 2.2.0 2de386f976af9b1d12e65fcfb8c99e1bcb61c88b 2.4.0 +f6a645a31a6bf02ba76b14a5c719406acf8f0a73 2.4.1 From ce2233a27f5f0e368661eaef600215404868be8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:00:57 +0200 Subject: [PATCH 05/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index faa880b04a..083515c407 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias Anglosajona', 'name_es_ES': 'Gestión de stock anglosajona', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From f52b0ea3774e00cf833dea20457e6f4dc280bec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 28 Jun 2012 14:51:17 +0200 Subject: [PATCH 06/26] Use root user to read sale lines issue2654 review402001 (transplanted from 226fbbe2d434194e54cbcefcaed11c363430fbf8) --- invoice.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/invoice.py b/invoice.py index 714a59a522..e4a29f69b8 100644 --- a/invoice.py +++ b/invoice.py @@ -4,6 +4,7 @@ from decimal import Decimal import operator from trytond.model import ModelView, ModelSQL from trytond.pool import Pool +from trytond.transaction import Transaction class InvoiceLine(ModelSQL, ModelView): @@ -65,7 +66,9 @@ class InvoiceLine(ModelSQL, ModelView): for move in purchase_line.moves if move.state == 'done'] elif line.invoice.type == 'out_invoice': - moves = [move for sale_line in line.sale_lines + with Transaction().set_user(0, set_context=True): + sale_lines = self.browse(line.id).sale_lines + moves = [move for sale_line in sale_lines for move in sale_line.moves if move.state == 'done'] if line.invoice.type == 'in_invoice': From 0995dd070deb8d4e55accd79e5d633a3eb0ee9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:35:38 +0200 Subject: [PATCH 07/26] Prepare release 2.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6f5b2d83fd..b327b9d727 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.2 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.1 - 2012-04-24 * Restore es_AR translation From 9fa08fe5aeb3296c3b2b4b38bf583e76df6b5e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:35:39 +0200 Subject: [PATCH 08/26] Added tag 2.4.2 for changeset 165cb7c0d25a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4f151c5e0b..37a9c746b2 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 82fe8016c9c5c5399895d2344a3128943a842020 2.2.0 2de386f976af9b1d12e65fcfb8c99e1bcb61c88b 2.4.0 f6a645a31a6bf02ba76b14a5c719406acf8f0a73 2.4.1 +165cb7c0d25a8511853ead79c38d17c1f8b972f2 2.4.2 From 426f34cc305816d73c788dfd2f584df4dabb6d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:35:46 +0200 Subject: [PATCH 09/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 083515c407..d4b851856f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias Anglosajona', 'name_es_ES': 'Gestión de stock anglosajona', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 98fb9c5a9d237ce7fa849a9a873af4e7ead3b4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Sun, 25 Nov 2012 18:27:55 +0100 Subject: [PATCH 10/26] Compute purchase_lines moves as root review583004 (transplanted from f2483c051a157956f41ee6b84c043a2579dc7be1) --- invoice.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/invoice.py b/invoice.py index e4a29f69b8..52432f8aa3 100644 --- a/invoice.py +++ b/invoice.py @@ -50,6 +50,8 @@ class InvoiceLine(ModelSQL, ModelView): move_obj = pool.get('stock.move') currency_obj = pool.get('currency.currency') + with Transaction().set_user(0, set_context=True): + line = self.browse(line.id) result = super(InvoiceLine, self).get_move_line(line) if line.type != 'line': From 54c952de3195f362f081a0acef291812710929cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:49:46 +0100 Subject: [PATCH 11/26] Prepare release 2.4.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b327b9d727..3506691fbf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.3 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.4.2 - 2012-09-02 * Bug fixes (see mercurial logs for details) From ae13436038465119d50f0427707eb4b431a32939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:49:47 +0100 Subject: [PATCH 12/26] Added tag 2.4.3 for changeset 402132ecfd6e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 37a9c746b2..20ef766dcf 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 2de386f976af9b1d12e65fcfb8c99e1bcb61c88b 2.4.0 f6a645a31a6bf02ba76b14a5c719406acf8f0a73 2.4.1 165cb7c0d25a8511853ead79c38d17c1f8b972f2 2.4.2 +402132ecfd6e24dbf67918170db4f81bd5c8e084 2.4.3 From 64930f5712e4dfa14717e7231057ce279a28dfa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:50:01 +0100 Subject: [PATCH 13/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d4b851856f..523f22c596 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias Anglosajona', 'name_es_ES': 'Gestión de stock anglosajona', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.4.3', + 'version': '2.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 0a1783f26321a8c667acb7d5e019428bfcb100e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 13 Jan 2013 22:50:22 +0100 Subject: [PATCH 14/26] Use root to update anglo_saxon_quantity review628002 (transplanted from b3dd5552c16e4c0012a1e5a9d2c0719d123bb137) --- stock.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stock.py b/stock.py index 68093ec9de..5e696346ab 100644 --- a/stock.py +++ b/stock.py @@ -4,6 +4,7 @@ from decimal import Decimal from trytond.model import ModelView, ModelSQL, fields from trytond.pyson import Eval from trytond.pool import Pool +from trytond.transaction import Transaction class Move(ModelSQL, ModelView): @@ -108,10 +109,11 @@ class Move(ModelSQL, ModelView): move_cost_price = move.cost_price cost += move_cost_price * Decimal(str(move_qty)) - self.write(move.id, { - 'anglo_saxon_quantity': ((move.anglo_saxon_quantity or 0.0) - + move_qty), - }) + with Transaction().set_user(0, set_context=True): + self.write(move.id, { + 'anglo_saxon_quantity': ((move.anglo_saxon_quantity or 0.0) + + move_qty), + }) if consumed_qty < total_qty: qty = total_qty - consumed_qty From 52be16a11a84f51e5b8a21f2c5cf96790d48eb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:13:19 +0100 Subject: [PATCH 15/26] Prepare release 2.4.4 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3506691fbf..bce8ab7427 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.4 - 2013-02-12 +* Bug fixes (see mercurial logs for details) + Version 2.4.3 - 2012-12-23 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index e792a2ca59..7e8c156c3f 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ -Copyright (C) 2010-2012 Cédric Krier. -Copyright (C) 2010-2012 B2CK SPRL. +Copyright (C) 2010-2013 Cédric Krier. +Copyright (C) 2010-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 58f8ecc999072e039b8fecf35f7150d07eec9a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:13:20 +0100 Subject: [PATCH 16/26] Added tag 2.4.4 for changeset 3cf17d2e2277 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 20ef766dcf..6591d19e8c 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 f6a645a31a6bf02ba76b14a5c719406acf8f0a73 2.4.1 165cb7c0d25a8511853ead79c38d17c1f8b972f2 2.4.2 402132ecfd6e24dbf67918170db4f81bd5c8e084 2.4.3 +3cf17d2e2277401dcf484cc42c80569f1a53b7af 2.4.4 From 49db39517bed31181cfc0891f90f2874c054f703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:13:36 +0100 Subject: [PATCH 17/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 523f22c596..48d0cb1acb 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias Anglosajona', 'name_es_ES': 'Gestión de stock anglosajona', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.4.4', + 'version': '2.4.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 8f724c478e94502fea58e07760865bc9cd49aca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 5 Mar 2013 10:38:11 +0100 Subject: [PATCH 18/26] Fix missing unit_price currency convertion issue3036 review698002 (transplanted from 8223dede40d05831c102cee78743cea28090941c) --- stock.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stock.py b/stock.py index 5e696346ab..3d01218729 100644 --- a/stock.py +++ b/stock.py @@ -31,8 +31,11 @@ class Move(ModelSQL, ModelView): and move.product.cost_price_method == 'fixed'): cost_price = uom_obj.compute_price(move.product.default_uom, move.cost_price, move.uom) + with Transaction().set_context(date=move.effective_date): + unit_price = currency_obj.compute(move.currency.id, + move.unit_price, move.company.currency.id, round=False) amount = currency_obj.round(move.company.currency, - Decimal(str(move.quantity)) * (move.unit_price - cost_price)) + Decimal(str(move.quantity)) * (unit_price - cost_price)) if currency_obj.is_zero(move.company.currency, amount): return lines account_id = move.product.account_stock_supplier_used.id From 40619ecd41f216632e60f85be6759d03b7b88054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Mar 2013 19:30:02 +0100 Subject: [PATCH 19/26] Fix missing unit_price currency convertion issue3072 review731002 (transplanted from acd9a30f1c147a7c8637201c6b829ef1dd67b21a) --- stock.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stock.py b/stock.py index 3d01218729..0cbb2e689e 100644 --- a/stock.py +++ b/stock.py @@ -90,7 +90,9 @@ class Move(ModelSQL, ModelView): Return the cost for quantity based on lines. Update anglo_saxon_quantity on the concerned moves. ''' - uom_obj = Pool().get('product.uom') + pool = Pool() + uom_obj = pool.get('product.uom') + currency_obj = pool.get('currency.currency') for move in moves: assert move.product == product, 'wrong product' @@ -106,8 +108,11 @@ class Move(ModelSQL, ModelView): consumed_qty += move_qty if type_.startswith('in_'): + with Transaction().set_context(date=move.effective_date): + unit_price = currency_obj.compute(move.currency, + move.unit_price, move.company.currency, round=False) move_cost_price = uom_obj.compute_price(move.uom, - move.unit_price, move.product.default_uom) + unit_price, move.product.default_uom) else: move_cost_price = move.cost_price cost += move_cost_price * Decimal(str(move_qty)) From bd956be320627c2a4eca5472290afdad675ce6f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:07:26 +0200 Subject: [PATCH 20/26] Prepare release 2.4.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bce8ab7427..f2ff0a7aaa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.5 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.4 - 2013-02-12 * Bug fixes (see mercurial logs for details) From 4ac4fc960e3d39d7e80abc7b3df88537f2d10734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:07:27 +0200 Subject: [PATCH 21/26] Added tag 2.4.5 for changeset f7a4f2066fde --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6591d19e8c..baee3d696c 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f6a645a31a6bf02ba76b14a5c719406acf8f0a73 2.4.1 165cb7c0d25a8511853ead79c38d17c1f8b972f2 2.4.2 402132ecfd6e24dbf67918170db4f81bd5c8e084 2.4.3 3cf17d2e2277401dcf484cc42c80569f1a53b7af 2.4.4 +f7a4f2066fde4855463c092c4273dc07aa13805f 2.4.5 From 5ee9a5589c9c4318ea4a4eff161b6364797bc813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:07:36 +0200 Subject: [PATCH 22/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 48d0cb1acb..aa84e6dbf5 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias Anglosajona', 'name_es_ES': 'Gestión de stock anglosajona', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.4.5', + 'version': '2.4.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9a3bc7b1d3a5141333ebef06236e3a5130139512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 14:27:21 +0200 Subject: [PATCH 23/26] Fix COGS computation with negative quantity issue3287 review976002 (transplanted from b041a5be1444d626bd9105f28f6861c7695ffaa9) --- invoice.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/invoice.py b/invoice.py index 52432f8aa3..3dec55b624 100644 --- a/invoice.py +++ b/invoice.py @@ -81,10 +81,17 @@ class InvoiceLine(ModelSQL, ModelView): type_ = 'out_supplier' elif line.invoice.type == 'out_credit_note': type_ = 'in_customer' + if line.quantity < 0: + direction, target = type_.split('_') + if direction == 'in': + direction = 'out' + else: + direction = 'in' + type_ = '%s_%s' % (direction, target) moves.sort(key=operator.attrgetter('effective_date')) cost = move_obj.update_anglo_saxon_quantity_product_cost( - line.product, moves, line.quantity, line.unit, type_) + line.product, moves, abs(line.quantity), line.unit, type_) cost = currency_obj.round(line.invoice.currency, cost) anglo_saxon_move_lines = self._get_anglo_saxon_move_lines(line, cost, From 296cf503ed2c801e118d7be8197c25366a31c674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:41:08 +0200 Subject: [PATCH 24/26] Prepare release 2.4.6 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f2ff0a7aaa..55c5f5bae4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.6 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.4.5 - 2013-05-02 * Bug fixes (see mercurial logs for details) From e9746bf54e0fbfafc56a13aee04a40715b4e30e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:41:09 +0200 Subject: [PATCH 25/26] Added tag 2.4.6 for changeset 7e192adad158 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index baee3d696c..1b5eccf22a 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f6a645a31a6bf02ba76b14a5c719406acf8f0a73 2.4.1 402132ecfd6e24dbf67918170db4f81bd5c8e084 2.4.3 3cf17d2e2277401dcf484cc42c80569f1a53b7af 2.4.4 f7a4f2066fde4855463c092c4273dc07aa13805f 2.4.5 +7e192adad1585ebb16a555aa28ebf728201bd52e 2.4.6 From d9a1308aa5833f1d595b3d43d0c80fe11dbc6884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:41:23 +0200 Subject: [PATCH 26/26] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index aa84e6dbf5..617b2b995b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias Anglosajona', 'name_es_ES': 'Gestión de stock anglosajona', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.4.6', + 'version': '2.4.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',