From 005783b1958e53c7a7e744ff719269723da4e844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:47:47 +0200 Subject: [PATCH 01/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 246fd1e4d2..2d93d5e481 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.0', + 'version': '2.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 95528c1702bb1eef5d845feb58121e13c579bd92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 May 2011 12:03:01 +0200 Subject: [PATCH 02/38] Fix if clause is not a tuple in search_move_field clause can be a list if it comes from json (transplanted from 2753ca6d96dd9bede285cf5d2531c81e611c2602) --- move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/move.py b/move.py index 6246a3901f..067c9d7b53 100644 --- a/move.py +++ b/move.py @@ -927,7 +927,7 @@ class Line(ModelSQL, ModelView): def search_move_field(self, name, clause): if name == 'move_state': name = 'state' - return [('move.' + name,) + clause[1:]] + return [('move.' + name,) + tuple(clause[1:])] def query_get(self, obj='l'): ''' From 5d25b1d4c98d0379e0101476d494901415aacbef Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:19:40 +0200 Subject: [PATCH 03/38] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 16b20a1e86..7bd6d24989 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-05-29 +* Bug fixes (see mercurial logs for details) + Version 2.0.0 - 2011-04-27 * Bug fixes (see mercurial logs for details) From 89dc071199b1a813e8287f44038c2d8718f308f9 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:19:41 +0200 Subject: [PATCH 04/38] Added tag 2.0.1 for changeset cd09f31c5f73 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6cdb2b3b78..f20ca23209 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ c25f8bf80f1f8f92954cfed3a6dd2f799bd370e4 1.2.0 a8c16bf00272129b9797a6efc12c9983420b2993 1.6.0 202fae34666e277acfdfba2fbace862a45227a52 1.8.0 517ebee49a67cde0f2a31a49e4034df6eba82fdb 2.0.0 +cd09f31c5f73e7834d5b1a6b4483550e2a10b0d3 2.0.1 From cb3503f0ef0cde97f3843828823acd34b61ca4dc Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 29 May 2011 14:19:51 +0200 Subject: [PATCH 05/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 2d93d5e481..27bdfe4fce 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.1', + 'version': '2.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 7d0a9ba98ac027f0d313546d3c9cef299ac0dae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 20 Jul 2011 16:58:39 +0200 Subject: [PATCH 06/38] Use user context if user is root review60001 (transplanted from 88545f29405329fe6989085e4ad480e6f7084e4b) --- party.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/party.py b/party.py index 1516600a64..1fbe90346c 100644 --- a/party.py +++ b/party.py @@ -71,7 +71,10 @@ class Party(ModelSQL, ModelView): return {} company_id = None - user = user_obj.browse(Transaction().user) + user_id = Transaction().user + if user_id == 0 and 'user' in Transaction().context: + user_id = Transaction().context['user'] + user = user_obj.browse(user_id) if Transaction().context.get('company'): child_company_ids = company_obj.search([ ('parent', 'child_of', [user.main_company.id]), @@ -131,7 +134,10 @@ class Party(ModelSQL, ModelView): raise Exception('Bad argument') company_id = None - user = user_obj.browse(Transaction().user) + user_id = Transaction().user + if user_id == 0 and 'user' in Transaction().context: + user_id = Transaction().context['user'] + user = user_obj.browse(user_id) if Transaction().context.get('company'): child_company_ids = company_obj.search([ ('parent', 'child_of', [user.main_company.id]), From 94af15400ce6b527f27daab743cb33f73c9624f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 15:28:19 +0200 Subject: [PATCH 07/38] Prepare release 2.0.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7bd6d24989..513ef80f0c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2011-09-10 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2011-05-29 * Bug fixes (see mercurial logs for details) From 9ec1fb8f93137ecb516b4c0b2e76dba66101702b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 15:28:36 +0200 Subject: [PATCH 08/38] Added tag 2.0.2 for changeset 6961fd72d2ab --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f20ca23209..d5a4369d32 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ a8c16bf00272129b9797a6efc12c9983420b2993 1.6.0 202fae34666e277acfdfba2fbace862a45227a52 1.8.0 517ebee49a67cde0f2a31a49e4034df6eba82fdb 2.0.0 cd09f31c5f73e7834d5b1a6b4483550e2a10b0d3 2.0.1 +6961fd72d2abd63232bffab60c4ebef9e169a1c9 2.0.2 From e9d0c7ab3005b772ef0100ac56061f8cd0354b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 15:38:01 +0200 Subject: [PATCH 09/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 27bdfe4fce..08d7f5a3ae 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.2', + 'version': '2.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 61816b1053e07ebfaa2c8034fe3db5dd4a8cd59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Fri, 28 Oct 2011 10:28:26 +0200 Subject: [PATCH 10/38] Fix typo (transplanted from d47f438ca66c72ba98bec1e125e990944dfd6881) --- move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/move.py b/move.py index 067c9d7b53..6c6af4e58d 100644 --- a/move.py +++ b/move.py @@ -835,7 +835,7 @@ class Line(ModelSQL, ModelView): amount = cursor.fetchone()[0] # SQLite uses float for SUM if not isinstance(amount, Decimal): - amout = Decimal(str(amount)) + amount = Decimal(str(amount)) if not currency_obj.is_zero( party.account_receivable.currency, amount): if amount > Decimal('0.0'): From 91ee6715c82a5546255ddb85629eb7c43b40a077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 14 Nov 2011 17:59:24 +0100 Subject: [PATCH 11/38] Create property for default account only if value is set issue2259 review174001 (transplanted from 2475a84195d25ba0b6c72637604fa2bfbac03959) --- account.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/account.py b/account.py index bcf48627d6..fb0d050df2 100644 --- a/account.py +++ b/account.py @@ -1815,13 +1815,14 @@ class CreateChartAccount(Wizard): ]) with Transaction().set_user(0): property_obj.delete(property_ids) - property_obj.create({ - 'name': 'account_receivable', - 'field': account_receivable_field_id, - 'value': 'account.account,' + \ - str(datas['form']['account_receivable']), - 'company': datas['form']['company'], - }) + if datas['form']['account_receivable']: + property_obj.create({ + 'name': 'account_receivable', + 'field': account_receivable_field_id, + 'value': 'account.account,' + \ + str(datas['form']['account_receivable']), + 'company': datas['form']['company'], + }) account_payable_field_id = model_field_obj.search([ ('model.model', '=', 'party.party'), @@ -1834,13 +1835,14 @@ class CreateChartAccount(Wizard): ]) with Transaction().set_user(0): property_obj.delete(property_ids) - property_obj.create({ - 'name': 'account_payable', - 'field': account_payable_field_id, - 'value': 'account.account,' + \ - str(datas['form']['account_payable']), - 'company': datas['form']['company'], - }) + if datas['form']['account_payable']: + property_obj.create({ + 'name': 'account_payable', + 'field': account_payable_field_id, + 'value': 'account.account,' + \ + str(datas['form']['account_payable']), + 'company': datas['form']['company'], + }) return {} CreateChartAccount() From 2f6b7525c75c5aa63849fc29edb64a9d133f19ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 2 Dec 2011 11:42:35 +0100 Subject: [PATCH 12/38] Convert value to Decimal when searching receivabel/payable issue2299 review191001 (transplanted from e0e172026e4683c47ab6681203912cb9962d906f) --- party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/party.py b/party.py index 1fbe90346c..88c0091632 100644 --- a/party.py +++ b/party.py @@ -176,7 +176,7 @@ class Party(ModelSQL, ModelView): 'GROUP BY l.party ' 'HAVING (SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))) ' \ + clause[1] + ' %s)', - [code] + today_value + [company_id] + [clause[2]]) + [code] + today_value + [company_id] + [Decimal(clause[2])]) return [('id', 'in', [x[0] for x in cursor.fetchall()])] Party() From 686ae20d342399429fd4f4cc79cfa3200ccdb8d2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:37:51 +0100 Subject: [PATCH 13/38] Prepare release 2.0.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 513ef80f0c..dce7c4e2a8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.3 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 2.0.2 - 2011-09-10 * Bug fixes (see mercurial logs for details) From fc4136a67fcc73a5d11464acf34485277ba71101 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:37:52 +0100 Subject: [PATCH 14/38] Added tag 2.0.3 for changeset 266aee16a701 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d5a4369d32..8a1570d9b4 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ a8c16bf00272129b9797a6efc12c9983420b2993 1.6.0 517ebee49a67cde0f2a31a49e4034df6eba82fdb 2.0.0 cd09f31c5f73e7834d5b1a6b4483550e2a10b0d3 2.0.1 6961fd72d2abd63232bffab60c4ebef9e169a1c9 2.0.2 +266aee16a701e9f49b19182ecba8a45374889997 2.0.3 From f6d79af43f0d523a2da3d349fad21132ba62e54c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:05 +0100 Subject: [PATCH 15/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 08d7f5a3ae..7d14b67a7e 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.3', + 'version': '2.0.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 5f6501eba0917e63c41cec0084b00e355d908509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 13 Apr 2012 13:21:07 +0200 Subject: [PATCH 16/38] Use default values when adding a record via on_change review324001 (transplanted from 73f705ea869d17fa953deee2519c9c3914a375d7) --- move.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/move.py b/move.py index 6c6af4e58d..b52d15f62d 100644 --- a/move.py +++ b/move.py @@ -762,6 +762,8 @@ class Line(ModelSQL, ModelView): tax_code_obj = self.pool.get('account.tax.code') tax_obj = self.pool.get('account.tax') move_obj = self.pool.get('account.move') + tax_line_obj = pool.get('account.tax.line') + if vals.get('move'): #Only for first line return res @@ -796,14 +798,18 @@ class Line(ModelSQL, ModelView): for code_id, tax_id in base_amounts: if not base_amounts[code_id, tax_id]: continue - res.setdefault('add', []).append({ - 'amount': base_amounts[code_id, tax_id], - 'currency_digits': account.currency_digits, - 'code': code_id, - 'code.rec_name': tax_code_obj.browse(code_id).rec_name, - 'tax': tax_id, - 'tax.rec_name': tax_obj.browse(tax_id).rec_name, - }) + value = tax_line_obj.default_get( + tax_line_obj._columns.keys()) + value.update({ + 'amount': base_amounts[code_id, tax_id], + 'currency_digits': account.currency_digits, + 'code': code_id, + 'code.rec_name': tax_code_obj.browse( + code_id).rec_name, + 'tax': tax_id, + 'tax.rec_name': tax_obj.browse(tax_id).rec_name, + }) + res.setdefault('add', []).append(value) return res def on_change_party(self, vals): From 5743fa1e6a4bedf4cb7b460ed7c83caae4bbba6f Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:07:09 +0200 Subject: [PATCH 17/38] Prepare release 2.0.4 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index dce7c4e2a8..91a361a94d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.4 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 2.0.3 - 2011-12-26 * 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 81a1e452bf7c3f06641fbedcfc24ccac37b326d0 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:07:10 +0200 Subject: [PATCH 18/38] Added tag 2.0.4 for changeset a07ee037071a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8a1570d9b4..101f6379eb 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ a8c16bf00272129b9797a6efc12c9983420b2993 1.6.0 cd09f31c5f73e7834d5b1a6b4483550e2a10b0d3 2.0.1 6961fd72d2abd63232bffab60c4ebef9e169a1c9 2.0.2 266aee16a701e9f49b19182ecba8a45374889997 2.0.3 +a07ee037071affaf0b8a92fd6a83af51541fbdfb 2.0.4 From ff7c3fb108a2f99589a331bf9e1f6258e713f15b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:07:21 +0200 Subject: [PATCH 19/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 7d14b67a7e..3577a3cc6c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.4', + 'version': '2.0.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 71259ddbabccd8256949edd5ad589e4aac3ff8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 Aug 2012 15:57:40 +0200 Subject: [PATCH 20/38] Fix search_receivable_payable with None value (transplanted from bbd17b4330367211576d5cebd23ba747780ee3a6) --- party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/party.py b/party.py index 88c0091632..72505a5130 100644 --- a/party.py +++ b/party.py @@ -176,7 +176,7 @@ class Party(ModelSQL, ModelView): 'GROUP BY l.party ' 'HAVING (SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))) ' \ + clause[1] + ' %s)', - [code] + today_value + [company_id] + [Decimal(clause[2])]) + [code] + today_value + [company_id] + [Decimal(clause[2] or 0)]) return [('id', 'in', [x[0] for x in cursor.fetchall()])] Party() From f1273549b1a856549f958add54f7c84fa4236518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 5 Aug 2012 21:10:40 +0200 Subject: [PATCH 21/38] Ensure clause concatination works with tuple vs list (transplanted from 3afd52ed80da5bee8d31ba1659b0849206d7070e) --- move.py | 4 ++-- tax.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/move.py b/move.py index b52d15f62d..6293bf5219 100644 --- a/move.py +++ b/move.py @@ -156,8 +156,8 @@ class Move(ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search(['OR', - ('reference',) + clause[1:], - (self._rec_name,) + clause[1:], + ('reference',) + tuple(clause[1:]), + (self._rec_name,) + tuple(clause[1:]), ]) return [('id', 'in', ids)] diff --git a/tax.py b/tax.py index 24b23609ba..6c10b797a2 100644 --- a/tax.py +++ b/tax.py @@ -239,10 +239,10 @@ class Code(ModelSQL, ModelView): return res def search_rec_name(self, name, clause): - ids = self.search([('code',) + clause[1:]], limit=1, order=[]) + ids = self.search([('code',) + tuple(clause[1:])], limit=1, order=[]) if ids: - return [('code',) + clause[1:]] - return [('name',) + clause[1:]] + return [('code',) + tuple(clause[1:])] + return [('name',) + tuple(clause[1:])] def delete(self, ids): if isinstance(ids, (int, long)): From 6a28ee525a91c0bb7a2c0309e1bb6b8b8a4ecb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 5 Aug 2012 21:11:26 +0200 Subject: [PATCH 22/38] Fix typo for account.rec_name (transplanted from ad252c972c1f7ccc738088e46672a36abda60f32) --- move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/move.py b/move.py index 6293bf5219..93dc91ae37 100644 --- a/move.py +++ b/move.py @@ -878,7 +878,7 @@ class Line(ModelSQL, ModelView): else: if 'account' not in res: res['account'] = party.account_payable.id - res['account.rec_name'] = party.account_payable.id + res['account.rec_name'] = party.account_payable.rec_name if party and vals.get('credit'): if vals['credit'] > Decimal('0.0'): From e6527fa5d6c4c20f3b64716d583f92a1c2001cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:14:31 +0200 Subject: [PATCH 23/38] Prepare release 2.0.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 91a361a94d..d1e6f98c05 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.5 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.0.4 - 2012-05-07 * Bug fixes (see mercurial logs for details) From 21f26ebcd68a6e1700f9fa6593c9ceda2aeb7c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:14:32 +0200 Subject: [PATCH 24/38] Added tag 2.0.5 for changeset 9eca0c6133ba --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 101f6379eb..76210455ef 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ cd09f31c5f73e7834d5b1a6b4483550e2a10b0d3 2.0.1 6961fd72d2abd63232bffab60c4ebef9e169a1c9 2.0.2 266aee16a701e9f49b19182ecba8a45374889997 2.0.3 a07ee037071affaf0b8a92fd6a83af51541fbdfb 2.0.4 +9eca0c6133ba5e42daa73ba474554db18ca2d2b8 2.0.5 From f50687b24e9f80d521dd79032110ae2c5b54ec16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:14:45 +0200 Subject: [PATCH 25/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 3577a3cc6c..9184a6b80f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.5', + 'version': '2.0.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 012839824c50047c6dcd7ff4e421bab5759aa879 Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Thu, 15 Nov 2012 10:46:54 +0100 Subject: [PATCH 26/38] Do not copy deferrals when copying account issue2892 review580004 (transplanted from 75313e5b3c7a767402bcc9c43a19ccef89af15ca) --- account.py | 1 + 1 file changed, 1 insertion(+) diff --git a/account.py b/account.py index fb0d050df2..75d03732e6 100644 --- a/account.py +++ b/account.py @@ -851,6 +851,7 @@ class Account(ModelSQL, ModelView): default = {} default['left'] = 0 default['right'] = 0 + default.setdefault('deferrals', []) res = super(Account, self).copy(ids, default=default) self._rebuild_tree('parent', False, 0) return res From 6bbaba1a1a615a7c7785a872ae03edb1d68b40aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 17:01:36 +0100 Subject: [PATCH 27/38] Prepare release 2.0.6 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d1e6f98c05..1acd265829 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.6 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.0.5 - 2012-09-02 * Bug fixes (see mercurial logs for details) From ed708a7bce6d235bcc519267feb7ccc934d31d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 17:01:37 +0100 Subject: [PATCH 28/38] Added tag 2.0.6 for changeset d57de6e4a57d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 76210455ef..b649b12e12 100644 --- a/.hgtags +++ b/.hgtags @@ -9,3 +9,4 @@ cd09f31c5f73e7834d5b1a6b4483550e2a10b0d3 2.0.1 266aee16a701e9f49b19182ecba8a45374889997 2.0.3 a07ee037071affaf0b8a92fd6a83af51541fbdfb 2.0.4 9eca0c6133ba5e42daa73ba474554db18ca2d2b8 2.0.5 +d57de6e4a57d2bc2e66e641a15589da3c961cdf2 2.0.6 From 54fdfa1df5f9d8235d6803c246bb287ff3d0ec2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 17:01:51 +0100 Subject: [PATCH 29/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9184a6b80f..a23f9389e5 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.6', + 'version': '2.0.7', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 34dae08c0fbc79675d3141e93d61c93819d7c16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 22 Mar 2013 18:53:12 +0100 Subject: [PATCH 30/38] Add missing filter on company in GeneralJournal report review727002 (transplanted from 85324c3f826e3bf63aab718edecc7e0fdc292f9b) --- move.py | 1 + 1 file changed, 1 insertion(+) diff --git a/move.py b/move.py index 93dc91ae37..4073dcabba 100644 --- a/move.py +++ b/move.py @@ -1708,6 +1708,7 @@ class GeneralJournal(Report): clause = [ ('date', '>=', datas['form']['from_date']), ('date', '<=', datas['form']['to_date']), + ('period.fiscalyear.company', '=', datas['form']['company']), ] if datas['form']['posted']: clause.append(('state', '=', 'posted')) From 2a1ab516d2a139803b4d35584a1be56046cc21df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:52:45 +0200 Subject: [PATCH 31/38] Prepare release 2.0.7 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1acd265829..ce43618fba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.7 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.0.6 - 2012-12-23 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 83c0f58495..244bb5d8dd 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2012 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2012 B2CK SPRL. +Copyright (C) 2008-2013 B2CK SPRL. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify From cf3b91b05952ee08de3f184ca71ec05c17c9b2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:52:46 +0200 Subject: [PATCH 32/38] Added tag 2.0.7 for changeset 8707d1c5989f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b649b12e12..33fa9d8d29 100644 --- a/.hgtags +++ b/.hgtags @@ -10,3 +10,4 @@ cd09f31c5f73e7834d5b1a6b4483550e2a10b0d3 2.0.1 a07ee037071affaf0b8a92fd6a83af51541fbdfb 2.0.4 9eca0c6133ba5e42daa73ba474554db18ca2d2b8 2.0.5 d57de6e4a57d2bc2e66e641a15589da3c961cdf2 2.0.6 +8707d1c5989f0b952cea77e6c623dc2ae7a45126 2.0.7 From 78d877673f80e3485a0ae9f7fccb2837ea5c06bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:52:58 +0200 Subject: [PATCH 33/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a23f9389e5..8cb3eba292 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.7', + 'version': '2.0.8', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a5ba08ec365de8682d76e20b3528456126b85aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 8 Aug 2013 02:34:15 +0200 Subject: [PATCH 34/38] Fix domain concatenation between list and tuple (transplanted from a4a8b60d192f53fce094e81390736316f72a0089) --- account.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/account.py b/account.py index 75d03732e6..46762c8b67 100644 --- a/account.py +++ b/account.py @@ -374,11 +374,11 @@ class AccountTemplate(ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search([ - ('code',) + clause[1:], + ('code',) + tuple(clause[1:]), ], limit=1) if ids: - return [('code',) + clause[1:]] - return [(self._rec_name,) + clause[1:]] + return [('code',) + tuple(clause[1:])] + return [(self._rec_name,) + tuple(clause[1:])] def _get_account_value(self, template, account=None): ''' @@ -840,11 +840,11 @@ class Account(ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search([ - ('code',) + clause[1:], + ('code',) + tuple(clause[1:]), ], limit=1) if ids: - return [('code',) + clause[1:]] - return [(self._rec_name,) + clause[1:]] + return [('code',) + tuple(clause[1:])] + return [(self._rec_name,) + tuple(clause[1:])] def copy(self, ids, default=None): if default is None: @@ -1031,8 +1031,8 @@ class AccountDeferral(ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search(['OR', - ('account.rec_name',) + clause[1:], - ('fiscalyear.rec_name',) + clause[1:], + ('account.rec_name',) + tuple(clause[1:]), + ('fiscalyear.rec_name',) + tuple(clause[1:]), ]) return [('id', 'in', ids)] From 150e3a77140fc1135c203833d9b4e6e61e00bf4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 10 Sep 2013 14:29:23 +0200 Subject: [PATCH 35/38] Fix domain concatenation between list and tuple (transplanted from 9be102d4bcd667f21a19430c36dc31c173fd4ffd) --- journal.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/journal.py b/journal.py index 32724435d9..b110aa898a 100644 --- a/journal.py +++ b/journal.py @@ -155,11 +155,11 @@ class Journal(ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search([ - ('code',) + clause[1:], + ('code',) + tuple(clause[1:]), ], limit=1, order=[]) if ids: - return [('code',) + clause[1:]] - return [(self._rec_name,) + clause[1:]] + return [('code',) + tuple(clause[1:])] + return [(self._rec_name,) + tuple(clause[1:])] Journal() From 6d0117a5d5e0f613578e99c837fc75b1952b8352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:27:14 +0200 Subject: [PATCH 36/38] Prepare release 2.0.8 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ce43618fba..36a8c13f26 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.8 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.0.7 - 2013-05-02 * Bug fixes (see mercurial logs for details) From 6077f0476c443c7a8822373c063c942f69428f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:27:15 +0200 Subject: [PATCH 37/38] Added tag 2.0.8 for changeset 5b36674c8e14 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 33fa9d8d29..86260374ad 100644 --- a/.hgtags +++ b/.hgtags @@ -11,3 +11,4 @@ a07ee037071affaf0b8a92fd6a83af51541fbdfb 2.0.4 9eca0c6133ba5e42daa73ba474554db18ca2d2b8 2.0.5 d57de6e4a57d2bc2e66e641a15589da3c961cdf2 2.0.6 8707d1c5989f0b952cea77e6c623dc2ae7a45126 2.0.7 +5b36674c8e14550e0315e2bff939b6896b70025b 2.0.8 From 1f2577edd07fd5cf3598fde7382099d1d52bec00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:27:31 +0200 Subject: [PATCH 38/38] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 8cb3eba292..c416e83af0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', 'name_nl_NL': 'Boekhouden', - 'version': '2.0.8', + 'version': '2.0.9', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',