({
const entriesTableColumns = computed(() => {
return [
{
- label: t('entry.summary.item'),
+ label: t('globals.item'),
field: 'itemFk',
name: 'item',
align: 'left',
},
{
- label: t('entry.summary.quantity'),
+ label: t('globals.quantity'),
field: 'quantity',
name: 'quantity',
align: 'left',
@@ -187,7 +186,7 @@ const entriesTableColumns = computed(() => {
align: 'left',
},
{
- label: t('entry.summary.weight'),
+ label: t('globals.weight'),
field: 'weight',
name: 'weight',
align: 'left',
@@ -212,13 +211,13 @@ const entriesTableColumns = computed(() => {
format: (value) => toCurrency(value),
},
{
- label: t('entry.buys.groupingPrice'),
+ label: t('item.fixedPrice.groupingPrice'),
field: 'price2',
name: 'price2',
align: 'left',
},
{
- label: t('entry.buys.packingPrice'),
+ label: t('item.fixedPrice.packingPrice'),
field: 'price3',
name: 'price3',
align: 'left',
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 8431e1096..c03b7756f 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -35,7 +35,7 @@ const packagingsOptions = ref([]);
const columns = computed(() => [
{
- label: t('entry.buys.item'),
+ label: t('globals.item'),
name: 'item',
field: 'itemFk',
options: lastItemBuysOptions.value,
@@ -56,19 +56,19 @@ const columns = computed(() => [
align: 'left',
},
{
- label: t('entry.buys.packing'),
+ label: t('entry.summary.packing'),
name: 'packing',
field: 'packing',
align: 'left',
},
{
- label: t('entry.buys.grouping'),
+ label: t('entry.summary.grouping'),
name: 'grouping',
field: 'grouping',
align: 'left',
},
{
- label: t('entry.buys.buyingValue'),
+ label: t('entry.summary.buyingValue'),
name: 'buyingValue',
field: 'buyingValue',
align: 'left',
@@ -200,7 +200,7 @@ const redirectToBuysView = () => {
{
-
+
{
-
+
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 62e13551a..d88f19417 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -84,7 +84,7 @@ const tableColumnComponents = {
const entriesTableColumns = computed(() => {
return [
{
- label: t('entry.summary.quantity'),
+ label: t('globals.quantity'),
field: 'quantity',
name: 'quantity',
align: 'left',
@@ -102,7 +102,7 @@ const entriesTableColumns = computed(() => {
align: 'left',
},
{
- label: t('entry.summary.weight'),
+ label: t('globals.weight'),
field: 'weight',
name: 'weight',
align: 'left',
@@ -188,8 +188,8 @@ const fetchEntryBuys = async () => {
:label="t('entry.summary.currency')"
:value="entry.currency?.name"
/>
-
-
+
+
{
/>
{
/>
{
:disable="true"
/>
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 23a6a0021..c885c2485 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -35,7 +35,7 @@ const entriesTableColumns = computed(() => [
{
align: 'left',
name: 'item',
- label: t('entry.summary.item'),
+ label: t('globals.item'),
field: (row) => row.item.name,
},
{
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 119808176..9f15130c0 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -40,7 +40,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.packing'),
+ label: t('entry.summary.packing'),
name: 'packing',
columnFilter: {
component: 'number',
@@ -49,7 +49,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.grouping'),
+ label: t('entry.summary.grouping'),
name: 'grouping',
columnFilter: {
component: 'number',
@@ -58,7 +58,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.quantity'),
+ label: t('globals.quantity'),
name: 'quantity',
columnFilter: {
component: 'number',
@@ -67,12 +67,12 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.description'),
+ label: t('globals.description'),
name: 'description',
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.size'),
+ label: t('globals.size'),
name: 'size',
columnFilter: {
component: 'number',
@@ -81,27 +81,27 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.tags'),
+ label: t('globals.tags'),
name: 'tags',
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.type'),
+ label: t('globals.type'),
name: 'type',
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.intrastat'),
+ label: t('globals.intrastat'),
name: 'intrastat',
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.origin'),
+ label: t('globals.origin'),
name: 'origin',
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
+ label: t('globals.weightByPiece'),
name: 'weightByPiece',
columnFilter: {
component: 'number',
@@ -129,7 +129,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
+ label: t('entry.summary.buyingValue'),
name: 'buyingValue',
columnFilter: {
component: 'number',
@@ -156,7 +156,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
+ label: t('entry.buys.packageValue'),
name: 'packageValue',
columnFilter: {
component: 'number',
@@ -202,7 +202,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.weight'),
+ label: t('globals.weight'),
name: 'weight',
columnFilter: {
component: 'number',
@@ -211,7 +211,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
+ label: t('entry.buys.packagingFk'),
name: 'packagingFk',
columnFilter: {
component: 'number',
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e9179c239..38bf09b53 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -47,14 +47,14 @@ const columns = computed(() => [
},
{
align: 'left',
- label: t('entry.list.tableVisibleColumns.id'),
+ label: t('globals.id'),
name: 'id',
isTitle: true,
cardVisible: true,
},
{
align: 'left',
- label: t('entry.list.tableVisibleColumns.reference'),
+ label: t('globals.reference'),
name: 'reference',
isTitle: true,
component: 'input',
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 9bc4856a8..92f3fffca 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -355,10 +355,10 @@ const createInvoiceInCorrection = async () => {
-
+
-
-
+
+
{{ entity?.supplier?.nickname }}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 801a04342..08fc11f69 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -95,7 +95,7 @@ const dueDayColumns = ref([
},
{
name: 'amount',
- label: 'invoiceIn.summary.amount',
+ label: 'invoiceIn.list.amount',
field: (row) => row.amount,
format: (value) => toCurrency(value),
sortable: true,
@@ -123,7 +123,7 @@ const intrastatColumns = ref([
},
{
name: 'amount',
- label: 'invoiceIn.summary.amount',
+ label: 'invoiceIn.list.amount',
field: (row) => toCurrency(row.amount),
sortable: true,
align: 'left',
@@ -210,7 +210,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
/>
@@ -221,7 +221,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
`#/invoice-in/${entityId.value}/${param}`;
:value="entity.expenseDeductible?.name"
/>
diff --git a/src/pages/InvoiceIn/InvoiceInCreate.vue b/src/pages/InvoiceIn/InvoiceInCreate.vue
index e6863beb1..c809e032b 100644
--- a/src/pages/InvoiceIn/InvoiceInCreate.vue
+++ b/src/pages/InvoiceIn/InvoiceInCreate.vue
@@ -83,7 +83,7 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 265f95b0e..d64876858 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -50,7 +50,7 @@ const cols = computed(() => [
{
align: 'left',
name: 'serial',
- label: t('invoiceIn.list.serial'),
+ label: t('invoiceIn.serial'),
},
{
align: 'left',
@@ -151,7 +151,7 @@ const cols = computed(() => [
(data.value = useCardDescription(entity.ref, entity.
-
+
{{ entity.client.name }}
@@ -79,7 +79,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index ca8fb075c..81b3e7c41 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -42,7 +42,7 @@ function fetch() {
const taxColumns = ref([
{
name: 'item',
- label: 'invoiceOut.summary.type',
+ label: 'globals.type',
field: (row) => row.name,
sortable: true,
},
@@ -72,21 +72,21 @@ const taxColumns = ref([
const ticketsColumns = ref([
{
name: 'item',
- label: t('invoiceOut.summary.ticketId'),
+ label: t('globals.ticketId'),
field: (row) => row.id,
sortable: true,
align: 'left',
},
{
name: 'nickname',
- label: t('invoiceOut.summary.nickname'),
+ label: t('globals.alias'),
field: (row) => row.nickname,
sortable: true,
align: 'left',
},
{
name: 'landed',
- label: t('invoiceOut.summary.shipped'),
+ label: t('globals.shipped'),
field: (row) => row.shipped,
format: (value) => toDate(value),
sortable: true,
@@ -124,18 +124,12 @@ const ticketsColumns = ref([
:label="t('invoiceOut.summary.dued')"
:value="toDate(invoiceOut.dued)"
/>
-
+
-
+
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 5f2eb3c02..7f6bf41d3 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -59,7 +59,7 @@ const columns = computed(() => [
field: 'clientId',
},
{
- label: t('invoiceOut.globalInvoices.table.client'),
+ label: t('globals.client'),
field: 'clientName',
name: 'clientName',
align: 'left',
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 94eab2aab..8c8c01e9c 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -33,7 +33,7 @@ const props = defineProps({
@@ -42,7 +42,7 @@ const props = defineProps({
@@ -51,7 +51,7 @@ const props = defineProps({
@@ -60,7 +60,7 @@ const props = defineProps({
@@ -79,7 +79,7 @@ const props = defineProps({
@@ -88,7 +88,7 @@ const props = defineProps({
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index a05125630..192f5b26f 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -9,9 +9,6 @@ invoiceOutList:
id: ID
ref: Referencia
issued: Fecha emisión
- customer: Cliente
- company: Empresa
- amount: Importe
created: F. creación
dueDate: F. máxima
invoiceOutSerial: Serial
@@ -20,12 +17,12 @@ invoiceOutList:
DownloadPdf: Descargar PDF
InvoiceOutSummary: Resumen
negativeBases:
- country: País
- clientId: ID del cliente
- client: Cliente
- base: Base
- ticketId: Ticket
- active: Activo
- hasToInvoice: Debe facturar
- verifiedData: Datos verificados
- commercial: Comercial
\ No newline at end of file
+ country: País
+ clientId: ID del cliente
+ client: Cliente
+ base: Base
+ ticketId: Ticket
+ active: Activo
+ hasToInvoice: Debe facturar
+ verifiedData: Datos verificados
+ commercial: Comercial
diff --git a/src/pages/Item/Card/CreateIntrastatForm.vue b/src/pages/Item/Card/CreateIntrastatForm.vue
index 5fe254759..443615d7e 100644
--- a/src/pages/Item/Card/CreateIntrastatForm.vue
+++ b/src/pages/Item/Card/CreateIntrastatForm.vue
@@ -42,7 +42,7 @@ onMounted(async () => {
:required="true"
/>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 243d4c7cb..c51b320b5 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -140,10 +140,7 @@ const openRegularizeStockForm = () => {
-
+
{
/>
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index 3cd51758b..735e5eb4f 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -75,7 +75,7 @@ const handlePhotoUpdated = (evt = false) => {
- {{ t('item.descriptor.item') }}
+ {{ t('globals.item') }}