diff --git a/assets/src/css/style.css b/assets/src/css/style.css
index 00fa7a9eb..c6c79e9f6 100644
--- a/assets/src/css/style.css
+++ b/assets/src/css/style.css
@@ -797,7 +797,13 @@ input.small-width {
 .select2-dropdown{
     z-index: 2000;
 }
-.input-group-addon .select2-selection{
+
+.after.input-group-addon .select2-selection{
 	 border-radius:0px 4px 4px 0px;
 	 border-left:none;
- }
\ No newline at end of file
+}
+
+.before.input-group-addon .select2-selection, .before.input-group-addon{
+	 border-radius:4px 0px 0px 4px;
+	 border-right:none;
+}
\ No newline at end of file
diff --git a/modules/dashboard/actions.php b/modules/dashboard/actions.php
index 355ffd887..5bc362415 100644
--- a/modules/dashboard/actions.php
+++ b/modules/dashboard/actions.php
@@ -147,7 +147,7 @@ switch (get('op')) {
 
         $rsp = $dbo->fetchArray($qp);
 
-        $interventi = $dbo->fetchArray("SELECT id, richiesta, DATE_FORMAT(data_richiesta,'%m%Y') AS mese, data_richiesta, an_anagrafiche.ragione_sociale, 'intervento' AS ref, (SELECT descrizione FROM in_tipiintervento WHERE in_tipiintervento.idtipointervento=in_interventi.idtipointervento) AS tipointervento FROM in_interventi INNER JOIN an_anagrafiche ON in_interventi.idanagrafica=an_anagrafiche.idanagrafica WHERE (SELECT COUNT(*) FROM in_interventi_tecnici WHERE in_interventi_tecnici.idintervento = in_interventi.id) = 0 ORDER BY data_richiesta ASC");
+        $interventi = $dbo->fetchArray("SELECT id, richiesta, id_contratto AS idcontratto, DATE_FORMAT(data_richiesta,'%m%Y') AS mese, data_richiesta, an_anagrafiche.ragione_sociale, 'intervento' AS ref, (SELECT descrizione FROM in_tipiintervento WHERE in_tipiintervento.idtipointervento=in_interventi.idtipointervento) AS tipointervento FROM in_interventi INNER JOIN an_anagrafiche ON in_interventi.idanagrafica=an_anagrafiche.idanagrafica WHERE (SELECT COUNT(*) FROM in_interventi_tecnici WHERE in_interventi_tecnici.idintervento = in_interventi.id) = 0 ORDER BY data_richiesta ASC");
 
         $rsp = array_merge($rsp, $interventi);
 
@@ -164,7 +164,7 @@ switch (get('op')) {
                     }
 
                     echo '
-                    <div class="fc-event '.$class.'" data-id="'.$r['id'].'" data-idcontratto="'.$r['idcontratto'].'" data-ref="'.$r['ref'].'">'.(!empty($r['idcontratto']) ? '<i class=\'fa fa-file-text-o pull-right\'></i>':'<i class=\'fa fa-wrench pull-right\'></i>').'
+                    <div class="fc-event '.$class.'" data-id="'.$r['id'].'" data-idcontratto="'.$r['idcontratto'].'" data-ref="'.$r['ref'].'">'.( ($r['ref']=='intervento') ? '<i class=\'fa fa-wrench pull-right\'></i>':'<i class=\'fa fa-file-text-o pull-right\'></i>').'
                         <b>'.$r['ragione_sociale'].'</b><br>'.Translator::dateToLocale($r['data_richiesta']).' ('.$r['tipointervento'].')'.(!empty($r['richiesta']) ? ' - '.$r['richiesta'] : '').'
                     </div>';
                 }
