[MERGE] forward port of branch 8.0 up to f57e580

addons/project_issue/project_issue.py

@@ -480,7 +480,9 @@ class project(osv.Model):
     _inherit = "project.project"
 
     def _get_alias_models(self, cr, uid, context=None):
-        return [('project.task', "Tasks"), ("project.issue", "Issues")]
+        res = super(project, self)._get_alias_models(cr, uid, context=context)
+        res.append(("project.issue", "Issues"))
+        return res
 
     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
         Issue = self.pool['project.issue']

addons/project_issue/project_issue_view.xml

@@ -310,6 +310,9 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
+                <xpath expr='//field[@name="use_tasks"]' position='attributes'>
+                    <attribute name="on_change">on_change_use_tasks_or_issues(use_tasks, use_issues)</attribute>
+                </xpath>
                 <xpath expr='//div[@name="options_active"]' position="attributes">
                     <attribute name="invisible">0</attribute>
                 </xpath>

addons/survey/wizard/survey_email_compose_message.py

@@ -155,7 +155,7 @@ class survey_mail_compose_message(osv.TransientModel):
                 'parent_id': None,
                 'partner_ids': partner_id and [(4, partner_id)] or None,
                 'notified_partner_ids': partner_id and [(4, partner_id)] or None,
-                'attachment_ids': wizard.attachment_ids or None,
+                'attachment_ids': wizard.attachment_ids and [(6, 0, wizard.attachment_ids.ids)] or None,
                 'email_from': wizard.email_from or None,
                 'email_to': email,
             }