From 6ffab198d8c64fb59e6dcf65a065a8e201f92eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 22 Oct 2012 23:00:21 +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 26ebbcd1a0..75591198d9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     purchase

From 126ea7eafe64f93f00204c1a522abe7d61879fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 26 Mar 2013 11:58:27 +0100
Subject: [PATCH 2/5] ProductSupplier is linked to template not product

---
 tests/test_stock_supply_day.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_stock_supply_day.py b/tests/test_stock_supply_day.py
index 47b2f8be91..7f3104f403 100644
--- a/tests/test_stock_supply_day.py
+++ b/tests/test_stock_supply_day.py
@@ -145,7 +145,7 @@ class StockSupplyDayTestCase(unittest.TestCase):
             'account_payable': payable.id,
             })
         product_supplier = self.product_supplier.create({
-            'product': product.id,
+            'product': product.template.id,
             'company': company.id,
             'party': supplier.id,
             'delivery_time': delivery_time,

From 2797025d56860021d7045e4e7b54aaaacea928f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 2 May 2013 10:33:35 +0200
Subject: [PATCH 3/5] Prepare release 2.6.1

---
 CHANGELOG | 3 +++
 COPYRIGHT | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 82c89b9826..39450ca4f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c724d0..d7165c7ec9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
 Copyright (C) 2008-2012 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 b7b408d7b24f418f570801d9ad559312964be142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 2 May 2013 10:33:36 +0200
Subject: [PATCH 4/5] Added tag 2.6.1 for changeset 65bc3e4156de

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9f7fa84f6d..b2ca46fdbf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -6,3 +6,4 @@ bd08fecfa2cf0e7e3580c85090f62e1711fcfb88 2.0.0
 fe083045a79de94717fd58ecfa407f9662d05445 2.2.0
 926d98699fe8374bf591a6a21561cb51af46b3cb 2.4.0
 5169c4780f85a719ae92808f229620867a6756ca 2.6.0
+65bc3e4156de5d15a9bad1f270a42c8b09e4eabb 2.6.1

From dc270f60da3565fbbcd6fa87ffcca1dfb137c84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 2 May 2013 10:33:44 +0200
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 75591198d9..80dcc89cd9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     ir
     purchase