diff --git a/modules/dashboard/edit.php b/modules/dashboard/edit.php
index a829f5757..0c020da9d 100644
--- a/modules/dashboard/edit.php
+++ b/modules/dashboard/edit.php
@@ -612,7 +612,7 @@ if (Modules::getPermission('Interventi') == 'rw') {
                 ref = $(this).data('ref');
                 if (ref == 'ordine') {
                     name = 'idordineservizio';
-                } else if (ref == 'ordine') {
+                } else if (ref == 'promemoria') {
                     name = 'idcontratto_riga';
                 } else {
                     name = 'id_intervento';
diff --git a/modules/fatture/crea_documento.php b/modules/fatture/crea_documento.php
index 70f317963..ab6a12083 100644
--- a/modules/fatture/crea_documento.php
+++ b/modules/fatture/crea_documento.php
@@ -89,7 +89,7 @@ echo '
 <p>'.str_replace('_NUM_', $numero, $head).'.</p>';
 
 // Selezione articoli dell'ordine da portare nel ddt
-$rs = $dbo->fetchArray('SELECT *, IFNULL((SELECT codice FROM mg_articoli WHERE id=idarticolo),"") AS codice, (qta - qta_evasa) AS qta_rimanente FROM '.$table.' INNER JOIN '.$rows.' ON '.$table.'.id='.$rows.'.'.$id.' WHERE '.$table.'.id='.prepare($id_record).' HAVING qta_rimanente > 0 ORDER BY `order`');
+$rs = $dbo->fetchArray('SELECT *, IFNULL((SELECT codice FROM mg_articoli WHERE id=idarticolo),"") AS codice, (qta - qta_evasa) AS qta_rimanente FROM '.$table.' INNER JOIN '.$rows.' ON '.$table.'.id='.$rows.'.'.$id.' WHERE '.$table.'.id='.prepare($id_record).' HAVING qta_rimanente > 0 OR is_descrizione = 1 ORDER BY `order`');
 
 if (!empty($rs)) {
     echo '
@@ -180,7 +180,7 @@ if (!empty($rs)) {
         // Q.tà da evadere
         echo '
         <td>
-            {[ "type": "number", "name": "qta_da_evadere['.$r['id'].']", "id": "qta_'.$i.'", "required": 1, "value": "'.$r['qta_rimanente'].'", "extra" : "onkeyup=\"ricalcola_subtotale_riga('.$i.');\"", "decimals": "qta", "min-value": "0" ]}
+            {[ "type": "number", "name": "qta_da_evadere['.$r['id'].']", "id": "qta_'.$i.'", "required": 1, "value": "'.$r['qta_rimanente'].'", "extra" : "onkeyup=\"ricalcola_subtotale_riga('.$i.');\"", "decimals": "qta", "min-value": "0", "extra": "'.(($r['is_descrizione']) ? 'readonly' : '').'" ]}
         </td>';
 
         // Subtotale
diff --git a/modules/interventi/add.php b/modules/interventi/add.php
index 1db4d04d3..50c52dbec 100644
--- a/modules/interventi/add.php
+++ b/modules/interventi/add.php
@@ -57,9 +57,11 @@ if (null !== filter('orario_inizio') && '00:00:00' != filter('orario_inizio')) {
 }
 
 // Se sto pianificando un contratto, leggo tutti i dati del contratto per predisporre l'aggiunta intervento
+//ref (intervento,promemoria,ordine)
+
 $id_intervento = filter('id_intervento');
 $idcontratto = filter('idcontratto');
-$idcontratto_riga = (!empty($idcontratto)) ? filter('id_intervento'):filter('idcontratto_riga');
+$idcontratto_riga = filter('idcontratto_riga');
 $idordineservizio = filter('idordineservizio');
 
 
diff --git a/src/HTMLBuilder/Handler/ChoicesHandler.php b/src/HTMLBuilder/Handler/ChoicesHandler.php
index 1e0872438..cae5900e5 100644
--- a/src/HTMLBuilder/Handler/ChoicesHandler.php
+++ b/src/HTMLBuilder/Handler/ChoicesHandler.php
@@ -50,7 +50,7 @@ class ChoicesHandler implements HandlerInterface
         // "+ this.checked" rende il valore booleano un numero
         $result = '
     <div class="input-group">
-        <span class="input-group-addon">
+        <span class="input-group-addon before">
             <input |attr| onchange="$(this).parent().find(\'[type=hidden]\').val( + this.checked)">
             <input type="hidden" name="|name|" value="|value|">
         </span>
diff --git a/src/HTMLBuilder/Wrapper/HTMLWrapper.php b/src/HTMLBuilder/Wrapper/HTMLWrapper.php
index 722c1c2a2..78759f7e0 100644
--- a/src/HTMLBuilder/Wrapper/HTMLWrapper.php
+++ b/src/HTMLBuilder/Wrapper/HTMLWrapper.php
@@ -30,7 +30,7 @@ class HTMLWrapper implements WrapperInterface
 
             if (!empty($values['icon-before'])) {
                 $result .= '
-        <span class="input-group-addon'.(!empty($values['icon-custom']) ? ' '.$values['icon-custom'] : '').'">'.$values['icon-before'].'</span>';
+        <span class="input-group-addon before'.(!empty($values['icon-custom']) ? ' '.$values['icon-custom'] : '').'">'.$values['icon-before'].'</span>';
             }
         }
 
@@ -44,7 +44,7 @@ class HTMLWrapper implements WrapperInterface
         if (!empty($values['icon-before']) || !empty($values['icon-after'])) {
             if (!empty($values['icon-after'])) {
                 $result .= '
-                <span class="input-group-addon'.(!empty($values['icon-custom']) ? ' '.$values['icon-custom'] : '').'">'.$values['icon-after'].'</span>';
+                <span class="input-group-addon after'.(!empty($values['icon-custom']) ? ' '.$values['icon-custom'] : '').'">'.$values['icon-after'].'</span>';
             }
 
             $result .= '