diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
| commit | 6fe94bd4bc076ad659dffe453c7b057e9340b54d (patch) | |
| tree | d673f7a2b25ec1f01307c45f081ed8c9fe27babf /addons/project_long_term | |
| parent | a642b36339ac6628b1a937bbf0d2750cc14fcdd5 (diff) | |
| parent | 37601079a987b0b20f22fff8963d22b1440b78b4 (diff) | |
[MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
Diffstat (limited to 'addons/project_long_term')
3 files changed, 8 insertions, 4 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 419c89cb449..ec575a514c1 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -136,7 +136,7 @@ </xpath> </field> </record> - + <record id="view_project_phase_form" model="ir.ui.view"> <field name="name">project.phase.form</field> <field name="model">project.phase</field> @@ -144,7 +144,7 @@ <field name="arch" type="xml"> <form string="Project Phase" version="7.0"> <header> - <button string="Start Phase" name="set_open" states="pending,draft"/> + <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/> <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"/> diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml index 37c7256cb7c..8439244d717 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -9,7 +9,9 @@ <field name="arch" type="xml"> <form string="Schedule Phases" version="7.0"> <header> - <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/> + <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> </header> <group> <field name="target_project"/> diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml index 3ceac7e9a9e..17779ffa268 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -9,7 +9,9 @@ <field name="arch" type="xml"> <form string="Schedule Tasks" version="7.0"> <header> - <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/> + <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> </header> <group> <field name="project_id"/> |