From d9a63e9ac3909f426a995899cd8d9cea4854c301 Mon Sep 17 00:00:00 2001 From: Tolotsoa Date: Wed, 3 Sep 2025 10:10:25 +0300 Subject: [PATCH] fix correction bugs null --- gestion/lib/Service/Devis/DevisDataProcessor.php | 2 +- gestion/lib/Service/Devis/DevisPdfTableRenderer.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gestion/lib/Service/Devis/DevisDataProcessor.php b/gestion/lib/Service/Devis/DevisDataProcessor.php index 7a204cc..fcb84b7 100644 --- a/gestion/lib/Service/Devis/DevisDataProcessor.php +++ b/gestion/lib/Service/Devis/DevisDataProcessor.php @@ -78,7 +78,7 @@ class DevisDataProcessor { $htPrice = $produit->prix_unitaire; - if ($devis['group_name'] != null) { + if ($devis['group_name'] != null && isset($produit->id)) { $price = $this->gestionBdd->getProductPriceByClientGroupId($filter, $produit->id); if ($price != null) { $htPrice = $price; diff --git a/gestion/lib/Service/Devis/DevisPdfTableRenderer.php b/gestion/lib/Service/Devis/DevisPdfTableRenderer.php index cb9215b..5475d87 100644 --- a/gestion/lib/Service/Devis/DevisPdfTableRenderer.php +++ b/gestion/lib/Service/Devis/DevisPdfTableRenderer.php @@ -116,8 +116,8 @@ class DevisPdfTableRenderer [26, 18, $devis['calendar_uuid']], [46, 23, $devis['num_commande']], [71, 18, mb_convert_encoding($formatterDate->format($dateSoin), 'ISO-8859-1', 'UTF-8')], - [91, 33, \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['lieu_nom'])], - [126, 28, \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['defunt_nom'])], + [91, 33, \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['lieu_nom'] ?? '')], // ← CORRECTION + [126, 28, \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['defunt_nom'] ?? '')], // ← CORRECTION [156, 18, number_format($devis['montant_htc'], 2, '.', '') . chr(128), 'C'], [176, 13, number_format($devis['montant_tva'], 2, '.', '') . chr(128), 'C'], [191, 13, number_format($devis['montant_ttc'], 2, '.', '') . chr(128), 'C'] @@ -129,8 +129,8 @@ class DevisPdfTableRenderer [36, 33, $devis['calendar_uuid']], [71, 33, $devis['num_commande']], [106, 18, mb_convert_encoding($formatterDate->format($dateSoin), 'ISO-8859-1', 'UTF-8')], - [126, 28, \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['lieu_nom'])], - [156, 48, \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['defunt_nom'])] + [126, 28, \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['lieu_nom'] ?? '')], // ← CORRECTION + [156, 48, \OCA\Gestion\Helpers\FileExportHelpers::FormatTextForExport($devis['defunt_nom'] ?? '')] // ← CORRECTION ]; }