Commit b60dd7d3 authored by Jérome Perrin's avatar Jérome Perrin

Merge career properties


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5074 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 21dc3020
...@@ -155,26 +155,15 @@ class Person: ...@@ -155,26 +155,15 @@ class Person:
, 'description' : 'The default career hold some important properties of a Person.' , 'description' : 'The default career hold some important properties of a Person.'
, 'type' : 'content' , 'type' : 'content'
, 'portal_type' : ( 'Career', ) , 'portal_type' : ( 'Career', )
, 'acquired_property_id': ( 'start_date', 'stop_date' , 'acquired_property_id': ( 'start_date', 'stop_date', 'title', 'description'
, 'subordination', 'subordination_title', 'subordination_value' , 'subordination', 'subordination_title', 'subordination_value'
, 'subordination_uid_list' , 'subordination_uid_list', 'subordination_uid'
, 'collective_agreement_title', 'salary_coefficient' , 'collective_agreement_title', 'salary_coefficient'
, 'skill_list', 'skill_id_list', 'skill_title_list', 'skill_value_list' , 'skill_list', 'skill_id_list', 'skill_title_list', 'skill_value_list'
, 'salary_level', 'salary_level_id', 'salary_level_title', 'salary_level_value' , 'salary_level', 'salary_level_id', 'salary_level_title', 'salary_level_value'
, 'grade', 'grade_id', 'grade_title', 'grade_value' , 'grade', 'grade_id', 'grade_title', 'grade_value'
, 'role', 'role_id', 'role_title', 'role_value' , 'role', 'role_id', 'role_title', 'role_value'
) , 'function', 'function_id', 'function_title', 'function_value'
, 'mode' : 'w'
},
# The properties in here are hold on the default career,
# but are not those that are blended with Person (contrary those above).
{ 'id' : 'career'
, 'storage_id' : 'default_career'
, 'description' : 'Properties of the default career.'
, 'type' : 'content'
, 'portal_type' : ( 'Career', )
, 'acquired_property_id': ( 'title', 'description'
, 'function', 'function_title', 'function_value'
) )
, 'mode' : 'w' , 'mode' : 'w'
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment