verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'test' into dev

This commit is contained in:
Gerard 2019-03-08 13:46:59 +01:00
parent 99ef9d71fe d1ce85c81e
commit cd86b78596
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ module.exports = Self => {
t.name type, u.id userId, t.name type, u.id userId,
intr.description AS intrastat, i.stems, intr.description AS intrastat, i.stems,
ori.code AS origin, t.name AS type, ori.code AS origin, t.name AS type,
ic.name AS category, i.density, tc.description AS taxClass, ic.name AS category, i.density,
b.grouping, b.packing, itn.code AS niche b.grouping, b.packing, itn.code AS niche
FROM item i FROM item i
LEFT JOIN itemType t ON t.id = i.typeFk LEFT JOIN itemType t ON t.id = i.typeFk
@ -115,7 +115,6 @@ module.exports = Self => {
LEFT JOIN intrastat intr ON intr.id = i.intrastatFk LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
LEFT JOIN producer pr ON pr.id = i.producerFk 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
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = t.warehouseFk 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` LEFT JOIN itemPlacement itn ON itn.itemFk = i.id AND itn.warehouseFk = t.warehouseFk`

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

@ -34,7 +34,6 @@
<vn-th th-id="origin">Origin</vn-th> <vn-th th-id="origin">Origin</vn-th>
<vn-th th-id="salesperson">Buyer</vn-th> <vn-th th-id="salesperson">Buyer</vn-th>
<vn-th th-id="density" number>Density</vn-th> <vn-th th-id="density" number>Density</vn-th>
<vn-th th-id="taxClass">Tax class</vn-th>
<vn-th th-id="active" shrink>Active</vn-th> <vn-th th-id="active" shrink>Active</vn-th>
<vn-th></vn-th> <vn-th></vn-th>
</vn-tr> </vn-tr>
@ -81,7 +80,6 @@
</span> </span>
</vn-td> </vn-td>
<vn-td number>{{::item.density}}</vn-td> <vn-td number>{{::item.density}}</vn-td>
<vn-td>{{::item.taxClass}}</vn-td>
<vn-td shrink> <vn-td shrink>
<vn-check <vn-check
disabled="true" disabled="true"