[MERGE] forward port branch saas-16 up to acfebff880

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, {})

addons/l10n_fr_certification/models/__init__.py

@@ -1,2 +1,2 @@
-import res_company
-import account
+from . import res_company
+from . import account

addons/resource/tests/test_resource.py

@@ -281,7 +281,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')))
@@ -292,9 +291,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]

odoo/sql_db.py

@@ -51,7 +51,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):