diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js
index 7711bc0f1..3b6da1acd 100644
--- a/modules/entry/back/methods/entry/latestBuysFilter.js
+++ b/modules/entry/back/methods/entry/latestBuysFilter.js
@@ -39,6 +39,11 @@ module.exports = Self => {
type: 'integer',
description: 'The buyer of the item',
},
+ {
+ arg: 'supplierFk',
+ type: 'integer',
+ description: 'The supplier of the item',
+ },
{
arg: 'active',
type: 'boolean',
@@ -99,6 +104,8 @@ module.exports = Self => {
return {'ic.id': value};
case 'salesPersonFk':
return {'it.workerFk': value};
+ case 'supplierFk':
+ return {'s.id': value};
case 'code':
return {'it.code': value};
case 'active':
@@ -172,7 +179,9 @@ module.exports = Self => {
LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
LEFT JOIN itemType t ON t.id = i.typeFk
LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
- LEFT JOIN origin ori ON ori.id = i.originFk`
+ LEFT JOIN origin ori ON ori.id = i.originFk
+ LEFT JOIN entry e ON e.id = b.entryFk
+ LEFT JOIN supplier s ON s.id = e.supplierFk`
);
if (ctx.args.tags) {
diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html
index 4693141f8..7d570f798 100644
--- a/modules/entry/front/latest-buys-search-panel/index.html
+++ b/modules/entry/front/latest-buys-search-panel/index.html
@@ -46,6 +46,17 @@
where="{role: {inq: ['logistic', 'buyer']}}"
label="Buyer">
+
+ {{name}}: {{nickname}}
+
{
type: 'integer',
description: 'The buyer of the item',
},
+ {
+ arg: 'supplierFk',
+ type: 'integer',
+ description: 'The supplier of the item',
+ },
{
arg: 'description',
type: 'string',
@@ -120,6 +125,8 @@ module.exports = Self => {
return {'ic.id': value};
case 'buyerFk':
return {'it.workerFk': value};
+ case 'supplierFk':
+ return {'s.id': value};
case 'origin':
return {'ori.code': value};
case 'intrastat':
@@ -170,7 +177,9 @@ module.exports = Self => {
LEFT JOIN producer pr ON pr.id = i.producerFk
LEFT JOIN origin ori ON ori.id = i.originFk
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = it.warehouseFk
- LEFT JOIN vn.buy b ON b.id = lb.buy_id`
+ LEFT JOIN buy b ON b.id = lb.buy_id
+ LEFT JOIN entry e ON e.id = b.entryFk
+ LEFT JOIN supplier s ON s.id = e.supplierFk`
);
if (ctx.args.tags) {
diff --git a/modules/item/front/search-panel/index.html b/modules/item/front/search-panel/index.html
index 57f05bb54..7cbe9c56d 100644
--- a/modules/item/front/search-panel/index.html
+++ b/modules/item/front/search-panel/index.html
@@ -43,10 +43,21 @@
ng-model="filter.buyerFk"
url="Items/activeBuyers"
show-field="nickname"
- search-function="{firstName: $search}"
+ search-function="{nickname: {like: '%'+ $search +'%'}}"
value-field="workerFk"
label="Buyer">
+
+ {{name}}: {{nickname}}
+