diff --git a/db/changes/10470-family/00-defaultViewConfig.sql b/db/changes/10470-family/00-defaultViewConfig.sql index 0a394e5bc..d423599b1 100644 --- a/db/changes/10470-family/00-defaultViewConfig.sql +++ b/db/changes/10470-family/00-defaultViewConfig.sql @@ -1,3 +1,3 @@ -INSERT INTO salix.defaultViewConfig (tableCode, columns) +INSERT INTO `salix`.`defaultViewConfig` (tableCode, columns) VALUES ('clientsDetail', '{"id":true,"phone":true,"city":true,"socialName":true,"salesPersonFk":true,"email":true,"name":false,"fi":false,"credit":false,"creditInsurance":false,"mobile":false,"street":false,"countryFk":false,"provinceFk":false,"postcode":false,"created":false,"businessTypeFk":false,"payMethodFk":false,"sageTaxTypeFk":false,"sageTransactionTypeFk":false,"isActive":false,"isVies":false,"isTaxDataChecked":false,"isEqualizated":false,"isFreezed":false,"hasToInvoice":false,"hasToInvoiceByAddress":false,"isToBeMailed":false,"hasLcr":false,"hasCoreVnl":false,"hasSepaVnl":false}'); diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js index 9f913071e..401541c2c 100644 --- a/front/core/components/smart-table/index.js +++ b/front/core/components/smart-table/index.js @@ -333,6 +333,15 @@ export default class SmartTable extends Component { continue; } + input = this.$compile(` + `)(this.$inputsScope); + if (options && options.autocomplete) { let props = ``; @@ -348,7 +357,9 @@ export default class SmartTable extends Component { on-change="$ctrl.searchByColumn('${field}')" clear-disabled="true" />`)(this.$inputsScope); - } else if (options && options.checkbox) { + } + + if (options && options.checkbox) { input = this.$compile(` `)(this.$inputsScope); - } else if (options && options.datepicker) { + } + + if (options && options.datepicker) { input = this.$compile(` `)(this.$inputsScope); - } else { - input = this.$compile(` - `)(this.$inputsScope); } + cell.appendChild(input[0]); } searchRow.appendChild(cell); diff --git a/modules/client/back/methods/client/extendedListFilter.js b/modules/client/back/methods/client/extendedListFilter.js index 19e08fb7d..8e02cd413 100644 --- a/modules/client/back/methods/client/extendedListFilter.js +++ b/modules/client/back/methods/client/extendedListFilter.js @@ -144,7 +144,6 @@ module.exports = Self => { LEFT JOIN payMethod pm ON pm.id = c.payMethodFk LEFT JOIN sage.TiposIva sti ON sti.CodigoIva = c.taxTypeSageFk LEFT JOIN sage.TiposTransacciones stt ON stt.CodigoTransaccion = c.transactionTypeSageFk - ` ); diff --git a/modules/client/front/extended-list/index.html b/modules/client/front/extended-list/index.html index 23c331915..b45a0bc5f 100644 --- a/modules/client/front/extended-list/index.html +++ b/modules/client/front/extended-list/index.html @@ -1,8 +1,7 @@ + limit="20">