diff --git a/front/core/components/input-file/index.html b/front/core/components/input-file/index.html
index be4c15248a..ad71b744db 100644
--- a/front/core/components/input-file/index.html
+++ b/front/core/components/input-file/index.html
@@ -30,7 +30,7 @@
ng-click="$ctrl.onClear($event)">
diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css
index 505fb8520e..8805815e85 100644
--- a/front/core/styles/icons/salixfont.css
+++ b/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";
}
@@ -301,4 +316,4 @@
}
.icon-worker:before {
content: "\e943";
-}
+}
\ No newline at end of file
diff --git a/front/core/styles/icons/salixfont.svg b/front/core/styles/icons/salixfont.svg
index 7cd1af528d..9ca57000d5 100644
--- a/front/core/styles/icons/salixfont.svg
+++ b/front/core/styles/icons/salixfont.svg
@@ -100,4 +100,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/front/core/styles/icons/salixfont.ttf b/front/core/styles/icons/salixfont.ttf
index 08a36a48ba..ab5de35ff5 100644
Binary files a/front/core/styles/icons/salixfont.ttf and b/front/core/styles/icons/salixfont.ttf differ
diff --git a/front/core/styles/icons/salixfont.woff b/front/core/styles/icons/salixfont.woff
index 325a1bc2d0..d9ade1e312 100644
Binary files a/front/core/styles/icons/salixfont.woff and b/front/core/styles/icons/salixfont.woff differ
diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index ba9b021f50..c915569dec 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/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;
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index 6d38dbba10..d3f149680f 100644
--- a/modules/entry/back/models/entry.json
+++ b/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": {
diff --git a/modules/entry/front/descriptor/index.html b/modules/entry/front/descriptor/index.html
index cd4057c43a..917c5d7213 100644
--- a/modules/entry/front/descriptor/index.html
+++ b/modules/entry/front/descriptor/index.html
@@ -35,6 +35,18 @@
value="{{$ctrl.entry.travel.warehouseOut.name}}">
+
+
+
+
+
+
diff --git a/modules/entry/front/descriptor/locale/es.yml b/modules/entry/front/descriptor/locale/es.yml
index 5e1eb25c2d..47fabb8f09 100644
--- a/modules/entry/front/descriptor/locale/es.yml
+++ b/modules/entry/front/descriptor/locale/es.yml
@@ -1,4 +1,6 @@
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
\ No newline at end of file
+Show entry report: Ver informe del pedido
+Is inventory entry: Es una entrada de inventario
+Is virtual entry: Es una redada
\ No newline at end of file
diff --git a/modules/entry/front/index/index.html b/modules/entry/front/index/index.html
index 60bbe46d54..cb44aa630e 100644
--- a/modules/entry/front/index/index.html
+++ b/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">