diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index e1ec621755e..dbc3e4077bc 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -389,80 +389,6 @@ cau:
subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
inputLabel: Explain why this error should not appear
askPrivileges: Ask for privileges
-entry:
- list:
- newEntry: New entry
- tableVisibleColumns:
- created: Creation
- supplierFk: Supplier
- isBooked: Booked
- isConfirmed: Confirmed
- isOrdered: Ordered
- companyFk: Company
- travelFk: Travel
- isExcludedFromAvailable: Inventory
- invoiceAmount: Import
- summary:
- commission: Commission
- currency: Currency
- invoiceNumber: Invoice number
- ordered: Ordered
- booked: Booked
- excludedFromAvailable: Inventory
- travelReference: Reference
- travelAgency: Agency
- travelShipped: Shipped
- travelDelivered: Delivered
- travelLanded: Landed
- travelReceived: Received
- buys: Buys
- stickers: Stickers
- package: Package
- packing: Pack.
- grouping: Group.
- buyingValue: Buying value
- import: Import
- pvp: PVP
- basicData:
- travel: Travel
- currency: Currency
- commission: Commission
- observation: Observation
- booked: Booked
- excludedFromAvailable: Inventory
- buys:
- observations: Observations
- packagingFk: Box
- color: Color
- printedStickers: Printed stickers
- notes:
- observationType: Observation type
- latestBuys:
- tableVisibleColumns:
- image: Picture
- itemFk: Item ID
- weightByPiece: Weight/Piece
- isActive: Active
- family: Family
- entryFk: Entry
- freightValue: Freight value
- comissionValue: Commission value
- packageValue: Package value
- isIgnored: Is ignored
- price2: Grouping
- price3: Packing
- minPrice: Min
- ektFk: Ekt
- packingOut: Package out
- landing: Landing
- isExcludedFromAvailable: Es inventory
- params:
- toShipped: To
- fromShipped: From
- warehouseiNFk: Warehouse
- daysOnward: Days onward
- daysAgo: Days ago
- warehouseInFk: Warehouse in
ticket:
params:
ticketFk: Ticket ID
@@ -869,7 +795,10 @@ components:
hasMinPrice: Minimum price
# LatestBuysFilter
salesPersonFk: Buyer
+ supplierFk: Supplier
from: From
+ to: To
+ visible: Is visible
active: Is active
floramondo: Is floramondo
showBadDates: Show future items
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4b4f6f552d6..1b6ed7b715c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -389,80 +389,6 @@ cau:
subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
inputLabel: Explique el motivo por el que no deberia aparecer este fallo
askPrivileges: Solicitar permisos
-entry:
- list:
- newEntry: Nueva entrada
- tableVisibleColumns:
- created: Creación
- supplierFk: Proveedor
- isBooked: Asentado
- isConfirmed: Confirmado
- isOrdered: Pedida
- companyFk: Empresa
- travelFk: Envio
- isExcludedFromAvailable: Inventario
- invoiceAmount: Importe
- summary:
- commission: Comisión
- currency: Moneda
- invoiceNumber: Núm. factura
- ordered: Pedida
- booked: Contabilizada
- excludedFromAvailable: Inventario
- travelReference: Referencia
- travelAgency: Agencia
- travelShipped: F. envio
- travelWarehouseOut: Alm. salida
- travelDelivered: Enviada
- travelLanded: F. entrega
- travelReceived: Recibida
- buys: Compras
- stickers: Etiquetas
- package: Embalaje
- packing: Pack.
- grouping: Group.
- buyingValue: Coste
- import: Importe
- pvp: PVP
- basicData:
- travel: Envío
- currency: Moneda
- observation: Observación
- commission: Comisión
- booked: Asentado
- excludedFromAvailable: Inventario
- buys:
- observations: Observaciónes
- packagingFk: Embalaje
- color: Color
- printedStickers: Etiquetas impresas
- notes:
- observationType: Tipo de observación
- latestBuys:
- tableVisibleColumns:
- image: Foto
- itemFk: Id Artículo
- weightByPiece: Peso (gramos)/tallo
- isActive: Activo
- family: Familia
- entryFk: Entrada
- freightValue: Porte
- comissionValue: Comisión
- packageValue: Embalaje
- isIgnored: Ignorado
- price2: Grouping
- price3: Packing
- minPrice: Min
- ektFk: Ekt
- packingOut: Embalaje envíos
- landing: Llegada
- isExcludedFromAvailable: Es inventario
- params:
- toShipped: Hasta
- fromShipped: Desde
- warehouseInFk: Alm. entrada
- daysOnward: Días adelante
- daysAgo: Días atras
ticket:
params:
ticketFk: ID de ticket
@@ -866,7 +792,11 @@ components:
wareHouseFk: Almacén
# LatestBuysFilter
salesPersonFk: Comprador
+ supplierFk: Proveedor
+ visible: Visible
active: Activo
+ from: Desde
+ to: Hasta
floramondo: Floramondo
showBadDates: Ver items a futuro
userPanel:
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 3f259633806..e00623a21d0 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,21 +1,13 @@
<script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
import EntryDescriptor from './EntryDescriptor.vue';
-import EntryFilter from '../EntryFilter.vue';
-import filter from './EntryFilter.js';
+import filter from './EntryFilter.js'
</script>
<template>
- <VnCard
+ <VnCardBeta
data-key="Entry"
base-url="Entries"
- :filter="filter"
:descriptor="EntryDescriptor"
- :filter-panel="EntryFilter"
- search-data-key="EntryList"
- :searchbar-props="{
- url: 'Entries/filter',
- label: 'Search entries',
- info: 'You can search by entry reference',
- }"
+ :user-filter="filter"
/>
</template>
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index f91f7f1284e..bc8b40aaaa1 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -40,7 +40,7 @@ const companiesOptions = ref([]);
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
<template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs">
- <strong>{{ t(`params.${tag.label}`) }}: </strong>
+ <strong>{{ t(`entryFilter.params.${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
@@ -49,7 +49,7 @@ const companiesOptions = ref([]);
<QItemSection>
<VnInput
v-model="params.search"
- :label="t('entryFilter.filter.search')"
+ :label="t('entryFilter.params.search')"
is-outlined
/>
</QItemSection>
@@ -58,7 +58,7 @@ const companiesOptions = ref([]);
<QItemSection>
<VnInput
v-model="params.reference"
- :label="t('entryFilter.filter.reference')"
+ :label="t('entryFilter.params.reference')"
is-outlined
/>
</QItemSection>
@@ -67,7 +67,7 @@ const companiesOptions = ref([]);
<QItemSection>
<VnInput
v-model="params.invoiceNumber"
- :label="t('params.invoiceNumber')"
+ :label="t('entryFilter.params.invoiceNumber')"
is-outlined
/>
</QItemSection>
@@ -76,7 +76,7 @@ const companiesOptions = ref([]);
<QItemSection>
<VnInput
v-model="params.travelFk"
- :label="t('params.travelFk')"
+ :label="t('entryFilter.params.travelFk')"
is-outlined
/>
</QItemSection>
@@ -84,7 +84,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnSelect
- :label="t('params.companyFk')"
+ :label="t('entryFilter.params.companyFk')"
v-model="params.companyFk"
@update:model-value="searchFn()"
:options="companiesOptions"
@@ -100,7 +100,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnSelect
- :label="t('params.currencyFk')"
+ :label="t('entryFilter.params.currencyFk')"
v-model="params.currencyFk"
@update:model-value="searchFn()"
:options="currenciesOptions"
@@ -116,7 +116,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnSelect
- :label="t('params.supplierFk')"
+ :label="t('entryFilter.params.supplierFk')"
v-model="params.supplierFk"
@update:model-value="searchFn()"
url="Suppliers"
@@ -148,7 +148,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnInputDate
- :label="t('params.created')"
+ :label="t('entryFilter.params.created')"
v-model="params.created"
@update:model-value="searchFn()"
is-outlined
@@ -158,7 +158,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnInputDate
- :label="t('params.from')"
+ :label="t('entryFilter.params.from')"
v-model="params.from"
@update:model-value="searchFn()"
is-outlined
@@ -168,7 +168,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<VnInputDate
- :label="t('params.to')"
+ :label="t('entryFilter.params.to')"
v-model="params.to"
@update:model-value="searchFn()"
is-outlined
@@ -178,14 +178,14 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<QCheckbox
- :label="t('params.isBooked')"
+ :label="t('entryFilter.params.isBooked')"
v-model="params.isBooked"
toggle-indeterminate
/>
</QItemSection>
<QItemSection>
<QCheckbox
- :label="t('params.isConfirmed')"
+ :label="t('entryFilter.params.isConfirmed')"
v-model="params.isConfirmed"
toggle-indeterminate
/>
@@ -194,7 +194,7 @@ const companiesOptions = ref([]);
<QItem>
<QItemSection>
<QCheckbox
- :label="t('params.isOrdered')"
+ :label="t('entryFilter.params.isOrdered')"
v-model="params.isOrdered"
toggle-indeterminate
/>
@@ -202,35 +202,4 @@ const companiesOptions = ref([]);
</QItem>
</template>
</VnFilterPanel>
-</template>
-
-<i18n>
-en:
- params:
-
- invoiceNumber: Invoice number
- travelFk: Travel
- companyFk: Company
- currencyFk: Currency
- supplierFk: Supplier
- from: From
- to: To
- created: Created
- isBooked: Booked
- isConfirmed: Confirmed
- isOrdered: Ordered
-es:
- params:
-
- invoiceNumber: Núm. factura
- travelFk: Envío
- companyFk: Empresa
- currencyFk: Moneda
- supplierFk: Proveedor
- from: Desde
- to: Hasta
- created: Fecha creación
- isBooked: Asentado
- isConfirmed: Confirmado
- isOrdered: Pedida
-</i18n>
+</template>
\ No newline at end of file
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 450efe62414..73fdcbbbf16 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -102,7 +102,7 @@ const columns = [
},
{
align: 'left',
- label: t('globals.weightByPiece'),
+ label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
name: 'weightByPiece',
columnFilter: {
component: 'number',
@@ -157,7 +157,7 @@ const columns = [
},
{
align: 'left',
- label: t('entry.buys.packageValue'),
+ label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
name: 'packageValue',
columnFilter: {
component: 'number',
@@ -262,8 +262,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
:right-search="false"
/>
</template>
-
-<i18n>
-es:
- Edit buy(s): Editar compra(s)
-</i18n>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 879a5091434..ea6f1a621ee 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -2,17 +2,17 @@
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import EntryFilter from './EntryFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import VnTable from 'components/VnTable/VnTable.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
import { toDate } from 'src/filters';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import EntrySummary from './Card/EntrySummary.vue';
import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
const { t } = useI18n();
const tableRef = ref();
+const dataKey = 'EntryList';
const { viewSummary } = useSummaryDialog();
const entryFilter = {
@@ -178,73 +178,73 @@ const columns = computed(() => [
},
]);
</script>
+
<template>
- <VnSearchbar
- data-key="EntryList"
+ <VnSection
+ :data-key="dataKey"
+ :columns="columns"
+ prefix="entry"
url="Entries/filter"
- :label="t('Search entries')"
- :info="t('You can search by entry reference')"
- />
- <RightMenu>
- <template #right-panel>
+ :array-data-props="{
+ url: 'Entries/filter',
+ order: 'id DESC',
+ userFilter: 'entryFilter',
+ }"
+ >
+ <template #rightMenu>
<EntryFilter data-key="EntryList" />
</template>
- </RightMenu>
- <VnTable
- ref="tableRef"
- data-key="EntryList"
- url="Entries/filter"
- :filter="entryFilter"
- :create="{
- urlCreate: 'Entries',
- title: t('Create entry'),
- onDataSaved: ({ id }) => tableRef.redirect(id),
- formInitialData: {},
- }"
- order="id DESC"
- :columns="columns"
- redirect="entry"
- :right-search="false"
- >
- <template #column-status="{ row }">
- <div class="row q-gutter-xs">
- <QIcon
- v-if="!!row.isExcludedFromAvailable"
- name="vn:inventory"
- color="primary"
- >
- <QTooltip>{{
- t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
- }}</QTooltip>
- </QIcon>
- <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
- <QTooltip>
- {{
- t('globals.raid', { daysInForward: row.daysInForward })
- }}</QTooltip
- >
- </QIcon>
- </div>
+ <template #body>
+ <VnTable
+ ref="tableRef"
+ :data-key="dataKey"
+ :create="{
+ urlCreate: 'Entries',
+ title: t('entry.list.newEntry'),
+ onDataSaved: ({ id }) => tableRef.redirect(id),
+ formInitialData: {},
+ }"
+ :columns="columns"
+ redirect="entry"
+ :right-search="false"
+ >
+ <template #column-status="{ row }">
+ <div class="row q-gutter-xs">
+ <QIcon
+ v-if="!!row.isExcludedFromAvailable"
+ name="vn:inventory"
+ color="primary"
+ >
+ <QTooltip>{{
+ t(
+ 'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+ )
+ }}</QTooltip>
+ </QIcon>
+ <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
+ <QTooltip>
+ {{
+ t('globals.raid', {
+ daysInForward: row.daysInForward,
+ })
+ }}</QTooltip
+ >
+ </QIcon>
+ </div>
+ </template>
+ <template #column-supplierFk="{ row }">
+ <span class="link" @click.stop>
+ {{ row.supplierName }}
+ <SupplierDescriptorProxy :id="row.supplierFk" />
+ </span>
+ </template>
+ <template #column-travelFk="{ row }">
+ <span class="link" @click.stop>
+ {{ row.travelRef }}
+ <TravelDescriptorProxy :id="row.travelFk" />
+ </span>
+ </template>
+ </VnTable>
</template>
- <template #column-supplierFk="{ row }">
- <span class="link" @click.stop>
- {{ row.supplierName }}
- <SupplierDescriptorProxy :id="row.supplierFk" />
- </span>
- </template>
- <template #column-travelFk="{ row }">
- <span class="link" @click.stop>
- {{ row.travelRef }}
- <TravelDescriptorProxy :id="row.travelFk" />
- </span>
- </template>
- </VnTable>
+ </VnSection>
</template>
-
-<i18n>
-es:
- Virtual entry: Es una redada
- Search entries: Buscar entradas
- You can search by entry reference: Puedes buscar por referencia de la entrada
- Create entry: Crear entrada
-</i18n>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 3f0cd2d99c1..fa0bdc12e2f 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -1,5 +1,5 @@
<script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { useState } from 'src/composables/useState';
import { useQuasar } from 'quasar';
@@ -19,7 +19,7 @@ const { t } = useI18n();
const quasar = useQuasar();
const state = useState();
const user = state.getUser();
-const columns = [
+const columns = computed(() => [
{
align: 'left',
label: 'Id',
@@ -31,7 +31,7 @@ const columns = [
{
align: 'left',
name: 'workerFk',
- label: t('Buyer'),
+ label: t('entryStockBought.buyer'),
isTitle: true,
component: 'select',
cardVisible: true,
@@ -49,7 +49,7 @@ const columns = [
},
{
align: 'center',
- label: t('Reserve'),
+ label: t('entryStockBought.reserve'),
name: 'reserve',
columnFilter: false,
create: true,
@@ -58,7 +58,7 @@ const columns = [
},
{
align: 'center',
- label: t('Bought'),
+ label: t('entryStockBought.bought'),
name: 'bought',
summation: true,
cardVisible: true,
@@ -66,7 +66,7 @@ const columns = [
},
{
align: 'left',
- label: t('Date'),
+ label: t('entryStockBought.date'),
name: 'dated',
component: 'date',
visible: false,
@@ -77,7 +77,7 @@ const columns = [
name: 'tableActions',
actions: [
{
- title: t('View more details'),
+ title: t('entryStockBought.viewMoreDetails'),
icon: 'search',
isPrimary: true,
action: (row) => {
@@ -92,7 +92,7 @@ const columns = [
},
],
},
-];
+]);
const fetchDataRef = ref();
const travelDialogRef = ref(false);
@@ -166,7 +166,7 @@ function round(value) {
<VnRow class="travel">
<div v-if="travel">
<span style="color: var(--vn-label-color)">
- {{ t('Purchase Spaces') }}:
+ {{ t('entryStockBought.purchaseSpaces') }}:
</span>
<span>
{{ travel?.m3 }}
@@ -177,7 +177,7 @@ function round(value) {
flat
icon="edit"
@click="openDialog()"
- :title="t('Edit travel')"
+ :title="t('entryStockBought.editTravel')"
color="primary"
/>
</div>
@@ -226,7 +226,7 @@ function round(value) {
@on-fetch="(data) => setFooter(data)"
:create="{
urlCreate: 'StockBoughts',
- title: t('Reserve some space'),
+ title: t('entryStockBought.reserveSomeSpace'),
onDataSaved: () => tableRef.reload(),
formInitialData: {
workerFk: user.id,
@@ -288,16 +288,3 @@ function round(value) {
color: $negative !important;
}
</style>
-<i18n>
- es:
- Edit travel: Editar envío
- Travel: Envíos
- Purchase Spaces: Espacios de compra
- Buyer: Comprador
- Reserve: Reservado
- Bought: Comprado
- Date: Fecha
- View more details: Ver más detalles
- Reserve some space: Reservar espacio
- This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
-</i18n>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index dbe05eb8803..3f7566ae0da 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -123,8 +123,8 @@ const printBuys = (rowId) => {
<VnSearchbar
data-key="myEntriesList"
url="Entries/filter"
- :label="t('Search entries')"
- :info="t('You can search by entry reference')"
+ :label="t('myEntries.search')"
+ :info="t('myEntries.searchInfo')"
/>
<VnTable
data-key="myEntriesList"
@@ -137,7 +137,3 @@ const printBuys = (rowId) => {
chip-locale="myEntries"
/>
</template>
-
-<i18n>
- You can search by entry reference: Puedes buscar por referencia de la entrada
-</i18n>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 59c2666a7a9..ff83de0abb5 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,9 +1,92 @@
-entryList:
+entry:
list:
+ newEntry: New entry
+ tableVisibleColumns:
+ created: Creation
+ supplierFk: Supplier
+ isBooked: Booked
+ isConfirmed: Confirmed
+ isOrdered: Ordered
+ companyFk: Company
+ travelFk: Travel
+ isExcludedFromAvailable: Inventory
+ invoiceAmount: Import
inventoryEntry: Inventory entry
- showEntryReport: Show entry report
+ summary:
+ commission: Commission
+ currency: Currency
+ invoiceNumber: Invoice number
+ ordered: Ordered
+ booked: Booked
+ excludedFromAvailable: Inventory
+ travelReference: Reference
+ travelAgency: Agency
+ travelShipped: Shipped
+ travelDelivered: Delivered
+ travelLanded: Landed
+ travelReceived: Received
+ buys: Buys
+ stickers: Stickers
+ package: Package
+ packing: Pack.
+ grouping: Group.
+ buyingValue: Buying value
+ import: Import
+ pvp: PVP
+ basicData:
+ travel: Travel
+ currency: Currency
+ commission: Commission
+ observation: Observation
+ booked: Booked
+ excludedFromAvailable: Inventory
+ buys:
+ observations: Observations
+ packagingFk: Box
+ color: Color
+ printedStickers: Printed stickers
+ notes:
+ observationType: Observation type
+ latestBuys:
+ tableVisibleColumns:
+ image: Picture
+ itemFk: Item ID
+ weightByPiece: Weight/Piece
+ isActive: Active
+ family: Family
+ entryFk: Entry
+ freightValue: Freight value
+ comissionValue: Commission value
+ packageValue: Package value
+ isIgnored: Is ignored
+ price2: Grouping
+ price3: Packing
+ minPrice: Min
+ ektFk: Ekt
+ packingOut: Package out
+ landing: Landing
+ isExcludedFromAvailable: Es inventory
+ params:
+ toShipped: To
+ fromShipped: From
+ daysOnward: Days onward
+ daysAgo: Days ago
+ warehouseInFk: Warehouse in
+ search: Search entries
+ searchInfo: You can search by entry reference
entryFilter:
- filter:
+ params:
+ invoiceNumber: Invoice number
+ travelFk: Travel
+ companyFk: Company
+ currencyFk: Currency
+ supplierFk: Supplier
+ from: From
+ to: To
+ created: Created
+ isBooked: Booked
+ isConfirmed: Confirmed
+ isOrdered: Ordered
search: General search
reference: Reference
myEntries:
@@ -19,5 +102,18 @@ myEntries:
daysOnward: Days onward
daysAgo: Days ago
downloadCsv: Download CSV
+ search: Search entries
+ searchInfo: You can search by entry reference
+entryStockBought:
+ travel: Travel
+ editTravel: Edit travel
+ purchaseSpaces: Purchase spaces
+ buyer: Buyer
+ reserve: Reserve
+ bought: Bought
+ date: Date
+ viewMoreDetails: View more details
+ reserveSomeSpace: Reserve some space
+ thisBuyerHasReservationThisDate: This buyer has already made a reservation for this date
wasteRecalc:
recalcOk: The wastes were successfully recalculated
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 4fb7bbf08b4..72072f6aba3 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -1,12 +1,93 @@
-Search entries: Buscar entradas
-You can search by entry reference: Puedes buscar por referencia de la entrada
-
-entryList:
+entry:
list:
+ newEntry: Nueva entrada
+ tableVisibleColumns:
+ created: Creación
+ supplierFk: Proveedor
+ isBooked: Asentado
+ isConfirmed: Confirmado
+ isOrdered: Pedida
+ companyFk: Empresa
+ travelFk: Envio
+ isExcludedFromAvailable: Inventario
+ invoiceAmount: Importe
inventoryEntry: Es inventario
- showEntryReport: Ver informe del pedido
+ summary:
+ commission: Comisión
+ currency: Moneda
+ invoiceNumber: Núm. factura
+ ordered: Pedida
+ booked: Contabilizada
+ excludedFromAvailable: Inventario
+ travelReference: Referencia
+ travelAgency: Agencia
+ travelShipped: F. envio
+ travelWarehouseOut: Alm. salida
+ travelDelivered: Enviada
+ travelLanded: F. entrega
+ travelReceived: Recibida
+ buys: Compras
+ stickers: Etiquetas
+ package: Embalaje
+ packing: Pack.
+ grouping: Group.
+ buyingValue: Coste
+ import: Importe
+ pvp: PVP
+ basicData:
+ travel: Envío
+ currency: Moneda
+ observation: Observación
+ commission: Comisión
+ booked: Asentado
+ excludedFromAvailable: Inventario
+ buys:
+ observations: Observaciónes
+ packagingFk: Embalaje
+ color: Color
+ printedStickers: Etiquetas impresas
+ notes:
+ observationType: Tipo de observación
+ latestBuys:
+ tableVisibleColumns:
+ image: Foto
+ itemFk: Id Artículo
+ weightByPiece: Peso (gramos)/tallo
+ isActive: Activo
+ family: Familia
+ entryFk: Entrada
+ freightValue: Porte
+ comissionValue: Comisión
+ packageValue: Embalaje
+ isIgnored: Ignorado
+ price2: Grouping
+ price3: Packing
+ minPrice: Min
+ ektFk: Ekt
+ packingOut: Embalaje envíos
+ landing: Llegada
+ isExcludedFromAvailable: Es inventario
+ params:
+ toShipped: Hasta
+ fromShipped: Desde
+ warehouseInFk: Alm. entrada
+ daysOnward: Días adelante
+ daysAgo: Días atras
+ search: Buscar entradas
+ searchInfo: Puedes buscar por referencia de entrada
entryFilter:
- filter:
+ params:
+ invoiceNumber: Núm. factura
+ travelFk: Envío
+ companyFk: Empresa
+ currencyFk: Moneda
+ supplierFk: Proveedor
+ from: Desde
+ to: Hasta
+ created: Fecha creación
+ isBooked: Asentado
+ isConfirmed: Confirmado
+ isOrdered: Pedida
search: Búsqueda general
reference: Referencia
myEntries:
@@ -22,5 +103,18 @@ myEntries:
daysOnward: Días adelante
daysAgo: Días atras
downloadCsv: Descargar CSV
+ search: Buscar entradas
+ searchInfo: Puedes buscar por referencia de la entrada
+entryStockBought:
+ travel: Envío
+ editTravel: Editar envío
+ purchaseSpaces: Espacios de compra
+ buyer: Comprador
+ reserve: Reservado
+ bought: Comprado
+ date: Fecha
+ viewMoreDetails: Ver más detalles
+ reserveSomeSpace: Reservar espacio
+ thisBuyerHasReservationThisDate: Este comprador ya ha hecho una reserva para esta fecha
wasteRecalc:
recalcOk: Se han recalculado las mermas correctamente
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 26ce773c5d1..f362c76533c 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -1,50 +1,123 @@
import { RouterView } from 'vue-router';
+const entryCard = {
+ name: 'EntryCard',
+ path: ':id',
+ component: () => import('src/pages/Entry/Card/EntryCard.vue'),
+ redirect: { name: 'EntrySummary' },
+ meta: {
+ menu: [
+ 'EntryBasicData',
+ 'EntryBuys',
+ 'EntryNotes',
+ 'EntryDms',
+ 'EntryLog',
+ ],
+ },
+ children: [
+ {
+ path: 'summary',
+ name: 'EntrySummary',
+ meta: {
+ title: 'summary',
+ icon: 'launch',
+ },
+ component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
+ },
+ {
+ path: 'basic-data',
+ name: 'EntryBasicData',
+ meta: {
+ title: 'basicData',
+ icon: 'vn:settings',
+ },
+ component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
+ },
+ {
+ path: 'buys',
+ name: 'EntryBuys',
+ meta: {
+ title: 'buys',
+ icon: 'vn:lines',
+ },
+ component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
+ },
+ {
+ path: 'buys/import',
+ name: 'EntryBuysImport',
+ component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
+ },
+ {
+ path: 'notes',
+ name: 'EntryNotes',
+ meta: {
+ title: 'notes',
+ icon: 'vn:notes',
+ },
+ component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
+ },
+ {
+ path: 'dms',
+ name: 'EntryDms',
+ meta: {
+ title: 'dms',
+ icon: 'smb_share',
+ },
+ component: () => import('src/pages/Entry/Card/EntryDms.vue'),
+ },
+ {
+ path: 'log',
+ name: 'EntryLog',
+ meta: {
+ title: 'log',
+ icon: 'vn:History',
+ },
+ component: () => import('src/pages/Entry/Card/EntryLog.vue'),
+ },
+ ],
+};
+
export default {
- path: '/entry',
name: 'Entry',
+ path: '/entry',
meta: {
title: 'entries',
icon: 'vn:entry',
moduleName: 'Entry',
keyBinding: 'e',
- },
- component: RouterView,
- redirect: { name: 'EntryMain' },
- menus: {
- main: [
+ menu: [
'EntryList',
'MyEntries',
'EntryLatestBuys',
'EntryStockBought',
'EntryWasteRecalc',
- ],
- card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
+ ]
},
+ component: RouterView,
+ redirect: { name: 'EntryMain' },
children: [
{
- path: '',
name: 'EntryMain',
+ path: '',
component: () => import('src/components/common/VnModule.vue'),
- redirect: { name: 'EntryList' },
+ redirect: { name: 'EntryIndexMain' },
children: [
{
- path: 'list',
- name: 'EntryList',
- meta: {
- title: 'list',
- icon: 'view_list',
- },
+ path:'',
+ name: 'EntryIndexMain',
+ redirect: { name: 'EntryList' },
component: () => import('src/pages/Entry/EntryList.vue'),
- },
- {
- path: 'my',
- name: 'MyEntries',
- meta: {
- title: 'labeler',
- icon: 'sell',
- },
- component: () => import('src/pages/Entry/MyEntries.vue'),
+ children: [
+ {
+ name: 'EntryList',
+ path: 'list',
+ meta: {
+ title: 'list',
+ icon: 'view_list',
+ },
+ },
+ entryCard,
+ ],
},
{
path: 'create',
@@ -54,6 +127,15 @@ export default {
icon: 'add',
},
component: () => import('src/pages/Entry/EntryCreate.vue'),
+ },
+ {
+ path: 'my',
+ name: 'MyEntries',
+ meta: {
+ title: 'labeler',
+ icon: 'sell',
+ },
+ component: () => import('src/pages/Entry/MyEntries.vue'),
},
{
path: 'latest-buys',
@@ -84,72 +166,5 @@ export default {
},
],
},
- {
- name: 'EntryCard',
- path: ':id',
- component: () => import('src/pages/Entry/Card/EntryCard.vue'),
- redirect: { name: 'EntrySummary' },
- children: [
- {
- name: 'EntrySummary',
- path: 'summary',
- meta: {
- title: 'summary',
- icon: 'launch',
- },
- component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
- },
- {
- path: 'basic-data',
- name: 'EntryBasicData',
- meta: {
- title: 'basicData',
- icon: 'vn:settings',
- },
- component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
- },
- {
- path: 'buys',
- name: 'EntryBuys',
- meta: {
- title: 'buys',
- icon: 'vn:lines',
- },
- component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
- },
- {
- path: 'buys/import',
- name: 'EntryBuysImport',
- component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
- },
- {
- path: 'notes',
- name: 'EntryNotes',
- meta: {
- title: 'notes',
- icon: 'vn:notes',
- },
- component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
- },
- {
- path: 'dms',
- name: 'EntryDms',
- meta: {
- title: 'dms',
- icon: 'smb_share',
- },
- component: () => import('src/pages/Entry/Card/EntryDms.vue'),
- },
- {
- path: 'log',
- name: 'EntryLog',
- meta: {
- title: 'log',
- icon: 'vn:History',
- },
- component: () => import('src/pages/Entry/Card/EntryLog.vue'),
- },
- ],
- },
],
-};
+};
\ No newline at end of file