Skip to content
Code-Schnipsel Gruppen Projekte
Commit cac14677 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'main' into 'next-4.x'

Update 'next-4.x' with latest changes from 'main'

See merge request !172
Übergeordnete 29877634 0d18d8fb
No related branches found
No related tags found
1 Merge Request!172Update 'next-4.x' with latest changes from 'main'
Pipeline #15598 bestanden mit Phase
in 2 Minuten und 45 Sekunden
...@@ -71,10 +71,10 @@ public function value(): float | int ...@@ -71,10 +71,10 @@ public function value(): float | int
/** /**
* Return the CalculationValue with the wanted precision * Return the CalculationValue with the wanted precision
* *
* @param bool $precision * @param bool|int $precision
* @return CalculationValue * @return CalculationValue
*/ */
public function precision(bool $precision = false): CalculationValue public function precision(bool | int $precision = false): CalculationValue
{ {
if ($precision === false) { if ($precision === false) {
return $this; return $this;
......
...@@ -209,8 +209,6 @@ public static function getMissingAttributes(array $attributes): array ...@@ -209,8 +209,6 @@ public static function getMissingAttributes(array $attributes): array
* *
* @param UserInterface $User * @param UserInterface $User
* @return self * @return self
*
* @throws QUI\ERP\Exception
*/ */
public static function convertUserToErpUser(UserInterface $User): User public static function convertUserToErpUser(UserInterface $User): User
{ {
...@@ -224,7 +222,6 @@ public static function convertUserToErpUser(UserInterface $User): User ...@@ -224,7 +222,6 @@ public static function convertUserToErpUser(UserInterface $User): User
$address = false; $address = false;
if (!QUI::getUsers()->isNobodyUser($User) && !QUI::getUsers()->isSystemUser($User)) { if (!QUI::getUsers()->isNobodyUser($User) && !QUI::getUsers()->isSystemUser($User)) {
/* @var $Address QUI\Users\Address */
$Address = $User->getStandardAddress(); $Address = $User->getStandardAddress();
if ($Address) { if ($Address) {
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren