[Erp5-report] r8329 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_p...

[nobody at svn.erp5.org]

Author: kevin
Date: Thu Jul  6 14:28:18 2006
New Revision: 8329

URL: http://svn.erp5.org?rev=8329&view=rev
Log:
Fix Organisation_getEmployeeList to handle non-defined grade on employees.

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

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=8329&r1=8328&r2=8329&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 Jul  6 14:28:18 2006
@@ -84,14 +84,27 @@
   start_date   = DateTime(current_year, 1, 1)\n
   stop_date    = DateTime(current_year + 1, 1, 1) - 1\n
 \n
+# Get persons\n
+person_list = []\n
+for subordinate in subordinate_list:\n
+  sub_obj  = subordinate \n
+  sub_type = subordinate.getPortalType()\n
+  # The parent of Assignments and Careers objects are Persons\n
+  if sub_type in (\'Assignment\', \'Career\'):\n
+    sub_obj  = subordinate.getParent()\n
+    sub_type = sub_obj.getPortalType()\n
+  # Last check to be sure we only include persons in person_list\n
+  if sub_type == \'Person\':\n
+    person_list.append(sub_obj)\n
+\n
+# Filter person list to only get employees\n
 employees = []\n
-\n
-for person in subordinate_list:\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
+for person in person_list:\n
+  if person.getValidationState()        == \'validated\' and \\\n
+     person.getDefaultCareerStopDate()  >= stop_date   and \\\n
+     person.getDefaultCareerStartDate() <= start_date  and \\\n
+     person.getRole().endswith(\'internal\')             and \\\n
+     person.getDefaultCareerGrade() not in (None, \'\')  and \\\n
      not person.getDefaultCareerGrade().endswith(\'trainee\'):\n
     # TODO: take car of discontinued career step period\n
     if person not in employees:\n
@@ -149,8 +162,12 @@
                             <string>None</string>
                             <string>DateTime</string>
                             <string>current_year</string>
+                            <string>person_list</string>
+                            <string>_getiter_</string>
+                            <string>subordinate</string>
+                            <string>sub_obj</string>
+                            <string>sub_type</string>
                             <string>employees</string>
-                            <string>_getiter_</string>
                             <string>person</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=8329&r1=8328&r2=8329&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Thu Jul  6 14:28:18 2006
@@ -1,3 +1,6 @@
+2006-07-06 Kevin
+* Fix Organisation_getEmployeeList to handle non-defined grade on employees.
+
 2006-06-29 jerome
 * fix matrix box in PaySheetLine_viewQuantity