diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml
index fe255e3..93eaf2f 100644
--- a/src-modules/module/rpta/conf/rpta.xml
+++ b/src-modules/module/rpta/conf/rpta.xml
@@ -498,6 +498,8 @@ scriptfile="" database=""/>
+
+
@@ -540,6 +542,8 @@ scriptfile="" database=""/>
+
+
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_fuellen.sql
new file mode 100644
index 0000000..24de31b
--- /dev/null
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_fuellen.sql
@@ -0,0 +1,153 @@
+--freemarker template
+<#include "RPTA-Makros"/>
+
+
+select count(*) from rpta_resultset where uniquename='sos_stud_astat';
+
+
+<#assign rpta_column_layout = {"uniquename":"sos_stud_astat_stip",
+"caption":"Stipendiaten",
+"rpta_resultset":"sos_stud_astat",
+"whereclause":"",
+"description":"Stipendiaten"
+}
+ />
+
+<#assign rpta_columns = [
+{"uniquename":"matrikel_nr",
+"caption":"Matrikel-Nr.",
+"srcfieldname":"matrikel_nr",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":"ggf. pseudonymisiert, bei Datenquelle HIS1 ist dies die student.id"
+},
+{"uniquename":"vorname",
+"caption":"Vorname",
+"srcfieldname":"",
+"targetfieldname":"vorname",
+"column_type":"lookupColumn",
+"col_function":"select A.firstname from sos_stud_address A where A.matrikel_nr=tmp_sos_stud_astat.matrikel_nr and A.firstname is not null",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"nachname",
+"caption":"Nachname",
+"srcfieldname":"",
+"targetfieldname":"nachname",
+"column_type":"lookupColumn",
+"col_function":"select A.surname from sos_stud_address A where A.matrikel_nr=tmp_sos_stud_astat.matrikel_nr and A.surname is not null",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"kz_rueck_beur_ein",
+"caption":"Rückmeldestatus",
+"srcfieldname":"kz_rueck_beur_ein",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"dim_studiengang_stg",
+"caption":"Fach (Schlüssel)",
+"srcfieldname":"dim_studiengang_stg",
+"column_type":"physicalColumn",
+"col_function":"",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"dim_studiengang_abschluss",
+"caption":"Abschluss (intern) (Schlüssel)",
+"srcfieldname":"dim_studiengang_abschluss",
+"column_type":"physicalColumn",
+"col_function":"",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"adresszusatz",
+"caption":"Adresszusatz",
+"srcfieldname":"",
+"targetfieldname":"adresszusatz",
+"column_type":"logicalColumn",
+"col_function":"null::varchar(255)",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"street",
+"caption":"Straße",
+"srcfieldname":"",
+"targetfieldname":"street",
+"column_type":"lookupColumn",
+"col_function":"select A.street from sos_stud_address A where A.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"postcode",
+"caption":"PLZ",
+"srcfieldname":"",
+"targetfieldname":"postcode",
+"column_type":"lookupColumn",
+"col_function":"select A.postcode from sos_stud_address A where A.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"city",
+"caption":"Ort",
+"srcfieldname":"",
+"targetfieldname":"city",
+"column_type":"lookupColumn",
+"col_function":"select A.city from sos_stud_address A where A.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"foerdermonat",
+"caption":"Fördermonat",
+"srcfieldname":"",
+"targetfieldname":"foerdermonat",
+"column_type":"lookupColumn",
+"col_function":"select M.foerdermonat from stip_meldung M where M.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"bafoeg",
+"caption":"Bafög",
+"srcfieldname":"",
+"targetfieldname":"bafoeg",
+"column_type":"lookupColumn",
+"col_function":"select M.bafoeg from stip_meldung M where M.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+}
+]
+ />
+
+<@rpta_column_layout_fuellen />
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_meldung_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_meldung_fuellen.sql
new file mode 100644
index 0000000..e7e537a
--- /dev/null
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_stip_meldung_fuellen.sql
@@ -0,0 +1,216 @@
+--freemarker template
+<#include "RPTA-Makros"/>
+
+
+select count(*) from rpta_resultset where uniquename='sos_stud_astat';
+
+
+<#assign rpta_column_layout = {"uniquename":"sos_stud_astat_stip_meldung",
+"caption":"Stipendiaten (amtlich)",
+"rpta_resultset":"sos_stud_astat",
+"whereclause":"matrikel_nr in (select matrikel_nr from stip_meldung)",
+"sortclause":"",
+"description":"Stipendiaten (amtlich)"
+}
+ />
+
+<#assign rpta_columns = [
+{"uniquename":"hs_nr",
+"caption":"Berichts - ID",
+"srcfieldname":"",
+"targetfieldname":"hs_nr",
+"column_type":"logicalColumn",
+"col_function":"(select hs_nr from hochschulinfo)",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"berichtsland",
+"caption":"Berichtsland",
+"srcfieldname":"",
+"targetfieldname":"berichtsland",
+"column_type":"lookupColumn",
+"col_function":"select apnr from cif where key=659",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"berichtsjahr",
+"caption":"Berichtsjahr",
+"srcfieldname":"",
+"targetfieldname":"sem_rueck_beur_ein",
+"column_type":"logicalColumn",
+"col_function":"(select sem_rueck_beur_ein/10::integer)",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"hochschulart",
+"caption":"Hochschulart",
+"srcfieldname":"hs_nr",
+"targetfieldname":"hochschulart",
+"column_type":"lookupColumn",
+"col_function":"select art from kenn_hochschulen H where H.hs_nr in (select hs_nr from hochschulinfo)",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"swf_sos_k_stort_astat",
+"caption":"Hochschul-Nr.",
+"srcfieldname":"sos_k_stort_astat",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"traeger_hs",
+"caption":"Hochschul-Träger",
+"srcfieldname":"",
+"targetfieldname":"traeger_hs",
+"column_type":"logicalColumn",
+"col_function":"2::integer",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"id_nummer",
+"caption":"ID-Nummer",
+"srcfieldname":"",
+"targetfieldname":"id_nummer",
+"column_type":"logicalColumn",
+"col_function":"1::integer",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"geschlecht",
+"caption":"Geschlecht",
+"srcfieldname":"geschlecht",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"ca12_staat",
+"caption":"Staatsangehörigkeit",
+"srcfieldname":"ca12_staat",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"hssem",
+"caption":"HS-Sem.",
+"srcfieldname":"hssem",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"fach_sem_zahl",
+"caption":"Fach-Sem.",
+"srcfieldname":"fach_sem_zahl",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"dim_studiengang_abschluss",
+"caption":"Abschluss",
+"srcfieldname":"dim_studiengang_abschluss",
+"column_type":"physicalColumn",
+"col_function":"",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"dim_studiengang_stg",
+"caption":"Studienfach",
+"srcfieldname":"dim_studiengang_stg",
+"column_type":"physicalColumn",
+"col_function":"",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"foerdermonat",
+"caption":"Förder-Monate",
+"srcfieldname":"",
+"targetfieldname":"foerdermonat",
+"column_type":"lookupColumn",
+"col_function":"select LPAD(M.foerdermonat::TEXT, 2, ''0'') from stip_meldung M where M.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"bafoeg",
+"caption":"Bafög",
+"srcfieldname":"",
+"targetfieldname":"bafoeg",
+"column_type":"lookupColumn",
+"col_function":"select M.bafoeg from stip_meldung M where M.matrikel_nr=tmp_sos_stud_astat.matrikel_nr",
+"format_code":"",
+"is_visible":"1",
+"is_aggregate":0,
+"visible_size":10,
+"description":""
+},
+{"uniquename":"matrikel_nr",
+"caption":"Matrikelnummer",
+"srcfieldname":"matrikel_nr",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":"ggf. pseudonymisiert, bei Datenquelle HIS1 ist dies die student.id"
+},
+{"uniquename":"nachname",
+"caption":"Name",
+"srcfieldname":"",
+"targetfieldname":"nachname",
+"column_type":"lookupColumn",
+"col_function":"select A.surname from sos_stud_address A where A.matrikel_nr=tmp_sos_stud_astat.matrikel_nr and A.surname is not null",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+},
+{"uniquename":"vorname",
+"caption":"Vorname",
+"srcfieldname":"",
+"targetfieldname":"vorname",
+"column_type":"lookupColumn",
+"col_function":"select A.firstname from sos_stud_address A where A.matrikel_nr=tmp_sos_stud_astat.matrikel_nr and A.firstname is not null",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":""
+}
+]
+ />
+
+<@rpta_column_layout_fuellen />