diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue index 6fff84539..49ded3186 100644 --- a/src/pages/Entry/EntryControl.vue +++ b/src/pages/Entry/EntryControl.vue @@ -9,6 +9,53 @@ const { t } = useI18n(); const companies = ref([]); const countries = ref([]); const columns = computed(() => [ + { + name: 'companyFk', + label: t('globals.company'), + columnFilter: { + component: 'select', + name: 'companyFk', + optionLabel: 'code', + options: companies.value, + }, + }, + { + name: 'gestDocFk', + label: t('entry.control.gestDocFk'), + }, + { + name: 'dmsType', + label: t('entry.control.dmsType'), + format: (row) => row.dmsType, + }, + { + name: 'invoiceNumber', + label: t('entry.control.invoiceNumber'), + }, + { + name: 'reference', + label: t('entry.control.reference'), + }, + { + name: 'shipped', + label: t('entry.control.shipped'), + }, + { + name: 'dated', + label: t('entry.control.dated'), + }, + { + name: 'id', + label: t('entry.control.id'), + isId: true, + chip: { + condition: () => true, + }, + }, + { + name: 'invoiceInFk', + label: t('entry.control.invoiceInFk'), + }, { name: 'supplierFk', label: t('globals.supplier'), @@ -20,52 +67,6 @@ const columns = computed(() => [ url: 'Suppliers', }, }, - { - name: 'companyFk', - label: t('globals.company'), - columnFilter: { - component: 'select', - name: 'companyFk', - options: companies.value, - }, - }, - { - name: 'gestDocFk', - label: t('entry.gestDocFk'), - }, - { - name: 'dmsType', - label: t('entry.dmsType'), - format: (row) => row.dmsType, - }, - { - name: 'invoiceNumber', - label: t('entry.invoiceNumber'), - }, - { - name: 'reference', - label: t('entry.reference'), - }, - { - name: 'shipped', - label: t('entry.shipped'), - }, - { - name: 'dated', - label: t('entry.dated'), - }, - { - name: 'id', - label: t('entry.id'), - isId: true, - chip: { - condition: () => true, - }, - }, - { - name: 'invoiceInFk', - label: t('entry.invoiceInFk'), - }, { name: 'country', label: t('globals.country'), @@ -82,7 +83,7 @@ const columns = computed(() => [ }, { name: 'payDem', - label: t('entry.payDem'), + label: t('entry.control.payDem'), }, { name: 'amount', @@ -90,11 +91,12 @@ const columns = computed(() => [ }, { name: 'isBooked', - label: t('entry.isBooked'), + label: t('entry.control.isBooked'), }, { name: 'received', - label: t('entry.received'), + label: t('entry.control.received'), + component: 'checkbox' }, // { // name: 'travelFk', @@ -127,13 +129,13 @@ const columns = computed(() => [ [ :columns auto-load :right-search="false" - /> + > + + diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml index 80f3491a8..6ed918126 100644 --- a/src/pages/Entry/locale/en.yml +++ b/src/pages/Entry/locale/en.yml @@ -78,6 +78,22 @@ entry: searchInfo: You can search by entry reference descriptorMenu: showEntryReport: Show entry report + control: + gestDocFk: Gestdoc + dmsType: Gestdoc type + invoiceNumber: Entry ref. + reference: Gestdoc ref. + shipped: Shipped + dated: Landed + id: Entry + invoiceInFk: Invoice in + supplierFk: Supplier + country: Country + description: Entry type + payDem: Payment term + amount: Amount + isBooked: B + received: R entryFilter: params: invoiceNumber: Invoice number diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml index a5b968016..3f9a4b8c2 100644 --- a/src/pages/Entry/locale/es.yml +++ b/src/pages/Entry/locale/es.yml @@ -79,6 +79,22 @@ entry: showEntryReport: Ver informe del pedido search: Buscar entradas searchInfo: Puedes buscar por referencia de entrada + control: + gestDocFk: Gestdoc + dmsType: Tipo gestdoc + invoiceNumber: Ref. Entrada + reference: Ref. gestdoc + shipped: F. envío + dated: F. llegada + id: Entrada + invoiceInFk: Recibida + supplierFk: Proveedor + country: País + description: Tipo de Entrada + payDem: Plazo de pago + amount: Importe + isBooked: C + received: R entryFilter: params: invoiceNumber: Núm. factura