-
+
{
{
{
{
/>
-
-
+
+
({
const entriesTableColumns = computed(() => {
return [
{
- label: t('entry.summary.item'),
+ label: t('globals.item'),
field: 'itemFk',
name: 'item',
align: 'left',
@@ -211,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 36ca3b797..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',
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index b22d6ba53..fa75e820d 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -122,14 +122,11 @@ watch;
-
+
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 0ed2e8a67..9fe9ae265 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -189,7 +189,7 @@ 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 0f9be6298..960c936ee 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 756948182..9e1492bb6 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -37,12 +37,12 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.packing'),
+ label: t('entry.summary.packing'),
name: 'packing',
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.grouping'),
+ label: t('entry.summary.grouping'),
name: 'grouping',
},
{
@@ -57,27 +57,27 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.size'),
+ label: t('globals.size'),
name: 'size',
},
{
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',
},
{
@@ -102,7 +102,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
+ label: t('entry.summary.buyingValue'),
name: 'buyingValue',
},
{
@@ -117,7 +117,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
+ label: t('entry.buys.packageValue'),
name: 'packageValue',
},
{
@@ -152,7 +152,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
+ label: t('entry.buys.packagingFk'),
name: 'packagingFk',
},
{
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e44e3891e..2bfea2a4d 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -43,7 +43,7 @@ const entryFilter = {
const columns = computed(() => [
{
align: 'left',
- label: t('entry.list.tableVisibleColumns.id'),
+ label: t('globals.id'),
name: 'id',
isTitle: true,
cardVisible: true,
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index 5e4be407e..2b60948dd 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -69,7 +69,7 @@ const setData = (entity) => (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 83b1bf8a4..027f08109 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,14 +72,14 @@ 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: 'quantity',
- label: t('invoiceOut.summary.nickname'),
+ label: t('globals.alias'),
field: (row) => row.nickname,
sortable: true,
align: 'left',
@@ -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 cf4c27e65..8c8c01e9c 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -51,7 +51,7 @@ const props = defineProps({
@@ -60,7 +60,7 @@ const props = defineProps({
@@ -79,7 +79,7 @@ const props = defineProps({
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index ef844824f..805ba6e11 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -173,10 +173,7 @@ const openCloneDialog = async () => {
-
+
{
/>
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index a4ef22ce3..063c77c65 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') }}
@@ -107,7 +107,7 @@ const handlePhotoUpdated = (evt = false) => {
>