diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-05-30 18:35:22 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-05-30 18:35:22 +0530 |
| commit | b02a3684d0ad01c19ecf540232fc17c896d9bd85 (patch) | |
| tree | b3dfbcb368a2ad95bcb55608392d420098418bd6 /addons/project_issue | |
| parent | 11bf57f1bf45f308ad76c35fd0f42560298a86f4 (diff) | |
| parent | eddbed0f583d5d81ab61759d5e25af3c04181334 (diff) | |
[MERGE]merge with parent branch and resolve conflicts
bzr revid: sgo@tinyerp.com-20120530130522-f8d6vem8wwlp0z4r
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 2 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index d49631fb771..0c4b6af0956 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -533,7 +533,7 @@ class account_analytic_account(osv.osv): _description = 'Analytic Account' _columns = { - 'use_issues' : fields.boolean('Issue Tracking:', help="Check this field if this project manages issues"), + 'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"), } # _defaults = { # 'use_issues': True, diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 99b4ecafc57..1dfd1ed1b5e 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -360,9 +360,13 @@ <field name="type">form</field> <field name="inherit_id" ref="project.edit_project"/> <field name="arch" type="xml"> - <field name="use_tasks" position="after"> - <field name="use_issues"/> - </field> + <xpath expr='//tr[@name="use_tasks_row"]' position='after'> + <tr name="use_issues_row"> + <th style="border-right:1px solid #DDD;" width="140px">Issues Tracking</th> + <td><field name="use_issues" nolabel="1"/></td> + <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td> + </tr> + </xpath> <field name="priority" position="before"> <field name="project_escalation_id"/> <field name="reply_to"/> |