Skip to content
Code-Schnipsel Gruppen Projekte

fix(Process): getGroupedRelatedTransactionEntities checks invoices correctly

Zusammengeführt Henning Leutz requested to merge next-3.x into main
1 Datei
+ 4
4
Änderungen vergleichen
  • Nebeneinander
  • In der Reihe
+ 4
4
@@ -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;
Lade