Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 11731)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 11732)
@@ -3206,18 +3206,31 @@
             self.depcode, self.certcode) == (None, None, None, None, None):
             # Export all students including those without certificate
-            job_id = self.context.start_export_job(exporter,
-                                          self.request.principal.id,
-                                          payments_start = payments_start,
-                                          payments_end = payments_end)
-        else:
-            job_id = self.context.start_export_job(exporter,
-                                          self.request.principal.id,
-                                          current_session=session,
-                                          current_level=level,
-                                          current_mode=mode,
-                                          depcode=self.depcode,
-                                          certcode=self.certcode,
-                                          payments_start = payments_start,
-                                          payments_end = payments_end)
+            if payments_start:
+                job_id = self.context.start_export_job(exporter,
+                                              self.request.principal.id,
+                                              payments_start = payments_start,
+                                              payments_end = payments_end)
+            else:
+                job_id = self.context.start_export_job(exporter,
+                                              self.request.principal.id)
+        else:
+            if payments_start:
+                job_id = self.context.start_export_job(exporter,
+                                              self.request.principal.id,
+                                              current_session=session,
+                                              current_level=level,
+                                              current_mode=mode,
+                                              depcode=self.depcode,
+                                              certcode=self.certcode,
+                                              payments_start = payments_start,
+                                              payments_end = payments_end)
+            else:
+                job_id = self.context.start_export_job(exporter,
+                                              self.request.principal.id,
+                                              current_session=session,
+                                              current_level=level,
+                                              current_mode=mode,
+                                              depcode=self.depcode,
+                                              certcode=self.certcode)
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         self.context.logger.info(
