From a08bf2fe90c53ab44abef1c5a7606d0077a13a67 Mon Sep 17 00:00:00 2001
From: FabioL <1647128+loviuz@users.noreply.github.com>
Date: Mon, 18 Nov 2024 18:14:59 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20miglioramento=20visualizzazione=20qt?=
 =?UTF-8?q?=C3=A0=20per=20sede?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/articoli/header.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/articoli/header.php b/modules/articoli/header.php
index 0cae9a482..d33f30e50 100644
--- a/modules/articoli/header.php
+++ b/modules/articoli/header.php
@@ -61,9 +61,9 @@ echo '
     </div>';
 
 if ($user->is_admin) {
-    $sedi = $dbo->fetchArray('(SELECT "0" AS id, "Sede legale" AS nomesede) UNION (SELECT id, nomesede FROM an_sedi WHERE idanagrafica='.prepare(setting('Azienda predefinita')).')');
+    $sedi = $dbo->fetchArray('SELECT * FROM ((SELECT "0" AS id, "Sede legale" AS nomesede) UNION (SELECT id, nomesede FROM an_sedi WHERE idanagrafica='.prepare(setting('Azienda predefinita')).')) sedi WHERE id IN(SELECT idsede FROM mg_movimenti WHERE idarticolo='.prepare($articolo->id).')');
 } else {
-    $sedi = $dbo->fetchArray('SELECT nomesede FROM zz_user_sedi INNER JOIN ((SELECT "0" AS id, "Sede legale" AS nomesede) UNION (SELECT id, nomesede FROM an_sedi WHERE idanagrafica='.prepare(setting('Azienda predefinita')).')) sedi ON zz_user_sedi.idsede=sedi.id WHERE id_user='.prepare($user['id']).' GROUP BY id_user, nomesede');
+    $sedi = $dbo->fetchArray('SELECT * FROM ((SELECT "0" AS id, "Sede legale" AS nomesede) UNION (SELECT id, nomesede FROM an_sedi WHERE idanagrafica='.prepare(setting('Azienda predefinita')).')) sedi WHERE id IN(SELECT idsede FROM mg_movimenti WHERE idarticolo='.prepare($articolo->id).') AND id IN(SELECT idsede FROM zz_user_sedi WHERE id_user='.prepare($user['id']).')');
 }
 
 $giacenze = $articolo->getGiacenze();
@@ -84,21 +84,19 @@ echo '
                 <table class="table table-sm">
                     <thead>
                         <tr>
-                            <th>Sede</th>
-                            <th class="text-right">Giacenza</th>
+                            <th>'.tr('Sede').'</th>
+                            <th class="text-right">'.tr('Giacenza').'</th>
                             '.($articolo->fattore_um_secondaria != 0 ? '<th class="text-right">'.tr('U.m. secondaria').'</th>' : '').'
                         </tr>
                     </thead>
                     <tbody>';
                 foreach ($sedi as $sede) {
-                    if ($giacenze[$sede['id']][0] != 0) {
-                        echo '
-                        <tr class="'.($giacenze[$sede['id']][0]<$articolo->threshold_qta ? 'text-danger' : '').'">
-                            <td>'.$sede['nomesede'].'</td>
-                            <td class="text-right">'.numberFormat($giacenze[$sede['id']][0], 'qta').' '.$articolo->um.'</td>
-                            '.($articolo->fattore_um_secondaria != 0 ? '<td class="text-right"><i class="fa fa-chevron-right pull-left"></i> '.$giacenze[$sede['id']][0] * $articolo->fattore_um_secondaria.' '.$articolo->um_secondaria.'</td>' : '').'
-                        </tr>';
-                    }
+                    echo '
+                    <tr class="'.($giacenze[$sede['id']][0]<$articolo->threshold_qta ? 'text-danger' : '').'">
+                        <td>'.$sede['nomesede'].'</td>
+                        <td class="text-right">'.numberFormat($giacenze[$sede['id']][0], 'qta').' '.$articolo->um.'</td>
+                        '.($articolo->fattore_um_secondaria != 0 ? '<td class="text-right"><i class="fa fa-chevron-right pull-left"></i> '.$giacenze[$sede['id']][0] * $articolo->fattore_um_secondaria.' '.$articolo->um_secondaria.'</td>' : '').'
+                    </tr>';
                 }
                 echo '
                     </tbody>