From 0a606fece8fac18e486c9e54d9c76c8307849e10 Mon Sep 17 00:00:00 2001 From: Pek5892 Date: Wed, 6 Dec 2023 12:27:34 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20righe=20per=20quantit=C3=A0=20=3D=200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/contratti/row-list.php | 4 ++-- modules/ordini/row-list.php | 2 +- modules/preventivi/row-list.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/contratti/row-list.php b/modules/contratti/row-list.php index b48760a2c..c48c3e130 100755 --- a/modules/contratti/row-list.php +++ b/modules/contratti/row-list.php @@ -145,8 +145,8 @@ foreach ($righe as $riga) { $evasione_bar['or_righe_ordini'] = 'success'; foreach ($evasione_bar as $table => $color) { $righe_ev = $dbo->table($table)->where('original_id', $riga->id)->where('original_type', get_class($riga))->get(); - $perc_ev = $righe_ev->sum('qta') * 100 / $riga->qta; - if ($perc_ev > 0) { + if ($righe_ev->count() > 0) { + $perc_ev = $righe_ev->sum('qta') * 100 / $riga->qta; echo '
'; } diff --git a/modules/ordini/row-list.php b/modules/ordini/row-list.php index 3a3c92994..73a74b4e2 100755 --- a/modules/ordini/row-list.php +++ b/modules/ordini/row-list.php @@ -213,8 +213,8 @@ foreach ($righe as $riga) { $evasione_bar['in_righe_interventi'] = 'warning'; $evasione_bar['or_righe_ordini'] = 'success'; foreach ($evasione_bar as $table => $color) { + $righe_ev = $dbo->table($table)->where('original_id', $riga->id)->where('original_type', get_class($riga))->get(); if ($righe_ev->count() > 0) { - $righe_ev = $dbo->table($table)->where('original_id', $riga->id)->where('original_type', get_class($riga))->get(); $perc_ev = $righe_ev->sum('qta') * 100 / $riga->qta; if ($perc_ev > 0) { echo ' diff --git a/modules/preventivi/row-list.php b/modules/preventivi/row-list.php index 1efa37ea6..e23d47016 100755 --- a/modules/preventivi/row-list.php +++ b/modules/preventivi/row-list.php @@ -434,8 +434,8 @@ echo ' - '.tr('Ricarico (_PRC_%)', [ - '_PRC_' => numberFormat($preventivo->ricarico_percentuale), + '.tr('Ricarico (_PRC_)', [ + '_PRC_' => ($preventivo->ricarico_percentuale != 0 ? numberFormat($preventivo->ricarico_percentuale). '%' : 'N.D.'), ]).': ';