diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 0f5a162e3..e2f18866a 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -219,6 +219,7 @@ function filterByRecord(modelLog) { } async function applyFilter(params = {}) { + paginate.value.arrayData.resetPagination(); paginate.value.arrayData.applyFilter({ filter: {}, params: { originFk: route.params.id, ...params }, diff --git a/src/pages/Account/Card/AccountDescriptorProxy.vue b/src/pages/Account/Card/AccountDescriptorProxy.vue index de3220fea..6a4b3e267 100644 --- a/src/pages/Account/Card/AccountDescriptorProxy.vue +++ b/src/pages/Account/Card/AccountDescriptorProxy.vue @@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue'; <QPopupProxy style="max-width: 10px"> <AccountDescriptor v-if="$attrs.id" - v-bind="$attrs.id" + v-bind="$attrs" :summary="AccountSummary" :proxy-render="true" /> diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue index e8df27511..c5d79b045 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue @@ -22,7 +22,7 @@ const routes = reactive({ getSupplier: (id) => { return { name: 'SupplierCard', params: { id } }; }, - getTickets: (id) => { + getInvoices: (id) => { return { name: 'InvoiceInList', query: { @@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) { </QBtn> <QBtn size="md" - icon="vn:ticket" + icon="vn:invoice-in" color="primary" - :to="routes.getTickets(entity.supplierFk)" + :to="routes.getInvoices(entity.supplierFk)" > - <QTooltip>{{ t('globals.ticketList') }}</QTooltip> + <QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip> </QBtn> <QBtn v-if=" diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml index d341c0aa7..a7a8d2469 100644 --- a/src/pages/InvoiceIn/locale/en.yml +++ b/src/pages/InvoiceIn/locale/en.yml @@ -15,6 +15,7 @@ invoiceIn: amount: Amount descriptor: ticketList: Ticket list + invoices: Supplier invoices descriptorMenu: book: Book unbook: Unbook diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml index c53d227fe..c593f5a08 100644 --- a/src/pages/InvoiceIn/locale/es.yml +++ b/src/pages/InvoiceIn/locale/es.yml @@ -14,7 +14,7 @@ invoiceIn: awb: AWB amount: Importe descriptor: - ticketList: Listado de tickets + invoices: Facturas de proveedor descriptorMenu: book: Contabilizar unbook: Descontabilizar diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue index aea47aa08..1cadd4cb4 100644 --- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue +++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue @@ -198,7 +198,7 @@ const getLocale = (label) => { <QItemSection> <VnSelect dense - rounded + filled :label="t('globals.params.packing')" v-model="params.packing" url="ItemPackingTypes" diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue index 26c84fe09..211a1e0ee 100644 --- a/src/pages/Worker/Card/WorkerSummary.vue +++ b/src/pages/Worker/Card/WorkerSummary.vue @@ -91,7 +91,7 @@ onBeforeMount(async () => { </template> </VnLv> </div> - <div class="vn-card-content"> + <div class="vn-card-content" v-if="advancedSummary"> <VnLv :label="t('worker.summary.fiDueDate')" :value="toDate(advancedSummary.fiDueDate)" diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js index fdaa01876..7058e154c 100644 --- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js +++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js @@ -13,7 +13,7 @@ describe('InvoiceInDescriptor', () => { cy.validateCheckbox(checkbox, false); }); - it.skip('should delete the invoice properly', () => { + it('should delete the invoice properly', () => { cy.visit('/#/invoice-in/2/summary'); cy.selectDescriptorOption(2); cy.clickConfirm();