diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue index 1cf36deeb..d1ceff4ce 100644 --- a/src/components/FilterItemForm.vue +++ b/src/components/FilterItemForm.vue @@ -50,25 +50,25 @@ const loading = ref(false); const tableColumns = computed(() => [ { - label: t('entry.buys.id'), + label: t('globals.id'), name: 'id', field: 'id', align: 'left', }, { - label: t('entry.buys.name'), + label: t('globals.name'), name: 'name', field: 'name', align: 'left', }, { - label: t('entry.buys.size'), + label: t('globals.size'), name: 'size', field: 'size', align: 'left', }, { - label: t('entry.buys.producer'), + label: t('globals.producer'), name: 'producerName', field: 'producer', align: 'left', @@ -152,10 +152,10 @@ const selectItem = ({ id }) => {

{{ t('Filter item') }}

- + { v-model="itemFilterParams.producerFk" /> [ { - label: t('entry.basicData.id'), + label: t('globals.id'), name: 'id', field: 'id', align: 'left', }, { - label: t('entry.basicData.warehouseOut'), + label: t('globals.warehouseOut'), name: 'warehouseOutFk', field: 'warehouseOutFk', align: 'left', @@ -62,7 +62,7 @@ const tableColumns = computed(() => [ warehousesOptions.value.find((warehouse) => warehouse.id === val).name, }, { - label: t('entry.basicData.warehouseIn'), + label: t('globals.warehouseIn'), name: 'warehouseInFk', field: 'warehouseInFk', align: 'left', @@ -77,7 +77,7 @@ const tableColumns = computed(() => [ format: (val) => toDate(val), }, { - label: t('entry.basicData.landed'), + label: t('globals.landed'), name: 'landed', field: 'landed', align: 'left', @@ -146,7 +146,7 @@ const selectTravel = ({ id }) => {

{{ t('Filter travels') }}

{ v-model="travelFilterParams.agencyModeFk" /> { v-model="travelFilterParams.warehouseOutFk" /> { v-model="travelFilterParams.shipped" /> diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue index e89d32da4..938dceb4d 100644 --- a/src/components/ItemsFilterPanel.vue +++ b/src/components/ItemsFilterPanel.vue @@ -248,7 +248,7 @@ const removeTag = (index, params, search) => { > @@ -42,8 +42,8 @@ const { t } = useI18n(); /> diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue index 05a9e073e..623eab94a 100644 --- a/src/pages/Department/Card/DepartmentSummary.vue +++ b/src/pages/Department/Card/DepartmentSummary.vue @@ -45,11 +45,7 @@ onMounted(async () => { />
- + { 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. - + { /> 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) => { >
- {{ t('item.descriptor.visible') }} + {{ t('globals.visible') }} {{ visible }}
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue index dd2c0649b..4570b2319 100644 --- a/src/pages/Item/Card/ItemSummary.vue +++ b/src/pages/Item/Card/ItemSummary.vue @@ -57,11 +57,11 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`; :url="getUrl(entityId, 'basic-data')" :text="t('globals.summary.basicData')" /> - + - - + + `#/Item/${id}/${param}`; :value="item.intrastat.id" /> @@ -115,7 +115,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`; /> - + { >
{
[ }, { - label: t('item.fixedPrice.warehouse'), + label: t('globals.warehouse'), field: 'warehouseFk', name: 'warehouseFk', ...defaultColumnAttrs, @@ -192,7 +192,7 @@ const editTableFieldsOptions = [ }, { field: 'warehouseFk', - label: t('item.fixedPrice.warehouse'), + label: t('globals.warehouse'), component: 'select', attrs: { options: [], diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue index ae4c9531c..2ad9c92d0 100644 --- a/src/pages/Item/ItemList.vue +++ b/src/pages/Item/ItemList.vue @@ -114,7 +114,7 @@ const columns = computed(() => [ }, }, { - label: t('item.list.grouping'), + label: t('entry.summary.grouping'), field: 'grouping', name: 'grouping', align: 'left', @@ -131,7 +131,7 @@ const columns = computed(() => [ format: (val) => dashIfEmpty(val), }, { - label: t('item.list.packing'), + label: t('entry.summary.packing'), field: 'packing', name: 'packing', align: 'left', @@ -180,7 +180,7 @@ const columns = computed(() => [ }, }, { - label: t('item.list.size'), + label: t('globals.size'), field: 'size', name: 'size', align: 'left', @@ -237,7 +237,7 @@ const columns = computed(() => [ }, { - label: t('item.list.intrastat'), + label: t('globals.intrastat'), field: 'intrastat', name: 'intrastat', align: 'left', @@ -256,7 +256,7 @@ const columns = computed(() => [ }, }, { - label: t('item.list.origin'), + label: t('globals.origin'), field: 'origin', name: 'origin', align: 'left', @@ -337,7 +337,7 @@ const columns = computed(() => [ columnFilter: null, }, { - label: t('item.list.producer'), + label: t('globals.producer'), field: 'producer', name: 'producer', align: 'left', @@ -354,7 +354,7 @@ const columns = computed(() => [ format: (val) => dashIfEmpty(val), }, { - label: t('item.list.landed'), + label: t('globals.landed'), field: 'landed', name: 'landed', align: 'left', diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue index 7dd961a35..be378893e 100644 --- a/src/pages/Item/ItemRequest.vue +++ b/src/pages/Item/ItemRequest.vue @@ -40,7 +40,7 @@ watch( const columns = computed(() => [ { - label: t('item.buyRequest.ticketId'), + label: t('globals.ticketId'), name: 'id', field: 'id', align: 'left', @@ -74,7 +74,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('item.buyRequest.price'), + label: t('globals.price'), field: 'price', name: 'price', align: 'left', @@ -89,7 +89,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('item.buyRequest.item'), + label: t('globals.item'), field: 'item', name: 'item', align: 'left', @@ -110,7 +110,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('item.buyRequest.state'), + label: t('globals.state'), field: 'state', name: 'state', align: 'left', diff --git a/src/pages/Order/Card/OrderBasicData.vue b/src/pages/Order/Card/OrderBasicData.vue index 4bc9e2e43..dc8d1a429 100644 --- a/src/pages/Order/Card/OrderBasicData.vue +++ b/src/pages/Order/Card/OrderBasicData.vue @@ -162,7 +162,7 @@ const onClientChange = async (clientId) => { @@ -109,9 +109,9 @@ function ticketFilter(order) { - - - + + + $props.id || route.params.id); const detailsColumns = ref([ { name: 'item', - label: t('order.summary.item'), + label: t('globals.item'), field: (row) => row?.item?.id, sortable: true, }, @@ -40,7 +40,7 @@ const detailsColumns = ref([ }, { name: 'price', - label: t('order.summary.price'), + label: t('globals.price'), field: (row) => toCurrency(row?.price), }, { @@ -69,7 +69,7 @@ const detailsColumns = ref([ :text="t('globals.pageTitles.basicData')" /> - + @@ -96,14 +96,14 @@ const detailsColumns = ref([ :value="toDateHourMinSec(entity?.created)" /> - +