diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue index fac74837f..ad4e4ecf5 100644 --- a/src/components/ui/VnNotes.vue +++ b/src/components/ui/VnNotes.vue @@ -1,6 +1,6 @@ - + diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue index ae67acc7a..ba81ed2f1 100644 --- a/src/pages/Customer/Card/CustomerFileManagement.vue +++ b/src/pages/Customer/Card/CustomerFileManagement.vue @@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router'; import { QBadge, QBtn, QCheckbox } from 'quasar'; import { downloadFile } from 'src/composables/downloadFile'; -import { toDateHour } from 'src/filters'; +import { toDateHourMinSec } from 'src/filters'; import FetchData from 'components/FetchData.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; @@ -163,7 +163,7 @@ const columns = computed(() => [ field: (value) => value.dms.created, label: t('Created'), name: 'created', - format: (value) => toDateHour(value), + format: (value) => toDateHourMinSec(value), }, { align: 'right', diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue index b8b0ba74f..940f04d31 100644 --- a/src/pages/Customer/Card/CustomerFiscalData.vue +++ b/src/pages/Customer/Card/CustomerFiscalData.vue @@ -80,9 +80,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa > @@ -117,7 +115,18 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa option-label="vat" option-value="id" v-model="data.sageTransactionTypeFk" - /> + > + + @@ -234,11 +243,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa - {{ - t( - 'When activating it, do not enter the country code in the ID field' - ) - }} + {{ t('whenActivatingIt') }} @@ -267,11 +272,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa /> - {{ - t( - "In order to invoice, this field is not contulted, but the consignee's ET. When modifiying this field if the invoice by address option is not checked, the change will be automatically propagated to all addresses, otherwise the user will be asked if he wants to propagate it or not" - ) - }} + {{ t('inOrderToInvoice') }} @@ -304,7 +305,6 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa es: Social name: Razón social - Only letters, numbers and spaces can be used: Sólo se pueden usar letras, números y espacios Tax number: NIF / CIF Street: Dirección fiscal Sage tax type: Tipo de impuesto Sage @@ -317,12 +317,17 @@ es: Frozen: Congelado Has to invoice: Factura Vies: Vies - When activating it, do not enter the country code in the ID field: Al activarlo, no informar el código del país en el campo nif. Notify by email: Notificar vía e-mail Invoice by address: Facturar por consignatario Is equalizated: Recargo de equivalencia - In order to invoice, this field is not contulted, but the consignee's ET. When modifiying this field if the invoice by address option is not checked, the change will be automatically propagated to all addresses, otherwise the user will be asked if he wants to propagate it or not: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar. Verified data: Datos comprobados Incoterms authorization: Autorización incoterms Electronic invoice: Factura electrónica + onlyLetters: Sólo se pueden usar letras, números y espacios + whenActivatingIt: Al activarlo, no informar el código del país en el campo nif + inOrderToInvoice: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar +en: + onlyLetters: Only letters, numbers and spaces can be used + whenActivatingIt: When activating it, do not enter the country code in the ID field + inOrderToInvoice: In order to invoice, this field is not contulted, but the consignee's ET. When modifiying this field if the invoice by address option is not checked, the change will be automatically propagated to all addresses, otherwise the user will be asked if he wants to propagate it or not diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue index 5628c64b3..485e61e79 100644 --- a/src/pages/Customer/Card/CustomerGreuges.vue +++ b/src/pages/Customer/Card/CustomerGreuges.vue @@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router'; import { date, QBtn } from 'quasar'; -import { toCurrency, toDateHour } from 'src/filters'; +import { toCurrency, toDateHourMinSec } from 'src/filters'; import FetchData from 'components/FetchData.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; @@ -73,7 +73,7 @@ const columns = computed(() => [ field: 'shipped', label: t('Date'), name: 'date', - format: (value) => toDateHour(value), + format: (value) => toDateHourMinSec(value), }, { align: 'left', diff --git a/src/pages/Customer/Card/CustomerMandates.vue b/src/pages/Customer/Card/CustomerMandates.vue index 161034894..32ce79480 100644 --- a/src/pages/Customer/Card/CustomerMandates.vue +++ b/src/pages/Customer/Card/CustomerMandates.vue @@ -3,7 +3,7 @@ import { computed, ref } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; -import { toDateHour } from 'src/filters'; +import { toDateHourMinSec } from 'src/filters'; import FetchData from 'components/FetchData.vue'; @@ -74,14 +74,14 @@ const columns = computed(() => [ field: 'created', label: t('Register date'), name: 'registerDate', - format: (value) => toDateHour(value), + format: (value) => toDateHourMinSec(value), }, { align: 'left', field: 'finished', label: t('End date'), name: 'endDate', - format: (value) => (value ? toDateHour(value) : '-'), + format: (value) => (value ? toDateHourMinSec(value) : '-'), }, ]); diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue index d8b25e012..e05d0016d 100644 --- a/src/pages/Customer/Card/CustomerSamples.vue +++ b/src/pages/Customer/Card/CustomerSamples.vue @@ -7,7 +7,7 @@ import { QBtn } from 'quasar'; import FetchData from 'components/FetchData.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; -import { toDateHour } from 'src/filters'; +import { toDateHourMinSec } from 'src/filters'; const { t } = useI18n(); const route = useRoute(); @@ -55,7 +55,7 @@ const columns = computed(() => [ field: 'created', label: t('Sent'), name: 'sent', - format: (value) => toDateHour(value), + format: (value) => toDateHourMinSec(value), }, { align: 'left', diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue index 4b5a8b365..0effaaca2 100644 --- a/src/pages/Customer/Card/CustomerWebPayment.vue +++ b/src/pages/Customer/Card/CustomerWebPayment.vue @@ -3,7 +3,7 @@ import { computed, ref } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; -import { toCurrency, toDateHour } from 'src/filters'; +import { toCurrency, toDateHourMinSec } from 'src/filters'; import FetchData from 'components/FetchData.vue'; import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue'; @@ -74,7 +74,7 @@ const columns = computed(() => [ field: 'created', label: t('Date'), name: 'date', - format: (value) => toDateHour(value), + format: (value) => toDateHourMinSec(value), }, { align: 'left', diff --git a/src/pages/Customer/components/CustomerCheckIconTooltip.vue b/src/pages/Customer/components/CustomerCheckIconTooltip.vue index 030c07bc5..880f6ad8e 100644 --- a/src/pages/Customer/components/CustomerCheckIconTooltip.vue +++ b/src/pages/Customer/components/CustomerCheckIconTooltip.vue @@ -32,7 +32,7 @@ const setClientsConfirmTransaction = async () => { {{ t('Confirm transaction') }} diff --git a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue index f0a97ec92..ad2686bb6 100644 --- a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue +++ b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue @@ -3,7 +3,7 @@ import { computed, ref } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; -import { toCurrency, toDateHour } from 'src/filters'; +import { toCurrency, toDateHourMinSec } from 'src/filters'; import FetchData from 'components/FetchData.vue'; @@ -41,7 +41,7 @@ const columns = computed(() => [ { align: 'left', field: 'created', - format: (value) => toDateHour(value), + format: (value) => toDateHourMinSec(value), label: t('Created'), name: 'created', }, diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue index 9b26891a1..be9e3c7a9 100644 --- a/src/pages/Order/Card/OrderSummary.vue +++ b/src/pages/Order/Card/OrderSummary.vue @@ -3,7 +3,7 @@ import { computed, ref } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; import { useStateStore } from 'stores/useStateStore'; -import { dashIfEmpty, toCurrency, toDateHour } from 'src/filters'; +import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters'; import VnLv from 'components/ui/VnLv.vue'; import CardSummary from 'components/ui/CardSummary.vue'; import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue'; @@ -86,15 +86,15 @@ const detailsColumns = ref([