diff --git a/modules/ddt/edit.php b/modules/ddt/edit.php
index 2d9caefa4..8aaf8621e 100755
--- a/modules/ddt/edit.php
+++ b/modules/ddt/edit.php
@@ -308,44 +308,44 @@ if ($dir == 'entrata') {
 
     <?php
         if (!empty($record['id_documento_fe']) || !empty($record['num_item']) || !empty($record['codice_cig']) || !empty($record['codice_cup'])) {
-            $collapsed = 'in';
-        } else {
             $collapsed = '';
+        } else {
+            $collapsed = ' collapsed-box';
         }
     ?>
 
     <!-- Fatturazione Elettronica PA-->
-    <div class="panel-group">
-        <div class="panel panel-primary <?php echo ($record['tipo_anagrafica'] == 'Ente pubblico' || $record['tipo_anagrafica'] == 'Azienda') ? 'show' : 'hide'; ?>">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <?php echo tr('Dati appalto'); ?>
 
-                    <div class="box-tools pull-right">
-                        <a data-toggle="collapse" href="#dati_appalto"><i class="fa fa-plus" style='color:white;margin-top:2px;'></i></a>
-                    </div>
-                </h4>
+    <div class="box box-primary collapsable  <?php echo ($record['tipo_anagrafica'] == 'Ente pubblico' || $record['tipo_anagrafica'] == 'Azienda') ? 'show' : 'hide'; ?> <?php echo $collapsed; ?>">
+        <div class=" box-header">
+            <h4 class=" box-title">
+                
+                <?php echo tr('Dati appalto'); ?></h4>
+
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            
+        </div>
+        <div class="box-body">
+            <div class="row">
+                <div class="col-md-6">
+                    {[ "type": "text", "label": "<?php echo tr('Identificatore Documento'); ?>", "name": "id_documento_fe", "required": 0, "help": "<?php echo tr('<span>Obbligatorio per valorizzare CIG/CUP. &Egrave; possible inserire: </span><ul><li>N. determina</li><li>RDO</li><li>Ordine MEPA</li></ul>'); ?>", "value": "$id_documento_fe$", "maxlength": 20 ]}
+                </div>
+
+                <div class="col-md-6">
+                    {[ "type": "text", "label": "<?php echo tr('Numero Riga'); ?>", "name": "num_item", "required": 0, "value": "$num_item$", "maxlength": 15 ]}
+                </div>
             </div>
-            <div id="dati_appalto" class="panel-collapse collapse <?php echo $collapsed; ?>">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            {[ "type": "text", "label": "<?php echo tr('Identificatore Documento'); ?>", "name": "id_documento_fe", "required": 0, "help": "<?php echo tr('<span>Obbligatorio per valorizzare CIG/CUP. &Egrave; possible inserire: </span><ul><li>N. determina</li><li>RDO</li><li>Ordine MEPA</li></ul>'); ?>", "value": "$id_documento_fe$", "maxlength": 20 ]}
-                        </div>
+            <div class="row">
+                <div class="col-md-6">
+                    {[ "type": "text", "label": "<?php echo tr('Codice CIG'); ?>", "name": "codice_cig", "required": 0, "value": "$codice_cig$", "maxlength": 15 ]}
+                </div>
 
-                        <div class="col-md-6">
-                            {[ "type": "text", "label": "<?php echo tr('Numero Riga'); ?>", "name": "num_item", "required": 0, "value": "$num_item$", "maxlength": 15 ]}
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            {[ "type": "text", "label": "<?php echo tr('Codice CIG'); ?>", "name": "codice_cig", "required": 0, "value": "$codice_cig$", "maxlength": 15 ]}
-                        </div>
-
-                        <div class="col-md-6">
-                            {[ "type": "text", "label": "<?php echo tr('Codice CUP'); ?>", "name": "codice_cup", "required": 0, "value": "$codice_cup$", "maxlength": 15 ]}
-                        </div>
-                    </div>
+                <div class="col-md-6">
+                    {[ "type": "text", "label": "<?php echo tr('Codice CUP'); ?>", "name": "codice_cup", "required": 0, "value": "$codice_cup$", "maxlength": 15 ]}
                 </div>
             </div>
         </div>
diff --git a/modules/preventivi/edit.php b/modules/preventivi/edit.php
index ce6d03b00..e49269d36 100755
--- a/modules/preventivi/edit.php
+++ b/modules/preventivi/edit.php
@@ -189,44 +189,44 @@ echo '
 
     <?php
         if (!empty($record['id_documento_fe']) || !empty($record['num_item']) || !empty($record['codice_cig']) || !empty($record['codice_cup'])) {
-            $collapsed = 'in';
-        } else {
             $collapsed = '';
+        } else {
+            $collapsed = ' collapsed-box';
         }
     ?>
 
     <!-- Fatturazione Elettronica PA-->
-    <div class="panel-group">
-        <div class="panel panel-primary <?php echo ($record['tipo_anagrafica'] == 'Ente pubblico' || $record['tipo_anagrafica'] == 'Azienda') ? 'show' : 'hide'; ?>">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <?php echo tr('Dati appalto'); ?>
 
-                    <div class="box-tools pull-right">
-                        <a data-toggle="collapse" href="#dati_appalto"><i class="fa fa-plus" style='color:white;margin-top:2px;'></i></a>
-                    </div>
-                </h4>
+    <div class="box box-primary collapsable  <?php echo ($record['tipo_anagrafica'] == 'Ente pubblico' || $record['tipo_anagrafica'] == 'Azienda') ? 'show' : 'hide'; ?> <?php echo $collapsed; ?>">
+        <div class=" box-header">
+            <h4 class=" box-title">
+                
+                <?php echo tr('Dati appalto'); ?></h4>
+
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            
+        </div>
+        <div class="box-body">
+            <div class="row">
+                <div class="col-md-6">
+                    {[ "type": "text", "label": "<?php echo tr('Identificatore Documento'); ?>", "name": "id_documento_fe", "required": 0, "help": "<?php echo tr('<span>Obbligatorio per valorizzare CIG/CUP. &Egrave; possible inserire: </span><ul><li>N. determina</li><li>RDO</li><li>Ordine MEPA</li></ul>'); ?>", "value": "$id_documento_fe$", "maxlength": 20 ]}
+                </div>
+
+                <div class="col-md-6">
+                    {[ "type": "text", "label": "<?php echo tr('Numero Riga'); ?>", "name": "num_item", "required": 0, "value": "$num_item$", "maxlength": 15 ]}
+                </div>
             </div>
-            <div id="dati_appalto" class="panel-collapse collapse <?php echo $collapsed; ?>">
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            {[ "type": "text", "label": "<?php echo tr('Identificatore Documento'); ?>", "name": "id_documento_fe", "required": 0, "help": "<?php echo tr('<span>Obbligatorio per valorizzare CIG/CUP. &Egrave; possible inserire: </span><ul><li>N. determina</li><li>RDO</li><li>Ordine MEPA</li></ul>'); ?>", "value": "$id_documento_fe$", "maxlength": 20 ]}
-                        </div>
+            <div class="row">
+                <div class="col-md-6">
+                    {[ "type": "text", "label": "<?php echo tr('Codice CIG'); ?>", "name": "codice_cig", "required": 0, "value": "$codice_cig$", "maxlength": 15 ]}
+                </div>
 
-                        <div class="col-md-6">
-                            {[ "type": "text", "label": "<?php echo tr('Numero Riga'); ?>", "name": "num_item", "required": 0, "value": "$num_item$", "maxlength": 15 ]}
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            {[ "type": "text", "label": "<?php echo tr('Codice CIG'); ?>", "name": "codice_cig", "required": 0, "value": "$codice_cig$", "maxlength": 15 ]}
-                        </div>
-
-                        <div class="col-md-6">
-                            {[ "type": "text", "label": "<?php echo tr('Codice CUP'); ?>", "name": "codice_cup", "required": 0, "value": "$codice_cup$", "maxlength": 15 ]}
-                        </div>
-                    </div>
+                <div class="col-md-6">
+                    {[ "type": "text", "label": "<?php echo tr('Codice CUP'); ?>", "name": "codice_cup", "required": 0, "value": "$codice_cup$", "maxlength": 15 ]}
                 </div>
             </div>
         </div>