diff --git a/modules/item/back/methods/item/lastEntriesFilter.js b/modules/item/back/methods/item/lastEntriesFilter.js index 63e154b9e..6f22f637f 100644 --- a/modules/item/back/methods/item/lastEntriesFilter.js +++ b/modules/item/back/methods/item/lastEntriesFilter.js @@ -12,7 +12,7 @@ module.exports = Self => { description: 'itemFk, id' }], returns: { - type: 'Array', + type: ['Object'], root: true }, http: { @@ -40,12 +40,19 @@ module.exports = Self => { b.weight, i.stems, b.quantity, + b.buyingValue + + b.freightValue + + b.comissionValue + + b.packageValue AS cost, b.buyingValue, + b.freightValue, + b.comissionValue, + b.packageValue, b.packageFk , s.id AS supplierFk, s.name AS supplier FROM itemType it - RIGHT JOIN (entry e + RIGHT JOIN (entry e LEFT JOIN supplier s ON s.id = e.supplierFk RIGHT JOIN buy b ON b.entryFk = e.id LEFT JOIN item i ON i.id = b.itemFk diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html index dd63bec27..f0cb06521 100644 --- a/modules/item/front/last-entries/index.html +++ b/modules/item/front/last-entries/index.html @@ -72,7 +72,17 @@ {{::entry.stems | dashIfEmpty}} {{::entry.quantity}} - {{::entry.buyingValue | dashIfEmpty}} + + + {{::entry.cost | dashIfEmpty}} + + {{::entry.weight | dashIfEmpty}} {{::entry.packageFk | dashIfEmpty}} {{::entry.supplier | dashIfEmpty}} diff --git a/modules/item/front/last-entries/locale/es.yml b/modules/item/front/last-entries/locale/es.yml index 0eac6eaa6..f2917bb63 100644 --- a/modules/item/front/last-entries/locale/es.yml +++ b/modules/item/front/last-entries/locale/es.yml @@ -9,4 +9,7 @@ Ignored: Ignorado Provider: Proveedor Cube: Cubo Price Per Unit: Precio Por Unidad -Price Per Package: Precio Por Paquete \ No newline at end of file +Price Per Package: Precio Por Paquete +Freight: Porte +Package: Embalaje +Comission: Comision \ No newline at end of file