diff --git a/db/changes/10420-valentines/00-defaultViewConfig.sql b/db/changes/10420-valentines/00-defaultViewConfig.sql new file mode 100644 index 0000000000..c65c1f4033 --- /dev/null +++ b/db/changes/10420-valentines/00-defaultViewConfig.sql @@ -0,0 +1,3 @@ +UPDATE salix.defaultViewConfig + SET `columns`='{"intrastat":false,"stemMultiplier":false,"landed":false,"producer":false}' + WHERE tableCode ='itemsIndex'; diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index 98e78c7aad..5755de69b5 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -161,6 +161,7 @@ module.exports = Self => { i.stemMultiplier, i.typeFk, i.isFloramondo, + pr.name AS producer, it.name AS typeName, it.workerFk AS buyerFk, u.name AS userName, diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 816777a740..750dbfc4df 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -54,6 +54,9 @@ Active + + Producer + Landed @@ -122,6 +125,7 @@ ng-model="::item.isActive"> + {{::item.producer | dashIfEmpty}} {{::item.landed | date:'dd/MM/yyyy'}} diff --git a/modules/item/front/index/index.js b/modules/item/front/index/index.js index 915027c3c4..d9e00305d9 100644 --- a/modules/item/front/index/index.js +++ b/modules/item/front/index/index.js @@ -81,6 +81,8 @@ class Controller extends Section { return {'intr.description': value}; case 'name': return {'i.name': {like: `%${value}%`}}; + case 'producer': + return {'pr.name': {like: `%${value}%`}}; case 'id': case 'size': case 'subname':