Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm

back/models/company.json

@@ -18,9 +18,6 @@
         },
         "expired": {
             "type": "date"
-        },
-        "isOfficial": {
-            "type": "boolean"
         }
     },
 

modules/ticket/front/index/index.html

@@ -24,7 +24,7 @@
                     <vn-th field="stateFk" >State</vn-th>
                     <vn-th field="zoneFk">Zone</vn-th>
                     <vn-th field="warehouseFk">Warehouse</vn-th>
-                    <vn-th number>Total</vn-th>
+                    <vn-th field="totalWithVat" number>Total</vn-th>
                     <vn-th></vn-th>
                 </vn-tr>
             </vn-thead>