Merge pull request '2844-item last entries show the total cost in the "cost" column' (#585) from 2844-item_lastEntries_sum into dev

Reviewed-on: #585
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

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

modules/item/front/last-entries/index.html

@@ -72,7 +72,17 @@
                         </vn-td>
                         <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.quantity}}</vn-td>
-                        <vn-td number class="expendable">{{::entry.buyingValue | dashIfEmpty}}</vn-td>
+                        <vn-td number 
+                            class="expendable">
+                                <span
+                                    vn-tooltip="
+                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}}<br> 
+                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
+                                    {{::entry.cost | dashIfEmpty}}
+                                </span>
+                        </vn-td>
                         <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>
                         <vn-td class="expendable" title="{{::entry.supplier | dashIfEmpty}}">{{::entry.supplier | dashIfEmpty}}</vn-td>

modules/item/front/last-entries/locale/es.yml

@@ -10,3 +10,6 @@ Provider: Proveedor
 Cube: Cubo
 Price Per Unit: Precio Por Unidad
 Price Per Package: Precio Por Paquete
+Freight: Porte
+Package: Embalaje
+Comission: Comision