From 2a48e183e93f6e85151465a50fe553357410d474 Mon Sep 17 00:00:00 2001 From: Gerard Date: Thu, 14 Feb 2019 09:59:54 +0100 Subject: [PATCH] information added to the table --- 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 cc047c608..5f7f4f675 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -36,7 +36,7 @@ module.exports = Self => { t.name type, u.nickname userNickname, intr.description AS intrastat, i.stems, ori.code AS origin, t.name AS type, - ic.name AS category + ic.name AS category, i.density, tc.description AS taxClass FROM item i JOIN itemType t ON t.id = i.typeFk LEFT JOIN itemCategory ic ON ic.id = t.categoryFk @@ -44,7 +44,8 @@ module.exports = Self => { JOIN account.user u ON u.id = w.userFk LEFT JOIN intrastat intr ON intr.id = i.intrastatFk LEFT JOIN producer pr ON pr.id = i.producerFk - LEFT JOIN origin ori ON ori.id = i.originFk` + LEFT JOIN origin ori ON ori.id = i.originFk + LEFT JOIN taxClass tc ON tc.id = i.taxClassFk` ); if (tags) { diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index d4def30a2..6bf0720d2 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -31,6 +31,8 @@ Intrastat Origin Sales person + Density + Tax class Active @@ -59,6 +61,8 @@ {{::item.intrastat}} {{::item.origin}} {{::item.userNickname}} + {{::item.density}} + {{::item.taxClass}}