verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 50 Releases Wiki Activity

3006-item_filter_category #683

Merged
joan merged 5 commits from 3006-item_filter_category into dev 2021-07-01 11:16:49 +00:00
Conversation 0 Commits 5 Files Changed 3 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 243636ccf6 - Show all commits

2
modules/item/back/methods/item/filter.js
View File

@ -144,7 +144,7 @@ module.exports = Self => {
it.workerFk AS buyerFk, it.workerFk AS buyerFk,
u.name AS userName, u.name AS userName,
ori.code AS origin, ori.code AS origin,
ic.name AS categoryFk, ic.name AS category,
intr.description AS intrastat, intr.description AS intrastat,
b.grouping, b.grouping,
b.packing, b.packing,

4
modules/item/front/index/index.html
View File

@ -67,8 +67,8 @@
<vn-td shrink title="{{::item.typeName}}"> <vn-td shrink title="{{::item.typeName}}">
{{::item.typeName}} {{::item.typeName}}
</vn-td> </vn-td>
<vn-td shrink title="{{::item.categoryFk}}"> <vn-td shrink title="{{::item.category}}">
{{::item.categoryFk}} {{::item.category}}
</vn-td> </vn-td>
<vn-td shrink title="{{::item.intrastat}}"> <vn-td shrink title="{{::item.intrastat}}">
{{::item.intrastat}} {{::item.intrastat}}