Index: /main/waeup.uniben/trunk/src/waeup/uniben/browser/pdf.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/browser/pdf.py	(revision 18102)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/browser/pdf.py	(revision 18103)
@@ -23,4 +23,5 @@
 import grok
 from waeup.kofa.browser.pdf import PDFCreator, LandscapePDFCreator
+from waeup.kofa.utils.helpers import get_user_account
 
 class CustomPDFCreator(PDFCreator):
@@ -36,11 +37,15 @@
     @property
     def watermark_path(self):
+        self.watermark_pos = [-25, 100]
         if self.view and self.view.__name__ == 'transcript.pdf':
-            if self.view.request.principal.id not in ('xyz',):
-                self.watermark_pos = [95, 190]
-                return os.path.join(
-                    os.path.dirname(__file__), 'static', 'pdf_stud_only.jpg')
-            #usertype = getattr(self.view.request.principal, 'user_type', None)
-            #if usertype and usertype == 'student':
+            account = get_user_account(self.view.request)
+            if account:
+                site_roles = get_user_account(self.view.request).roles
+                if 'waeup.TranscriptOfficer' in site_roles:
+                    return os.path.join(
+                        os.path.dirname(__file__), 'static', 'pdf_watermark.jpg')
+            self.watermark_pos = [95, 190]
+            return os.path.join(
+                os.path.dirname(__file__), 'static', 'pdf_stud_only.jpg')
         return os.path.join(
             os.path.dirname(__file__), 'static', 'pdf_watermark.jpg')
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 18102)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 18103)
@@ -1103,7 +1103,27 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
-        path = os.path.join(samples_dir(), 'transcript.pdf')
+        path = os.path.join(samples_dir(), 'transcript_student.pdf')
         open(path, 'wb').write(self.browser.contents)
         print "Sample PDF transcript.pdf written to %s" % path
+        self.browser.open(transcript_path)
+        self.browser.getLink("Logout").click()
+        # Create officer
+        self.app['users'].addUser('mrtranscript', SECRET)
+        self.app['users']['mrtranscript'].email = 'mrtranscript@foo.ng'
+        self.app['users']['mrtranscript'].title = 'Ruth Gordon'
+        prmglobal = IPrincipalRoleManager(self.app)
+        prmglobal.assignRoleToPrincipal('waeup.TranscriptOfficer', 'mrtranscript')
+        # Login
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = 'mrtranscript'
+        self.browser.getControl(name="form.password").value = SECRET
+        self.browser.getControl("Login").click()
+        self.browser.open(self.student_path + '/studycourse/transcript.pdf')
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
+        path = os.path.join(samples_dir(), 'transcript_officer.pdf')
+        open(path, 'wb').write(self.browser.contents)
+        print "Sample PDF transcript.pdf written to %s" % path
+
 
     def test_student_accommodation(self):
