diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2013-06-26 15:37:56 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2013-06-26 15:37:56 +0530 |
| commit | 254dc5b8a9e952ec887ce110a2cd8a9299d4e883 (patch) | |
| tree | d04520919059e0d8f9c7a123a98fb0aaf1c87231 /addons/project_issue | |
| parent | db949377ef3dea7b35ab6513a0270565e3f8070a (diff) | |
| parent | c180afab26171617c1c7c22db5d9836b159e5e7d (diff) | |
[MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20130626100756-56td56rp3ido6cpx
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 8 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 8bcac4581c3..33e4fcb409c 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -653,6 +653,14 @@ class project_project(osv.Model): elif vals.get('use_issues') and not vals.get('use_tasks'): vals['alias_model'] = 'project.issue' + def on_change_use_tasks_or_issues(self, cr, uid, ids, use_tasks, use_issues, context=None): + values = {} + if use_tasks and not use_issues: + values['alias_model'] = 'project.task' + elif not use_tasks and use_issues: + values['alias_model'] = 'project.issues' + return {'value': values} + def create(self, cr, uid, vals, context=None): self._check_create_write_values(cr, uid, vals, context=context) return super(project_project, self).create(cr, uid, vals, context=context) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 9f5dc8135bb..da3034c72f5 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -309,7 +309,8 @@ <field name="inherit_id" ref="project.edit_project"/> <field name="arch" type="xml"> <xpath expr='//div[@name="options_active"]' position='inside'> - <field name="use_issues" class="oe_inline"/> + <field name="use_issues" class="oe_inline" + on_change="on_change_use_tasks_or_issues(use_tasks, use_issues)"/> <label for="use_issues"/> </xpath> <xpath expr='//div[@name="buttons"]' position='inside'> @@ -318,21 +319,12 @@ <xpath expr='//page[@name="project_stages"]' position="attributes"> <attribute name="attrs">{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}</attribute> </xpath> + <xpath expr='//field[@name="use_tasks"]' position="attributes"> + <attribute name="attrs">{'on_change': 'on_change_use_tasks_or_issues(use_tasks, use_issues)'}</attribute> + </xpath> <field name="priority" position="before"> <field name="project_escalation_id"/> </field> - <xpath expr='//span[@name="edit_alias"]' position='replace'> - <span class="oe_edit_only" name="edit_alias"> - <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/> - @ - <field class="oe_inline" name="alias_domain"/> - <span class="oe_inline" - attrs="{'invisible': ['|', ('use_issues', '!=', True), ('use_tasks', '!=', True)]}"> - <label for="alias_model" string="creates"/> - <field name="alias_model" class="oe_inline"/> - </span> - </span> - </xpath> </field> </record> |