diff --git a/client/client/src/summary/index.html b/client/client/src/summary/index.html
index 4d41ad036..7ea875094 100644
--- a/client/client/src/summary/index.html
+++ b/client/client/src/summary/index.html
@@ -182,12 +182,12 @@
ng-class="{bold: $ctrl.summary.debt.debt > $ctrl.summary.credit}">
+ value="{{$ctrl.summary.creditInsurance | currency:'€ ':2}} ({{$ctrl.summary.classifications[0].insurances[0].grade}})">
diff --git a/client/item/src/data/index.html b/client/item/src/data/index.html
index 8b2fe80d7..e08838518 100644
--- a/client/item/src/data/index.html
+++ b/client/item/src/data/index.html
@@ -19,9 +19,7 @@
field="$ctrl.item.longName"
info="Full name calculates based on tags 1-3. Is not recommended to change it manually">
-
-
-
+
+
{{::description}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/item/src/data/locale/es.yml b/client/item/src/data/locale/es.yml
index cfac5303e..84cfa08f7 100644
--- a/client/item/src/data/locale/es.yml
+++ b/client/item/src/data/locale/es.yml
@@ -3,4 +3,5 @@ Full name calculates based on tags 1-3. Is not recommended to change it manually
El nombre completo se calcula
basado en los tags 1-3.
No se recomienda cambiarlo manualmente
-Is active: Activo
\ No newline at end of file
+Is active: Activo
+Expence: Gasto
diff --git a/client/item/src/locale/es.yml b/client/item/src/locale/es.yml
index 280bf790f..8c42b742f 100644
--- a/client/item/src/locale/es.yml
+++ b/client/item/src/locale/es.yml
@@ -2,7 +2,7 @@ Item: Artículo
View item: Ver artículo
Category: Categoría
Description: Descripción
-Size: Tamaño
+Size: Medida
Type: Tipo
Name: Nombre
Full name: Nombre completo
@@ -41,6 +41,9 @@ Available: Disponible
Create: Crear
Client card: Ficha del cliente
Shipped: F. envio
+stems: Tallos
+Compression: Compresión
+Density: Densidad
#Sections
Items: Artículos
diff --git a/client/item/src/summary/index.html b/client/item/src/summary/index.html
index d0bbe21da..92e3b6d63 100644
--- a/client/item/src/summary/index.html
+++ b/client/item/src/summary/index.html
@@ -25,7 +25,7 @@
- Basic data
+ Basic data (I)
@@ -35,20 +35,14 @@
-
-
-
-
-
+
-
+
@@ -56,20 +50,45 @@
-
- Tax
-
+
+ Basic data (II)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tags
+
-
- Tags
-
+
+ Tax
+
diff --git a/package-lock.json b/package-lock.json
index 2d2c6445d..de84db619 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6586,8 +6586,7 @@
"jsbn": {
"version": "0.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"json-schema": {
"version": "0.2.3",
diff --git a/services/client/common/methods/receipt/filter.js b/services/client/common/methods/receipt/filter.js
index 501e155aa..fbd4cd107 100644
--- a/services/client/common/methods/receipt/filter.js
+++ b/services/client/common/methods/receipt/filter.js
@@ -51,7 +51,7 @@ module.exports = Self => {
SELECT
i.id,
TRUE,
- i.dued,
+ i.issued,
c.code,
i.created,
CONCAT(' N/FRA ', i.ref),
diff --git a/services/loopback/common/methods/item/clone.js b/services/loopback/common/methods/item/clone.js
index 90ba1820e..b8b2fd5c1 100644
--- a/services/loopback/common/methods/item/clone.js
+++ b/services/loopback/common/methods/item/clone.js
@@ -39,6 +39,7 @@ module.exports = Self => {
delete copy.itemTag;
delete copy.description;
delete copy.image;
+ delete copy.comment;
let newItem = await Self.create(copy);
let promises = [];
diff --git a/services/loopback/common/methods/item/getSummary.js b/services/loopback/common/methods/item/getSummary.js
index 0ed76e134..3cbb8bcab 100644
--- a/services/loopback/common/methods/item/getSummary.js
+++ b/services/loopback/common/methods/item/getSummary.js
@@ -67,6 +67,7 @@ module.exports = Self => {
where: {
itemFk: id
},
+ order: 'priority',
include: {
relation: 'tag'
}
diff --git a/services/loopback/common/models/item.json b/services/loopback/common/models/item.json
index 08cefab2e..12dff25eb 100644
--- a/services/loopback/common/models/item.json
+++ b/services/loopback/common/models/item.json
@@ -43,6 +43,9 @@
"relevancy": {
"type": "Number"
},
+ "density": {
+ "type": "Number"
+ },
"image": {
"type": "String"
},