From 9735095ce612d1e27c81e311e64bac60c9127f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:47:51 +0200 Subject: [PATCH 01/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 675598d817..a62cf0e738 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Facturación', 'name_fr_FR': 'Facturation', 'name_nl_NL': 'Facturatie', - 'version': '2.0.0', + 'version': '2.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d64db7025c7e6156e569685af5d41991393d279e Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Mon, 9 Jan 2012 08:38:50 +0100 Subject: [PATCH 02/14] Check the right account in the journal when paying in_invoices issue2376 review218001 (transplanted from 512c5206e1642fc0fac1077f91d663b47b4bcfcb) --- invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/invoice.py b/invoice.py index 2650967984..6431ba7072 100644 --- a/invoice.py +++ b/invoice.py @@ -1083,7 +1083,7 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView): 'amount_second_currency': amount_second_currency, 'second_currency': second_currency, }) - if invoice.account.id == journal.debit_account.id: + if invoice.account.id == journal.credit_account.id: self.raise_user_error('same_credit_account') if not journal.credit_account: self.raise_user_error('missing_credit_account') From 6d15248232457e803a5ce94c4bc69d296191b8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 13 Apr 2012 13:21:47 +0200 Subject: [PATCH 03/14] Use default values when adding a record via on_change review321002 (transplanted from 5aed7d67f16d93bbaec69b8dd4ca3ca14b94ff6e) --- invoice.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/invoice.py b/invoice.py index 6431ba7072..59e6463562 100644 --- a/invoice.py +++ b/invoice.py @@ -406,7 +406,9 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView): if key not in tax_keys: res['tax_amount'] += computed_taxes[key]['amount'] res['taxes'].setdefault('add', []) - res['taxes']['add'].append(computed_taxes[key]) + value = tax_obj.default_get(tax_obj._columns.keys()) + value.update(computed_taxes[key]) + res['taxes']['add'].append(value) if currency: res['untaxed_amount'] = currency_obj.round(currency, res['untaxed_amount']) From 9fa60f905f548121d5f4823a8bcb01dbeddff668 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:07:22 +0200 Subject: [PATCH 04/14] Prepare release 2.0.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9c7c50ab3f..498f03e2ea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 2.0.0 - 2011-04-27 * Bug fixes (see mercurial logs for details) * Add field currency_date to set the date for the rate calculation 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 215f7ceb6792aec1855cffade5479ec0070fe00d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:07:22 +0200 Subject: [PATCH 05/14] Added tag 2.0.1 for changeset 66b57dc6da48 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e05072913e..31af4d7962 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ b216acc6d40df3e151fe47ad08eb7bd3b1682a28 1.4.0 c43494eaf7ebf40f510e86f86f67098fd2ae8469 1.6.0 070dc16e361191655000713e404119b6f3faa518 1.8.0 2589c884dba43447ce45d446276678b5e6d29163 2.0.0 +66b57dc6da48522aa3a94b3ca12f255229cef6c3 2.0.1 From 869658abcfaa942f4e91d4bc0bda3a593fc56acb Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:07:31 +0200 Subject: [PATCH 06/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a62cf0e738..8a45754440 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Facturación', 'name_fr_FR': 'Facturation', 'name_nl_NL': 'Facturatie', - 'version': '2.0.1', + 'version': '2.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b29479728dfafe87673cdf55540c45f293e95c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 23 Feb 2013 17:40:40 +0100 Subject: [PATCH 07/14] Fix default value of account.invoice.tax review662003 (transplanted from 84191cf1b798e850171076caadc394e4549ad291) --- invoice.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/invoice.py b/invoice.py index 59e6463562..269cdb375c 100644 --- a/invoice.py +++ b/invoice.py @@ -331,6 +331,7 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView): def _on_change_lines_taxes(self, vals): currency_obj = self.pool.get('currency.currency') tax_obj = self.pool.get('account.tax') + invoice_tax_obj = self.pool.get('account.invoice.tax') res = { 'untaxed_amount': Decimal('0.0'), 'tax_amount': Decimal('0.0'), @@ -406,7 +407,8 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView): if key not in tax_keys: res['tax_amount'] += computed_taxes[key]['amount'] res['taxes'].setdefault('add', []) - value = tax_obj.default_get(tax_obj._columns.keys()) + value = invoice_tax_obj.default_get( + invoice_tax_obj._columns.keys()) value.update(computed_taxes[key]) res['taxes']['add'].append(value) if currency: From a03d84ebf2d6b1ba8700910bbde7e8a8c3d766f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:53:16 +0200 Subject: [PATCH 08/14] Prepare release 2.0.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 498f03e2ea..12f487470b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2012-05-07 * 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 869e2f245837a600c76074a2a35f2399af51644d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:53:17 +0200 Subject: [PATCH 09/14] Added tag 2.0.2 for changeset f26877d74ef2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 31af4d7962..9fb962734d 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ c43494eaf7ebf40f510e86f86f67098fd2ae8469 1.6.0 070dc16e361191655000713e404119b6f3faa518 1.8.0 2589c884dba43447ce45d446276678b5e6d29163 2.0.0 66b57dc6da48522aa3a94b3ca12f255229cef6c3 2.0.1 +f26877d74ef252db669de238af3aa10a54a7815f 2.0.2 From 5e0fc432ce35ca524ed154b93cbb919f28f21c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:53:26 +0200 Subject: [PATCH 10/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 8a45754440..563afde585 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Facturación', 'name_fr_FR': 'Facturation', 'name_nl_NL': 'Facturatie', - 'version': '2.0.2', + 'version': '2.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9810e7cc3bc2d1ca74cfe171cbf783aff236a8fd Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:41:37 +0200 Subject: [PATCH 11/14] Fix domain concatenation between list and tuple issue3386 review1099002 (transplanted from dac8c752fd39ff10cc7885e3df8fd16be2f2b51a) --- invoice.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/invoice.py b/invoice.py index 269cdb375c..ab03041f1b 100644 --- a/invoice.py +++ b/invoice.py @@ -876,12 +876,12 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search(['OR', - ('number',) + clause[1:], - ('reference',) + clause[1:], + ('number',) + tuple(clause[1:]), + ('reference',) + tuple(clause[1:]), ], order=[]) if ids: return [('id', 'in', ids)] - return [('party',) + clause[1:]] + return [('party',) + tuple(clause[1:])] def delete(self, ids): if not ids: From 743a24cbb980e8b655f71f10bd782e6f4b94e96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:42:06 +0100 Subject: [PATCH 12/14] Prepare release 2.0.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 12f487470b..fe88dd2ee4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.3 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.0.2 - 2013-05-02 * Bug fixes (see mercurial logs for details) From e72fb8dc31ac0e039df96eb52226e2bd8f2fdf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:42:07 +0100 Subject: [PATCH 13/14] Added tag 2.0.3 for changeset e54de1e2b799 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9fb962734d..0292687e8c 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ c43494eaf7ebf40f510e86f86f67098fd2ae8469 1.6.0 2589c884dba43447ce45d446276678b5e6d29163 2.0.0 66b57dc6da48522aa3a94b3ca12f255229cef6c3 2.0.1 f26877d74ef252db669de238af3aa10a54a7815f 2.0.2 +e54de1e2b7991347d068a34d4b8d323ea82f8bdc 2.0.3 From 3f2444e1d76f7169ebce2d65047d4d84ae730e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:42:22 +0100 Subject: [PATCH 14/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 563afde585..c0852db9b9 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Facturación', 'name_fr_FR': 'Facturation', 'name_nl_NL': 'Facturatie', - 'version': '2.0.3', + 'version': '2.0.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',