diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-07-04 10:52:24 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-07-04 10:52:24 +0530 |
| commit | d7bcb161d7b03603d4f4c8b6f07fe96a787264ec (patch) | |
| tree | 316f66dd62cb6c3c32f8690def6c3a897d643c24 /addons/project_long_term | |
| parent | ef37a6856a9b8fb286805f3b2851268db182e7aa (diff) | |
| parent | f5f8cb037b3bece495c22377ca82538ac0898df6 (diff) | |
[MERGE]merge with addons trunk
bzr revid: sgo@tinyerp.com-20120704052224-0rv2gtt2rejuev3z
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 32 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_workflow.xml | 8 |
2 files changed, 20 insertions, 20 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index ec575a514c1..a98e9088402 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -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> |