diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js index 187ca6dbc..97d80c670 100644 --- a/src/boot/qformMixin.js +++ b/src/boot/qformMixin.js @@ -31,7 +31,7 @@ export default { console.error(error); } form.addEventListener('keyup', function (evt) { - if (evt.key === 'Enter') { + if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) { const input = evt.target; if (input.type == 'textarea' && evt.shiftKey) { evt.preventDefault(); diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue index 3cd18d1c8..91a2e5d39 100644 --- a/src/components/RegularizeStockForm.vue +++ b/src/components/RegularizeStockForm.vue @@ -44,7 +44,7 @@ const onDataSaved = (data) => { diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index f4c0091d2..cf217555a 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -6,6 +6,7 @@ import { useArrayData } from 'composables/useArrayData'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useState } from 'src/composables/useState'; import { useRoute } from 'vue-router'; +import VnMoreOptions from './VnMoreOptions.vue'; const $props = defineProps({ url: { @@ -47,7 +48,6 @@ let store; let entity; const isLoading = ref(false); const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName); -const menuRef = ref(); defineExpose({ getData }); onBeforeMount(async () => { @@ -159,25 +159,11 @@ const toModule = computed(() => - - - {{ t('components.cardDescriptor.moreOptions') }} - - - - - - - + + +
@@ -222,8 +208,8 @@ const toModule = computed(() => /> - + - -en: - isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries - isLinked: The entry {bookEntry} has been linked to Sage. Please contact administration for further information - assertAction: Are you sure you want to {action} this invoice? -es: - book: asentar - unbook: desasentar - delete: eliminar - clone: clonar - To book: Contabilizar - To unbook: Descontabilizar - Delete invoice: Eliminar factura - Invoice deleted: Factura eliminada - Clone invoice: Clonar factura - Invoice cloned: Factura clonada - Show agricultural receipt as PDF: Ver recibo agrícola como PDF - Send agricultural receipt as PDF: Enviar recibo agrícola como PDF - Are you sure you want to send it?: Estás seguro que quieres enviarlo? - Send PDF invoice: Enviar factura a PDF - Create rectificative invoice: Crear factura rectificativa - Rectificative invoice: Factura rectificativa - Original invoice: Factura origen - Entry: entrada - isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes - isLinked: El asiento {bookEntry} fue enlazado a Sage, por favor contacta con administración - assertAction: Estas seguro de querer {action} esta factura? - diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue new file mode 100644 index 000000000..647b68f88 --- /dev/null +++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue @@ -0,0 +1,206 @@ + + + + + +en: + isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries + isLinked: The entry has been linked to Sage. Please contact administration for further information + assertAction: Are you sure you want to {action} this invoice? +es: + isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes + isLinked: El asiento fue enlazado a Sage, por favor contacta con administración + assertAction: Estas seguro de querer {action} esta factura? + diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index 115a33208..eca0c7af1 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -10,6 +10,7 @@ import VnLv from 'src/components/ui/VnLv.vue'; import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue'; import InvoiceIntoBook from '../InvoiceInToBook.vue'; import VnTitle from 'src/components/common/VnTitle.vue'; +import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue'; const props = defineProps({ id: { type: [Number, String], default: 0 } }); const { t } = useI18n(); @@ -26,14 +27,14 @@ const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 }); const vatColumns = ref([ { name: 'expense', - label: 'InvoiceIn.summary.expense', + label: 'invoicein.summary.expense', field: (row) => row.expenseFk, sortable: true, align: 'left', }, { name: 'landed', - label: 'InvoiceIn.summary.taxableBase', + label: 'invoicein.summary.taxableBase', field: (row) => row.taxableBase, format: (value) => toCurrency(value), sortable: true, @@ -41,7 +42,7 @@ const vatColumns = ref([ }, { name: 'vat', - label: 'InvoiceIn.summary.sageVat', + label: 'invoicein.summary.sageVat', field: (row) => { if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`; }, @@ -51,7 +52,7 @@ const vatColumns = ref([ }, { name: 'transaction', - label: 'InvoiceIn.summary.sageTransaction', + label: 'invoicein.summary.sageTransaction', field: (row) => { if (row.transactionTypeSage) return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`; @@ -62,7 +63,7 @@ const vatColumns = ref([ }, { name: 'rate', - label: 'InvoiceIn.summary.rate', + label: 'invoicein.summary.rate', field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate), format: (value) => toCurrency(value), sortable: true, @@ -70,7 +71,7 @@ const vatColumns = ref([ }, { name: 'currency', - label: 'InvoiceIn.summary.currency', + label: 'invoicein.summary.currency', field: (row) => row.foreignValue, format: (val) => val && toCurrency(val, currency.value), sortable: true, @@ -81,21 +82,21 @@ const vatColumns = ref([ const dueDayColumns = ref([ { name: 'date', - label: 'InvoiceIn.summary.dueDay', + label: 'invoicein.summary.dueDay', field: (row) => toDate(row.dueDated), sortable: true, align: 'left', }, { name: 'bank', - label: 'InvoiceIn.summary.bank', + label: 'invoicein.summary.bank', field: (row) => row.bank.bank, sortable: true, align: 'left', }, { name: 'amount', - label: 'InvoiceIn.list.amount', + label: 'invoicein.list.amount', field: (row) => row.amount, format: (value) => toCurrency(value), sortable: true, @@ -103,7 +104,7 @@ const dueDayColumns = ref([ }, { name: 'landed', - label: 'InvoiceIn.summary.foreignValue', + label: 'invoicein.summary.foreignValue', field: (row) => row.foreignValue, format: (val) => val && toCurrency(val, currency.value), sortable: true, @@ -114,7 +115,7 @@ const dueDayColumns = ref([ const intrastatColumns = ref([ { name: 'code', - label: 'InvoiceIn.summary.code', + label: 'invoicein.summary.code', field: (row) => { return `${row.intrastat.id}: ${row.intrastat?.description}`; }, @@ -123,21 +124,21 @@ const intrastatColumns = ref([ }, { name: 'amount', - label: 'InvoiceIn.list.amount', + label: 'invoicein.list.amount', field: (row) => toCurrency(row.amount), sortable: true, align: 'left', }, { name: 'net', - label: 'InvoiceIn.summary.net', + label: 'invoicein.summary.net', field: (row) => row.net, sortable: true, align: 'left', }, { name: 'stems', - label: 'InvoiceIn.summary.stems', + label: 'invoicein.summary.stems', field: (row) => row.stems, format: (value) => value, sortable: true, @@ -145,7 +146,7 @@ const intrastatColumns = ref([ }, { name: 'landed', - label: 'InvoiceIn.summary.country', + label: 'invoicein.summary.country', field: (row) => row.country?.code, format: (value) => value, sortable: true, @@ -200,6 +201,9 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`; + diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml index 3723a0f05..94db50066 100644 --- a/src/pages/InvoiceIn/locale/en.yml +++ b/src/pages/InvoiceIn/locale/en.yml @@ -1,4 +1,4 @@ -InvoiceIn: +invoicein: serial: Serial isBooked: Is booked list: @@ -12,6 +12,26 @@ InvoiceIn: amount: Amount descriptor: ticketList: Ticket list + descriptorMenu: + book: Book + unbook: Unbook + delete: Delete + clone: Clone + toBook: To book + toUnbook: To unbook + deleteInvoice: Delete invoice + invoiceDeleted: invoice deleted + cloneInvoice: Clone invoice + invoiceCloned: Invoice cloned + showAgriculturalPdf: Show agricultural receipt as PDF + sendAgriculturalPdf: Send agricultural receipt as PDF + checkSendInvoice: Are you sure you want to send it? + sendPdfInvoice: Send PDF invoice + createCorrective: Create rectificative invoice + correctiveInvoice: Rectificative invoice + originalInvoice: Original invoice + entry: Entry + emailEmpty: The email can't be empty card: client: Client company: Company @@ -46,8 +66,6 @@ InvoiceIn: search: Id or supplier name correctedFk: Corrected isBooked: Is booked -invoicein: - params: account: Ledger account correctingFk: Rectificative \ No newline at end of file diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml index 5637605f6..bcb9c0551 100644 --- a/src/pages/InvoiceIn/locale/es.yml +++ b/src/pages/InvoiceIn/locale/es.yml @@ -1,4 +1,4 @@ -InvoiceIn: +invoicein: serial: Serie isBooked: Contabilizada list: @@ -12,6 +12,26 @@ InvoiceIn: amount: Importe descriptor: ticketList: Listado de tickets + descriptorMenu: + book: Asentar + unbook: Desasentar + delete: Eliminar + clone: Clonar + toBook: Contabilizar + toUnbook: Descontabilizar + deleteInvoice: Eliminar factura + invoiceDeleted: Factura eliminada + cloneInvoice: Clonar factura + invoiceCloned: Factura clonada + showAgriculturalPdf: Ver recibo agrícola como PDF + sendAgriculturalPdf: Enviar recibo agrícola como PDF + checkSendInvoice: ¿Estás seguro que quieres enviarlo? + sendPdfInvoice: Enviar factura a PDF + createCorrective: Crear factura rectificativa + correctiveInvoice: Factura rectificativa + originalInvoice: Factura origen + entry: Entrada + emailEmpty: El email no puede estar vacío card: client: Cliente company: Empresa @@ -43,8 +63,6 @@ InvoiceIn: params: search: Id o nombre proveedor correctedFk: Rectificada -invoicein: - params: account: Cuenta contable correctingFk: Rectificativa - + diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index 81b3e7c41..3ceb447dd 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -10,6 +10,7 @@ import { getUrl } from 'src/composables/getUrl'; import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue'; import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue'; import VnTitle from 'src/components/common/VnTitle.vue'; +import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue'; onMounted(async () => { fetch(); @@ -113,6 +114,9 @@ const ticketsColumns = ref([ +