Merge branch 'next' into 'master'

Next

See merge request !73

src/QUI/ERP/User.php

@@ -294,6 +294,18 @@ public function getName()
         $name = $firstName . ' ' . $lastName;
 
         if (!empty($salutation)) {
+            switch ($salutation) {
+                case 'Herr':
+                case 'mr':
+                    $salutation = QUI::getLocale()->get('quiqqer/quiqqer', 'address.salutation.male');
+                    break;
+
+                case 'Frau':
+                case 'mrs':
+                    $salutation = QUI::getLocale()->get('quiqqer/quiqqer', 'address.salutation.female');
+                    break;
+            }
+
             $name = $salutation . ' ' . $name;
         }