From 2f6edfef49430f8c571c7cf0e485a22f6a0867d4 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 15 Jun 2017 19:00:54 +0200
Subject: [PATCH 1/2] [FIX] resource: remove bad test introduced by previous
 forward-port

---
 addons/resource/tests/test_resource.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/resource/tests/test_resource.py b/addons/resource/tests/test_resource.py
index 5415f85e5f4..5a76a14c64f 100644
--- a/addons/resource/tests/test_resource.py
+++ b/addons/resource/tests/test_resource.py
@@ -279,7 +279,6 @@ class ResourceWorkingHours(TestResourceCommon):
         res = self.calendar.plan_hours(-40, day_dt=Datetime.from_string('2013-02-12 09:00:00'))
         self.assertEqual(res, Datetime.from_string('2013-01-29 09:00:00'))
 
-
     def test_calendar_hours_scheduling_forward(self):
         res = self.calendar._schedule_hours(40, day_dt=Datetime.from_string('2013-02-12 09:00:00'))
         self.assertEqual(res[0][:2], (Datetime.from_string('2013-02-12 09:00:00'), Datetime.from_string('2013-02-12 16:00:00')))
@@ -290,9 +289,6 @@ class ResourceWorkingHours(TestResourceCommon):
         self.assertEqual(res[5][:2], (Datetime.from_string('2013-02-22 16:00:00'), Datetime.from_string('2013-02-22 23:00:00')))
         self.assertEqual(res[6][:2], (Datetime.from_string('2013-02-26 08:00:00'), Datetime.from_string('2013-02-26 09:00:00')))
 
-        res = self.calendar.schedule_hours_get_date(40, day_dt=self.date1.replace(minute=0, second=0))
-        self.assertEqual(res, Datetime.from_string('2013-02-26 09:00:00'))
-
         td = timedelta()
         for item in res:
             td += item[1] - item[0]

From acfebff88079054b5b76104ab0825159acf88e0e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 15 Jun 2017 19:24:03 +0200
Subject: [PATCH 2/2] [FIX] *: correct PY3 compatibility introduced by previous
 forward-ports

---
 addons/l10n_fr_certification/__init__.py        | 4 ++--
 addons/l10n_fr_certification/models/__init__.py | 4 ++--
 odoo/sql_db.py                                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_fr_certification/__init__.py b/addons/l10n_fr_certification/__init__.py
index 24644871f1e..dcd82374562 100644
--- a/addons/l10n_fr_certification/__init__.py
+++ b/addons/l10n_fr_certification/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import models
-from openerp import api, SUPERUSER_ID
+from . import models
+from odoo import api, SUPERUSER_ID
 
 def _setup_inalterability(cr, registry):
     env = api.Environment(cr, SUPERUSER_ID, {})
diff --git a/addons/l10n_fr_certification/models/__init__.py b/addons/l10n_fr_certification/models/__init__.py
index 17a7d5cf526..8472b2f8bfb 100644
--- a/addons/l10n_fr_certification/models/__init__.py
+++ b/addons/l10n_fr_certification/models/__init__.py
@@ -1,2 +1,2 @@
-import res_company
-import account
+from . import res_company
+from . import account
diff --git a/odoo/sql_db.py b/odoo/sql_db.py
index b4c69824ab2..acd422b5d33 100644
--- a/odoo/sql_db.py
+++ b/odoo/sql_db.py
@@ -55,7 +55,7 @@ psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,)
 from . import tools
 from .tools.func import frame_codeinfo
 
-from tools import parse_version as pv
+from .tools import parse_version as pv
 if pv(psycopg2.__version__) < pv('2.7'):
     from psycopg2._psycopg import QuotedString
     def adapt_string(adapted):