Better Role and Grade test condition

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7737 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml

@@ -89,10 +89,10 @@ employees = []\n
 for person in subordinate_list:\n
   if person.getPortalType()             == \'Person\'     and \\\n
      person.getValidationState()        == \'validated\'  and \\\n
-     person.getRole()                   == \'internal\'  and \\\n
-     person.getDefaultCareerGrade()     != \'trainee\'   and \\\n
      person.getDefaultCareerStopDate()  >= stop_date    and \\\n
-     person.getDefaultCareerStartDate() <= start_date:\n
+     person.getDefaultCareerStartDate() <= start_date   and \\\n
+     person.getRole().endswith(\'internal\')              and \\\n
+     not person.getDefaultCareerGrade().endswith(\'trainee\'):\n
     # TODO: take car of discontinued career step period\n
     if person not in employees:\n
       employees.append(person)\n