Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/reports/student_payment_statistics.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/reports/student_payment_statistics.py	(revision 15080)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/reports/student_payment_statistics.py	(revision 15081)
@@ -155,8 +155,5 @@
     new_col_names = []
     for name in col_names:
-        if len(name) > 18:
-            new_col_names.append(name.replace(' ', '\n', 1))
-        else:
-            new_col_names.append(name)
+        new_col_names.append(name.replace(' ', '\n'))
     head = [''] + [col_name for col_name in new_col_names]
     result = [head]
@@ -244,6 +241,10 @@
     def create_pdf(self, job_id):
         creator = getUtility(IPDFCreator, name=self.pdfcreator)
+        maxlength = len(str(self.data[2][-1][-1])) \
+            + len(str(self.data[2][-1][-2])) \
+            + 3
+        maxlength = max(maxlength, 10)
         table_data = tbl_data_to_table(*self.data)
-        col_widths = [None,] + [3.2*cm] * len(self.data[1]) + [None,]
+        col_widths = [None,] + [.17*cm*maxlength] * len(self.data[1]) + [None,]
         pdf_data = [Paragraph('<b>%s - Report %s</b>'
                               % (self.creation_dt_string, job_id),
