Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2145_e2e_linux_fix

front/core/components/drop-down/index.html

@@ -3,7 +3,8 @@
         ng-model="$ctrl.search"
         class="dense search"
         ng-blur="$ctrl.onFocusOut()"
-        placeholder="{{::'Search' | translate}}">
+        placeholder="{{::'Search' | translate}}"
+        autocomplete="off">
     </vn-textfield>
 </div>
 <div class="list" tabindex="-1">

front/core/components/field/index.js

@@ -132,6 +132,17 @@ export default class Field extends FormInput {
         return this.error || this.inputError || null;
     }
 
+    get autocomplete() {
+        return this._autocomplete;
+    }
+
+    set autocomplete(value) {
+        this._autocomplete = value;
+
+        if (value === 'off')
+            this.input.setAttribute('autocomplete', 'off');
+    }
+
     refreshHint() {
         let error = this.shownError;
         let hint = error || this.hint;
@@ -206,6 +217,7 @@ ngModule.vnComponent('vnField', {
     controller: Field,
     bindings: {
         type: '@?',
+        autocomplete: '@?',
         placeholder: '@?',
         value: '=?',
         info: '@?',

front/core/components/input-file/index.html

@@ -30,7 +30,7 @@
             ng-click="$ctrl.onClear($event)">
         </vn-icon>
         <vn-icon
-            icon="attach_file"
+            icon="icon-attach"
             vn-tooltip="Select a file"
             ng-click="$ctrl.openFileSelector()">
         </vn-icon>

front/core/styles/icons/salixfont.css

@@ -23,6 +23,21 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-zone:before {
+  content: "\e95d";
+}
+.icon-inventory:before {
+  content: "\e95e";
+}
+.icon-wiki:before {
+  content: "\e968";
+}
+.icon-attach:before {
+  content: "\e96c";
+}
+.icon-zone2:before {
+  content: "\e96d";
+}
 .icon-net:before {
   content: "\e95b";
 }

modules/entry/back/methods/entry/filter.js

@@ -150,7 +150,6 @@ module.exports = Self => {
                     JOIN vn.currency cu ON cu.id = e.currencyFk`
         );
 
-
         stmt.merge(conn.makeSuffix(filter));
         let itemsIndex = stmts.push(stmt) - 1;
 

modules/entry/back/models/entry.json

@@ -11,7 +11,7 @@
     },
     "properties": {
         "id": {
-            "type": "Number",
+            "type": "number",
             "id": true,
             "description": "Identifier"
         },
@@ -19,46 +19,49 @@
             "type": "date"
         },
         "ref": {
-            "type": "String"
+            "type": "string"
         },
         "isBooked": {
-            "type": "Boolean"
+            "type": "boolean"
         },
         "isInventory": {
-            "type": "Boolean"
+            "type": "boolean"
         },
         "notes": {
-            "type": "Number"
+            "type": "number"
         },
         "isConfirmed": {
-            "type": "Boolean"
+            "type": "boolean"
         },
         "isVirtual": {
-            "type": "Boolean",
+            "type": "boolean",
 			"mysql": {
 				"columnName": "isRaid"
 			}
         },
+        "isRaid": {
+            "type": "boolean"
+        },
         "commission": {
-            "type": "Number"
+            "type": "number"
         },
         "isOrdered": {
-            "type": "Boolean"
+            "type": "boolean"
         },
         "created": {
             "type": "date"
         },
         "observation": {
-            "type": "String",
+            "type": "string",
 			"mysql": {
 				"columnName": "evaNotes"
 			}
         },
         "isBlocked": {
-            "type": "Boolean"
+            "type": "boolean"
         },
         "loadPriority": {
-            "type": "Number"
+            "type": "number"
         }
     },
     "relations": {

modules/entry/front/descriptor/index.html

@@ -35,6 +35,18 @@
                 value="{{$ctrl.entry.travel.warehouseOut.name}}">
             </vn-label-value>            
         </div>
+        <div class="icons">
+            <vn-icon
+                vn-tooltip="Is inventory entry"
+                icon="icon-inventory"
+                ng-class="{bright: $ctrl.entry.isInventory}">
+            </vn-icon>
+            <vn-icon
+                vn-tooltip="Is virtual entry"
+                icon="icon-net"
+                ng-class="{bright: $ctrl.entry.isRaid}">
+            </vn-icon>
+        </div>
         <vn-quick-links
             links="$ctrl.quicklinks">
         </vn-quick-links>

modules/entry/front/descriptor/locale/es.yml

@@ -2,3 +2,5 @@ Reference: Referencia
 All travels with current agency: Todos los envios con la agencia actual
 All entries with current supplier: Todas las entradas con el proveedor actual
 Show entry report: Ver informe del pedido
+Is inventory entry: Es una entrada de inventario
+Is virtual entry: Es una redada

modules/entry/front/index/index.html

@@ -38,7 +38,7 @@
                         ng-show="entry.isInventory"
                         class="bright"
                         vn-tooltip="Inventory entry"
-                        icon="icon-anonymous">
+                        icon="icon-inventory">
                     </vn-icon>
                     <vn-icon
                         ng-show="entry.isRaid"

modules/ticket/back/methods/ticket/new.js

@@ -6,7 +6,7 @@ module.exports = Self => {
         accessType: 'WRITE',
         accepts: [{
             arg: 'clientId',
-            type: 'Number',
+            type: 'number',
             description: `The client id filter`,
             required: true
         },
@@ -22,29 +22,29 @@ module.exports = Self => {
         },
         {
             arg: 'warehouseId',
-            type: 'Number',
+            type: 'number',
             description: `The warehouse id filter`,
             required: true
         },
         {
             arg: 'companyId',
-            type: 'Number',
+            type: 'number',
             description: `The company id filter`
         },
         {
             arg: 'addressId',
-            type: 'Number',
+            type: 'number',
             description: `The address id filter`,
             required: true
         },
         {
             arg: 'agencyModeId',
-            type: 'Number',
+            type: 'any',
             description: `The agencyMode id filter`
         },
         {
             arg: 'routeId',
-            type: 'Number',
+            type: 'number',
             description: `The route id filter`
         }],
         returns: {

modules/ticket/front/index/index.html

@@ -129,7 +129,7 @@
 
 <div fixed-bottom-right>
     <vn-vertical style="align-items: center;">
-        <vn-button class="round message xs vn-mb-sm"
+        <vn-button class="round sm vn-mb-sm"
             icon="icon-recovery"
             ng-show="$ctrl.totalChecked > 0"
             ng-click="$ctrl.openBalanceDialog()"

modules/zone/front/routes.json

@@ -1,12 +1,12 @@
 {
     "module": "zone",
     "name": "Zones",
-    "icon" : "location_on",
+    "icon" : "icon-zone",
     "validations" : true,
     "dependencies": ["worker"],
     "menus": {
         "main": [
-            {"state": "zone.index", "icon": "location_on"},
+            {"state": "zone.index", "icon": "icon-zone"},
             {"state": "zone.deliveryDays", "icon": "today"}
         ],
         "card": [