diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-09-20 16:49:00 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-09-20 16:49:00 +0200 |
| commit | 84fbc3b7da2a9ac2c3e6faed911eebdcb3585980 (patch) | |
| tree | 2c407a3bf81f348f0ebaadb6160c72599d7c2251 /addons/project_issue | |
| parent | fda33df8a608fd5063ae45b7f9db73c9e1c65013 (diff) | |
| parent | 5959a1f7a987b1349bc005df63570e530e0833ba (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120920144900-isobpji9066sftj1
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 6d1d0272ab0..66b3b97b5e8 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -100,8 +100,6 @@ states="open"/> <button name="case_close" string="Done" type="object" states="draft,pending"/> - <button name="case_escalate" string="Escalate" type="object" - states="draft,open,pending"/> <button name="case_cancel" string="Cancel" type="object" states="draft,open,pending"/> </span> @@ -118,7 +116,11 @@ </group> <group> <field name="priority"/> - <field name="project_id" required="True" on_change="on_change_project(project_id)" context="{'default_use_issues':1}"/> + <label for="project_id"/> + <div> + <field name="project_id" required="True" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/> + <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" class="oe_inline"/> + </div> <label for="task_id"/> <div> <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/> |