diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 9eca3c711..c6b9f29d1 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -799,7 +799,7 @@ watch(
evt.target.blur()"
@clear="selectFilter('date', 'from')"
@@ -1053,9 +1053,9 @@ en:
Deletes: Deletes
Accesses: Accesses
Users:
- User: Usuario
- All: Todo
- System: Sistema
+ User: User
+ All: All
+ System: System
properties:
id: ID
claimFk: Claim ID
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index dbc3e4077..51ea4a814 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1,9 +1,9 @@
globals:
lang:
es: Spanish
- en: English
- quantity: Quantity
+ en: English
language: Language
+ quantity: Quantity
entity: Entity
user: User
details: Details
@@ -35,7 +35,6 @@ globals:
confirm: Confirm
assign: Assign
back: Back
- downloadPdf: Download PDF
yes: 'Yes'
no: 'No'
noChanges: No changes to save
@@ -59,6 +58,7 @@ globals:
downloadCSVSuccess: CSV downloaded successfully
reference: Reference
agency: Agency
+ entry: Entry
warehouseOut: Warehouse Out
warehouseIn: Warehouse In
landed: Landed
@@ -67,11 +67,11 @@ globals:
amount: Amount
packages: Packages
download: Download
+ downloadPdf: Download PDF
selectRows: 'Select all { numberRows } row(s)'
allRows: 'All { numberRows } row(s)'
markAll: Mark all
requiredField: Required field
- valueCantBeEmpty: Value cannot be empty
class: clase
type: Type
reason: reason
@@ -81,6 +81,9 @@ globals:
warehouse: Warehouse
company: Company
fieldRequired: Field required
+ valueCantBeEmpty: Value cannot be empty
+ Value can't be blank: Value cannot be blank
+ Value can't be null: Value cannot be null
allowedFilesText: 'Allowed file types: { allowedContentTypes }'
smsSent: SMS sent
confirmDeletion: Confirm deletion
@@ -130,6 +133,26 @@ globals:
medium: Medium
big: Big
email: Email
+ supplier: Supplier
+ ticketList: Ticket List
+ created: Created
+ worker: Worker
+ now: Now
+ name: Name
+ new: New
+ comment: Comment
+ observations: Observations
+ goToModuleIndex: Go to module index
+ createInvoiceIn: Create invoice in
+ myAccount: My account
+ noOne: No one
+ maxTemperature: Max
+ minTemperature: Min
+ changePass: Change password
+ deleteConfirmTitle: Delete selected elements
+ changeState: Change state
+ raid: 'Raid {daysInForward} days'
+ isVies: Vies
pageTitles:
logIn: Login
addressEdit: Update address
@@ -151,13 +174,14 @@ globals:
subRoles: Subroles
inheritedRoles: Inherited Roles
customers: Customers
+ customerCreate: New customer
+ createCustomer: Create customer
+ createOrder: New order
list: List
webPayments: Web Payments
extendedList: Extended list
notifications: Notifications
defaulter: Defaulter
- customerCreate: New customer
- createOrder: New order
fiscalData: Fiscal data
billingData: Billing data
consignees: Consignees
@@ -193,27 +217,28 @@ globals:
claims: Claims
claimCreate: New claim
lines: Lines
- photos: Photos
development: Development
+ photos: Photos
action: Action
invoiceOuts: Invoice out
negativeBases: Negative Bases
globalInvoicing: Global invoicing
invoiceOutCreate: Create invoice out
+ order: Orders
+ orderList: List
+ orderCreate: New order
+ catalog: Catalog
+ volume: Volume
shelving: Shelving
shelvingList: Shelving List
shelvingCreate: New shelving
invoiceIns: Invoices In
invoiceInCreate: Create invoice in
vat: VAT
+ labeler: Labeler
dueDay: Due day
intrastat: Intrastat
corrective: Corrective
- order: Orders
- orderList: List
- orderCreate: New order
- catalog: Catalog
- volume: Volume
workers: Workers
workerCreate: New worker
department: Department
@@ -226,10 +251,10 @@ globals:
wagonsList: Wagons List
wagonCreate: Create wagon
wagonEdit: Edit wagon
+ wagonCounter: Trolley counter
typesList: Types List
typeCreate: Create type
typeEdit: Edit type
- wagonCounter: Trolley counter
roadmap: Roadmap
stops: Stops
routes: Routes
@@ -238,21 +263,16 @@ globals:
routeCreate: New route
RouteRoadmap: Roadmaps
RouteRoadmapCreate: Create roadmap
+ RouteExtendedList: Router
autonomous: Autonomous
suppliers: Suppliers
supplier: Supplier
- expedition: Expedition
- services: Service
- components: Components
- pictures: Pictures
- packages: Packages
- tracking: Tracking
- labeler: Labeler
supplierCreate: New supplier
accounts: Accounts
addresses: Addresses
agencyTerm: Agency agreement
travel: Travels
+ create: Create
extraCommunity: Extra community
travelCreate: New travel
history: Log
@@ -260,14 +280,13 @@ globals:
items: Items
diary: Diary
tags: Tags
- create: Create
- buyRequest: Buy requests
fixedPrice: Fixed prices
+ buyRequest: Buy requests
wasteBreakdown: Waste breakdown
itemCreate: New item
- barcode: Barcodes
tax: Tax
botanical: Botanical
+ barcode: Barcodes
itemTypeCreate: New item type
family: Item Type
lastEntries: Last entries
@@ -283,13 +302,20 @@ globals:
formation: Formation
locations: Locations
warehouses: Warehouses
- saleTracking: Sale tracking
roles: Roles
connections: Connections
acls: ACLs
mailForwarding: Mail forwarding
mailAlias: Mail alias
privileges: Privileges
+ observation: Notes
+ expedition: Expedition
+ saleTracking: Sale tracking
+ services: Service
+ tracking: Tracking
+ components: Components
+ pictures: Pictures
+ packages: Packages
ldap: LDAP
samba: Samba
twoFactor: Two factor
@@ -300,27 +326,12 @@ globals:
serial: Serial
medical: Mutual
pit: IRPF
- RouteExtendedList: Router
wasteRecalc: Waste recaclulate
operator: Operator
parking: Parking
- supplier: Supplier
- created: Created
- worker: Worker
- now: Now
- name: Name
- new: New
- comment: Comment
- observations: Observations
- goToModuleIndex: Go to module index
unsavedPopup:
title: Unsaved changes will be lost
subtitle: Are you sure exit without saving?
- createInvoiceIn: Create invoice in
- myAccount: My account
- noOne: No one
- maxTemperature: Max
- minTemperature: Min
params:
clientFk: Client id
salesPersonFk: Sales person
@@ -338,19 +349,13 @@ globals:
supplierFk: Supplier
supplierRef: Supplier ref
serial: Serial
- amount: Importe
+ amount: Amount
awbCode: AWB
correctedFk: Rectified
correctingFk: Rectificative
daysOnward: Days onward
countryFk: Country
companyFk: Company
- changePass: Change password
- setPass: Set password
- deleteConfirmTitle: Delete selected elements
- changeState: Change state
- raid: 'Raid {daysInForward} days'
- isVies: Vies
errors:
statusUnauthorized: Access denied
statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 1b6ed7b71..6318749f7 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -53,11 +53,12 @@ globals:
today: Hoy
yesterday: Ayer
dateFormat: es-ES
- noSelectedRows: No tienes ninguna línea seleccionada
microsip: Abrir en MicroSIP
+ noSelectedRows: No tienes ninguna línea seleccionada
downloadCSVSuccess: Descarga de CSV exitosa
reference: Referencia
agency: Agencia
+ entry: Entrada
warehouseOut: Alm. salida
warehouseIn: Alm. entrada
landed: F. entrega
@@ -132,6 +133,26 @@ globals:
medium: Mediano/a
big: Grande
email: Correo
+ supplier: Proveedor
+ ticketList: Listado de tickets
+ created: Fecha creación
+ worker: Trabajador
+ now: Ahora
+ name: Nombre
+ new: Nuevo
+ comment: Comentario
+ observations: Observaciones
+ goToModuleIndex: Ir al índice del módulo
+ createInvoiceIn: Crear factura recibida
+ myAccount: Mi cuenta
+ noOne: Nadie
+ maxTemperature: Máx
+ minTemperature: Mín
+ changePass: Cambiar contraseña
+ deleteConfirmTitle: Eliminar los elementos seleccionados
+ changeState: Cambiar estado
+ raid: 'Redada {daysInForward} días'
+ isVies: Vies
pageTitles:
logIn: Inicio de sesión
addressEdit: Modificar consignatario
@@ -154,17 +175,17 @@ globals:
inheritedRoles: Roles heredados
customers: Clientes
customerCreate: Nuevo cliente
+ createCustomer: Crear cliente
createOrder: Nuevo pedido
list: Listado
webPayments: Pagos Web
extendedList: Listado extendido
notifications: Notificaciones
defaulter: Morosos
- createCustomer: Crear cliente
fiscalData: Datos fiscales
billingData: Forma de pago
consignees: Consignatarios
- 'address-create': Nuevo consignatario
+ address-create: Nuevo consignatario
notes: Notas
credits: Créditos
greuges: Greuges
@@ -230,10 +251,10 @@ globals:
wagonsList: Listado vagones
wagonCreate: Crear tipo
wagonEdit: Editar tipo
+ wagonCounter: Contador de carros
typesList: Listado tipos
typeCreate: Crear tipo
typeEdit: Editar tipo
- wagonCounter: Contador de carros
roadmap: Troncales
stops: Paradas
routes: Rutas
@@ -242,8 +263,8 @@ globals:
routeCreate: Nueva ruta
RouteRoadmap: Troncales
RouteRoadmapCreate: Crear troncal
- autonomous: Autónomos
RouteExtendedList: Enrutador
+ autonomous: Autónomos
suppliers: Proveedores
supplier: Proveedor
supplierCreate: Nuevo proveedor
@@ -308,23 +329,9 @@ globals:
wasteRecalc: Recalcular mermas
operator: Operario
parking: Parking
- supplier: Proveedor
- created: Fecha creación
- worker: Trabajador
- now: Ahora
- name: Nombre
- new: Nuevo
- comment: Comentario
- observations: Observaciones
- goToModuleIndex: Ir al índice del módulo
unsavedPopup:
title: Los cambios que no haya guardado se perderán
subtitle: ¿Seguro que quiere salir sin guardar?
- createInvoiceIn: Crear factura recibida
- myAccount: Mi cuenta
- noOne: Nadie
- maxTemperature: Máx
- minTemperature: Mín
params:
clientFk: Id cliente
salesPersonFk: Comercial
@@ -347,12 +354,6 @@ globals:
packing: ITP
countryFk: País
companyFk: Empresa
- changePass: Cambiar contraseña
- setPass: Establecer contraseña
- deleteConfirmTitle: Eliminar los elementos seleccionados
- changeState: Cambiar estado
- raid: 'Redada {daysInForward} días'
- isVies: Vies
errors:
statusUnauthorized: Acceso denegado
statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 90aa50af7..498e67303 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -268,7 +268,7 @@ function deleteFile(dmsFk) {
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
-import InvoiceInFilter from '../InvoiceInFilter.vue';
-import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
-import { onBeforeRouteUpdate } from 'vue-router';
-import { setRectificative } from '../composables/setRectificative';
const filter = {
include: [
@@ -39,20 +35,13 @@ const filter = {
},
],
};
-
-onBeforeRouteUpdate(async (to) => await setRectificative(to));
+
-
-
-
-
-
+ :user-filter="filter"
+ />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 4d9e180eb..8782e7c3b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -166,10 +166,10 @@ const createInvoiceInCorrection = async () => {
-
-
-
-
+
+
+
+
{{ entity?.supplier?.nickname }}
@@ -186,7 +186,7 @@ const createInvoiceInCorrection = async () => {
color="primary"
:to="routes.getSupplier(entity.supplierFk)"
>
- {{ t('invoicein.list.supplier') }}
+ {{ t('globals.supplier') }}
{
color="primary"
:to="routes.getEntry(entity.entryFk)"
>
- {{ t('Entry') }}
+ {{ t('globals.entry') }}
{
color="primary"
:to="routes.getTickets(entity.supplierFk)"
>
- {{ t('InvoiceOut.card.ticketList') }}
+ {{ t('globals.ticketList') }}
- {{ t('invoicein.descriptorMenu.toBook') }}
+ {{ t('invoiceIn.descriptorMenu.toBook') }}
@@ -155,28 +155,28 @@ function sendPdfInvoice({ address }) {
@click="triggerMenu('unbook')"
>
- {{ t('invoicein.descriptorMenu.toUnbook') }}
+ {{ t('invoiceIn.descriptorMenu.toUnbook') }}
- {{ t('invoicein.descriptorMenu.deleteInvoice') }}
+ {{ t('invoiceIn.descriptorMenu.deleteInvoice') }}
- {{ t('invoicein.descriptorMenu.cloneInvoice') }}
+ {{ t('invoiceIn.descriptorMenu.cloneInvoice') }}
{{
- t('invoicein.descriptorMenu.showAgriculturalPdf')
+ t('invoiceIn.descriptorMenu.showAgriculturalPdf')
}}
{{ t('invoicein.descriptorMenu.sendAgriculturalPdf') }}...{{ t('invoiceIn.descriptorMenu.sendAgriculturalPdf') }}...
{{ t('invoicein.descriptorMenu.createCorrective') }}...{{ t('invoiceIn.descriptorMenu.createCorrective') }}...
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index eca0c7af1..e546638f2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -27,14 +27,14 @@ const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
const vatColumns = ref([
{
name: 'expense',
- label: 'invoicein.summary.expense',
+ label: 'invoiceIn.summary.expense',
field: (row) => row.expenseFk,
sortable: true,
align: 'left',
},
{
name: 'landed',
- label: 'invoicein.summary.taxableBase',
+ label: 'invoiceIn.summary.taxableBase',
field: (row) => row.taxableBase,
format: (value) => toCurrency(value),
sortable: true,
@@ -42,7 +42,7 @@ const vatColumns = ref([
},
{
name: 'vat',
- label: 'invoicein.summary.sageVat',
+ label: 'invoiceIn.summary.sageVat',
field: (row) => {
if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
},
@@ -52,7 +52,7 @@ const vatColumns = ref([
},
{
name: 'transaction',
- label: 'invoicein.summary.sageTransaction',
+ label: 'invoiceIn.summary.sageTransaction',
field: (row) => {
if (row.transactionTypeSage)
return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
@@ -63,7 +63,7 @@ const vatColumns = ref([
},
{
name: 'rate',
- label: 'invoicein.summary.rate',
+ label: 'invoiceIn.summary.rate',
field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
format: (value) => toCurrency(value),
sortable: true,
@@ -71,7 +71,7 @@ const vatColumns = ref([
},
{
name: 'currency',
- label: 'invoicein.summary.currency',
+ label: 'invoiceIn.summary.currency',
field: (row) => row.foreignValue,
format: (val) => val && toCurrency(val, currency.value),
sortable: true,
@@ -82,21 +82,21 @@ const vatColumns = ref([
const dueDayColumns = ref([
{
name: 'date',
- label: 'invoicein.summary.dueDay',
+ label: 'invoiceIn.summary.dueDay',
field: (row) => toDate(row.dueDated),
sortable: true,
align: 'left',
},
{
name: 'bank',
- label: 'invoicein.summary.bank',
+ label: 'invoiceIn.summary.bank',
field: (row) => row.bank.bank,
sortable: true,
align: 'left',
},
{
name: 'amount',
- label: 'invoicein.list.amount',
+ label: 'invoiceIn.list.amount',
field: (row) => row.amount,
format: (value) => toCurrency(value),
sortable: true,
@@ -104,7 +104,7 @@ const dueDayColumns = ref([
},
{
name: 'landed',
- label: 'invoicein.summary.foreignValue',
+ label: 'invoiceIn.summary.foreignValue',
field: (row) => row.foreignValue,
format: (val) => val && toCurrency(val, currency.value),
sortable: true,
@@ -115,7 +115,7 @@ const dueDayColumns = ref([
const intrastatColumns = ref([
{
name: 'code',
- label: 'invoicein.summary.code',
+ label: 'invoiceIn.summary.code',
field: (row) => {
return `${row.intrastat.id}: ${row.intrastat?.description}`;
},
@@ -124,21 +124,21 @@ const intrastatColumns = ref([
},
{
name: 'amount',
- label: 'invoicein.list.amount',
+ label: 'invoiceIn.list.amount',
field: (row) => toCurrency(row.amount),
sortable: true,
align: 'left',
},
{
name: 'net',
- label: 'invoicein.summary.net',
+ label: 'invoiceIn.summary.net',
field: (row) => row.net,
sortable: true,
align: 'left',
},
{
name: 'stems',
- label: 'invoicein.summary.stems',
+ label: 'invoiceIn.summary.stems',
field: (row) => row.stems,
format: (value) => value,
sortable: true,
@@ -146,7 +146,7 @@ const intrastatColumns = ref([
},
{
name: 'landed',
- label: 'invoicein.summary.country',
+ label: 'invoiceIn.summary.country',
field: (row) => row.country?.code,
format: (value) => value,
sortable: true,
@@ -214,7 +214,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
/>
@@ -225,14 +225,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-
+
`#/invoice-in/${entityId.value}/${param}`;
@@ -272,18 +272,18 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
/>
-
+
@@ -294,11 +294,11 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-
+
`#/invoice-in/${entityId.value}/${param}`;
:color="amountsNotMatch ? 'negative' : 'transparent'"
:title="
amountsNotMatch
- ? t('invoicein.summary.noMatch')
- : t('invoicein.summary.dueTotal')
+ ? t('invoiceIn.summary.noMatch')
+ : t('invoiceIn.summary.dueTotal')
"
>
{{ toCurrency(entity.totals.totalDueDay) }}
@@ -318,7 +318,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-
+
`#/invoice-in/${entityId.value}/${param}`;
-
+
@@ -404,7 +404,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
{
@@ -97,10 +97,10 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
map-options
hide-selected
:required="true"
- :rules="validate('invoicein.companyFk')"
+ :rules="validate('invoiceIn.companyFk')"
/>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 31a611936..43b91c93f 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -164,7 +164,7 @@ function handleDaysAgo(params, daysAgo) {
[
{
align: 'left',
name: 'isBooked',
- label: t('invoicein.isBooked'),
+ label: t('invoiceIn.isBooked'),
columnFilter: false,
},
{
@@ -41,7 +41,7 @@ const cols = computed(() => [
{
align: 'left',
name: 'supplierFk',
- label: t('invoicein.list.supplier'),
+ label: t('invoiceIn.list.supplier'),
columnFilter: {
component: 'select',
attrs: {
@@ -55,16 +55,16 @@ const cols = computed(() => [
{
align: 'left',
name: 'supplierRef',
- label: t('invoicein.list.supplierRef'),
+ label: t('invoiceIn.list.supplierRef'),
},
{
align: 'left',
name: 'serial',
- label: t('invoicein.serial'),
+ label: t('invoiceIn.serial'),
},
{
align: 'left',
- label: t('invoicein.list.issued'),
+ label: t('invoiceIn.list.issued'),
name: 'issued',
component: null,
columnFilter: {
@@ -74,7 +74,7 @@ const cols = computed(() => [
},
{
align: 'left',
- label: t('invoicein.list.dueDated'),
+ label: t('invoiceIn.list.dueDated'),
name: 'dueDated',
component: null,
columnFilter: {
@@ -86,12 +86,12 @@ const cols = computed(() => [
{
align: 'left',
name: 'awbCode',
- label: t('invoicein.list.awb'),
+ label: t('invoiceIn.list.awb'),
},
{
align: 'left',
name: 'amount',
- label: t('invoicein.list.amount'),
+ label: t('invoiceIn.list.amount'),
format: ({ amount }) => toCurrency(amount),
cardVisible: true,
},
@@ -130,71 +130,81 @@ const cols = computed(() => [
},
]);
+
(companies = data)" auto-load />
-
-
-
+
+
-
-
-
-
- {{ row.supplierName }}
-
-
-
-
-
+
-
-
-
- {{ scope.opt?.nickname }}
- #{{ scope.opt?.id }}, {{ scope.opt?.name }}
-
-
+
+
+ {{ row.supplierName }}
+
+
-
-
-
-
+
+
+
+
+
+ {{ scope.opt?.nickname }}
+
+ #{{ scope.opt?.id }}, {{ scope.opt?.name }}
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/pages/InvoiceIn/InvoiceInSearchbar.vue b/src/pages/InvoiceIn/InvoiceInSearchbar.vue
deleted file mode 100644
index f2731b005..000000000
--- a/src/pages/InvoiceIn/InvoiceInSearchbar.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-es:
- Search invoice: Buscar factura recibida
- Search invoices in by id or supplier fiscal name: Buscar facturas recibidas por id o por nombre fiscal del proveedor
-
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 94db50066..6b21b316b 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -1,4 +1,6 @@
-invoicein:
+invoiceIn:
+ search: Search invoice
+ searchInfo: Search incoming invoices by ID or supplier fiscal name
serial: Serial
isBooked: Is booked
list:
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index bcb9c0551..3f27c895c 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -1,4 +1,6 @@
-invoicein:
+invoiceIn:
+ search: Buscar factura recibida
+ searchInfo: Buscar facturas recibidas por ID o nombre fiscal del proveedor
serial: Serie
isBooked: Contabilizada
list:
@@ -63,6 +65,7 @@ invoicein:
params:
search: Id o nombre proveedor
correctedFk: Rectificada
+ isBooked: Contabilizada
account: Cuenta contable
correctingFk: Rectificativa
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 09873642d..3b9d3d843 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -355,7 +355,7 @@ watchEffect(selectedRows);
import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
+ redirect: { name: 'InvoiceInSummary' },
meta: {
- title: 'invoiceIns',
- icon: 'vn:invoice-in',
- moduleName: 'InvoiceIn',
- },
- component: RouterView,
- redirect: { name: 'InvoiceInMain' },
- menus: {
- main: ['InvoiceInList', 'InvoiceInSerial'],
- card: [
+ menu: [
'InvoiceInBasicData',
'InvoiceInVat',
'InvoiceInDueDay',
@@ -23,29 +17,109 @@ export default {
},
children: [
{
- path: '',
+ path: 'summary',
+ name: 'InvoiceInSummary',
+ meta: {
+ title: 'summary',
+ icon: 'view_list',
+ },
+ component: () => import('src/pages/InvoiceIn/Card/InvoiceInSummary.vue'),
+ },
+ {
+ name: 'InvoiceInBasicData',
+ path: 'basic-data',
+ meta: {
+ title: 'basicData',
+ icon: 'vn:settings',
+ },
+ component: () =>
+ import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
+ },
+ {
+ name: 'InvoiceInVat',
+ path: 'vat',
+ meta: {
+ title: 'vat',
+ icon: 'vn:tax',
+ },
+ component: () => import('src/pages/InvoiceIn/Card/InvoiceInVat.vue'),
+ },
+ {
+ name: 'InvoiceInDueDay',
+ path: 'due-day',
+ meta: {
+ title: 'dueDay',
+ icon: 'vn:calendar',
+ },
+ component: () =>
+ import('src/pages/InvoiceIn/Card/InvoiceInDueDay.vue'),
+ },
+ {
+ name: 'InvoiceInIntrastat',
+ path: 'intrastat',
+ meta: {
+ title: 'intrastat',
+ icon: 'vn:lines',
+ },
+ component: () =>
+ import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
+ },
+ {
+ name: 'InvoiceInCorrective',
+ path: 'corrective',
+ meta: {
+ title: 'corrective',
+ icon: 'attachment',
+ },
+ component: () =>
+ import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
+ },
+ {
+ name: 'InvoiceInLog',
+ path: 'log',
+ meta: {
+ title: 'log',
+ icon: 'history',
+ },
+ component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
+ },
+ ],
+};
+
+export default {
+ name: 'InvoiceIn',
+ path: '/invoice-in',
+ meta: {
+ title: 'invoiceIns',
+ icon: 'vn:invoice-in',
+ moduleName: 'InvoiceIn',
+ menu: ['InvoiceInList', 'InvoiceInSerial'],
+ },
+ component: RouterView,
+ redirect: { name: 'InvoiceInMain' },
+ children: [
+ {
name: 'InvoiceInMain',
+ path: '',
component: () => import('src/components/common/VnModule.vue'),
- redirect: { name: 'InvoiceInList' },
+ redirect: { name: 'InvoiceInIndexMain' },
children: [
{
- path: 'list',
- name: 'InvoiceInList',
- meta: {
- title: 'list',
- icon: 'view_list',
- },
+ path: '',
+ name: 'InvoiceInIndexMain',
+ redirect: { name: 'InvoiceInList' },
component: () => import('src/pages/InvoiceIn/InvoiceInList.vue'),
- },
- {
- path: 'serial',
- name: 'InvoiceInSerial',
- meta: {
- title: 'serial',
- icon: 'view_list',
- },
- component: () =>
- import('src/pages/InvoiceIn/Serial/InvoiceInSerial.vue'),
+ children: [
+ {
+ name: 'InvoiceInList',
+ path: 'list',
+ meta: {
+ title: 'list',
+ icon: 'view_list',
+ },
+ },
+ invoiceInCard,
+ ],
},
{
path: 'create',
@@ -56,87 +130,16 @@ export default {
},
component: () => import('src/pages/InvoiceIn/InvoiceInCreate.vue'),
},
- ],
- },
- {
- name: 'InvoiceInCard',
- path: ':id',
- component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
- redirect: { name: 'InvoiceInSummary' },
- beforeEnter: async (to, from, next) => {
- await setRectificative(to);
- next();
- },
- children: [
{
- name: 'InvoiceInSummary',
- path: 'summary',
+ path: 'serial',
+ name: 'InvoiceInSerial',
meta: {
- title: 'summary',
+ title: 'serial',
icon: 'view_list',
},
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInSummary.vue'),
- },
- {
- name: 'InvoiceInBasicData',
- path: 'basic-data',
- meta: {
- title: 'basicData',
- icon: 'vn:settings',
- },
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
- },
- {
- name: 'InvoiceInVat',
- path: 'vat',
- meta: {
- title: 'vat',
- icon: 'vn:tax',
- },
- component: () => import('src/pages/InvoiceIn/Card/InvoiceInVat.vue'),
- },
- {
- name: 'InvoiceInDueDay',
- path: 'due-day',
- meta: {
- title: 'dueDay',
- icon: 'vn:calendar',
- },
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInDueDay.vue'),
- },
- {
- name: 'InvoiceInIntrastat',
- path: 'intrastat',
- meta: {
- title: 'intrastat',
- icon: 'vn:lines',
- },
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
- },
- {
- name: 'InvoiceInLog',
- path: 'log',
- meta: {
- title: 'log',
- icon: 'history',
- },
- component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
- },
- {
- name: 'InvoiceInCorrective',
- path: 'corrective',
- meta: {
- title: 'corrective',
- icon: 'attachment',
- },
- component: () =>
- import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
+ component: () => import('src/pages/InvoiceIn/Serial/InvoiceInSerial.vue'),
},
],
},
],
-};
+};
\ No newline at end of file