From f04b048c304f7aec34308506174540163293c949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:03 +0200 Subject: [PATCH 1/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index c1de2f8d38..da9bb4daa9 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Ventas Analíticas', 'name_es_ES': 'Venta analítica', 'name_fr_FR': 'Vente analytique', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 84d2bc311794728bc90afac4f70981f22365292e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 Apr 2012 22:02:45 +0200 Subject: [PATCH 2/9] Restore es_AR translation (transplanted from da0ba9a5a053a36149943fa5096c7ca441938c76) --- locale/es_AR.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locale/es_AR.po b/locale/es_AR.po index 542f2921b5..6c5db27e81 100644 --- a/locale/es_AR.po +++ b/locale/es_AR.po @@ -1,3 +1,7 @@ # msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "field:sale.line,analytic_accounts:" +msgid "Analytic Accounts" +msgstr "Cuentas analíticas" From 29ced09251e1ee3301ea24c885acaf2e2d781873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:10:04 +0200 Subject: [PATCH 3/9] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 875c8bfa83..dc330bae3b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2012-04-24 +* Restore es_AR translation + Version 2.4.0 - 2012-04-23 * Bug fixes (see mercurial logs for details) From 10e1d15a5f48313f3a2da1a800d5a87c97d656b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:10:08 +0200 Subject: [PATCH 4/9] Added tag 2.4.1 for changeset a50902d00e8f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c33e108607..a6fbaa71e3 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ a105664d657d9cd55022e87f1718ce2e6bd22a0b 2.0.0 c73d9b89bbd23e411978fb728178c426e6625a47 2.2.0 49aa14cdd8669eb95b15298fdfcce9a7cd671607 2.4.0 +a50902d00e8fa6bc3aa57011cecbc632ba257300 2.4.1 From 883331878cef7bb54b864a9d00031e26cb607039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:10:35 +0200 Subject: [PATCH 5/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index da9bb4daa9..6cf0338692 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Ventas Analíticas', 'name_es_ES': 'Venta analítica', 'name_fr_FR': 'Vente analytique', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4c99182239deb093e7ff29a8963ee0c336ceb680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 25 Apr 2012 17:13:10 +0200 Subject: [PATCH 6/9] get_invoice_line takes invoice_type now (transplanted from 4b858296c2da5b079fafcedd977cb25c0042b4c6) --- sale.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sale.py b/sale.py index e53f19a174..396e02d614 100644 --- a/sale.py +++ b/sale.py @@ -182,11 +182,11 @@ class SaleLine(ModelSQL, ModelView): return new_ids[0] return new_ids - def get_invoice_line(self, line): + def get_invoice_line(self, line, invoice_type): pool = Pool() account_selection_obj = pool.get('analytic_account.account.selection') - res = super(SaleLine, self).get_invoice_line(line) + res = super(SaleLine, self).get_invoice_line(line, invoice_type) if not res: return res From deb9b3bab8146e8bcab7ce54ed32240325a6c45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:44:31 +0200 Subject: [PATCH 7/9] Prepare release 2.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index dc330bae3b..c3ffbfc42d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.2 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.1 - 2012-04-24 * Restore es_AR translation From b78059b0ef53e01e6f81bb4894a01173901bd7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:44:32 +0200 Subject: [PATCH 8/9] Added tag 2.4.2 for changeset 1c0fb151bbc2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a6fbaa71e3..e5b9517953 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ a105664d657d9cd55022e87f1718ce2e6bd22a0b 2.0.0 c73d9b89bbd23e411978fb728178c426e6625a47 2.2.0 49aa14cdd8669eb95b15298fdfcce9a7cd671607 2.4.0 a50902d00e8fa6bc3aa57011cecbc632ba257300 2.4.1 +1c0fb151bbc2dfe46a2d91bde14e2775d9b978d8 2.4.2 From a0124f5193f6814455cd4307265ebcbcbbc2b7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:44:43 +0200 Subject: [PATCH 9/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6cf0338692..95c5c8c9b9 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Ventas Analíticas', 'name_es_ES': 'Venta analítica', 'name_fr_FR': 'Vente analytique', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',