From 468ee67476cf5c59070ee281ec365c6dc0da2eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Oct 2011 17:30:13 +0200 Subject: [PATCH 1/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 96aebf8d61..a8baed575b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Estado de cuentas', 'name_fr_FR': 'Relevé comptable', 'name_nl_NL': 'Bankafschriften', - 'version': '2.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ce9c47bcf1ae8ca48a6bdff5063435e21d07152f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 16 Aug 2012 14:54:26 +0200 Subject: [PATCH 2/9] Fix sign of the amount to pay on line issue2746 review464003 (transplanted from e61b42e38133c3e8351bb8b445c18e153859dc01) --- statement.py | 4 +++- tests/scenario_account_statement.rst | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/statement.py b/statement.py index b4d4fd8bb2..d901fb4ff8 100644 --- a/statement.py +++ b/statement.py @@ -244,7 +244,9 @@ class Statement(ModelWorkflow, ModelSQL, ModelView): else: res['lines']['update'].append({ 'id': line['id'], - 'amount': amount_to_pay, + 'amount': (amount_to_pay + if line['amount'] >= 0 + else -amount_to_pay), }) res['lines'].setdefault('add', []) vals = line.copy() diff --git a/tests/scenario_account_statement.rst b/tests/scenario_account_statement.rst index dfd67bec57..dd98f0241a 100644 --- a/tests/scenario_account_statement.rst +++ b/tests/scenario_account_statement.rst @@ -242,11 +242,16 @@ Paid 50 to supplier:: >>> statement_line = StatementLine() >>> statement.lines.append(statement_line) >>> statement_line.date = today - >>> statement_line.amount = Decimal('-50') + >>> statement_line.amount = Decimal('-60') >>> statement_line.party = supplier >>> statement_line.account == payable True >>> statement_line.invoice = supplier_invoice + >>> statement_line.amount == Decimal('-50') + True + >>> statement_line = statement.lines.pop() + >>> statement_line.amount == Decimal('-10') + True >>> statement.save() From a37964e1ade4f124c51a0d69186b7bbbd335d666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:30:00 +0200 Subject: [PATCH 3/9] Prepare release 2.2.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index af7659bb11..2622ed5ae0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2012-09-02 +* 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 a9feb419c1..83c0f58495 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. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify From f6b520d92c26ac5ce75d64d4373556733fe2fc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:30:01 +0200 Subject: [PATCH 4/9] Added tag 2.2.1 for changeset 62b6bb41c030 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 33fed077a6..af341563cb 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ cd2bb33bf2e6c12b16987f9e41f704256dee9687 1.6.0 aa5eeb9ec42c629a6d02fb161fe77cffa0f30f6d 1.8.0 4fee0aa595f576ab1bda4b322a7afe39fee21e6e 2.0.0 4cc691e92efa06c6181cee5bd81a5207cc92a158 2.2.0 +62b6bb41c0306d8aeeb2f5dd446f26cb01832d42 2.2.1 From 2f81b3ea46507c878041bba2513394ac946a2565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:30:07 +0200 Subject: [PATCH 5/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a8baed575b..0cac7cff0c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Estado de cuentas', 'name_fr_FR': 'Relevé comptable', 'name_nl_NL': 'Bankafschriften', - 'version': '2.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 1dd74d4724a9500aa21d47c18bce9d66836c3abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 19 Sep 2012 22:19:04 +0200 Subject: [PATCH 6/9] Fix domain concatenation between list and tuple (transplanted from 41a25660ece8cf25bb018f07b79cd676189eba76) --- statement.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/statement.py b/statement.py index d901fb4ff8..f0c496ba12 100644 --- a/statement.py +++ b/statement.py @@ -169,12 +169,12 @@ class Statement(ModelWorkflow, ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search(['OR', - ('start_balance',) + clause[1:], - ('end_balance',) + clause[1:], + ('start_balance',) + tuple(clause[1:]), + ('end_balance',) + tuple(clause[1:]), ]) if ids: return [('id', 'in', ids)] - return [('journal',) + clause[1:]] + return [('journal',) + tuple(clause[1:])] def get_move_lines(self, ids, name): ''' From f78c2f5df97d2131c6f21ee9e2522b9a8dc88327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:14:57 +0100 Subject: [PATCH 7/9] Prepare release 2.2.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2622ed5ae0..59fceb9bbd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.2 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.2.1 - 2012-09-02 * Bug fixes (see mercurial logs for details) From 2d276e63a5576e1e082bf23b5e38ae13eb0ecbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:14:58 +0100 Subject: [PATCH 8/9] Added tag 2.2.2 for changeset 679f6715c5bd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index af341563cb..2cb3b43d56 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ aa5eeb9ec42c629a6d02fb161fe77cffa0f30f6d 1.8.0 4fee0aa595f576ab1bda4b322a7afe39fee21e6e 2.0.0 4cc691e92efa06c6181cee5bd81a5207cc92a158 2.2.0 62b6bb41c0306d8aeeb2f5dd446f26cb01832d42 2.2.1 +679f6715c5bdb74ce94e36e482682fc74525b6f8 2.2.2 From a1fe054cd4af475719f20f0d49d771ea8b4fc73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 18:15:06 +0100 Subject: [PATCH 9/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 0cac7cff0c..2e7d52960a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Estado de cuentas', 'name_fr_FR': 'Relevé comptable', 'name_nl_NL': 'Bankafschriften', - 'version': '2.2.2', + 'version': '2.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',