From 8e98dc44e47c97a5e1ebb3855cc115bd3b29733f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Oct 2011 17:51:05 +0200 Subject: [PATCH 1/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a04c27fd21..acff8113e7 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.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 6848590a8de79a8acde05fa1c783b4e85a2aaf73 Mon Sep 17 00:00:00 2001 From: Marco Huymajer Date: Mon, 25 Mar 2013 09:07:52 +0100 Subject: [PATCH 2/5] 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 17fa67c181..3d272622c1 100644 --- a/invoice.py +++ b/invoice.py @@ -206,7 +206,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 a2fa22054d7e243fe6ec25b3e5227161dbe97850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:01:51 +0200 Subject: [PATCH 3/5] Prepare release 2.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 905eea5700..2d86f84b72 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-24 * Bug fixes (see mercurial logs for details) From 696344564764e9b9ab28a341ae446d5f094abfa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:01:52 +0200 Subject: [PATCH 4/5] Added tag 2.2.1 for changeset 190ff9954d3e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 3e7f1e0ed5..037a7cf067 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ afc6f1d14f7696ae612d7ff5f88c1830e1253a0e 1.6.0 9b07a7f0eb01b42f983f8c998f6a00e23f013c89 1.8.0 ff543b2c867e79dcf723c61358b194a8f914a3f0 2.0.0 902780a4f261b4b3c62aa081614272733e99efc8 2.2.0 +190ff9954d3e1b585ba6c5920011c2a9012344fa 2.2.1 From c41d90346b6e149242a399fc46623fe17ab487ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:02:00 +0200 Subject: [PATCH 5/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index acff8113e7..096a6aa7a7 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.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',