diff --git a/modules/articoli/plugins/articoli.lotti.php b/modules/articoli/plugins/articoli.lotti.php
index c6f9cbbdf..ade84f392 100644
--- a/modules/articoli/plugins/articoli.lotti.php
+++ b/modules/articoli/plugins/articoli.lotti.php
@@ -155,7 +155,7 @@ $rs = $dbo->fetchArray('SELECT COUNT(id) AS tot FROM mg_prodotti WHERE id_artico
 $tot_prodotti = $rs[0]['tot'];
 
 // Visualizzazione di tutti i prodotti
-$query = 'SELECT serial, created_at FROM mg_prodotti WHERE serial IS NOT NULL AND id_articolo='.prepare($id_record).(!empty($search_serial) ? ' AND serial LIKE '.prepare('%'.$search_serial.'%') : '').' GROUP BY serial ORDER BY created_at DESC, serial DESC, lotto DESC, altro DESC';
+$query = 'SELECT id, serial, created_at FROM mg_prodotti WHERE serial IS NOT NULL AND id_articolo='.prepare($id_record).(!empty($search_serial) ? ' AND serial LIKE '.prepare('%'.$search_serial.'%') : '').' GROUP BY serial ORDER BY created_at DESC, serial DESC, lotto DESC, altro DESC';
 $rs2 = $dbo->fetchArray($query);
 
 echo '
diff --git a/modules/ddt/plugins/ddt.anagrafiche.php b/modules/ddt/plugins/ddt.anagrafiche.php
index aafa4126d..71cfd5942 100644
--- a/modules/ddt/plugins/ddt.anagrafiche.php
+++ b/modules/ddt/plugins/ddt.anagrafiche.php
@@ -37,16 +37,16 @@ if (!empty($rsddt)) {
                 <span>'.($key + 1).'</span>
             </td>
             <td>
-                '.Modules::link('Ddt di vendita', $rsddt[$i]['idddt'], $rsddt[$i]['numero_esterno']).'
+                '.Modules::link('Ddt di vendita', $r['idddt'], !empty($r['numero_esterno']) ? $r['numero_esterno'] : $r['numero']).'
             </td>
             <td>
-                <span>'.(!empty($rsddt[$i]['data']) ? Translator::dateToLocale($rsddt[$i]['data']) : '').'</span>
+                <span>'.(!empty($r['data']) ? Translator::dateToLocale($r['data']) : '').'</span>
             </td>
             <td>
-                <span>'.$rsddt[$i]['descrizione'].'</span>
+                <span>'.$r['descrizione'].'</span>
             </td>
             <td>
-                <span>'.Translator::numberToLocale($rsddt[$i]['qta']).' '.$rsddt[$i]['um'].'</span>
+                <span>'.Translator::numberToLocale($r['qta']).' '.$r['um'].'</span>
             </td>
         </tr>';
     } ?>
@@ -55,40 +55,6 @@ if (!empty($rsddt)) {
     </tbody>
 </table>
 
-<script>
-
-function attivaricerca (){
-    // Setup - add a text input to each footer cell
-    $('#tabella thead th').each( function () {
-        var title = $(this).text();
-        $(this).html( '<b>'+title+'</b><br><input type="text" class="filter form-control" placeholder="Filtra... '+title+'" />' );
-    });
-
-    table.columns.adjust().draw();
-
-    // Apply the search
-    table.columns().eq(0).each(function(colIdx) {
-        $('input', table.column(colIdx).header()).on('keyup change', function() {
-            table
-                .column(colIdx)
-                .search(this.value)
-                .draw();
-        });
-
-        $('input', table.column(colIdx).header()).on('click', function(e) {
-            e.stopPropagation();
-        });
-    });
-}
-
-$(document).ready(function() {
-    setTimeout(function(){
-        attivaricerca()
-    }, 1000);
-});
-
-</script>
-
 <?php
 
 } else {
diff --git a/modules/fatture/actions.php b/modules/fatture/actions.php
index 073cd6c94..b3515ed71 100644
--- a/modules/fatture/actions.php
+++ b/modules/fatture/actions.php
@@ -385,7 +385,6 @@ switch (post('op')) {
                     $rs = $dbo->fetchArray($query);
                     $desc_iva = $rs[0]['descrizione'];
 
-                    $subtot = $rsr[$i]['prezzo_vendita'] * $rsr[$i]['qta'];
                     $iva = ($subtot) / 100 * $rs[0]['percentuale'];
                     $iva_indetraibile = $iva / 100 * $rs[0]['indetraibile'];
 
diff --git a/modules/zone/add.php b/modules/zone/add.php
index ee2533119..8a468509d 100644
--- a/modules/zone/add.php
+++ b/modules/zone/add.php
@@ -7,11 +7,11 @@ include_once __DIR__.'/../../core.php';
 	<input type="hidden" name="backto" value="record-edit">
 
 	<div class="row">
-		<div class="col-md-2">
-			{[ "type": "text", "label": "<?php echo tr('Nome'); ?>", "name": "nome", "required": 1, "value": "" ]}
+		<div class="col-md-4">
+			{[ "type": "text", "label": "<?php echo tr('Codice'); ?>", "name": "nome", "required": 1, "value": "" ]}
 		</div>
 
-		<div class="col-md-6">
+		<div class="col-md-8">
 			{[ "type": "text", "label": "<?php echo tr('Descrizione'); ?>", "name": "descrizione", "required": 1, "value": "" ]}
 		</div>
 	</div>
diff --git a/modules/zone/edit.php b/modules/zone/edit.php
index 95b5bf66e..d7c2392b1 100644
--- a/modules/zone/edit.php
+++ b/modules/zone/edit.php
@@ -15,11 +15,11 @@ include_once __DIR__.'/../../core.php';
 	<div class="clearfix"></div>
 
 	<div class="row">
-		<div class="col-md-2">
+		<div class="col-md-4">
 			{[ "type": "text", "label": "<?php echo tr('Codice') ?>", "name": "nome", "required": 1, "value": "$nome$" ]}
 		</div>
 
-		<div class="col-md-6">
+		<div class="col-md-8">
 			{[ "type": "text", "label": "<?php echo tr('Descrizione') ?>", "name": "descrizione", "required": 1, "value": "$descrizione$" ]}
 		</div>
 	</div>
diff --git a/templates/scadenzario/pdfgen.scadenzario.php b/templates/scadenzario/pdfgen.scadenzario.php
index 17d2a6ce6..ec2f573ee 100644
--- a/templates/scadenzario/pdfgen.scadenzario.php
+++ b/templates/scadenzario/pdfgen.scadenzario.php
@@ -15,10 +15,10 @@ include_once $docroot.'/templates/pdfgen_variables.php';
 */
 if (get('type') == 'clienti') {
     $titolo = 'Scadenzario clienti';
-    $add_where = "AND an_tipianagrafiche.descrizione='Cliente'";
+    $add_where = "AND co_tipidocumento.dir='entrata'";
 } elseif (get('type') == 'fornitori') {
     $titolo = 'Scadenzario fornitori';
-    $add_where = "AND an_tipianagrafiche.descrizione='Fornitore'";
+    $add_where = "AND co_tipidocumento.dir='uscita'";
 } else {
     $titolo = 'Scadenzario';
     $add_where = '';
diff --git a/update/2_3.sql b/update/2_3.sql
index a10f58730..b6dbcc962 100644
--- a/update/2_3.sql
+++ b/update/2_3.sql
@@ -805,6 +805,7 @@ OR (`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di acquisto
 OR (`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'MyImpianti') AND `name` = 'Data')
 OR (`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Ordini cliente') AND `name` = 'Data')
 OR (`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Movimenti') AND `name` = 'Data')
+OR (`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Movimenti') AND `name` = 'Quantità')
 OR (`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Prima nota') AND `name` = 'Dare')
 OR (`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Prima nota') AND `name` = 'Avere');