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

Merge pull request 'entry.latestBuys v2' (#376) from 2444-entry_latestBuys_v2 into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #376
This commit is contained in:
Joan Sanchez 2020-09-14 10:34:39 +00:00
parent 559a2e9721 a767d256b2
commit 1348cc9df8
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/entry/back/methods/entry/latestBuysFilter.js
View File

@ -108,6 +108,20 @@ module.exports = Self => {
i.isActive,
i.minPrice,
i.description,
i.name,
i.subName,
i.tag5,
i.value5,
i.tag6,
i.value6,
i.tag7,
i.value7,
i.tag8,
i.value8,
i.tag9,
i.value9,
i.tag10,
i.value10,
t.name AS type,
intr.description AS intrastat,
ori.code AS origin,

16
modules/entry/front/latest-buys/index.html
View File

@ -36,6 +36,7 @@
<vn-th field="quantity">Quantity</vn-th>
<vn-th field="description" style="text-align: center">Description</vn-th>
<vn-th field="size">Size</vn-th>
<vn-th field="tags" style="text-align: center">Tags</vn-th>
<vn-th field="type">Type</vn-th>
<vn-th field="intrastat">Intrastat</vn-th>
<vn-th field="origin">Origin</vn-th>
@ -95,6 +96,14 @@
{{::buy.description | dashIfEmpty}}
</vn-td>
<vn-td number>{{::buy.size}}</vn-td>
<vn-td expand>
<vn-fetched-tags
max-length="6"
item="::buy"
name="::buy.name"
sub-name="::buy.subName">
</vn-fetched-tags>
</vn-td>
<vn-td shrink title="{{::buy.type}}">
{{::buy.type}}
</vn-td>
@ -121,7 +130,12 @@
<vn-td number>{{::buy.freightValue | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::buy.comissionValue | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::buy.packageValue | currency: 'EUR':2}}</vn-td>
<vn-td shrink>{{::buy.isIgnored}}</vn-td>
<vn-td shrink>
<vn-check
disabled="true"
ng-model="::buy.isIgnored">
</vn-check>
</vn-td>
<vn-td number>{{::buy.price2 | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::buy.price3 | currency: 'EUR':2}}</vn-td>
<vn-td number>{{::buy.minPrice | currency: 'EUR':2}}</vn-td>