summaryrefslogtreecommitdiff
path: root/addons/hr/process/hr_process.xml
diff options
context:
space:
mode:
authorhda@tinyerp.com <>2008-11-07 13:04:10 +0530
committerhda@tinyerp.com <>2008-11-07 13:04:10 +0530
commit26da3a62cf3c6f6c9652cadfaf73c77dc705af41 (patch)
tree0c184e8e5d7dccaa62c611bfe385878c63272a0d /addons/hr/process/hr_process.xml
parent818d795547ee9fef6b922ca95605874395e8af4f (diff)
revert pso merge because of conflicts
bzr revid: hda@tinyerp.com-20081107073410-p8k13j0p04fk73qz
Diffstat (limited to 'addons/hr/process/hr_process.xml')
-rw-r--r--addons/hr/process/hr_process.xml16
1 files changed, 4 insertions, 12 deletions
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index eb3fb81b072..1afb90f3020 100644
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -19,7 +19,7 @@
<record id="process_node_jobshiring0" model="process.node">
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Jobs hiring&quot;&quot;&quot;" name="name"/>
- <field eval="&quot;&quot;&quot;Process to search, interview and evaluate new candidates&quot;&quot;&quot;" name="note"/>
+ <field eval="&quot;&quot;&quot;Jobs hiring to new employees&quot;&quot;&quot;" name="note"/>
<field name="process_id" ref="process_process_employeecontractworkflow0"/>
<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
@@ -54,20 +54,11 @@
<field name="process_id" ref="process_process_employeecontractworkflow0"/>
<field eval="0" name="flow_start"/>
</record>
-
+
<!--
Process Transition
-->
-
- <record id="process_transition_employeeuser0" model="process.transition">
- <field eval="[(6,0,[])]" name="role_ids"/>
- <field eval="[(6,0,[])]" name="transition_ids"/>
- <field eval="&quot;&quot;&quot;Openerp user&quot;&quot;&quot;" name="name"/>
- <field eval="&quot;&quot;&quot;Create openerp user&quot;&quot;&quot;" name="note"/>
- <field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/>
- <field model="process.node" name="source_node_id" ref="process_node_employee0"/>
- </record>
-
+
<record id="process_transition_employeejob0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -85,6 +76,7 @@
<field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/>
<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
</record>
+
</data>
</openerp>