Merge branch 'feature-27946/infocenter_zusaetzliche_spalte_fuer_kaution'

This commit is contained in:
Andreas Österreicher
2023-05-05 08:53:17 +02:00
8 changed files with 173 additions and 27 deletions
+5 -3
View File
@@ -41,7 +41,8 @@ $filters = array(
{"name": "InfoCenterMitarbeiter"},
{"name": "LockUser"},
{"name": "HoldDate"},
{"name": "Rueckstellgrund"}
{"name": "Rueckstellgrund"},
{"name": "Kaution"}
],
"filters": [
{
@@ -512,13 +513,14 @@ $filters = array(
{
"name": "Abgewiesen - Alle",
"columns": [
{"name": "PersonID"},
{"name": "PersonId"},
{"name": "PreStudentID"},
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "Studiengang"},
{"name": "AbgewiesenAm"},
{"name": "Nachricht"}
{"name": "Nachricht"},
{"name": "Kaution"}
],
"filters": []
}
+40 -1
View File
@@ -4134,6 +4134,26 @@ When on hold, the date is only a reminder.',
)
)
),
array(
'app' => 'infocenter',
'category' => 'infocenter',
'phrase' => 'kaution',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Kaution',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Deposit',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'password',
@@ -17743,6 +17763,26 @@ array(
)
)
),
array(
'app' => 'infocenter',
'category' => 'infocenter',
'phrase' => 'abgewiesenam',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Abgewiesen am',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Rejected on',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'infocenter',
'category' => 'infocenter',
@@ -17783,7 +17823,6 @@ array(
)
)
),
);