diff --git a/product/ERP5/Document/Career.py b/product/ERP5/Document/Career.py index 279ad3a057f2fcd91472f1fb6639b3f518e852a8..0d711eea21bf3a2c3b11c934dbaa4aa8d30c0f9e 100644 --- a/product/ERP5/Document/Career.py +++ b/product/ERP5/Document/Career.py @@ -57,5 +57,6 @@ class Career(Path): , PropertySheet.Task , PropertySheet.Arrow , PropertySheet.Path + , PropertySheet.Reference , PropertySheet.Assignment ) diff --git a/product/ERP5/PropertySheet/Person.py b/product/ERP5/PropertySheet/Person.py index 960045aee5ae043cc2741e0a55e88a3a9ba6ad5b..2ea3506b02b13dfbbb76022b86e65ae29058bf42 100644 --- a/product/ERP5/PropertySheet/Person.py +++ b/product/ERP5/PropertySheet/Person.py @@ -191,7 +191,8 @@ class Person: , 'description' : 'The default career hold some properties of a Person.' , 'type' : 'content' , 'portal_type' : ( 'Career', ) - , 'acquired_property_id': ( 'start_date', 'stop_date', 'title', 'description' + , 'acquired_property_id': ( 'start_date', 'stop_date', 'title', + 'description', 'reference' , 'subordination', 'subordination_title', 'subordination_value' , 'subordination_uid_list', 'subordination_uid' , 'collective_agreement_title', 'salary_coefficient' diff --git a/product/ERP5/tests/testERP5Base.py b/product/ERP5/tests/testERP5Base.py index 496879bbb79f31a2edd05ae671531bfa6eb85013..44a75f7708aad2a506834102fd38d957e48e8682 100644 --- a/product/ERP5/tests/testERP5Base.py +++ b/product/ERP5/tests/testERP5Base.py @@ -508,11 +508,13 @@ class TestERP5Base(ERP5TypeTestCase): person.setCareerSalaryCoefficient(1) person.setCareerCollectiveAgreementTitle('SYNTEC convention') person.setCareerActivity('software') + person.setCareerReference('1234') self.assertEquals(person.getCareerStopDate() , dummy_date2) self.assertEquals(person.getCareerStartDate() , dummy_date1) self.assertEquals(person.getCareerSalaryCoefficient() , 1) self.assertEquals(person.getCareerCollectiveAgreementTitle(), 'SYNTEC convention') self.assertEquals(person.getCareerActivityTitle(), 'Software') + self.assertEquals(person.getCareerReference(), '1234') # Set & Check function function_categories = self.getCategoryList(base_category='function') @@ -605,6 +607,7 @@ class TestERP5Base(ERP5TypeTestCase): # Test getter with 'Career' prefix self.assertEquals(person.getCareer() , default_career.getRelativeUrl()) self.assertEquals(person.getCareerTitle() , default_career.getTitle()) + self.assertEquals(person.getCareerReference(), default_career.getReference()) self.assertEquals(person.getCareerValue() , default_career) self.assertEquals(person.getCareerDescription(), default_career.getDescription())