From d38e490af3b548c45119b176d9788313f9a554b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 22:58:42 +0200 Subject: [PATCH 1/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 850ab196e9..a6edcf0116 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: analytic_account analytic_invoice From dd9f90d986bc25ef93c537573dda100f8fc7dffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Dec 2012 12:20:39 +0100 Subject: [PATCH 2/5] "add" operator takes a list of ids issue2923 (transplanted from fd98b319a3e08168e286c7ea8707253875abf3aa) --- purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purchase.py b/purchase.py index 13e8420cd1..5d31c1db09 100644 --- a/purchase.py +++ b/purchase.py @@ -122,7 +122,7 @@ class PurchaseLine: if field.startswith('analytic_account_'): if vals[field]: selection_vals.setdefault('accounts', []) - selection_vals['accounts'].append(('add', vals[field])) + selection_vals['accounts'].append(('add', [vals[field]])) del vals[field] if vals.get('analytic_accounts'): Selection.write([Selection(vals['analytic_accounts'])], From 13dffde89fba1b18df2796729e0a1aa847d82c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:40:40 +0100 Subject: [PATCH 3/5] Prepare release 2.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e70af61017..39c1db79ba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) From 50bd48bf84937fd83edc59f43e1be8c03f78df0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:40:41 +0100 Subject: [PATCH 4/5] Added tag 2.6.1 for changeset 782141528498 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 26fd1e9655..ae798dc58d 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ ddace105f3c6567b4ca629babf455ea1a845c1d7 2.0.0 de4d0c3e74d96184c3df925d056f661e3c70f777 2.2.0 bbfae4e4b52c7916c5ac7c2e187bd5d8ec905868 2.4.0 5ff02f82b3682ca5f06e19e60042709fd54c6a5c 2.6.0 +78214152849804200127f5fad1086f433f7fcac1 2.6.1 From 089ecda3a689b0d313885c8e6e326cd20b8f8d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:40:48 +0100 Subject: [PATCH 5/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index a6edcf0116..b6e970c46a 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: analytic_account analytic_invoice