diff --git a/modules/client/back/methods/receipt/filter.js b/modules/client/back/methods/receipt/filter.js index f4ec6ad40..b9f26b1ab 100644 --- a/modules/client/back/methods/receipt/filter.js +++ b/modules/client/back/methods/receipt/filter.js @@ -42,7 +42,8 @@ module.exports = Self => { r.bankFk, firstName, name, - r.clientFk + r.clientFk, + FALSE pdf FROM vn.receipt r LEFT JOIN vn.worker w ON w.id = r.workerFk JOIN vn.company c ON c.id = r.companyFk @@ -60,7 +61,8 @@ module.exports = Self => { NULL, NULL, NULL, - i.clientFk + i.clientFk, + i.pdf FROM vn.invoiceOut i JOIN vn.company c ON c.id = i.companyFk WHERE i.clientFk = ? AND i.companyFk = ? diff --git a/modules/client/front/address/index/index.html b/modules/client/front/address/index/index.html index b9e60c2e2..494d249d9 100644 --- a/modules/client/front/address/index/index.html +++ b/modules/client/front/address/index/index.html @@ -6,7 +6,6 @@ data="addresses" auto-load="true"> - Addresses diff --git a/modules/client/front/index/index.js b/modules/client/front/index/index.js index 7fa644f5c..1497224fe 100644 --- a/modules/client/front/index/index.js +++ b/modules/client/front/index/index.js @@ -12,7 +12,7 @@ export default class Controller { case 'search': return /^\d+$/.test(value) ? {id: value} - : {name: {regexp: value}}; + : {name: {like: `%${value}%`}}; case 'phone': return { or: [ @@ -23,7 +23,7 @@ export default class Controller { case 'name': case 'socialName': case 'city': - return {[param]: {regexp: value}}; + return {[param]: {regexp: `%${value}%`}}; case 'id': case 'fi': case 'postcode': diff --git a/modules/client/front/risk/index/index.html b/modules/client/front/risk/index/index.html index d93a77b59..9c87712f9 100644 --- a/modules/client/front/risk/index/index.html +++ b/modules/client/front/risk/index/index.html @@ -30,7 +30,7 @@
-
Total por empresa
+
Total by company
Creation date Employee Reference - Bank - Debit - Havings - Balance - Conciliated + Bank + Debit + Havings + Balance + Conciliated @@ -62,23 +62,23 @@ {{::risk.created | dateTime:'dd/MM/yyyy HH:mm'}} {{::risk.firstName}} {{::risk.name}} {{::risk.ref ? 'N/FRA ' + risk.ref : ''}} - {{::risk.bankFk}} - {{::risk.debit | currency:'€':2}} - {{::risk.credit | currency:'€':2}} - {{risk.balance | currency:'€':2}} - + {{::risk.bankFk}} + {{::risk.debit | currency:'€':2}} + {{::risk.credit | currency:'€':2}} + {{risk.balance | currency:'€':2}} + - - + - - + @@ -94,8 +94,13 @@ - - + + + - \ No newline at end of file diff --git a/modules/client/front/risk/index/locale/es.yml b/modules/client/front/risk/index/locale/es.yml index f0eb2cd52..17672a8a9 100644 --- a/modules/client/front/risk/index/locale/es.yml +++ b/modules/client/front/risk/index/locale/es.yml @@ -4,4 +4,7 @@ Bank: Caja Debit: Debe Conciliated: Conciliado New payment: Añadir pago -Havings: Haber \ No newline at end of file +Havings: Haber +Balance: Balance +Total by company: Total por empresa +Download PDF: Descargar PDF \ No newline at end of file