Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py	(revision 17492)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py	(revision 17493)
@@ -145,4 +145,5 @@
         #        amount = 2000.0 * no_additional_courses
         elif category.startswith('schoolfee'):
+            increment_2022 = 0
             if category == 'schoolfee_pde1':
                 if not student.current_mode.startswith('pd'):
@@ -266,7 +267,4 @@
                         amount = 13975
                     increment_2022 = 20125
-                
-                if student.entry_session > 2021:
-                    amount += increment_2022
             else:
                 # NCE I fresh sw
@@ -332,4 +330,6 @@
                 if academic_session == None:
                     return _(u'Session configuration object is not available.'), None
+            if p_session > 2021:
+                    amount += increment_2022
         else:
             fee_name = category + '_fee'
