Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 15873)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 15918)
@@ -3760,5 +3760,5 @@
             'zope.mgr - students.browser.DatacenterExportJobContainerJobConfig '
             '- exported: bursary (2004, 100, ug_ft, None, None, None, '
-            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -3843,7 +3843,8 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
+            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            %(curr_year-6) in self.browser.contents)
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)
         job_id = self.app['datacenter'].running_exports[0][0]
@@ -3859,5 +3860,5 @@
             'zope.mgr - students.browser.FacultiesExportJobContainerJobConfig '
             '- exported: bursary (2004, 100, ug_ft, None, None, None, '
-            '13/12/2012, 14/12/2012, all, all, schoolfee, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, schoolfee, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -3889,7 +3890,8 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
+            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            %(curr_year-6) in self.browser.contents)
 
     def test_faculty_export(self):
@@ -3941,5 +3943,5 @@
             'zope.mgr - students.browser.FacultyExportJobContainerJobConfig '
             '- exported: students (2004, 100, ug_ft, fac1, None, None, '
-            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -4000,5 +4002,5 @@
             'zope.mgr - students.browser.DepartmentExportJobContainerJobConfig '
             '- exported: students (2004, 100, ug_ft, None, dep1, None, '
-            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -4047,5 +4049,6 @@
             'zope.mgr - students.browser.CertificateExportJobContainerJobConfig '
             '- exported: students '
-            '(2004, 100, None, None, None, CERT1, , , None, None, None, None), '
+            '(2004, 100, None, None, None, CERT1, , , None, None, '
+            'None, None, None), '
             'job_id=%s'
             % job_id in logcontent
@@ -4246,7 +4249,8 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
+            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            %(curr_year-6) in self.browser.contents)
         # ... and discarded
         self.browser.open('http://localhost/app/faculties/exports')
@@ -4272,7 +4276,8 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
+            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            %(curr_year-6) in self.browser.contents)
 
     def test_export_accommodation_officers(self):
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py	(revision 15873)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py	(revision 15918)
@@ -1365,5 +1365,13 @@
         super(SessionPaymentsOverviewExporterTest, self).setUp()
         self.setup_for_export()
+        paycats = ('schoolfee', 'clearance', 'gown', 'transcript')
+        paycatyears = ''
         grok.getSite()['configuration'].current_academic_session = curr_year - 4
+        year_range = range(curr_year-6, curr_year-3)
+        year_range_tuple = tuple([str(year)[2:] for year in year_range])
+        for cat in paycats:
+            for year in year_range_tuple:
+                paycatyears += '%s,'%(cat+str(year))
+        self.paycatyears = paycatyears.strip(',')
         return
 
@@ -1389,10 +1397,8 @@
             'student_id,matric_number,display_fullname,state,certcode,'
             'faccode,depcode,is_postgrad,current_level,current_session,'
-            'current_mode,entry_session,reg_number,schoolfee13,'
-            'schoolfee14,schoolfee15,clearance13,clearance14,clearance15,'
-            'gown13,gown14,gown15,transcript13,transcript14,transcript15\r\n'
+            'current_mode,entry_session,reg_number,%s\r\n'
             'A111111,234,Anna M. Tester,created,CERT1,NA,NA,0,200,'
             '2012,ug_ft,2010,123,'
-            '12.12,,,,,,,,,,,\r\n' in result
+            '12.12,,,,,,,,,,,\r\n' %self.paycatyears in result
             )
         return
@@ -1431,13 +1437,9 @@
             'student_id,matric_number,display_fullname,state,certcode,faccode,'
             'depcode,is_postgrad,current_level,current_session,'
-            'current_mode,entry_session,reg_number,'
-            'schoolfee13,schoolfee14,schoolfee15,'
-            'clearance13,clearance14,clearance15,'
-            'gown13,gown14,gown15,'
-            'transcript13,transcript14,transcript15\r\n'
+            'current_mode,entry_session,reg_number,%s\r\n'
             'A111111,234,Anna M. Tester,created,CERT1,NA,NA,0,200,2012,ug_ft,'
             '2010,123,'
             '12.12,14.14,1.01,,,,,,,,,\r\n'
-            in result
+            %self.paycatyears in result
             )
         return
