diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 8d40542b8..eb2dce909 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -721,9 +721,9 @@ export default {
},
workerSummary: {
header: 'vn-worker-summary h5',
- id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(2) > section > span',
- email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span',
- department: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span',
+ id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span',
+ email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span',
+ department: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(5) > section > span',
userId: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(2) > section > span',
userName: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(3) > section > span',
role: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(4) > section > span',
diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index daee3aa05..42dbe3078 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -93,7 +93,12 @@ module.exports = Self => {
let where = buildFilter(ctx.args, (param, value) => {
switch (param) {
case 'search':
- return {'e.id': value};
+ return /^\d+$/.test(value)
+ ? {'e.id': value}
+ : {or: [
+ {'s.name': {like: `%${value}%`}},
+ {'s.nickname': {like: `%${value}%`}}
+ ]};
case 'ref':
param = `e.${param}`;
return {[param]: {like: `%${value}%`}};
@@ -141,6 +146,7 @@ module.exports = Self => {
e.invoiceInFk,
t.landed,
s.name AS supplierName,
+ s.nickname AS supplierAlias,
co.code AS companyCode,
cu.code AS currencyCode
FROM vn.entry e
diff --git a/modules/entry/front/main/index.html b/modules/entry/front/main/index.html
index f19db2151..6c08cd0c4 100644
--- a/modules/entry/front/main/index.html
+++ b/modules/entry/front/main/index.html
@@ -8,11 +8,14 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/modules/entry/front/search-panel/index.html b/modules/entry/front/search-panel/index.html
index cff555e91..38acdf77d 100644
--- a/modules/entry/front/search-panel/index.html
+++ b/modules/entry/front/search-panel/index.html
@@ -5,7 +5,7 @@
vn-one
label="General search"
ng-model="filter.search"
- info="Search entries by id"
+ info="Search entry by id or a suppliers by name or alias"
vn-focus>
@@ -45,8 +45,11 @@
label="Supplier"
ng-model="filter.supplierFk"
url="Suppliers"
+ fields="['name','nickname']"
+ search-function="{or: [{nickname: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
show-field="name"
value-field="id">
+ {{name}}: {{nickname}}