diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-07-05 15:09:47 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-07-05 15:09:47 +0200 |
| commit | 9ee414b2b6070fcf4143fb40fba8c665d7be25cf (patch) | |
| tree | 0111b58bab2881af598e22bf6a7d849c1acb2645 /addons/project_long_term | |
| parent | e8d8218de646f55585b949b8f02b78fc5c20eb87 (diff) | |
| parent | 7a152a77e5c9ee098c68fb9015120ab4a74fbe23 (diff) | |
[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120705130947-6pxlmw8uzds6x1kj
Diffstat (limited to 'addons/project_long_term')
4 files changed, 28 insertions, 24 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..a98e9088402 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"/> @@ -152,23 +152,23 @@ <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> </header> <sheet> - <label for="name" class="oe_edit_only"/> - <h1><field name="name"/></h1> - <label for="project_id" class="oe_edit_only"/> - <h2> - <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/> - </h2> + <div class="oe_title"> + <label for="name" class="oe_edit_only"/> + <h1><field name="name"/></h1> + <label for="project_id" class="oe_edit_only"/> + <h2> + <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/> + </h2> + </div> <group> - <group> - <field name="date_start"/> - <field name="date_end"/> - </group><group> - <label for="duration"/> - <div> - <field name="duration" class="oe_inline"/> - <field name="product_uom"/> - </div> - </group> + <label for="date_start" string="Duration"/> + <div> + <div> + <field name="duration" class="oe_inline"/> + <field name="product_uom" class="oe_inline"/> + </div> + <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/> + </div> </group> <notebook> <page string="Planning of Users"> diff --git a/addons/project_long_term/project_long_term_workflow.xml b/addons/project_long_term/project_long_term_workflow.xml index 3a821ddd274..317f98d9a35 100644 --- a/addons/project_long_term/project_long_term_workflow.xml +++ b/addons/project_long_term/project_long_term_workflow.xml @@ -2,7 +2,7 @@ <openerp> <data> - <record id="wkf_phase" model="workflow"> + <record id="wkf_phase" model="workflow"> <field name="name">project.phase.wkf</field> <field name="osv">project.phase</field> <field name="on_create">True</field> @@ -31,7 +31,7 @@ <field name="action">set_cancel()</field> </record> - <record id="act_phase_pending" model="workflow.activity"> + <record id="act_phase_pending" model="workflow.activity"> <field name="wkf_id" ref="wkf_phase"/> <field name="name">set_pending</field> <field name="kind">function</field> @@ -64,7 +64,7 @@ <field name="signal">set_done</field> </record> - <record id="t3" model="workflow.transition"> + <record id="t3" model="workflow.transition"> <field name="act_from" ref="act_start_phase"/> <field name="act_to" ref="act_phase_pending"/> <field name="signal">set_pending</field> @@ -106,5 +106,5 @@ <field name="signal">set_draft</field> </record> - </data> + </data> </openerp> 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"/> |