Merge branch 'dev' into 3370-client_create

front/core/styles/icons/salixfont.css

@@ -23,30 +23,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-basketadd:before {
+.icon-preserved:before {
-  content: "\e901";
+  content: "\e963";
 }
-.icon-addperson:before {
+.icon-treatments:before {
-  content: "\e955";
+  content: "\e964";
 }
-.icon-supplierfalse:before {
+.icon-funeral:before {
+  content: "\e965";
+}
+.icon-handmadeArtificial:before {
+  content: "\e966";
+}
+.icon-fixedPrice:before {
   content: "\e962";
 }
-.icon-invoice-in-create:before {
+.icon-accounts:before {
-  content: "\e948";
+  content: "\e95f";
 }
-.icon-invoiceOut:before {
+.icon-clientConsumption:before {
   content: "\e960";
 }
-.icon-invoiceIn:before {
+.icon-lastBuy:before {
   content: "\e961";
 }
-.icon-supplier:before {
-  content: "\e936";
-}
-.icon-latestBuy:before {
-  content: "\e95f";
-}
 .icon-zone:before {
   content: "\e95d";
 }
@@ -86,6 +86,9 @@
 .icon-deliveryprices:before {
   content: "\e956";
 }
+.icon-basketadd:before {
+  content: "\e955";
+}
 .icon-catalog:before {
   content: "\e952";
 }
@@ -128,9 +131,15 @@
 .icon-actions:before {
   content: "\e900";
 }
+.icon-addperson:before {
+  content: "\e901";
+}
 .icon-albaran:before {
   content: "\e902";
 }
+.icon-apps:before {
+  content: "\e948";
+}
 .icon-artificial:before {
   content: "\e903";
 }
@@ -239,6 +248,9 @@
 .icon-mandatory:before {
   content: "\e921";
 }
+.icon-niche:before {
+  content: "\e922";
+}
 .icon-no036:before {
   content: "\e923";
 }
@@ -302,6 +314,9 @@
 .icon-stowaway:before {
   content: "\e92c";
 }
+.icon-supplier:before {
+  content: "\e936";
+}
 .icon-tags:before {
   content: "\e937";
 }

modules/entry/front/routes.json

@@ -7,7 +7,7 @@
     "menus": {
         "main": [
             {"state": "entry.index", "icon": "icon-entry"},
-            {"state": "entry.latestBuys", "icon": "contact_support"}
+            {"state": "entry.latestBuys", "icon": "icon-lastBuy"}
         ],
         "card": [
             {"state": "entry.card.basicData", "icon": "settings"},

modules/item/front/routes.json

@@ -9,7 +9,7 @@
             {"state": "item.index", "icon": "icon-item"},
             {"state": "item.request", "icon": "pan_tool"},
             {"state": "item.waste.index", "icon": "icon-claims"},
-            {"state": "item.fixedPrice", "icon": "contact_support"}
+            {"state": "item.fixedPrice", "icon": "icon-fixedPrice"}
         ],
         "card": [
             {"state": "item.card.basicData", "icon": "settings"},

modules/supplier/front/routes.json

@@ -13,7 +13,7 @@
             {"state": "supplier.card.fiscalData", "icon": "account_balance"},
             {"state": "supplier.card.billingData", "icon": "icon-payment"},
             {"state": "supplier.card.address.index", "icon": "icon-delivery"},
-            {"state": "supplier.card.account", "icon": "contact_support"},
+            {"state": "supplier.card.account", "icon": "icon-accounts"},
             {"state": "supplier.card.contact", "icon": "contact_phone"},
             {"state": "supplier.card.log", "icon": "history"},
             {"state": "supplier.card.consumption", "icon": "show_chart"}