From 1b6e7de7ba04b750bb8794b848d4e818b643723b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Oct 2011 17:33:15 +0200 Subject: [PATCH 01/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 0b4a39f372..49c424913e 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -4,7 +4,7 @@ 'name': 'Account Stock Anglo-Saxon', 'name_de_DE': 'Buchhaltung Lagerbewertung Angelsächsische Methode', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 01dad010b0b0bcc3de39d48ae95d941a5256f700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 28 Mar 2012 17:48:07 +0200 Subject: [PATCH 02/22] Don't duplicate anglo_saxon_quantity review307004 (transplanted from be6b207b023bbc00eff759bafbd3f4a6318305e9) --- stock.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/stock.py b/stock.py index f74b787d1c..f2166bf809 100644 --- a/stock.py +++ b/stock.py @@ -81,4 +81,11 @@ class Move(ModelSQL, ModelView): cost += product.cost_price * Decimal(str(qty)) return cost + def copy(self, ids, default=None): + if default is None: + default = {} + default = default.copy() + default.setdefault('anglo_saxon_quantity', None) + return super(Move, self).copy(ids, default=default) + Move() From 09ec89ea735d007f69e0ae900074c3aff65bad2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 10 Apr 2012 14:05:10 +0200 Subject: [PATCH 03/22] Use default value for anglo_saxon_quantity when duplicate (transplanted from f88037e2180bda8379d561e54d9e3a96683bcbe7) --- stock.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stock.py b/stock.py index f2166bf809..36b5ad52f1 100644 --- a/stock.py +++ b/stock.py @@ -85,7 +85,8 @@ class Move(ModelSQL, ModelView): if default is None: default = {} default = default.copy() - default.setdefault('anglo_saxon_quantity', None) + default.setdefault('anglo_saxon_quantity', + self.default_anglo_saxon_quantity()) return super(Move, self).copy(ids, default=default) Move() From 2bc328f2f3e8f1dc25101966c9b96db153cf9aec Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:09:36 +0200 Subject: [PATCH 04/22] Prepare release 2.2.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fec2e3d53a..438afe255f 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-24 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index de261a68a1..e792a2ca59 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ -Copyright (C) 2010-2011 Cédric Krier. -Copyright (C) 2010-2011 B2CK SPRL. +Copyright (C) 2010-2012 Cédric Krier. +Copyright (C) 2010-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 2087065e2de2abc06ce7373545987aca34532723 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:09:36 +0200 Subject: [PATCH 05/22] Added tag 2.2.1 for changeset 63b290feb751 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index fd6c5a7a94..292eec3ef2 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 3941e71cc08412948b8f927c7acbb8057908fbac 2.0.0 82fe8016c9c5c5399895d2344a3128943a842020 2.2.0 +63b290feb751707de00b783cc2171913ec952404 2.2.1 From 9a4bb88abf74b27abe07ff1fd459bfee0198887e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:09:39 +0200 Subject: [PATCH 06/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 49c424913e..52c3c4a4d1 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -4,7 +4,7 @@ 'name': 'Account Stock Anglo-Saxon', 'name_de_DE': 'Buchhaltung Lagerbewertung Angelsächsische Methode', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 938da24c6696dc9c696ffbf0bdbc446f25e05549 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 07/22] 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 43b14505cc..5fc93d5912 100644 --- a/invoice.py +++ b/invoice.py @@ -4,6 +4,7 @@ from decimal import Decimal import operator from trytond.model import ModelView, ModelSQL, fields from trytond.pool import Pool +from trytond.transaction import Transaction class InvoiceLine(ModelSQL, ModelView): @@ -66,7 +67,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 c4bbf0749675c82d128170d7b015d3789b742a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:36:24 +0200 Subject: [PATCH 08/22] Prepare release 2.2.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 438afe255f..4803af3f2e 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 4b9bce181d20819f4159364900b7e7976f4bfbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:36:25 +0200 Subject: [PATCH 09/22] Added tag 2.2.2 for changeset 396c8e6c8744 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 292eec3ef2..96bbf186ba 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 3941e71cc08412948b8f927c7acbb8057908fbac 2.0.0 82fe8016c9c5c5399895d2344a3128943a842020 2.2.0 63b290feb751707de00b783cc2171913ec952404 2.2.1 +396c8e6c874474736b2c2c73ed6e3397e35665ee 2.2.2 From 4b26709d26fae566bd704b869d1748ef1cad538f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:36:31 +0200 Subject: [PATCH 10/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 52c3c4a4d1..c880858a1c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -4,7 +4,7 @@ 'name': 'Account Stock Anglo-Saxon', 'name_de_DE': 'Buchhaltung Lagerbewertung Angelsächsische Methode', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.2.2', + 'version': '2.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 8646f6a52010a824c201cd58f5e7ce311252a402 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 11/22] 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 5fc93d5912..2f639eaac6 100644 --- a/invoice.py +++ b/invoice.py @@ -51,6 +51,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 68d4e4aa1260b9fb724658469ffb63e473bc88df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:58:00 +0100 Subject: [PATCH 12/22] Prepare release 2.2.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4803af3f2e..d04df5f447 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.3 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.2.2 - 2012-09-02 * Bug fixes (see mercurial logs for details) From 8dae1d13263a4fb4bac6e85799b4466f63c80453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:58:01 +0100 Subject: [PATCH 13/22] Added tag 2.2.3 for changeset 42b05d20f9f1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 96bbf186ba..5c035617af 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 82fe8016c9c5c5399895d2344a3128943a842020 2.2.0 63b290feb751707de00b783cc2171913ec952404 2.2.1 396c8e6c874474736b2c2c73ed6e3397e35665ee 2.2.2 +42b05d20f9f1395ac2d5700e44cbd5ede1ead494 2.2.3 From 94ef54e07d70702c9e1e5923717d1cc1a366eea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:58:08 +0100 Subject: [PATCH 14/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c880858a1c..ac05c78463 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -4,7 +4,7 @@ 'name': 'Account Stock Anglo-Saxon', 'name_de_DE': 'Buchhaltung Lagerbewertung Angelsächsische Methode', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.2.3', + 'version': '2.2.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 849b48dc97efc4c59f7e93e045ade4b18f06d6a4 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 15/22] 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 36b5ad52f1..afcebbde8e 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): @@ -70,10 +71,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 7a81e26eb45b8e410daa71b4546d18c9943583be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:14:12 +0100 Subject: [PATCH 16/22] Prepare release 2.2.4 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d04df5f447..92b4a8ac79 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.4 - 2013-02-12 +* Bug fixes (see mercurial logs for details) + Version 2.2.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 53b4a63518c2e2b290c07d4d06f907d54be21eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:14:13 +0100 Subject: [PATCH 17/22] Added tag 2.2.4 for changeset d7e70b778610 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5c035617af..cec7c8695a 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 63b290feb751707de00b783cc2171913ec952404 2.2.1 396c8e6c874474736b2c2c73ed6e3397e35665ee 2.2.2 42b05d20f9f1395ac2d5700e44cbd5ede1ead494 2.2.3 +d7e70b77861070671355ea2443bf93abe0738cdf 2.2.4 From b302cabfb80daeb847dc839b41a5c891a414cf2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:14:22 +0100 Subject: [PATCH 18/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index ac05c78463..5e257e8f97 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -4,7 +4,7 @@ 'name': 'Account Stock Anglo-Saxon', 'name_de_DE': 'Buchhaltung Lagerbewertung Angelsächsische Methode', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.2.4', + 'version': '2.2.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9a1c11639d465904c946a7ca3a6de5147d0b5adf 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 19/22] Fix missing unit_price currency convertion issue3036 review698002 (transplanted from 8223dede40d05831c102cee78743cea28090941c) --- stock.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stock.py b/stock.py index afcebbde8e..6cef553312 100644 --- a/stock.py +++ b/stock.py @@ -51,6 +51,7 @@ class Move(ModelSQL, ModelView): Update anglo_saxon_quantity on the concerned moves. ''' uom_obj = Pool().get('product.uom') + currency_obj = Pool().get('currency.currency') for move in moves: assert move.product == product, 'wrong product' @@ -65,8 +66,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.id, + move.unit_price, move.company.currency.id, 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 3fb422c02b2ec8bd38ae250040f5fc74f75fd9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:00:29 +0200 Subject: [PATCH 20/22] Prepare release 2.2.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 92b4a8ac79..c3c9442146 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.5 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.2.4 - 2013-02-12 * Bug fixes (see mercurial logs for details) From 7e4e2ec05af0da0dab9621b5c070db555a109100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:00:30 +0200 Subject: [PATCH 21/22] Added tag 2.2.5 for changeset 442a2d82c010 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index cec7c8695a..2d98701e9e 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ a66493cfbeefa27297e1397f51d84a7836931206 2.0.0 396c8e6c874474736b2c2c73ed6e3397e35665ee 2.2.2 42b05d20f9f1395ac2d5700e44cbd5ede1ead494 2.2.3 d7e70b77861070671355ea2443bf93abe0738cdf 2.2.4 +442a2d82c010779182dba9f4afc957f6f5714004 2.2.5 From 591cba11f946e72aab3cb904e78bf6f1eedf09ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:00:38 +0200 Subject: [PATCH 22/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 5e257e8f97..82d3dd4f22 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -4,7 +4,7 @@ 'name': 'Account Stock Anglo-Saxon', 'name_de_DE': 'Buchhaltung Lagerbewertung Angelsächsische Methode', 'name_fr_FR': 'Gestion de stock anglo-saxonne', - 'version': '2.2.5', + 'version': '2.2.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',