[MERGE] forward port of branch 8.0 up to 17a1304

addons/hr_timesheet_sheet/hr_timesheet_sheet.py

@@ -26,7 +26,11 @@ from pytz import timezone
 import pytz
 
 from openerp.osv import fields, osv
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools import (
+    DEFAULT_SERVER_DATE_FORMAT,
+    DEFAULT_SERVER_DATETIME_FORMAT,
+    drop_view_if_exists,
+)
 from openerp.tools.translate import _
 from openerp.exceptions import UserError
 
@@ -564,6 +568,7 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
     }
 
     def init(self, cr):
+        drop_view_if_exists(cr, 'hr_timesheet_sheet_sheet_day')
         cr.execute("""create or replace view hr_timesheet_sheet_sheet_day as
             SELECT
                 id,
@@ -656,6 +661,7 @@ class hr_timesheet_sheet_sheet_account(osv.osv):
     }
 
     def init(self, cr):
+        drop_view_if_exists(cr, 'hr_timesheet_sheet_sheet_account')
         cr.execute("""create or replace view hr_timesheet_sheet_sheet_account as (
             select
                 min(hrt.id) as id,