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

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

Next 3.x

See merge request !116
Übergeordnete fc1cff38 c22fa25b
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!140Update 'next-4.x' with latest changes from 'main',!116Next 3.x
Pipeline-Nr. 8941 mit Warnungen bestanden
......@@ -13,6 +13,12 @@
*/
interface ErpCopyInterface
{
/**
* @param User|null $PermissionUser
* @param bool|string $globalProcessId - false = new process will start
*
* @return ErpEntityInterface
*/
public function copy(
User $PermissionUser = null,
bool|string $globalProcessId = false
......
......@@ -555,7 +555,7 @@ public function getOffers(): array
]
]);
} catch (\Exception) {
return [];
$offers = [];
}
$result = [];
......@@ -568,6 +568,27 @@ public function getOffers(): array
}
}
// temporary
try {
$temporaryOffers = QUI::getDatabase()->fetch([
'select' => 'id,hash,global_process_id,date',
'from' => QUI\ERP\Accounting\Offers\Handler::getInstance()->temporaryOffersTable(),
'where_or' => [
'global_process_id' => $this->processId,
'hash' => $this->processId
]
]);
} catch (\Exception) {
$temporaryOffers = [];
}
foreach ($temporaryOffers as $temporaryOffer) {
try {
$result[] = $Offers->getTemporaryOffer($temporaryOffer['id']);
} catch (\Exception) {
}
}
return $result;
}
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren