diff --git a/src/QUI/ERP/Shipping/Api/AbstractShippingEntry.php b/src/QUI/ERP/Shipping/Api/AbstractShippingEntry.php
index cdf860c8fdefac07508ff81899eab05afecf84ed..f2d14e80b2e6ffa549e19197d07a20d8f1e6aeff 100644
--- a/src/QUI/ERP/Shipping/Api/AbstractShippingEntry.php
+++ b/src/QUI/ERP/Shipping/Api/AbstractShippingEntry.php
@@ -92,7 +92,7 @@ abstract public function getTitle($Locale = null): string;
      * @param null|QUI\Locale $Locale
      * @return string
      */
-    abstract public function getDescription(QUI\Locale $Locale = null): string;
+    abstract public function getDescription(null | QUI\Locale $Locale = null): string;
 
     /**
      * @return string
@@ -146,7 +146,7 @@ public function isVisible(): bool
      * @return string
      */
     public function getInvoiceInformationText(
-        QUI\ERP\Accounting\Invoice\Invoice|QUI\ERP\Accounting\Invoice\InvoiceTemporary|QUI\ERP\Accounting\Invoice\InvoiceView $Invoice
+        QUI\ERP\Accounting\Invoice\Invoice | QUI\ERP\Accounting\Invoice\InvoiceTemporary | QUI\ERP\Accounting\Invoice\InvoiceView $Invoice
     ): string {
         return '';
     }
diff --git a/src/QUI/ERP/Shipping/Api/AbstractShippingType.php b/src/QUI/ERP/Shipping/Api/AbstractShippingType.php
index a53354a79cb10428e8baaf9ffe9ff881b04cc7b6..3141e78bd3ae202a6034c5d1b991156c1cf8ca5f 100644
--- a/src/QUI/ERP/Shipping/Api/AbstractShippingType.php
+++ b/src/QUI/ERP/Shipping/Api/AbstractShippingType.php
@@ -30,7 +30,7 @@ public function getType(): string
      * @param QUI\Locale|null $Locale
      * @return array
      */
