diff --git a/modules/invoiceOut/back/methods/invoiceOut/filter.js b/modules/invoiceOut/back/methods/invoiceOut/filter.js index 8b6d00763..58e8c5243 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/filter.js +++ b/modules/invoiceOut/back/methods/invoiceOut/filter.js @@ -19,42 +19,56 @@ module.exports = Self => { type: 'String', description: 'Searchs the invoiceOut by id', http: {source: 'query'} - }, { + }, + { arg: 'clientFk', type: 'Integer', description: 'The client id', http: {source: 'query'} - }, { + }, + { + arg: 'fi', + type: 'String', + description: 'The client fiscal id', + http: {source: 'query'} + }, + { arg: 'hasPdf', type: 'Boolean', description: 'Whether the the invoiceOut has PDF or not', http: {source: 'query'} - }, { + }, + { arg: 'amount', type: 'Number', description: 'The amount filter', http: {source: 'query'} - }, { + }, + { arg: 'min', type: 'Number', description: 'The minimun amount flter', http: {source: 'query'} - }, { + }, + { arg: 'max', type: 'Number', description: 'The maximun amount flter', http: {source: 'query'} - }, { + }, + { arg: 'issued', type: 'Date', description: 'The issued date filter', http: {source: 'query'} - }, { + }, + { arg: 'created', type: 'Date', description: 'The created date filter', http: {source: 'query'} - }, { + }, + { arg: 'dued', type: 'Date', description: 'The due date filter', @@ -88,6 +102,8 @@ module.exports = Self => { return {'i.created': value}; case 'clientFk': return {'i.clientFk': value}; + case 'fi': + return {'c.fi': value}; case 'amount': case 'companyFk': case 'issued': diff --git a/modules/invoiceOut/front/locale/es.yml b/modules/invoiceOut/front/locale/es.yml index d21c9c23c..0a5b190eb 100644 --- a/modules/invoiceOut/front/locale/es.yml +++ b/modules/invoiceOut/front/locale/es.yml @@ -1,2 +1,3 @@ InvoiceOut: Facturas -Search invoices by reference: Buscar facturas por referencia \ No newline at end of file +Search invoices by reference: Buscar facturas por referencia +Client fiscal id: CIF del cliente \ No newline at end of file diff --git a/modules/invoiceOut/front/search-panel/index.html b/modules/invoiceOut/front/search-panel/index.html index ec469264c..f49002cca 100644 --- a/modules/invoiceOut/front/search-panel/index.html +++ b/modules/invoiceOut/front/search-panel/index.html @@ -15,6 +15,11 @@ label="Client id" ng-model="filter.clientFk"> + +