From 2ced147af20489fabf86734b6afd9c5a8d88b174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:18:59 +0200 Subject: [PATCH 01/13] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9ffea55669..9c62783191 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias continental', 'name_es_ES': 'Gestión de stock continental', 'name_fr_FR': 'Gestion de stock continentale', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ae5b31f33b31078b2f43515a13135a6008cbb10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 Apr 2012 22:02:42 +0200 Subject: [PATCH 02/13] Restore es_AR translation (transplanted from 43ec80211baa561412fbc712026833d06ba55641) --- locale/es_AR.po | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/locale/es_AR.po b/locale/es_AR.po index 542f2921b5..4da992dcec 100644 --- a/locale/es_AR.po +++ b/locale/es_AR.po @@ -1,3 +1,113 @@ # msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:account.configuration,stock_journal:" +msgid "Stock Journal" +msgstr "Diario de Existencias" + +msgctxt "field:product.category,account_stock:" +msgid "Account Stock" +msgstr "Cuenta de Existencias" + +msgctxt "field:product.category,account_stock_customer:" +msgid "Account Stock Customer" +msgstr "Cuenta de Existencias del Cliente" + +msgctxt "field:product.category,account_stock_customer_used:" +msgid "Account Stock Customer Used" +msgstr "Cuenta de Existencias del Cliente utilizada" + +msgctxt "field:product.category,account_stock_lost_found:" +msgid "Account Stock Lost and Found" +msgstr "Cuenta de Existencias Perdidas y Encontradas" + +msgctxt "field:product.category,account_stock_lost_found_used:" +msgid "Account Stock Lost and Found" +msgstr "Cuenta de Existencias Perdidas y Encontradas" + +msgctxt "field:product.category,account_stock_supplier:" +msgid "Account Stock Supplier" +msgstr "Cuenta de Existencias del Proveedor" + +msgctxt "field:product.category,account_stock_supplier_used:" +msgid "Account Stock Supplier Used" +msgstr "Cuenta de Existencias del Proveedor utilizada" + +msgctxt "field:product.category,account_stock_used:" +msgid "Account Stock Used" +msgstr "Cuenta de Existencias utilizada" + +msgctxt "field:product.template,account_stock:" +msgid "Account Stock" +msgstr "Cuenta de Existencias" + +msgctxt "field:product.template,account_stock_customer:" +msgid "Account Stock Customer" +msgstr "Cuenta de Existencias del Cliente" + +msgctxt "field:product.template,account_stock_customer_used:" +msgid "Account Stock Customer Used" +msgstr "Cuenta de Existencias del Cliente utilizada" + +msgctxt "field:product.template,account_stock_lost_found:" +msgid "Account Stock Lost and Found" +msgstr "Cuenta de Existencias Perdidas y Encontradas" + +msgctxt "field:product.template,account_stock_lost_found_used:" +msgid "Account Stock Lost and Found" +msgstr "Cuenta de Existencias Perdidas y Encontradas" + +msgctxt "field:product.template,account_stock_supplier:" +msgid "Account Stock Supplier" +msgstr "Cuenta de Existencias del Proveedor" + +msgctxt "field:product.template,account_stock_supplier_used:" +msgid "Account Stock Supplier Used" +msgstr "Cuenta de Existencias del Proveedor utilizada" + +msgctxt "field:product.template,account_stock_used:" +msgid "Account Stock Used" +msgstr "Cuenta de Existencias utilizada" + +msgctxt "field:stock.move,account_move:" +msgid "Account Move" +msgstr "Asiento contable" + +msgctxt "help:product.template,account_stock:" +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 "help:product.template,account_stock_customer:" +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 "help:product.template,account_stock_lost_found:" +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 "help:product.template,account_stock_supplier:" +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_stock" +msgid "Stock" +msgstr "Existencias" + +msgctxt "model:account.account.template,name:account_template_stock_customer" +msgid "Stock Customer" +msgstr "Existencias del Cliente" + +msgctxt "" +"model:account.account.template,name:account_template_stock_lost_found" +msgid "Stock Lost and Found" +msgstr "Existencias Perdidas y Encontradas" + +msgctxt "model:account.account.template,name:account_template_stock_supplier" +msgid "Stock Supplier" +msgstr "Existencias del Proveedor" + +msgctxt "" +"model:account.account.type.template,name:account_type_template_asset_current_inventories" +msgid "Inventories" +msgstr "Inventarios" From 7215c05dc07166d1528fa4890da2866bff66a662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:02:09 +0200 Subject: [PATCH 03/13] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ac649ee2e9..d037334679 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) * Create move also from supplier to customer From 8d4ac6672dc3cd9478213865304d032fdcea6772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:02:13 +0200 Subject: [PATCH 04/13] Added tag 2.4.1 for changeset baa7385a9ebd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8b6f27a5be..8e9f80e1c4 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 8e0e555d065fa97e9bfb6b3d331fa36ceec1f194 2.0.0 a29ef2c2b0ec2093d8632b5aa31b5f8eee2579d0 2.2.0 b2abfc4d7074c0f4e3183305ce944ae29abb9f04 2.4.0 +baa7385a9ebd5b9eb1260c31baad69b02b5c613f 2.4.1 From 2681003de6d298c41f7ec72515bb325bcc4949aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:02:52 +0200 Subject: [PATCH 05/13] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9c62783191..7810c96684 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias continental', 'name_es_ES': 'Gestión de stock continental', 'name_fr_FR': 'Gestion de stock continentale', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 14c6e71e32889ea881c08f8a7e08e12215216a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 25 Jul 2012 15:33:19 +0200 Subject: [PATCH 06/13] Use root to create account move issue2714 review428001 (transplanted from cd25d2a14a8420303bf24114d39c9c341754462f) --- stock.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stock.py b/stock.py index aaf0ec0bf9..8433ed732b 100644 --- a/stock.py +++ b/stock.py @@ -3,6 +3,7 @@ from decimal import Decimal from trytond.model import Model, fields from trytond.pool import Pool +from trytond.transaction import Transaction class Move(Model): @@ -137,12 +138,13 @@ class Move(Model): if move_line: account_move_lines.append(move_line) - account_move_id = account_move_obj.create( - self._get_account_stock_move(move, account_move_lines)) + with Transaction().set_user(0, set_context=True): + account_move_id = account_move_obj.create( + self._get_account_stock_move(move, account_move_lines)) + account_move_obj.post(account_move_id) self.write(move.id, { 'account_move': account_move_id, }) - account_move_obj.post(account_move_id) return account_move_id def copy(self, ids, default=None): From a95a64137fe9474e78207b4382007366adb1466e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:39:28 +0200 Subject: [PATCH 07/13] Prepare release 2.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d037334679..0dc5ac28da 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 f3b38c40d4e999bd4438a306eae610e4fb831daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:39:28 +0200 Subject: [PATCH 08/13] Added tag 2.4.2 for changeset 96ed9a88faa1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8e9f80e1c4..07c4925ad9 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ a29ef2c2b0ec2093d8632b5aa31b5f8eee2579d0 2.2.0 b2abfc4d7074c0f4e3183305ce944ae29abb9f04 2.4.0 baa7385a9ebd5b9eb1260c31baad69b02b5c613f 2.4.1 +96ed9a88faa1d47149060bfa278f84107b3ba212 2.4.2 From 163b11dc76ef3a8bae5cac174904702665cb3dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:39:36 +0200 Subject: [PATCH 09/13] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 7810c96684..fc8d81324f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias continental', 'name_es_ES': 'Gestión de stock continental', 'name_fr_FR': 'Gestion de stock continentale', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ec8de43d9235ed6bf79d94791d77a890b58013b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 5 Mar 2013 10:36:56 +0100 Subject: [PATCH 10/13] Fix missing unit_price currency convertion issue3036 review697002 (transplanted from 1d1da0ad31d92ddc55db2710ef7ee850caee60b5) --- stock.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stock.py b/stock.py index 8433ed732b..f19843952a 100644 --- a/stock.py +++ b/stock.py @@ -26,7 +26,9 @@ class Move(Model): } if (type_.endswith('supplier') and move.product.cost_price_method != 'fixed'): - unit_price = move.unit_price + 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) else: unit_price = uom_obj.compute_price(move.product.default_uom, move.cost_price, move.uom) From 8789a944db9dfbe65fc0a426d88e3ff8f5c7dc42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:08:01 +0200 Subject: [PATCH 11/13] Prepare release 2.4.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0dc5ac28da..28c081182e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.3 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.2 - 2012-09-02 * 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 914fd9ec03c89d26b45d0d49b13b9759c0ad8cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:08:02 +0200 Subject: [PATCH 12/13] Added tag 2.4.3 for changeset 8a55a831d4ba --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 07c4925ad9..d7e36aee92 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ a29ef2c2b0ec2093d8632b5aa31b5f8eee2579d0 2.2.0 b2abfc4d7074c0f4e3183305ce944ae29abb9f04 2.4.0 baa7385a9ebd5b9eb1260c31baad69b02b5c613f 2.4.1 96ed9a88faa1d47149060bfa278f84107b3ba212 2.4.2 +8a55a831d4ba75d41cd44b58e1f3cba352df3c34 2.4.3 From c6f07185721763e77a730d6d3b30062e0027043c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:08:10 +0200 Subject: [PATCH 13/13] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index fc8d81324f..15c3389515 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_AR': 'Contabilidad de existencias continental', 'name_es_ES': 'Gestión de stock continental', 'name_fr_FR': 'Gestion de stock continentale', - 'version': '2.4.3', + 'version': '2.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',