[MERGE] forward port branch saas-11 up to 6825ddf9ad

addons/project_issue/report/project_issue_report.py

@@ -41,7 +41,7 @@ class ProjectIssueReport(models.Model):
                     c.working_hours_open,
                     c.working_hours_close,
                     c.stage_id,
-                    date(c.date_closed) as date_closed,
+                    c.date_closed as date_closed,
                     c.company_id as company_id,
                     c.priority as priority,
                     c.project_id as project_id,

odoo/models.py

@@ -292,7 +292,8 @@ class BaseModel(object):
         model = self.env['ir.model'].browse(cr.fetchone()[0])
         self._context['todo'].append((10, model.modified, [list(params)]))
 
-        if 'module' in self._context:
+        if self._module == self._context.get('module'):
+            # self._module is the name of the module that last extended self
             xmlid = 'model_' + self._name.replace('.', '_')
             cr.execute("SELECT * FROM ir_model_data WHERE name=%s AND module=%s",
                        (xmlid, self._context['module']))