Changeset 17523

Timestamp:

28 Jul 2023, 06:02:20 (16 months ago)

Author:

Henrik Bettermann

Message:

Fix fee calculation.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• interswitch/browser.py (modified) (2 diffs)
• students/schoolfees_12.csv (modified) (1 diff)
• students/schoolfees_13.csv (modified) (1 diff)
• students/schoolfees_14.csv (modified) (1 diff)
• students/schoolfees_15.csv (modified) (1 diff)
• students/schoolfees_20.csv (modified) (1 diff)
• students/schoolfees_21.csv (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

@@ -336 +336 @@
                 else:
                     sorted_items = SCHOOLFEES[22][student.certcode].items()
-                sorted_items.insert(0, sorted_items.pop(4))
+                # Move tuition
+                sorted_items.insert(0, sorted_items.pop(3))
                 for item in sorted_items:
                     try:
@@ -357 +358 @@
                             elif student.current_mode in (
                                 'ug_pt', 'de_pt','dp_pt', 'de_dsh', 'ug_dsh'):
-                                BANK_ACCOUNTS['parttime']
+                                bank = BANK_ACCOUNTS['parttime']
                             elif student.faccode in ('FAG', 'FAT', 'FBM', 'FMLS', 'fac1'):
                                 bank = BANK_ACCOUNTS['fac1']

main/waeup.aaue/trunk/src/waeup/aaue/students/schoolfees_12.csv

@@ -94 +94 @@
 BSCPSY,FSS,PSY,28500,16000,1000,4500,3000,3000,
 BSCSOC,FSS,SOC,28500,16000,1000,4500,3000,3000,
-BAGRPT,AGR,AEC,82000,16000,,4500,3000,3000,1000
-BAGRPTP,AGR,AEC,82000,16000,,4500,3000,3000,1000
-BAENGPT,ART,ENG,82000,16000,,4500,3000,3000,1000
-BAENGPTP,ART,ENG,82000,16000,,4500,3000,3000,1000
-BEDMATPT,EDU,CAI,82000,16000,,4500,3000,3000,1000
-BEDMATPTP,EDU,CAI,82000,16000,,4500,3000,3000,1000
-BEDECOPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDECOPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDEDMPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDEDMPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDGRPPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDGRPPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDPSEPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDPSEPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDACCPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDACCPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDAGRPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDAGRPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDENGPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDENGPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDHECPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDHECPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDSECPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDSECPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDTEEPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDTEEPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
+BAGRPT,FAG,EES,82000,16000,,4500,3000,3000,1000
+BAGRPTP,FAG,EES,82000,16000,,4500,3000,3000,1000
+BAENGPT,FAT,ENG,82000,16000,,4500,3000,3000,1000
+BAENGPTP,FAT,ENG,82000,16000,,4500,3000,3000,1000
+BEDMATPT,FED,CAI,82000,16000,,4500,3000,3000,1000
+BEDMATPTP,FED,CAI,82000,16000,,4500,3000,3000,1000
+BEDECOPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDECOPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDEDMPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDEDMPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDGRPPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDGRPPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDPSEPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDPSEPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDACCPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDACCPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDAGRPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDAGRPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDENGPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDENGPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDHECPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDHECPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDSECPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDSECPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDTEEPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDTEEPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
 BAENGSH,FAT,ENG,82000,16000,,4500,3000,3000,1000
 BEDACCSH,FED,BED,82000,16000,,4500,3000,3000,1000

main/waeup.aaue/trunk/src/waeup/aaue/students/schoolfees_13.csv

@@ -94 +94 @@
 BSCPSY,FSS,PSY,28000,16000,1000,4500,3000,3000,
 BSCSOC,FSS,SOC,28000,16000,1000,4500,3000,3000,
-BAGRPT,AGR,AEC,82000,16000,,4500,3000,3000,1000
-BAGRPTP,AGR,AEC,82000,16000,,4500,3000,3000,1000
-BAENGPT,ART,ENG,82000,16000,,4500,3000,3000,1000
-BAENGPTP,ART,ENG,82000,16000,,4500,3000,3000,1000
-BEDMATPT,EDU,CAI,82000,16000,,4500,3000,3000,1000
-BEDMATPTP,EDU,CAI,82000,16000,,4500,3000,3000,1000
-BEDECOPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDECOPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDEDMPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDEDMPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDGRPPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDGRPPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDPSEPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDPSEPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDACCPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDACCPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDAGRPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDAGRPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDENGPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDENGPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDHECPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDHECPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDSECPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDSECPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDTEEPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDTEEPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
+BAGRPT,FAG,EES,82000,16000,,4500,3000,3000,1000
+BAGRPTP,FAG,EES,82000,16000,,4500,3000,3000,1000
+BAENGPT,FAT,ENG,82000,16000,,4500,3000,3000,1000
+BAENGPTP,FAT,ENG,82000,16000,,4500,3000,3000,1000
+BEDMATPT,FED,CAI,82000,16000,,4500,3000,3000,1000
+BEDMATPTP,FED,CAI,82000,16000,,4500,3000,3000,1000
+BEDECOPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDECOPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDEDMPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDEDMPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDGRPPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDGRPPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDPSEPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDPSEPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDACCPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDACCPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDAGRPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDAGRPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDENGPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDENGPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDHECPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDHECPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDSECPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDSECPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDTEEPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDTEEPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
 BAENGSH,FAT,ENG,82000,16000,,4500,3000,3000,1000
 BEDACCSH,FED,BED,82000,16000,,4500,3000,3000,1000

main/waeup.aaue/trunk/src/waeup/aaue/students/schoolfees_14.csv

@@ -94 +94 @@
 BSCPSY,FSS,PSY,29500,16000,1000,4500,3000,3000,
 BSCSOC,FSS,SOC,29500,16000,1000,4500,3000,3000,
-BAGRPT,AGR,AEC,82000,16000,,4500,3000,3000,1000
-BAGRPTP,AGR,AEC,82000,16000,,4500,3000,3000,1000
-BAENGPT,ART,ENG,82000,16000,,4500,3000,3000,1000
-BAENGPTP,ART,ENG,82000,16000,,4500,3000,3000,1000
-BEDMATPT,EDU,CAI,82000,16000,,4500,3000,3000,1000
-BEDMATPTP,EDU,CAI,82000,16000,,4500,3000,3000,1000
-BEDECOPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDECOPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDEDMPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDEDMPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDGRPPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDGRPPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDPSEPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDPSEPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDACCPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDACCPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDAGRPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDAGRPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDENGPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDENGPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDHECPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDHECPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDSECPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDSECPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDTEEPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDTEEPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
+BAGRPT,FAG,EES,82000,16000,,4500,3000,3000,1000
+BAGRPTP,FAG,EES,82000,16000,,4500,3000,3000,1000
+BAENGPT,FAT,ENG,82000,16000,,4500,3000,3000,1000
+BAENGPTP,FAT,ENG,82000,16000,,4500,3000,3000,1000
+BEDMATPT,FED,CAI,82000,16000,,4500,3000,3000,1000
+BEDMATPTP,FED,CAI,82000,16000,,4500,3000,3000,1000
+BEDECOPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDECOPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDEDMPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDEDMPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDGRPPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDGRPPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDPSEPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDPSEPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDACCPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDACCPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDAGRPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDAGRPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDENGPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDENGPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDHECPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDHECPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDSECPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDSECPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDTEEPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDTEEPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
 BAENGSH,FAT,ENG,82000,16000,,4500,3000,3000,1000
 BEDACCSH,FED,BED,82000,16000,,4500,3000,3000,1000

main/waeup.aaue/trunk/src/waeup/aaue/students/schoolfees_15.csv

@@ -94 +94 @@
 BSCPSY,FSS,PSY,91950,16000,1000,4500,3000,3000,
 BSCSOC,FSS,SOC,91950,16000,1000,4500,3000,3000,
-BAGRPT,AGR,AEC,82000,16000,,4500,3000,3000,1000
-BAGRPTP,AGR,AEC,82000,16000,,4500,3000,3000,1000
-BAENGPT,ART,ENG,82000,16000,,4500,3000,3000,1000
-BAENGPTP,ART,ENG,82000,16000,,4500,3000,3000,1000
-BEDMATPT,EDU,CAI,82000,16000,,4500,3000,3000,1000
-BEDMATPTP,EDU,CAI,82000,16000,,4500,3000,3000,1000
-BEDECOPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDECOPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDEDMPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDEDMPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDGRPPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDGRPPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDPSEPT,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDPSEPTP,EDU,ELF,82000,16000,,4500,3000,3000,1000
-BEDACCPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDACCPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDAGRPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDAGRPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDENGPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDENGPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDHECPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDHECPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDSECPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDSECPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDTEEPT,EDU,VAT,82000,16000,,4500,3000,3000,1000
-BEDTEEPTP,EDU,VAT,82000,16000,,4500,3000,3000,1000
+BAGRPT,FAG,EES,82000,16000,,4500,3000,3000,1000
+BAGRPTP,FAG,EES,82000,16000,,4500,3000,3000,1000
+BAENGPT,FAT,ENG,82000,16000,,4500,3000,3000,1000
+BAENGPTP,FAT,ENG,82000,16000,,4500,3000,3000,1000
+BEDMATPT,FED,CAI,82000,16000,,4500,3000,3000,1000
+BEDMATPTP,FED,CAI,82000,16000,,4500,3000,3000,1000
+BEDECOPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDECOPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDEDMPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDEDMPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDGRPPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDGRPPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDPSEPT,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDPSEPTP,FED,EFM,82000,16000,,4500,3000,3000,1000
+BEDACCPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDACCPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDAGRPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDAGRPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDENGPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDENGPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDHECPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDHECPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDSECPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDSECPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDTEEPT,FED,VTE,82000,16000,,4500,3000,3000,1000
+BEDTEEPTP,FED,VTE,82000,16000,,4500,3000,3000,1000
 BAENGSH,FAT,ENG,82000,16000,,4500,3000,3000,1000
 BEDACCSH,FED,BED,82000,16000,,4500,3000,3000,1000

main/waeup.aaue/trunk/src/waeup/aaue/students/schoolfees_20.csv

@@ -94 +94 @@
 BSCPSY,FSS,PSY,95950,16000,1000,4500,3000,3000,,
 BSCSOC,FSS,SOC,95950,16000,1000,4500,3000,3000,,
-BAGRPT,AGR,AEC,86000,16000,,4500,3000,3000,20000,1000
-BAGRPTP,AGR,AEC,86000,16000,,4500,3000,3000,20000,1000
-BAENGPT,ART,ENG,86000,16000,,4500,3000,3000,20000,1000
-BAENGPTP,ART,ENG,86000,16000,,4500,3000,3000,20000,1000
-BEDMATPT,EDU,CAI,86000,16000,,4500,3000,3000,20000,1000
-BEDMATPTP,EDU,CAI,86000,16000,,4500,3000,3000,20000,1000
-BEDECOPT,EDU,ELF,86000,16000,,4500,3000,3000,20000,1000
-BEDECOPTP,EDU,ELF,86000,16000,,4500,3000,3000,20000,1000
-BEDEDMPT,EDU,ELF,86000,16000,,4500,3000,3000,20000,1000
-BEDEDMPTP,EDU,ELF,86000,16000,,4500,3000,3000,20000,1000
-BEDGRPPT,EDU,ELF,86000,16000,,4500,3000,3000,20000,1000
-BEDGRPPTP,EDU,ELF,86000,16000,,4500,3000,3000,20000,1000
-BEDPSEPT,EDU,ELF,86000,16000,,4500,3000,3000,20000,1000
-BEDPSEPTP,EDU,ELF,86000,16000,,4500,3000,3000,20000,1000
-BEDACCPT,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDACCPTP,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDAGRPT,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDAGRPTP,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDENGPT,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDENGPTP,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDHECPT,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDHECPTP,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDSECPT,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDSECPTP,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDTEEPT,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
-BEDTEEPTP,EDU,VAT,86000,16000,,4500,3000,3000,20000,1000
+BAGRPT,FAG,EES,86000,16000,,4500,3000,3000,20000,1000
+BAGRPTP,FAG,EES,86000,16000,,4500,3000,3000,20000,1000
+BAENGPT,FAT,ENG,86000,16000,,4500,3000,3000,20000,1000
+BAENGPTP,FAT,ENG,86000,16000,,4500,3000,3000,20000,1000
+BEDMATPT,FED,CAI,86000,16000,,4500,3000,3000,20000,1000
+BEDMATPTP,FED,CAI,86000,16000,,4500,3000,3000,20000,1000
+BEDECOPT,FED,EFM,86000,16000,,4500,3000,3000,20000,1000
+BEDECOPTP,FED,EFM,86000,16000,,4500,3000,3000,20000,1000
+BEDEDMPT,FED,EFM,86000,16000,,4500,3000,3000,20000,1000
+BEDEDMPTP,FED,EFM,86000,16000,,4500,3000,3000,20000,1000
+BEDGRPPT,FED,EFM,86000,16000,,4500,3000,3000,20000,1000
+BEDGRPPTP,FED,EFM,86000,16000,,4500,3000,3000,20000,1000
+BEDPSEPT,FED,EFM,86000,16000,,4500,3000,3000,20000,1000
+BEDPSEPTP,FED,EFM,86000,16000,,4500,3000,3000,20000,1000
+BEDACCPT,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDACCPTP,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDAGRPT,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDAGRPTP,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDENGPT,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDENGPTP,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDHECPT,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDHECPTP,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDSECPT,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDSECPTP,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDTEEPT,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
+BEDTEEPTP,FED,VTE,86000,16000,,4500,3000,3000,20000,1000
 BAENGSH,FAT,ENG,86000,16000,,4500,3000,3000,20000,1000
 BEDACCSH,FED,BED,86000,16000,,4500,3000,3000,20000,1000

main/waeup.aaue/trunk/src/waeup/aaue/students/schoolfees_21.csv

@@ -94 +94 @@
 BSCPSY,FSS,PSY,125750,16000,1000,4500,3000,3000,100_20000,
 BSCSOC,FSS,SOC,125750,16000,1000,4500,3000,3000,100_20000,
-BAGRPT,AGR,AEC,115000,16000,,4500,3000,3000,100_20000,1000
-BAGRPTP,AGR,AEC,115000,16000,,4500,3000,3000,100_20000,1000
-BAENGPT,ART,ENG,115000,16000,,4500,3000,3000,100_20000,1000
-BAENGPTP,ART,ENG,115000,16000,,4500,3000,3000,100_20000,1000
-BEDMATPT,EDU,CAI,115000,16000,,4500,3000,3000,100_20000,1000
-BEDMATPTP,EDU,CAI,115000,16000,,4500,3000,3000,100_20000,1000
-BEDECOPT,EDU,ELF,115000,16000,,4500,3000,3000,100_20000,1000
-BEDECOPTP,EDU,ELF,115000,16000,,4500,3000,3000,100_20000,1000
-BEDEDMPT,EDU,ELF,115000,16000,,4500,3000,3000,100_20000,1000
-BEDEDMPTP,EDU,ELF,115000,16000,,4500,3000,3000,100_20000,1000
-BEDGRPPT,EDU,ELF,115000,16000,,4500,3000,3000,100_20000,1000
-BEDGRPPTP,EDU,ELF,115000,16000,,4500,3000,3000,100_20000,1000
-BEDPSEPT,EDU,ELF,115000,16000,,4500,3000,3000,100_20000,1000
-BEDPSEPTP,EDU,ELF,115000,16000,,4500,3000,3000,100_20000,1000
-BEDACCPT,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDACCPTP,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDAGRPT,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDAGRPTP,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDENGPT,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDENGPTP,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDHECPT,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDHECPTP,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDSECPT,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDSECPTP,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDTEEPT,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
-BEDTEEPTP,EDU,VAT,115000,16000,,4500,3000,3000,100_20000,1000
+BAGRPT,FAG,EES,115000,16000,,4500,3000,3000,100_20000,1000
+BAGRPTP,FAG,EES,115000,16000,,4500,3000,3000,100_20000,1000
+BAENGPT,FAT,ENG,115000,16000,,4500,3000,3000,100_20000,1000
+BAENGPTP,FAT,ENG,115000,16000,,4500,3000,3000,100_20000,1000
+BEDMATPT,FED,CAI,115000,16000,,4500,3000,3000,100_20000,1000
+BEDMATPTP,FED,CAI,115000,16000,,4500,3000,3000,100_20000,1000
+BEDECOPT,FED,EFM,115000,16000,,4500,3000,3000,100_20000,1000
+BEDECOPTP,FED,EFM,115000,16000,,4500,3000,3000,100_20000,1000
+BEDEDMPT,FED,EFM,115000,16000,,4500,3000,3000,100_20000,1000
+BEDEDMPTP,FED,EFM,115000,16000,,4500,3000,3000,100_20000,1000
+BEDGRPPT,FED,EFM,115000,16000,,4500,3000,3000,100_20000,1000
+BEDGRPPTP,FED,EFM,115000,16000,,4500,3000,3000,100_20000,1000
+BEDPSEPT,FED,EFM,115000,16000,,4500,3000,3000,100_20000,1000
+BEDPSEPTP,FED,EFM,115000,16000,,4500,3000,3000,100_20000,1000
+BEDACCPT,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDACCPTP,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDAGRPT,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDAGRPTP,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDENGPT,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDENGPTP,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDHECPT,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDHECPTP,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDSECPT,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDSECPTP,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDTEEPT,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
+BEDTEEPTP,FED,VTE,115000,16000,,4500,3000,3000,100_20000,1000
 BAENGSH,FAT,ENG,115000,16000,,4500,3000,3000,100_20000,1000
 BEDACCSH,FED,BED,115000,16000,,4500,3000,3000,100_20000,1000