diff options
| author | sgo@tinyerp.com <> | 2013-06-04 11:06:54 +0530 |
|---|---|---|
| committer | sgo@tinyerp.com <> | 2013-06-04 11:06:54 +0530 |
| commit | bb00be2dfe2f6ceefb34e11ed6c3afbb451e5c0a (patch) | |
| tree | 1e299d0cca264289084b7046c106eab406db625e /addons/project | |
| parent | 4bbb78f5317c2001770aca0dadcb2790275d161f (diff) | |
| parent | 95c9d77c9f6330c4f87da460124cc59d4bd852b2 (diff) | |
[MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130604053654-iioke97u2i18j5jz
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/html/index.html | 1 | ||||
| -rw-r--r-- | addons/project/process/task_process.xml | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/addons/project/html/index.html b/addons/project/html/index.html index c1b6c3b966f..93f1be8a41d 100644 --- a/addons/project/html/index.html +++ b/addons/project/html/index.html @@ -7,7 +7,6 @@ <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=project"> <img src="project_01.png"> </a> - <span class="oe_demo_play"> </span> <div class="oe_demo_footer oe_centeralign">Online Demo</div> </div> </div> diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 4a73bfd00d1..9955fe1ffe1 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -68,24 +68,24 @@ <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Delegate"""" name="name"/> <field eval=""""Delegates tasks to the other user"""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_drafttask0"/> - <field model="process.node" name="source_node_id" ref="process_node_taskbydelegate0"/> + <field name="target_node_id" ref="process_node_drafttask0"/> + <field name="source_node_id" ref="process_node_taskbydelegate0"/> </record> <record id="process_transition_draftopentask0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Draft Open task"""" name="name"/> <field eval=""""From draft state, it will come into the open state."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_opentask0"/> - <field model="process.node" name="source_node_id" ref="process_node_drafttask0"/> + <field name="target_node_id" ref="process_node_opentask0"/> + <field name="source_node_id" ref="process_node_drafttask0"/> </record> <record id="process_transition_opendonetask0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Open Done Task"""" name="name"/> <field eval=""""When task is completed, it will come into the done state."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_donetask0"/> - <field model="process.node" name="source_node_id" ref="process_node_opentask0"/> + <field name="target_node_id" ref="process_node_donetask0"/> + <field name="source_node_id" ref="process_node_opentask0"/> </record> |