Index: /main/waeup.kofa/trunk/docs/source/userdocs/students/workflow.rst
===================================================================
--- /main/waeup.kofa/trunk/docs/source/userdocs/students/workflow.rst	(revision 15333)
+++ /main/waeup.kofa/trunk/docs/source/userdocs/students/workflow.rst	(revision 15334)
@@ -147,16 +147,17 @@
 Transcript Officer will see the new request and can either reject
 the request **(-o)** or validate the request **(p)**. Before
-validation course results can be edited or added. After validation
-the entire studycourse including its content is locked. Nobody will
-be able to modify the course lists, neither through the UI nor by
-import. Transcripts can now be electronically signed by Transcript
-Signees. Once all signees have done their job, the Transcript
-Officer can release the transcript **(q)**. A pdf file is created
-and stored in the file system. The transcript pdf slip contains all
-signatures. The dynamic transcript generation is disabled. Nothing
-can be changed now, unless the entire transcript process is reset
-**(-r)** by a Students Manager. Then comments and signatures will be
-removed and the pdf file deleted. The student can start afresh.
-
+validation course results can be edited or added by a Students
+Manager, transcript study level remarks also by Transcript Officers.
+After validation the entire studycourse including its content is
+locked. Nobody will be able to modify the course lists, neither
+through the UI nor by import. Transcripts can now be electronically
+signed by Transcript Signees. Once all signees have done their job,
+the Transcript Officer can release the transcript **(q)**. A pdf
+file is created and stored in the file system. The transcript pdf
+slip contains all signatures. The dynamic transcript generation is
+disabled. Nothing can be changed now, unless the entire transcript
+process is reset **(-r)** by a Students Manager. Then comments and
+signatures will be removed and the pdf file deleted. The student can
+start afresh.
 
 .. _registration_workflow_batch_processing:
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 15333)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 15334)
@@ -1709,5 +1709,6 @@
         level_title = translate(self.context.level_title, 'waeup.kofa',
             target_language=lang)
-        return _('Edit transcript remark of level ${a}', mapping = {'a':level_title})
+        return _(
+            'Edit transcript remark of level ${a}', mapping = {'a':level_title})
 
     @property
@@ -1719,7 +1720,6 @@
     def save(self, **data):
         msave(self, **data)
-        self.redirect(
-            self.url(self.context.student, 'studycourse/validate_transcript')
-            +'#tab4')
+        self.redirect(self.url(self.context.student)
+            + '/studycourse/validate_transcript#tab4')
         return
 
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 15333)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 15334)
@@ -2177,7 +2177,19 @@
         self.browser.getControl("Save").click()
         self.assertTrue('Form has been saved' in self.browser.contents)
-        # Officer can validate the transcript
+        # Officer can edit transcript remarks and validate the transcript
         self.browser.open(self.studycourse_path + '/transcript')
         self.browser.getLink("Validate transcript").click()
+        self.browser.getLink("Edit").click()
+        self.assertEqual(
+            self.browser.url, self.studycourse_path + '/100/remark')
+        self.browser.getControl(
+            name="form.transcript_remark").value = 'Oh, the student failed'
+        self.browser.getControl(
+            "Save remark and go and back to transcript validation page").click()
+        self.assertEqual(
+            self.browser.url,
+            self.studycourse_path + '/validate_transcript#tab4')
+        self.assertEqual(self.student['studycourse']['100'].transcript_remark,
+            'Oh, the student failed')
         self.browser.getControl("Save comment and validate transcript").click()
         # After validation all manage forms are locked.
@@ -2189,4 +2201,6 @@
         self.assertTrue('The requested form is locked' in self.browser.contents)
         self.browser.open(self.studycourse_path + '/100/COURSE1/manage')
+        self.assertTrue('The requested form is locked' in self.browser.contents)
+        self.browser.open(self.studycourse_path + '/100/remark')
         self.assertTrue('The requested form is locked' in self.browser.contents)
 
