From 2226cca939e1664fd5f9f82461e3fa25b8f9fbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:48:03 +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 f37bd0f976..394e70073f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Facturación Analítica', 'name_es_ES': 'Facturación analítica', 'name_fr_FR': 'Facturation analytique', - 'version': '2.0.0', + 'version': '2.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a2df4c474e646e2c0368c60fd98ae733c3bdf1be Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Mon, 22 Aug 2011 13:25:37 +0200 Subject: [PATCH 02/14] Remove field names beginning with 'analytic_account_' from defaults. issue1830 review76005 (transplanted from d4968377b04bde30bed36b55727e7c047254685e) --- invoice.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/invoice.py b/invoice.py index b85c5f3325..a7608fc8a7 100644 --- a/invoice.py +++ b/invoice.py @@ -34,6 +34,11 @@ class InvoiceLine(ModelSQL, ModelView): analytic_accounts_field, fields_names)) return res + def default_get(self, fields, with_rec_name=True): + fields = [x for x in fields if not x.startswith('analytic_account_')] + return super(InvoiceLine, self).default_get(fields, + with_rec_name=with_rec_name) + def read(self, ids, fields_names=None): selection_obj = self.pool.get('analytic_account.account.selection') From a660734979c9eb1c1e59542ca9d9eab323d14d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 19:06:37 +0200 Subject: [PATCH 03/14] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f74f0b3dd2..9dc110f4a0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-09-10 +* Bug fixes (see mercurial logs for details) + Version 2.0.0 - 2011-04-27 * Bug fixes (see mercurial logs for details) From 88a63878684804284a5926d222804305616d277a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 19:06:47 +0200 Subject: [PATCH 04/14] Added tag 2.0.1 for changeset 856af71950a2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index baa1973e40..a6897893aa 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ fe952b1980954923e7c0d0241beb0db743d565eb 1.4.0 afc6f1d14f7696ae612d7ff5f88c1830e1253a0e 1.6.0 9b07a7f0eb01b42f983f8c998f6a00e23f013c89 1.8.0 ff543b2c867e79dcf723c61358b194a8f914a3f0 2.0.0 +856af71950a2b5f33c7242c0c4aff007824adc34 2.0.1 From 8e6abb4ad477eda008d98a07b123c5e359f30774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Sep 2011 19:08:31 +0200 Subject: [PATCH 05/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 394e70073f..3a9273f8b7 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Facturación Analítica', 'name_es_ES': 'Facturación analítica', 'name_fr_FR': 'Facturation analytique', - 'version': '2.0.1', + 'version': '2.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ce6ace95209ca43a51e5b4bcaf2e7bd8859e2dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 3 Oct 2011 23:30:42 +0200 Subject: [PATCH 06/14] Fix credit to copy analytic_accounts issue1829 review130001 (transplanted from d121be5e80ac54fc553e2217117c9cedfb9a24ad) --- invoice.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/invoice.py b/invoice.py index a7608fc8a7..82eced1e33 100644 --- a/invoice.py +++ b/invoice.py @@ -183,6 +183,16 @@ class InvoiceLine(ModelSQL, ModelView): return new_ids[0] return new_ids + def _credit(self, line): + selection_obj = Pool().get('analytic_account.account.selection') + + result = super(InvoiceLine, self)._credit(line) + + if line.analytic_accounts: + selection_id = selection_obj.copy(line.analytic_accounts.id) + result['analytic_accounts'] = selection_id + return result + def get_move_line(self, line): values = super(InvoiceLine, self).get_move_line(line) if line.analytic_accounts and line.analytic_accounts.accounts: From 0d1059d43af60e0f64d5b5e60406c4d2dae59a18 Mon Sep 17 00:00:00 2001 From: Jan Grasnick Date: Sun, 27 Nov 2011 08:03:12 +0100 Subject: [PATCH 07/14] Wrong backport of changeset 88:d121be5e80ac issue1829 --- invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/invoice.py b/invoice.py index 82eced1e33..ba34c47bb8 100644 --- a/invoice.py +++ b/invoice.py @@ -184,7 +184,7 @@ class InvoiceLine(ModelSQL, ModelView): return new_ids def _credit(self, line): - selection_obj = Pool().get('analytic_account.account.selection') + selection_obj = self.pool.get('analytic_account.account.selection') result = super(InvoiceLine, self)._credit(line) From 0beaf2e714c746af38388112ba6d718670c027c2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:05 +0100 Subject: [PATCH 08/14] Prepare release 2.0.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9dc110f4a0..b42da23477 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2011-09-10 * Bug fixes (see mercurial logs for details) From 5a41c397c2646eb1e14e56c796160cd8b19a3975 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:05 +0100 Subject: [PATCH 09/14] Added tag 2.0.2 for changeset 82df146756a4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a6897893aa..5851a31153 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ afc6f1d14f7696ae612d7ff5f88c1830e1253a0e 1.6.0 9b07a7f0eb01b42f983f8c998f6a00e23f013c89 1.8.0 ff543b2c867e79dcf723c61358b194a8f914a3f0 2.0.0 856af71950a2b5f33c7242c0c4aff007824adc34 2.0.1 +82df146756a48c9663e1d333ddc968c745dd6076 2.0.2 From 1d40a99eb7815415fcfb8043dd738c8bf559578c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:09 +0100 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 3a9273f8b7..657d964ad0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Facturación Analítica', 'name_es_ES': 'Facturación analítica', 'name_fr_FR': 'Facturation analytique', - 'version': '2.0.2', + 'version': '2.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b938398393727c76439304dec3160dfb4c098d83 Mon Sep 17 00:00:00 2001 From: Marco Huymajer Date: Mon, 25 Mar 2013 09:07:52 +0100 Subject: [PATCH 11/14] Use accounting date instead of invoice date For the analytic lines generated out of invoice lines use the accounting date instead of the invoice date. issue3075 review728002 (transplanted from 0103490821cb72dd23fe4c0821b756fa0ce22fe7) --- invoice.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/invoice.py b/invoice.py index ba34c47bb8..57475c4af1 100644 --- a/invoice.py +++ b/invoice.py @@ -205,7 +205,8 @@ class InvoiceLine(ModelSQL, ModelView): vals['credit'] = value['credit'] vals['account'] = account.id vals['journal'] = line.invoice.journal.id - vals['date'] = line.invoice.invoice_date + vals['date'] = (line.invoice.accounting_date + or line.invoice.invoice_date) vals['reference'] = line.invoice.reference vals['party'] = line.invoice.party.id value['analytic_lines'].append(('create', vals)) From 7d5f18fd61ca71bcab12f4ca9f3e17340f4b1307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:55:32 +0200 Subject: [PATCH 12/14] Prepare release 2.0.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b42da23477..4f10983297 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.3 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.0.2 - 2011-12-26 * Bug fixes (see mercurial logs for details) From 5969933095afc163dda53b15f6108692cdd67601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:55:33 +0200 Subject: [PATCH 13/14] Added tag 2.0.3 for changeset 0e234ba79bb4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5851a31153..606bdda06d 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ afc6f1d14f7696ae612d7ff5f88c1830e1253a0e 1.6.0 ff543b2c867e79dcf723c61358b194a8f914a3f0 2.0.0 856af71950a2b5f33c7242c0c4aff007824adc34 2.0.1 82df146756a48c9663e1d333ddc968c745dd6076 2.0.2 +0e234ba79bb4a12091da20bf2f71aacb119f24f8 2.0.3 From 70a9108d58c4b7104d8326a56b040011c28645f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 09:55:43 +0200 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 657d964ad0..04a7a33f3a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Facturación Analítica', 'name_es_ES': 'Facturación analítica', 'name_fr_FR': 'Facturation analytique', - 'version': '2.0.3', + 'version': '2.0.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',