From 4c90bdad783b5ce15ef649d8612d523db832eb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:42:42 +0100 Subject: [PATCH 01/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 913e43a852..82e1ccebf8 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Facturación', 'name_es_ES': 'Facturación', 'name_fr_FR': 'Facturation', - 'version': '1.8.0', + 'version': '1.8.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From e1cfdbb89d304ca0d74646acbe0c1a12e5518046 Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Mon, 9 Jan 2012 08:38:50 +0100 Subject: [PATCH 02/10] 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 dc621eb49d..e2184f32d9 100644 --- a/invoice.py +++ b/invoice.py @@ -1061,7 +1061,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 be6d20650d83ef04a4f8e20d1a4f6d1b11471f46 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/10] 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 e2184f32d9..63491f0c45 100644 --- a/invoice.py +++ b/invoice.py @@ -386,7 +386,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 c5e339c4fc4154c11c77d3374e313c644272ed8b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:39 +0200 Subject: [PATCH 04/10] Prepare release 1.8.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b713a73879..ba265c2523 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.1 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.8.0 - 2010-11-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 94a43fbe61..b63cf45895 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008-2010 Cédric Krier. +Copyright (C) 2008-2012 Cédric Krier. Copyright (C) 2008-2010 Bertrand Chenal. -Copyright (C) 2008-2010 B2CK SPRL. +Copyright (C) 2008-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 2014673a565bd64b81c15765ee8fa5a3bbfec8b2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:39 +0200 Subject: [PATCH 05/10] Added tag 1.8.1 for changeset 52b4ff9da462 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d1011bfe53..ce15e2b5e2 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ b216acc6d40df3e151fe47ad08eb7bd3b1682a28 1.4.0 c43494eaf7ebf40f510e86f86f67098fd2ae8469 1.6.0 070dc16e361191655000713e404119b6f3faa518 1.8.0 +52b4ff9da46286cca75555d950f3cf8def6dec74 1.8.1 From ca3a630e75e588eb716611d4ef1cf7c3971d0561 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:45 +0200 Subject: [PATCH 06/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 82e1ccebf8..1d0a34568e 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Facturación', 'name_es_ES': 'Facturación', 'name_fr_FR': 'Facturation', - 'version': '1.8.1', + 'version': '1.8.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 535da8633e9348d3a888238b3b84e948d222c3a9 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/10] 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 63491f0c45..fb91691667 100644 --- a/invoice.py +++ b/invoice.py @@ -311,6 +311,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'), @@ -386,7 +387,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 a4aee67f64d47308df85dea5dbbac20262a8ef5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:50:06 +0200 Subject: [PATCH 08/10] Prepare release 1.8.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ba265c2523..e231c98729 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.2 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 1.8.1 - 2012-05-07 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index b63cf45895..4073cb306f 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008-2012 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2010 Bertrand Chenal. -Copyright (C) 2008-2012 B2CK SPRL. +Copyright (C) 2008-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 25b8c3fb6f00f794eaabb5d654eb3cb6ca09a698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:50:07 +0200 Subject: [PATCH 09/10] Added tag 1.8.2 for changeset 81af1b76bead --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ce15e2b5e2..e8c902ac54 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ b216acc6d40df3e151fe47ad08eb7bd3b1682a28 1.4.0 c43494eaf7ebf40f510e86f86f67098fd2ae8469 1.6.0 070dc16e361191655000713e404119b6f3faa518 1.8.0 52b4ff9da46286cca75555d950f3cf8def6dec74 1.8.1 +81af1b76bead43026e9a90af1f7fcf44e4154ba4 1.8.2 From 9b2c7993aeb858eccc4b76512c8393b1ee0549aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:50:16 +0200 Subject: [PATCH 10/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1d0a34568e..cac77a911b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Facturación', 'name_es_ES': 'Facturación', 'name_fr_FR': 'Facturation', - 'version': '1.8.2', + 'version': '1.8.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',