diff options
| author | kum (Open ERP) <kum@tinyerp.co.in> | 2009-11-26 14:12:52 +0530 |
|---|---|---|
| committer | kum (Open ERP) <kum@tinyerp.co.in> | 2009-11-26 14:12:52 +0530 |
| commit | c9f87c4dc9ebceddb609c5cfc2e6fd15abc481e8 (patch) | |
| tree | 053269a0cc8d08a3d44694c3c73d38abadd6749e /addons/hr/process | |
| parent | 38caea46b0ba92d3a2db17c7c72ec4c290b3b334 (diff) | |
| parent | d8dc05715d93963f3c72b78a57d07ca9552ef45f (diff) | |
[IMP] English Improvement resolved conflicts
bzr revid: kum@tinyerp.co.in-20091125113147-pmsqovlrx4ia54hf
bzr revid: kum@tinyerp.co.in-20091126062538-149ru08q9obdlksy
bzr revid: kum@tinyerp.co.in-20091126084252-ml6pgh170e6f4r3f
Diffstat (limited to 'addons/hr/process')
| -rwxr-xr-x | addons/hr/process/hr_process.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml index 7dedef35be2..8910f767132 100755 --- a/addons/hr/process/hr_process.xml +++ b/addons/hr/process/hr_process.xml @@ -9,7 +9,7 @@ <record id="process_process_employeecontractprocess0" model="process.process"> <field eval="1" name="active"/> <field name="model_id" ref="hr.model_hr_employee"/> - <field eval=""""Employee Contract Process"""" name="name"/> + <field eval=""""Employee Contract"""" name="name"/> </record> <!-- @@ -21,7 +21,7 @@ <field name="model_id" ref="hr.model_hr_employee"/> <field eval=""""state"""" name="kind"/> <field eval=""""Employee"""" name="name"/> - <field eval=""""Employee Complete Form"""" name="note"/> + <field eval=""""Employee form and structure"""" name="note"/> <field name="process_id" ref="process_process_employeecontractprocess0"/> <field eval="0" name="flow_start"/> </record> @@ -31,7 +31,7 @@ <field name="model_id" ref="hr.model_hr_employee"/> <field eval=""""state"""" name="kind"/> <field eval=""""Employee Contact"""" name="name"/> - <field eval=""""Fill up employee's contact information"""" name="note"/> + <field eval=""""Other information"""" name="note"/> <field name="process_id" ref="process_process_employeecontractprocess0"/> <field eval="0" name="flow_start"/> </record> @@ -41,7 +41,7 @@ <field name="model_id" ref="base.model_res_users"/> <field eval=""""state"""" name="kind"/> <field eval=""""Openerp user"""" name="name"/> - <field eval=""""Create OpenERP User"""" name="note"/> + <field eval=""""Creation of a OpenERP user"""" name="note"/> <field name="process_id" ref="process_process_employeecontractprocess0"/> <field eval="0" name="flow_start"/> </record> @@ -53,8 +53,8 @@ <record id="process_transition_employeeuser0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Openerp user"""" name="name"/> - <field eval=""""Create openerp user"""" name="note"/> + <field eval=""""Link a user to an employee"""" name="name"/> + <field eval=""""The field Relate'd user in the Employee form allows to link the OpenERP user (and his rights and role) to the employee."""" 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> @@ -62,8 +62,8 @@ <record id="process_transition_contactofemployee0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Contact of employee"""" name="name"/> - <field eval=""""Fill up contact information"""" name="note"/> + <field eval=""""Link the employee to information"""" name="name"/> + <field eval=""""In the Employee form, there are different kind of information like Contact information."""" name="note"/> <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> |