From 00f9754c1e085a69c6b5e309386ec28e7eb0a4b4 Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Tue, 5 Mar 2019 12:03:34 +0100
Subject: [PATCH] #1171 item.index mostrar campos medida y nicho

---
 modules/item/back/methods/item/filter.js | 5 +++--
 modules/item/front/index/index.html      | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js
index 0abb3ceb6..0aa8808b1 100644
--- a/modules/item/back/methods/item/filter.js
+++ b/modules/item/back/methods/item/filter.js
@@ -99,7 +99,7 @@ module.exports = Self => {
                     intr.description AS intrastat, i.stems,
                     ori.code AS origin, t.name AS type,
                     ic.name AS category, i.density, tc.description AS taxClass,
-                    b.grouping, b.packing
+                    b.grouping, b.packing, itn.code AS niche
                 FROM item i
                     LEFT JOIN itemType t ON t.id = i.typeFk
                     LEFT JOIN itemCategory ic ON ic.id = t.categoryFk
@@ -110,7 +110,8 @@ module.exports = Self => {
                     LEFT JOIN origin ori ON ori.id = i.originFk
                     LEFT JOIN taxClass tc ON tc.id = i.taxClassFk
                     LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = t.warehouseFk
-                    LEFT JOIN vn.buy b ON b.id = lb.buy_id`
+                    LEFT JOIN vn.buy b ON b.id = lb.buy_id
+                    LEFT JOIN itemPlacement itn ON itn.itemFk = i.id AND itn.warehouseFk = t.warehouseFk`
         );
 
         if (ctx.args.hasVisible === true) {
diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html
index 5a2988537..6f748a752 100644
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@@ -26,6 +26,8 @@
                     <vn-th th-id="packing" number>Packing</vn-th>
                     <vn-th th-id="description" style="text-align: center">Description</vn-th>
                     <vn-th th-id="stems" number>Stems</vn-th>
+                    <vn-th th-id="size"number>Size</vn-th>
+                    <vn-th th-id="niche"number>Niche</vn-th>
                     <vn-th th-id="type">Type</vn-th>
                     <vn-th th-id="category">Category</vn-th>
                     <vn-th th-id="intrastat">Intrastat</vn-th>
@@ -65,6 +67,8 @@
                         </vn-fetched-tags>
                     </vn-td>
                     <vn-td number>{{::item.stems}}</vn-td>
+                    <vn-td number>{{::item.size}}</vn-td>
+                    <vn-td number>{{::item.niche}}</vn-td>
                     <vn-td>{{::item.type}}</vn-td>
                     <vn-td>{{::item.category}}</vn-td>
                     <vn-td>{{::item.intrastat}}</vn-td>