diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 908157610d..da6c89cbbb 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -325,6 +325,8 @@ function handleOnDataSaved(_) { } function handleScroll() { + if ($props.crudModel.disableInfiniteScroll) return; + const tMiddle = tableRef.value.$el.querySelector('.q-table__middle'); const { scrollHeight, scrollTop, clientHeight } = tMiddle; const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40; diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index aa8df17e2c..0701255407 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -940,7 +940,7 @@ supplier: basicData: alias: Alias workerFk: Responsible - isSerious: Verified + isReal: Verified isActive: Active isPayMethodChecked: PayMethod checked note: Notes diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 575e2c6c72..54728c5b69 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -938,7 +938,7 @@ supplier: basicData: alias: Alias workerFk: Responsable - isSerious: Verificado + isReal: Verificado isActive: Activo isPayMethodChecked: Método de pago validado note: Notas diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue index 815c7d5196..628af681ab 100644 --- a/src/pages/Item/ItemFixedPrice.vue +++ b/src/pages/Item/ItemFixedPrice.vue @@ -440,7 +440,7 @@ function handleOnDataSave({ CrudModelRef }) { selection: 'multiple', }" :crud-model="{ - paginate: false, + disableInfiniteScroll: true, }" v-model:selected="rowsSelected" :row-click="saveOnRowChange" diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue index fac6017351..17f72f188d 100644 --- a/src/pages/Monitor/MonitorOrders.vue +++ b/src/pages/Monitor/MonitorOrders.vue @@ -27,7 +27,7 @@ function exprBuilder(param, value) { const columns = computed(() => [ { - label: t('salesOrdersTable.dateSend'), + label: t('globals.landed'), name: 'dateSend', field: 'dateSend', align: 'left', diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml index b8082f02af..e905d2521b 100644 --- a/src/pages/Monitor/locale/en.yml +++ b/src/pages/Monitor/locale/en.yml @@ -11,7 +11,6 @@ salesClientsTable: client: Client salesOrdersTable: delete: Delete - dateSend: Send date dateMake: Make date client: Client salesPerson: Salesperson diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml index 4ee5b90a9b..a191453009 100644 --- a/src/pages/Monitor/locale/es.yml +++ b/src/pages/Monitor/locale/es.yml @@ -11,7 +11,6 @@ salesClientsTable: client: Cliente salesOrdersTable: delete: Eliminar - dateSend: Fecha de envío dateMake: Fecha de realización client: Cliente salesPerson: Comercial diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue index 52964557db..c1a107d3a4 100644 --- a/src/pages/Supplier/Card/SupplierBasicData.vue +++ b/src/pages/Supplier/Card/SupplierBasicData.vue @@ -61,8 +61,8 @@ const workersOptions = ref([]); { {{ t('Inactive supplier') }} `#/supplier/${entityId.value}/${section}`;