summaryrefslogtreecommitdiff
path: root/addons/project_long_term/project_long_term_view.xml
diff options
context:
space:
mode:
authorMartin Trigaux <mat@openerp.com>2013-06-12 17:15:34 +0200
committerMartin Trigaux <mat@openerp.com>2013-06-12 17:15:34 +0200
commitbd10a9471d9ba52f0dc2b81e8811741c80b59385 (patch)
treebae68616fc2d3648e418a3f5dc43cdcc93b77b31 /addons/project_long_term/project_long_term_view.xml
parent283838cca8afe5f45ecdbceb4cea31f30f5b0024 (diff)
parente532701d28d63fba37df3149e89804630f14f999 (diff)
[MERGE] sync
bzr revid: mat@openerp.com-20130612151534-294ch1a1apeca3nu
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
-rw-r--r--addons/project_long_term/project_long_term_view.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e8e21caab0a..671d8fb2b4d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -146,7 +146,7 @@
<button string="Done" name="set_done" states="pending,open"/>
<button string="Pending" name="set_pending" states="open"/>
<button string="Draft" name="set_draft" states="open"/>
- <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
+ <button string="Cancel Phase" name="set_cancel" states="draft,open,pending"/>
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet>
@@ -322,7 +322,7 @@
<field name="inherit_id" ref="project.view_task_search_form"/>
<field name="arch" type="xml">
<field name="user_id" position="before">
- <field name="phase_id"/>
+ <field name="phase_id" domain="[]"/>
</field>
</field>
</record>