Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp

system/filtersupdate.php

@@ -1378,7 +1378,44 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null
-	)
+		),
+		array(
+			'app' => 'personalverwaltung',
+			'dataset_name' => 'handyverwaltung',
+			'filter_kurzbz' => 'ma4handyverwaltung',
+			'description' => '{MA Handyverwaltung}',
+			'sort' => 1,
+			'default_filter' => true,
+			'filter' => '
+				{
+					"name": "MA Handyverwaltung",
+					"columns": [
+						{"name": "UID"},
+						{"name": "PersonId"},
+						{"name": "Vorname"},
+						{"name": "Nachname"},
+						{"name": "EMail"}, 
+						{"name": "Unternehmen"}, 
+						{"name": "Vertragsart"}, 
+						{"name": "DV_von"}, 
+						{"name": "DV_bis"}, 
+						{"name": "Wochenstunden"}, 
+						{"name": "WS_von"}, 
+						{"name": "WS_bis"}, 
+						{"name": "Standardkostenstelle"}
+					],
+					"filters": [
+						{
+							"name": "Nachname",
+							"option": "",
+							"operation": "",
+							"condition": ""
+						}
+					]
+				}
+			',
+			'oe_kurzbz' => null,
+		),
 );
 
 // Loop through the filters array

system/phrasesupdate.php

@@ -23468,7 +23468,7 @@ array(
 				'text' => 'The field {field} must contain a valid email address.',
 				'description' => '',
 				'insertvon' => 'system'
-			)
+				)
 		)
 	),
 	// Personalverwaltung begin
@@ -28297,6 +28297,7 @@ array(
 			)
 		)
 	),
+	// Betriebsmittel begin
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -28377,6 +28378,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'betriebsmittel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betriebsmittel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Resources',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -28657,6 +28678,7 @@ array(
 			)
 		)
 	),
+	// Betriebsmittel end
 	//****************************	 CORE/konto
 	array(
 		'app' => 'core',