[Erp5-report] r7737 - /erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/

[nobody at svn.erp5.org]

Author: kevin
Date: Thu Jun 15 16:51:09 2006
New Revision: 7737

URL: http://svn.erp5.org?rev=7737&view=rev
Log:
Better Role and Grade test condition

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml?rev=7737&r1=7736&r2=7737&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Organisation_getEmployeeList.xml Thu Jun 15 16:51:09 2006
@@ -87,12 +87,12 @@
 employees = []\n
 \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
+  if person.getPortalType()             == \'Person\'     and \\\n
+     person.getValidationState()        == \'validated\'  and \\\n
+     person.getDefaultCareerStopDate()  >= stop_date    and \\\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