Merge pull request '2789 correct filter tag and changed type names for 3 digits' (#555) from 2789-entry_multiple_changes into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #555
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
Carlos Jimenez Ruiz 2021-02-25 10:00:51 +00:00
commit 8a77c7ad97
3 changed files with 34 additions and 32432 deletions

View File

@ -78,6 +78,8 @@ module.exports = Self => {
return {'ic.id': value}; return {'ic.id': value};
case 'salesPersonFk': case 'salesPersonFk':
return {'it.workerFk': value}; return {'it.workerFk': value};
case 'code':
return {'it.code': value};
case 'typeFk': case 'typeFk':
return {'i.typeFk': value}; return {'i.typeFk': value};
case 'active': case 'active':
@ -103,6 +105,7 @@ module.exports = Self => {
i.id AS itemFk, i.id AS itemFk,
i.size, i.size,
i.density, i.density,
it.code,
i.typeFk, i.typeFk,
i.family, i.family,
i.isActive, i.isActive,

View File

@ -37,8 +37,8 @@
<vn-th field="quantity">Quantity</vn-th> <vn-th field="quantity">Quantity</vn-th>
<vn-th field="description" style="text-align: center">Description</vn-th> <vn-th field="description" style="text-align: center">Description</vn-th>
<vn-th field="size">Size</vn-th> <vn-th field="size">Size</vn-th>
<vn-th field="tags" style="text-align: center">Tags</vn-th> <vn-th field="name" style="text-align: center">Tags</vn-th>
<vn-th field="type">Type</vn-th> <vn-th field="code">Type</vn-th>
<vn-th field="intrastat">Intrastat</vn-th> <vn-th field="intrastat">Intrastat</vn-th>
<vn-th field="origin">Origin</vn-th> <vn-th field="origin">Origin</vn-th>
<vn-th field="density">Density</vn-th> <vn-th field="density">Density</vn-th>
@ -109,7 +109,7 @@
</vn-fetched-tags> </vn-fetched-tags>
</vn-td> </vn-td>
<vn-td shrink title="{{::buy.type}}"> <vn-td shrink title="{{::buy.type}}">
{{::buy.type}} {{::buy.code}}
</vn-td> </vn-td>
<vn-td shrink title="{{::item.intrastat}}"> <vn-td shrink title="{{::item.intrastat}}">
{{::buy.intrastat}} {{::buy.intrastat}}

32457
package-lock.json generated

File diff suppressed because it is too large Load Diff