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

Merge branch 'cherry-pick-27bb5530' into 'dev'

fix: error at invoice sum with invoice canceled payment status

See merge request !43
Übergeordnete d2034d03 20fd341e
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
3 Merge Requests!45fix: error at invoice sum with invoice canceled payment status,!44fix: error at invoice sum with invoice canceled payment status,!43fix: error at invoice sum with invoice canceled payment status
Pipeline-Nr. 6444 bestanden
......@@ -407,7 +407,7 @@ public function getPaidStatusInformation(): array
}
if ($this->getInvoiceType() === Handler::TYPE_INVOICE_STORNO) {
$this->setAttribute('paid_status', QUI\ERP\Constants::PAYMENT_STATUS_CANCELED);
//$this->setAttribute('paid_status', QUI\ERP\Constants::PAYMENT_STATUS_CANCELED);
}
return [
......
......@@ -804,6 +804,9 @@ protected function parseListForGrid(array $data): array
$Status->getTitle() . '</span>';
}
// if status is paid = invoice is paid
$invoiceData['paid_status'] = $Invoice->getAttribute('paid_status');
// display totals
$invoiceData['display_nettosum'] = $Currency->format($invoiceData['nettosum']);
$invoiceData['display_sum'] = $Currency->format($invoiceData['sum']);
......@@ -811,6 +814,7 @@ protected function parseListForGrid(array $data): array
$invoiceData['display_paid'] = $Currency->format($invoiceData['paid']);
$invoiceData['display_toPay'] = $Currency->format($invoiceData['toPay']);
$invoiceData['calculated_nettosum'] = $invoiceData['nettosum'];
$invoiceData['calculated_sum'] = $invoiceData['sum'];
$invoiceData['calculated_subsum'] = $invoiceData['subsum'];
......@@ -845,6 +849,7 @@ protected function parseListForGrid(array $data): array
$invoiceData['overdue'] = 1;
}
// internal cache
// wird genutzt damit calc und display nicht doppelt abfragen machen
$this->cache[$entry['id']] = $invoiceData;
......
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