diff --git a/product/ERP5/PropertySheet/Person.py b/product/ERP5/PropertySheet/Person.py index 2ea3506b02b13dfbbb76022b86e65ae29058bf42..81d12a76b74ee2c4ea98521f225ebac04719541e 100644 --- a/product/ERP5/PropertySheet/Person.py +++ b/product/ERP5/PropertySheet/Person.py @@ -196,7 +196,9 @@ class Person: , 'subordination', 'subordination_title', 'subordination_value' , 'subordination_uid_list', 'subordination_uid' , 'collective_agreement_title', 'salary_coefficient' - , 'skill', 'skill_list', 'skill_id_list', 'skill_title_list', 'skill_value_list' + , 'skill', 'skill_list', 'skill_id_list' + , 'skill_title_list', 'skill_value_list' + , 'skill_title', 'skill_value' , 'salary_level', 'salary_level_id', 'salary_level_title', 'salary_level_value' , 'grade', 'grade_id', 'grade_title', 'grade_value' , 'activity', 'activity_id', 'activity_title', 'activity_value' diff --git a/product/ERP5/tests/testERP5Base.py b/product/ERP5/tests/testERP5Base.py index 6b9d3515c5039ba1788eb9cd55cd5c31ece2aa50..5e86c5d5ad4ec9181ab7d2b979f72c75688ea560 100644 --- a/product/ERP5/tests/testERP5Base.py +++ b/product/ERP5/tests/testERP5Base.py @@ -587,10 +587,13 @@ class TestERP5Base(ERP5TypeTestCase): self.assertEquals(person.getCareerSkillList() , skill_path_list) self.assertEquals(person.getCareerSkillTitleList(), skill_title_list) self.assertEquals(person.getCareerSkillValueList(), skill_object_list) + self.assertEquals(person.getCareerSkillTitle(), skill_title_list[0]) + self.assertEquals(person.getCareerSkillValue(), skill_object_list[0]) # skill must be acquired on person person.reindexObject(); get_transaction().commit(); self.tic() for skill_object in skill_object_list: self.failUnless(person in skill_object.getSkillRelatedValueList()) + self.assertEquals(person.getSkillValue(), skill_object_list[0]) def stepCheckPersonCareer(self, sequence=None, sequence_list=None, **kw): """