diff --git a/product/ERP5/PropertySheet/Person.py b/product/ERP5/PropertySheet/Person.py index ff6117d98bb0949bd100da41f8f216af137fc453..a33c7e2616171d2a587aba062e792e55a8163c5c 100755 --- a/product/ERP5/PropertySheet/Person.py +++ b/product/ERP5/PropertySheet/Person.py @@ -138,13 +138,14 @@ class Person: , 'acquisition_depends' : None , 'mode' : 'w' }, - { 'id' : 'career' + # Using an empty id generate automaticality getSubordination() and setSubordination() + # methods on Person. These methods allow us to save subordination on the default career. + { 'id' : '' , 'storage_id' : 'default_career' - , 'description' : 'The current career step of a person.' + , 'description' : 'The default career hold some important properties of a Person.' , 'type' : 'content' , 'portal_type' : ( 'Career', ) - , 'acquired_property_id': ( 'title', 'description' - , 'start_date', 'stop_date' + , 'acquired_property_id': ( 'start_date', 'stop_date' , 'subordination', 'subordination_title', 'subordination_value' , 'subordination_uid_list' , 'collective_agreement_title', 'salary_coefficient' @@ -152,6 +153,17 @@ class Person: , 'salary_level', 'salary_level_title' , 'grade', 'grade_title' , 'role', 'role_title' + ) + , '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' ) , 'mode' : 'w'