-    public function toArray(QUI\Locale $Locale = null): array
+    public function toArray(null | QUI\Locale $Locale = null): array
     {
         if ($Locale === null) {
             $Locale = QUI::getLocale();
@@ -46,7 +46,7 @@ public function toArray(QUI\Locale $Locale = null): array
      * @param QUI\Locale|null $Locale
      * @return string
      */
-    abstract public function getTitle(QUI\Locale $Locale = null): string;
+    abstract public function getTitle(null | QUI\Locale $Locale = null): string;
 
     /**
      * @return string
diff --git a/src/QUI/ERP/Shipping/Api/ShippingInterface.php b/src/QUI/ERP/Shipping/Api/ShippingInterface.php
index 9832fa4f2ffb61ad3fc68fce00a045248ee36d64..57bb2f6767683e7c046aa9998a1df6414fdb3208 100644
--- a/src/QUI/ERP/Shipping/Api/ShippingInterface.php
+++ b/src/QUI/ERP/Shipping/Api/ShippingInterface.php
@@ -18,7 +18,7 @@ interface ShippingInterface
     /**
      * @return int|string
      */
-    public function getId(): int|string;
+    public function getId(): int | string;
 
     /**
      * @param null|QUI\Locale $Locale
@@ -48,7 +48,7 @@ public function getShippingType(): ShippingTypeInterface;
      *
      * @return float|int
      */
-    public function getPrice(): float|int;
+    public function getPrice(): float | int;
 
     /**
      * Return the price display
diff --git a/src/QUI/ERP/Shipping/Api/ShippingTypeInterface.php b/src/QUI/ERP/Shipping/Api/ShippingTypeInterface.php
index 997eee2312488e721369dcef678b8bf56914980a..4e06868a05e1c2c7942765f1ef1ecd047a3cac8f 100644
--- a/src/QUI/ERP/Shipping/Api/ShippingTypeInterface.php
+++ b/src/QUI/ERP/Shipping/Api/ShippingTypeInterface.php
@@ -22,7 +22,7 @@ public function getType(): string;
      * @param null|QUI\Locale $Locale
      * @return string
      */
-    public function getTitle(QUI\Locale $Locale = null): string;
+    public function getTitle(null | QUI\Locale $Locale = null): string;
 
     /**
      * @return string
@@ -35,5 +35,5 @@ public function getIcon(): string;
      * @param QUI\Locale|null $Locale
      * @return array
      */
-    public function toArray(QUI\Locale $Locale = null): array;
+    public function toArray(null | QUI\Locale $Locale = null): array;
 }
diff --git a/src/QUI/ERP/Shipping/Rules/Factory.php b/src/QUI/ERP/Shipping/Rules/Factory.php
index 39c679d32064add874a94fac7ed5f41f019d2bdb..9f14c578d033446bc3659e40012629a148916744 100644
--- a/src/QUI/ERP/Shipping/Rules/Factory.php
+++ b/src/QUI/ERP/Shipping/Rules/Factory.php
@@ -70,6 +70,7 @@ public function createChild(array $data = []): QUI\CRUD\Child
     {
         // filter
         $allowed = array_flip([
+            'active',
             'title',
             'workingTitle',
             'date_from',
diff --git a/src/QUI/ERP/Shipping/Rules/ShippingRule.php b/src/QUI/ERP/Shipping/Rules/ShippingRule.php
index 7d67255c374537c03a206516e61718bfecd72dad..6163482460ba680cf9f0632311b43faeddb180c3 100644
--- a/src/QUI/ERP/Shipping/Rules/ShippingRule.php
+++ b/src/QUI/ERP/Shipping/Rules/ShippingRule.php
@@ -191,7 +191,7 @@ public function toArray(): array
      * @param Locale|null $Locale
      * @return string
      */
-    public function getTitle(QUI\Locale $Locale = null): string
+    public function getTitle(null | QUI\Locale $Locale = null): string
     {
         if ($Locale === null) {
             $Locale = QUI::getLocale();
@@ -337,7 +337,7 @@ public function canUsedBy(QUI\Interfaces\Users\User $User): bool
      * @param Address|QUI\Users\Address|null $Address
      * @return bool
      */
-    public function canUsedWithAddress(QUI\ERP\Address|QUI\Users\Address $Address = null): bool
+    public function canUsedWithAddress(null | QUI\ERP\Address | QUI\Users\Address $Address = null): bool
     {
         if (!$Address) {
             return false;
@@ -365,7 +365,7 @@ public function canUsedWithAddress(QUI\ERP\Address|QUI\Users\Address $Address =
      * @param QUI\ERP\ErpEntityInterface|null $ErpEntity
      * @return bool
      */
-    public function canUsedIn(QUI\ERP\ErpEntityInterface $ErpEntity = null): bool
+    public function canUsedIn(null | QUI\ERP\ErpEntityInterface $ErpEntity = null): bool
     {
         if (!$this->isValid()) {
             Debug::addLog("{$this->getTitle()} :: is not valid");
@@ -819,7 +819,7 @@ public function getDiscountType(): int
      *
      * @return bool|array
      */
-    public function getUnitTerms(): bool|array
+    public function getUnitTerms(): bool | array
     {
         $unitTerms = $this->getAttribute('unit_terms');
 
diff --git a/src/QUI/ERP/Shipping/Shipping.php b/src/QUI/ERP/Shipping/Shipping.php
index 70bdd4252b8ee6e829b1ced28e68e6fa3e827be7..49712063f928883126ffd4023f54a2ab14c07b52 100644
--- a/src/QUI/ERP/Shipping/Shipping.php
+++ b/src/QUI/ERP/Shipping/Shipping.php
@@ -239,7 +239,7 @@ public function getShippingType(string $shippingType): Api\ShippingTypeInterface
      *
      * @throws Exception
      */
-    public function getShippingEntry(int|string $shippingId): Types\ShippingEntry
+    public function getShippingEntry(int | string $shippingId): Types\ShippingEntry
     {
         try {
             return Factory::getInstance()->getChild($shippingId);
@@ -277,8 +277,10 @@ public function getShippingList(array $queryParams = []): array
      * @param QUI\ERP\ErpEntityInterface|null $Entity - optional
      * @return QUI\ERP\Shipping\Types\ShippingEntry[]
      */
-    public function getUserShipping(User $User = null, QUI\ERP\ErpEntityInterface $Entity = null): array
-    {
+    public function getUserShipping(
+        null | User $User = null,
+        null | QUI\ERP\ErpEntityInterface $Entity = null
+    ): array {
         if ($User === null) {
             $User = QUI::getUserBySession();
         }
@@ -302,8 +304,8 @@ public function getUserShipping(User $User = null, QUI\ERP\ErpEntityInterface $E
      * @param QUI\ERP\ErpEntityInterface $Entity
      * @return PriceFactorInterface|ErpPriceFactor|null
      */
-    public function getShippingPriceFactor(QUI\ERP\ErpEntityInterface $Entity): ErpPriceFactor|PriceFactorInterface|null
-    {
+    public function getShippingPriceFactor(QUI\ERP\ErpEntityInterface $Entity
+    ): ErpPriceFactor | PriceFactorInterface | null {
         $PriceFactors = $Entity->getArticles()->getPriceFactors();
 
         foreach ($PriceFactors as $PriceFactor) {
@@ -321,7 +323,7 @@ public function getShippingPriceFactor(QUI\ERP\ErpEntityInterface $Entity): ErpP
      *
      * @deprecated use getShippingPriceFactor
      */
-    public function getShippingPriceFactorByOrder(AbstractOrder $Order): ErpPriceFactor|PriceFactorInterface|null
+    public function getShippingPriceFactorByOrder(AbstractOrder $Order): ErpPriceFactor | PriceFactorInterface | null
     {
         QUI\System\Log::addNotice(
             'Shipping->getShippingPriceFactorByOrder() is deprecated, use getShippingPriceFactor'
@@ -421,7 +423,7 @@ public function getHost(): string
      */
     public function getShippingByObject(
         QUI\ERP\ErpEntityInterface $Entity
-    ): Types\ShippingEntry|Types\ShippingUnique|null {
+    ): Types\ShippingEntry | Types\ShippingUnique | null {
         $Shipping = null;
         $Delivery = $Entity->getDeliveryAddress();
 
@@ -440,7 +442,7 @@ public function getShippingByObject(
      * @param $orderId
      * @return ShippingEntry|ShippingUnique|null
      */
-    public function getShippingByOrderId($orderId): ShippingEntry|ShippingUnique|null
+    public function getShippingByOrderId($orderId): ShippingEntry | ShippingUnique | null
     {
         try {
             $Order = QUI\ERP\Order\Handler::getInstance()->getOrderById($orderId);
@@ -551,7 +553,7 @@ public function getVat(QUI\ERP\ErpEntityInterface $ErpEntity): mixed
     public function sendStatusChangeNotification(
         ErpEntityInterface $ErpEntity,
         int $statusId,
-        string $message = null
+        null | string $message = null
     ): void {
         $Customer = $ErpEntity->getCustomer();
         $customerEmail = $Customer->getAttribute('email');