diff --git a/modules/invoiceIn/back/methods/invoice-in/filter.js b/modules/invoiceIn/back/methods/invoice-in/filter.js
index b480df64a..3b9330eb9 100644
--- a/modules/invoiceIn/back/methods/invoice-in/filter.js
+++ b/modules/invoiceIn/back/methods/invoice-in/filter.js
@@ -109,8 +109,9 @@ module.exports = Self => {
                 return {'ii.created': {gte: value}};
             case 'to':
                 return {'ii.created': {lte: value}};
-            case 'account':
             case 'fi':
+                return {'s.nif': value};
+            case 'account':
                 return {[`s.${param}`]: value};
             case 'supplierRef':
             case 'supplierFk':
diff --git a/modules/invoiceIn/front/index/index.html b/modules/invoiceIn/front/index/index.html
index 3d9b787d9..62074be33 100644
--- a/modules/invoiceIn/front/index/index.html
+++ b/modules/invoiceIn/front/index/index.html
@@ -54,19 +54,22 @@
                     </vn-icon-button>
                 </vn-td>
                 <vn-td shrink>
-                    <vn-icon-button
+   <!--                  <vn-icon-button
                         ng-show="invoiceIn.dmsFk"
                         vn-click-stop="$ctrl.openPdf(invoiceIn.dmsFk)"
                         icon="cloud_download"
                         title="Download PDF"
                         vn-tooltip="Download PDF">
-                    </vn-icon-button>
+                    </vn-icon-button> -->
                 </vn-td>
             </a>
         </vn-tbody>
     </vn-table>
     </vn-card>
 </vn-data-viewer>
+<vn-supplier-descriptor-popover 
+    vn-id="supplierDescriptor">
+</vn-supplier-descriptor-popover>
 <vn-popup vn-id="summary">
     <vn-invoice-in-summary
         invoice-in="$ctrl.selectedInvoiceIn">
diff --git a/modules/invoiceIn/front/search-panel/index.html b/modules/invoiceIn/front/search-panel/index.html
index 90bb73725..d26bc063e 100644
--- a/modules/invoiceIn/front/search-panel/index.html
+++ b/modules/invoiceIn/front/search-panel/index.html
@@ -27,11 +27,12 @@
                 label="Account"
                 ng-model="filter.account">
             </vn-textfield>
-            <vn-textfield
+            <vn-input-number
                 vn-one
                 label="Amount"
-                ng-model="filter.amount">
-            </vn-textfield>
+                ng-model="filter.amount"
+                step="0.01">
+            </vn-input-number>
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html
index 95693cc43..8685990a4 100644
--- a/modules/invoiceOut/front/index/index.html
+++ b/modules/invoiceOut/front/index/index.html
@@ -36,7 +36,7 @@
                 <vn-td expand>{{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
                 <vn-td>{{::invoiceOut.companyCode | dashIfEmpty}}</vn-td>
                 <vn-td shrink>{{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
-                <vn-td>
+                <vn-td shrink>
                     <vn-icon-button
                         ng-show="invoiceOut.hasPdf"
                         vn-click-stop="$ctrl.openPdf(invoiceOut.id)"
@@ -45,7 +45,7 @@
                         vn-tooltip="Download PDF">
                     </vn-icon-button>
                 </vn-td>
-                <vn-td>
+                <vn-td shrink>
                     <vn-icon-button
                         vn-click-stop="$ctrl.preview(invoiceOut)"
                         vn-tooltip="Preview"