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

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

fix(Process):  getGroupedRelatedTransactionEntities checks invoices correctly

See merge request !166
Übergeordnete 4d3fad80 d1103891
No related branches found
Tags 3.10.9
2 Merge Requests!166fix(Process): getGroupedRelatedTransactionEntities checks invoices correctly,!140Update 'next-4.x' with latest changes from 'main'
Pipeline #14452 mit Warnungen bestanden mit Phase
in 52 Sekunden
...@@ -122,8 +122,8 @@ class_exists('QUI\ERP\Accounting\Invoice\Invoice') ...@@ -122,8 +122,8 @@ class_exists('QUI\ERP\Accounting\Invoice\Invoice')
) { ) {
foreach ($entities as $Entity) { foreach ($entities as $Entity) {
if ( if (
!($Entity instanceof QUI\ERP\Accounting\Invoice\Invoice !($Entity instanceof QUI\ERP\Accounting\Invoice\Invoice)
|| $Entity instanceof QUI\ERP\Accounting\Invoice\InvoiceTemporary) && !($Entity instanceof QUI\ERP\Accounting\Invoice\InvoiceTemporary)
) { ) {
continue; continue;
} }
...@@ -245,7 +245,7 @@ class_exists('QUI\ERP\Accounting\Invoice\Invoice') ...@@ -245,7 +245,7 @@ class_exists('QUI\ERP\Accounting\Invoice\Invoice')
* @param string $message * @param string $message
* @param bool|int $time - optional, unix timestamp * @param bool|int $time - optional, unix timestamp
*/ */
public function addHistory(string $message, bool|int $time = false): void public function addHistory(string $message, bool | int $time = false): void
{ {
$this->getHistory()->addComment($message, $time); $this->getHistory()->addComment($message, $time);
...@@ -524,7 +524,7 @@ public function hasOrder(): bool ...@@ -524,7 +524,7 @@ public function hasOrder(): bool
* *
* @return null|Order\Order|Order\OrderInProcess * @return null|Order\Order|Order\OrderInProcess
*/ */
public function getOrder(): Order\OrderInProcess|Order\Order|null public function getOrder(): Order\OrderInProcess | Order\Order | null
{ {
if (!QUI::getPackageManager()->isInstalled('quiqqer/order')) { if (!QUI::getPackageManager()->isInstalled('quiqqer/order')) {
return null; return null;
......
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