refs #6915 test_master24_8 #2067
290
CHANGELOG.md
290
CHANGELOG.md
|
|
@ -5,299 +5,349 @@ All notable changes to this project will be documented in this file.
|
|||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [2408.01] - 2024-02-22
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
## [2406.01] - 2024-02-08
|
||||
|
||||
### Added
|
||||
### Changed
|
||||
### Fixed
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
## [2404.01] - 2024-01-25
|
||||
|
||||
### Added
|
||||
### Changed
|
||||
### Fixed
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
## [2402.01] - 2024-01-11
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
## [2400.01] - 2024-01-04
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
## [2350.01] - 2023-12-14
|
||||
|
||||
### Características Añadidas 🆕
|
||||
- **Tickets → Expediciones:** Añadido soporte para Viaexpress
|
||||
|
||||
- **Tickets → Expediciones:** Añadido soporte para Viaexpress
|
||||
|
||||
## [2348.01] - 2023-11-30
|
||||
|
||||
### Características Añadidas 🆕
|
||||
- **Tickets → Adelantar:** Permite mover lineas sin generar negativos
|
||||
- **Tickets → Adelantar:** Permite modificar la fecha de los tickets
|
||||
- **Trabajadores → Notificaciones:** Nueva sección (lilium)
|
||||
|
||||
- **Tickets → Adelantar:** Permite mover lineas sin generar negativos
|
||||
- **Tickets → Adelantar:** Permite modificar la fecha de los tickets
|
||||
- **Trabajadores → Notificaciones:** Nueva sección (lilium)
|
||||
|
||||
### Correcciones 🛠️
|
||||
- **Tickets → RocketChat:** Arreglada detección de cambios
|
||||
|
||||
- **Tickets → RocketChat:** Arreglada detección de cambios
|
||||
|
||||
## [2346.01] - 2023-11-16
|
||||
|
||||
### Added
|
||||
### Changed
|
||||
### Fixed
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
## [2342.01] - 2023-11-02
|
||||
|
||||
### Added
|
||||
- (Usuarios -> Foto) Se muestra la foto del trabajador
|
||||
### Fixed
|
||||
- (Usuarios -> Historial) Abre el descriptor del usuario correctamente
|
||||
|
||||
- (Usuarios -> Foto) Se muestra la foto del trabajador
|
||||
|
||||
### Fixed
|
||||
|
||||
- (Usuarios -> Historial) Abre el descriptor del usuario correctamente
|
||||
|
||||
## [2340.01] - 2023-10-05
|
||||
|
||||
## [2338.01] - 2023-09-21
|
||||
|
||||
### Added
|
||||
- (Ticket -> Servicios) Se pueden abonar servicios
|
||||
- (Facturas -> Datos básicos) Muestra valores por defecto
|
||||
- (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
|
||||
|
||||
- (Ticket -> Servicios) Se pueden abonar servicios
|
||||
- (Facturas -> Datos básicos) Muestra valores por defecto
|
||||
- (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
|
||||
|
||||
### Changed
|
||||
- (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia
|
||||
|
||||
- (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia
|
||||
|
||||
## [2336.01] - 2023-09-07
|
||||
|
||||
## [2334.01] - 2023-08-24
|
||||
|
||||
### Added
|
||||
- (General -> Errores) Botón para enviar cau con los datos del error
|
||||
|
||||
- (General -> Errores) Botón para enviar cau con los datos del error
|
||||
|
||||
## [2332.01] - 2023-08-10
|
||||
|
||||
### Added
|
||||
- (Trabajadores -> Gestión documental) Soporte para Docuware
|
||||
- (General -> Agencia) Soporte para Viaexpress
|
||||
- (Tickets -> SMS) Nueva sección en Lilium
|
||||
|
||||
- (Trabajadores -> Gestión documental) Soporte para Docuware
|
||||
- (General -> Agencia) Soporte para Viaexpress
|
||||
- (Tickets -> SMS) Nueva sección en Lilium
|
||||
|
||||
### Changed
|
||||
- (General -> Tickets) Devuelve el motivo por el cual no es editable
|
||||
- (Desplegables -> Trabajadores) Mejorados
|
||||
- (General -> Clientes) Razón social y dirección en mayúsculas
|
||||
|
||||
- (General -> Tickets) Devuelve el motivo por el cual no es editable
|
||||
- (Desplegables -> Trabajadores) Mejorados
|
||||
- (General -> Clientes) Razón social y dirección en mayúsculas
|
||||
|
||||
### Fixed
|
||||
- (Clientes -> SMS) Al pasar el ratón por encima muestra el mensaje completo
|
||||
|
||||
- (Clientes -> SMS) Al pasar el ratón por encima muestra el mensaje completo
|
||||
|
||||
## [2330.01] - 2023-07-27
|
||||
|
||||
### Added
|
||||
- (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
|
||||
- (Rutas -> Troncales) Nueva sección
|
||||
- (Tickets -> Opciones) Opción establecer peso
|
||||
- (Clientes -> SMS) Nueva sección
|
||||
|
||||
- (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
|
||||
- (Rutas -> Troncales) Nueva sección
|
||||
- (Tickets -> Opciones) Opción establecer peso
|
||||
- (Clientes -> SMS) Nueva sección
|
||||
|
||||
### Changed
|
||||
- (General -> Iconos) Añadidos nuevos iconos
|
||||
- (Clientes -> Razón social) Permite crear clientes con la misma razón social según el país
|
||||
|
||||
- (General -> Iconos) Añadidos nuevos iconos
|
||||
- (Clientes -> Razón social) Permite crear clientes con la misma razón social según el país
|
||||
|
||||
## [2328.01] - 2023-07-13
|
||||
|
||||
### Added
|
||||
- (Clientes -> Morosos) Añadida columna "es trabajador"
|
||||
- (Trabajadores -> Departamentos) Nueva sección
|
||||
- (Trabajadores -> Departamentos) Añadido listado de Trabajadores por departamento
|
||||
- (Trabajadores -> Departamentos) Añadido características de departamento e información
|
||||
|
||||
- (Clientes -> Morosos) Añadida columna "es trabajador"
|
||||
- (Trabajadores -> Departamentos) Nueva sección
|
||||
- (Trabajadores -> Departamentos) Añadido listado de Trabajadores por departamento
|
||||
- (Trabajadores -> Departamentos) Añadido características de departamento e información
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
- (Trabajadores -> Departamentos) Arreglado búscador
|
||||
|
||||
- (Trabajadores -> Departamentos) Arreglado búscador
|
||||
|
||||
## [2326.01] - 2023-06-29
|
||||
|
||||
### Added
|
||||
- (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas
|
||||
- (General -> Históricos) Botón para ver el estado del registro en cada punto
|
||||
- (General -> Históricos) Al filtar por registro se muestra todo el histórial desde que fue creado
|
||||
- (Tickets -> Índice) Permite enviar varios albaranes a Docuware
|
||||
|
||||
- (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas
|
||||
- (General -> Históricos) Botón para ver el estado del registro en cada punto
|
||||
- (General -> Históricos) Al filtar por registro se muestra todo el histórial desde que fue creado
|
||||
- (Tickets -> Índice) Permite enviar varios albaranes a Docuware
|
||||
|
||||
### Changed
|
||||
- (General -> Históricos) Los registros se muestran agrupados por usuario y entidad
|
||||
- (Facturas -> Facturación global) Optimizada, generación de PDFs y notificaciones en paralelo
|
||||
|
||||
- (General -> Históricos) Los registros se muestran agrupados por usuario y entidad
|
||||
- (Facturas -> Facturación global) Optimizada, generación de PDFs y notificaciones en paralelo
|
||||
|
||||
### Fixed
|
||||
- (General -> Históricos) Duplicidades eliminadas
|
||||
- (Facturas -> Facturación global) Solucionados fallos que paran el proceso
|
||||
|
||||
- (General -> Históricos) Duplicidades eliminadas
|
||||
- (Facturas -> Facturación global) Solucionados fallos que paran el proceso
|
||||
|
||||
## [2324.01] - 2023-06-15
|
||||
|
||||
### Added
|
||||
- (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
|
||||
- (General -> Desplegables) Mejorada eficiencia de carga de datos
|
||||
- (General -> Históricos) Ahora, ademas de los ids, se muestra la descripión de los atributos
|
||||
- (General -> Históricos) Botón para hacer más ágil mostrar sólo los cambios en un registro
|
||||
- (General -> Históricos) Filtro por cambios
|
||||
|
||||
- (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
|
||||
- (General -> Desplegables) Mejorada eficiencia de carga de datos
|
||||
- (General -> Históricos) Ahora, ademas de los ids, se muestra la descripión de los atributos
|
||||
- (General -> Históricos) Botón para hacer más ágil mostrar sólo los cambios en un registro
|
||||
- (General -> Históricos) Filtro por cambios
|
||||
|
||||
### Changed
|
||||
- (General -> Permisos) Mejorada seguridad
|
||||
- (General -> Históricos) Elementos de la interfaz reorganizados para hacerla más ágil e intuitiva
|
||||
|
||||
- (General -> Permisos) Mejorada seguridad
|
||||
- (General -> Históricos) Elementos de la interfaz reorganizados para hacerla más ágil e intuitiva
|
||||
|
||||
### Fixed
|
||||
|
||||
-
|
||||
|
||||
|
||||
|
||||
## [2322.01] - 2023-06-01
|
||||
|
||||
### Added
|
||||
- (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
|
||||
- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
|
||||
- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
|
||||
|
||||
- (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
|
||||
- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
|
||||
- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
|
||||
|
||||
### Changed
|
||||
- (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
|
||||
- (Tickets -> Expediciones) Interfaz mejorada y contador añadido
|
||||
|
||||
- (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
|
||||
- (Tickets -> Expediciones) Interfaz mejorada y contador añadido
|
||||
|
||||
### Fixed
|
||||
- (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
|
||||
- (Tickets -> Cambiar estado) Ahora muestra la lista completa de todos los estados
|
||||
|
||||
|
||||
- (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
|
||||
- (Tickets -> Cambiar estado) Ahora muestra la lista completa de todos los estados
|
||||
|
||||
## [2320.01] - 2023-05-25
|
||||
|
||||
### Added
|
||||
- (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
|
||||
|
||||
- (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
|
||||
|
||||
### Changed
|
||||
- (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
|
||||
|
||||
- (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
|
||||
|
||||
### Fixed
|
||||
|
||||
-
|
||||
|
||||
|
||||
|
||||
## [2318.01] - 2023-05-08
|
||||
|
||||
### Added
|
||||
- (Usuarios -> Histórico) Nueva sección
|
||||
- (Roles -> Histórico) Nueva sección
|
||||
- (Trabajadores -> Dar de alta) Permite elegir el método de pago
|
||||
|
||||
- (Usuarios -> Histórico) Nueva sección
|
||||
- (Roles -> Histórico) Nueva sección
|
||||
- (Trabajadores -> Dar de alta) Permite elegir el método de pago
|
||||
|
||||
### Changed
|
||||
- (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
|
||||
- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
|
||||
|
||||
- (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
|
||||
- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
|
||||
|
||||
### Fixed
|
||||
- (Ticket -> Boxing) Arreglado selección de horas
|
||||
- (Cesta -> Índice) Optimizada búsqueda
|
||||
|
||||
|
||||
- (Ticket -> Boxing) Arreglado selección de horas
|
||||
- (Cesta -> Índice) Optimizada búsqueda
|
||||
|
||||
## [2314.01] - 2023-04-20
|
||||
|
||||
### Added
|
||||
- (Clientes -> Morosos) Ahora se puede filtrar por las columnas "Desde" y "Fecha Ú. O.". También se envia un email al comercial cuando se añade una nota.
|
||||
- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
|
||||
- (Facturas recibidas -> Bases negativas) Nueva sección
|
||||
|
||||
- (Clientes -> Morosos) Ahora se puede filtrar por las columnas "Desde" y "Fecha Ú. O.". También se envia un email al comercial cuando se añade una nota.
|
||||
- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
|
||||
- (Facturas recibidas -> Bases negativas) Nueva sección
|
||||
|
||||
### Fixed
|
||||
- (Clientes -> Morosos) Ahora se mantienen los elementos seleccionados al hacer sroll.
|
||||
|
||||
- (Clientes -> Morosos) Ahora se mantienen los elementos seleccionados al hacer sroll.
|
||||
|
||||
## [2312.01] - 2023-04-06
|
||||
|
||||
### Added
|
||||
- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
|
||||
|
||||
- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
|
||||
|
||||
### Changed
|
||||
- (Monitor tickets) Cuando se filtra por 'Pendiente' ya no muestra los estados de 'Previa'
|
||||
- (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe.
|
||||
- (Envíos -> Índice) Cambiado el buscador superior por uno lateral
|
||||
|
||||
- (Monitor tickets) Cuando se filtra por 'Pendiente' ya no muestra los estados de 'Previa'
|
||||
- (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe.
|
||||
- (Envíos -> Índice) Cambiado el buscador superior por uno lateral
|
||||
|
||||
## [2310.01] - 2023-03-23
|
||||
|
||||
### Added
|
||||
- (Trabajadores -> Control de horario) Ahora se puede confirmar/no confirmar el registro horario de cada semana desde esta sección
|
||||
|
||||
- (Trabajadores -> Control de horario) Ahora se puede confirmar/no confirmar el registro horario de cada semana desde esta sección
|
||||
|
||||
### Fixed
|
||||
- (Clientes -> Listado extendido) Resuelto error al filtrar por clientes inactivos desde la columna "Activo"
|
||||
- (General) Al pasar el ratón por encima del icono de "Borrar" en un campo, se hacía más grande afectando a la interfaz
|
||||
|
||||
- (Clientes -> Listado extendido) Resuelto error al filtrar por clientes inactivos desde la columna "Activo"
|
||||
- (General) Al pasar el ratón por encima del icono de "Borrar" en un campo, se hacía más grande afectando a la interfaz
|
||||
|
||||
## [2308.01] - 2023-03-09
|
||||
|
||||
### Added
|
||||
- (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
|
||||
- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
|
||||
- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
|
||||
- (Trabajador -> PDA) Nueva sección
|
||||
|
||||
- (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
|
||||
- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
|
||||
- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
|
||||
- (Trabajador -> PDA) Nueva sección
|
||||
|
||||
### Changed
|
||||
- (Ticket -> Borrar ticket) Restringido el borrado de tickets con abono
|
||||
|
||||
- (Ticket -> Borrar ticket) Restringido el borrado de tickets con abono
|
||||
|
||||
## [2306.01] - 2023-02-23
|
||||
|
||||
### Added
|
||||
- (Tickets -> Datos Básicos) Mensaje de confirmación al intentar generar tickets con negativos
|
||||
- (Artículos) El visible y disponible se calcula a partir de un almacén diferente dependiendo de la sección en la que te encuentres. Se ha añadido un icono que informa sobre a partir de que almacén se esta calculando.
|
||||
|
||||
- (Tickets -> Datos Básicos) Mensaje de confirmación al intentar generar tickets con negativos
|
||||
- (Artículos) El visible y disponible se calcula a partir de un almacén diferente dependiendo de la sección en la que te encuentres. Se ha añadido un icono que informa sobre a partir de que almacén se esta calculando.
|
||||
|
||||
### Changed
|
||||
- (General -> Inicio) Ahora permite recuperar la contraseña tanto con el correo de recuperación como el usuario
|
||||
|
||||
- (General -> Inicio) Ahora permite recuperar la contraseña tanto con el correo de recuperación como el usuario
|
||||
|
||||
### Fixed
|
||||
- (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
|
||||
- (Zone -> Días de entrega) Al hacer click en un día, muestra correctamente las zonas
|
||||
- (Artículos) El disponible en la vista previa se muestra correctamente
|
||||
|
||||
- (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
|
||||
- (Zone -> Días de entrega) Al hacer click en un día, muestra correctamente las zonas
|
||||
- (Artículos) El disponible en la vista previa se muestra correctamente
|
||||
|
||||
## [2304.01] - 2023-02-09
|
||||
|
||||
### Added
|
||||
- (Rutas) Al descargar varias facturas se comprime en un zip
|
||||
- (Trabajadores -> Nuevo trabajador) Nueva sección
|
||||
- (Tickets -> Adelantar tickets) Añadidos campos "líneas" y "litros" al ticket origen
|
||||
- (Tickets -> Adelantar tickets) Nuevo icono muestra cuando las agencias de los tickets origen/destino son distintas
|
||||
|
||||
- (Rutas) Al descargar varias facturas se comprime en un zip
|
||||
- (Trabajadores -> Nuevo trabajador) Nueva sección
|
||||
- (Tickets -> Adelantar tickets) Añadidos campos "líneas" y "litros" al ticket origen
|
||||
- (Tickets -> Adelantar tickets) Nuevo icono muestra cuando las agencias de los tickets origen/destino son distintas
|
||||
|
||||
### Changed
|
||||
- (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
|
||||
- (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
|
||||
- (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
|
||||
- (Proveedores -> Crear/Editar) Permite añadir Proveedores con la misma razón social pero con países distintos
|
||||
- (Tickets -> Adelantar tickets) Cambiados selectores de estado por checks "Pendiente origen/destino"
|
||||
- (Tickets -> Adelantar tickets) Cambiado stock de destino a origen.
|
||||
|
||||
- (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
|
||||
- (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
|
||||
- (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
|
||||
- (Proveedores -> Crear/Editar) Permite añadir Proveedores con la misma razón social pero con países distintos
|
||||
- (Tickets -> Adelantar tickets) Cambiados selectores de estado por checks "Pendiente origen/destino"
|
||||
- (Tickets -> Adelantar tickets) Cambiado stock de destino a origen.
|
||||
|
||||
### Fixed
|
||||
- (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
|
||||
- (Cliente -> Datos Fiscales) No se permite seleccionar 'Notificar vía e-mail' a los clientes sin e-mail
|
||||
- (Tickets -> Datos básicos) Permite guardar la hora de envío
|
||||
- (Tickets -> Añadir pago) Eliminado "null" en las referencias
|
||||
- (Tickets -> Adelantar tickets) Permite ordenar por importe
|
||||
- (Tickets -> Adelantar tickets) El filtrado por encajado muestra también los tickets sin tipo de encajado
|
||||
|
||||
- (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
|
||||
- (Cliente -> Datos Fiscales) No se permite seleccionar 'Notificar vía e-mail' a los clientes sin e-mail
|
||||
- (Tickets -> Datos básicos) Permite guardar la hora de envío
|
||||
- (Tickets -> Añadir pago) Eliminado "null" en las referencias
|
||||
- (Tickets -> Adelantar tickets) Permite ordenar por importe
|
||||
- (Tickets -> Adelantar tickets) El filtrado por encajado muestra también los tickets sin tipo de encajado
|
||||
|
||||
## [2302.01] - 2023-01-26
|
||||
|
||||
### Added
|
||||
- (General -> Inicio) Permite recuperar la contraseña
|
||||
- (Tickets -> Opciones) Subir albarán a Docuware
|
||||
- (Tickets -> Opciones) Enviar correo con PDF de Docuware
|
||||
- (Artículos -> Datos Básicos) Añadido campo Unidades/Caja
|
||||
|
||||
- (General -> Inicio) Permite recuperar la contraseña
|
||||
- (Tickets -> Opciones) Subir albarán a Docuware
|
||||
- (Tickets -> Opciones) Enviar correo con PDF de Docuware
|
||||
- (Artículos -> Datos Básicos) Añadido campo Unidades/Caja
|
||||
|
||||
### Changed
|
||||
- (Reclamaciones -> Descriptor) Cambiado el campo Agencia por Zona
|
||||
- (Tickets -> Líneas preparadas) Actualizada sección para que sea más visual
|
||||
|
||||
- (Reclamaciones -> Descriptor) Cambiado el campo Agencia por Zona
|
||||
- (Tickets -> Líneas preparadas) Actualizada sección para que sea más visual
|
||||
|
||||
### Fixed
|
||||
- (General) Al utilizar el traductor de Google se descuadraban los iconos
|
||||
|
||||
- (General) Al utilizar el traductor de Google se descuadraban los iconos
|
||||
|
||||
### Removed
|
||||
- (Tickets -> Control clientes) Eliminada sección
|
||||
|
||||
- (Tickets -> Control clientes) Eliminada sección
|
||||
|
|
|
|||
10
Dockerfile
10
Dockerfile
|
|
@ -13,7 +13,7 @@ RUN apt-get update \
|
|||
graphicsmagick \
|
||||
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
||||
&& apt-get install -y --no-install-recommends nodejs \
|
||||
&& npm install -g npm@9.6.6
|
||||
&& corepack enable pnpm
|
||||
|
||||
# Puppeteer
|
||||
|
||||
|
|
@ -39,12 +39,12 @@ RUN apt-get update \
|
|||
|
||||
WORKDIR /salix
|
||||
|
||||
COPY print/package.json print/package-lock.json print/
|
||||
RUN npm --prefix ./print install --omit=dev ./print
|
||||
COPY print/package.json print/pnpm-lock.yaml print/
|
||||
RUN pnpm install --prod --prefix=print
|
||||
|
||||
COPY package.json package-lock.json ./
|
||||
COPY package.json pnpm-lock.yaml ./
|
||||
COPY loopback/package.json loopback/
|
||||
RUN npm install --omit=dev
|
||||
RUN pnpm install --prod
|
||||
|
||||
COPY loopback loopback
|
||||
COPY back back
|
||||
|
|
|
|||
|
|
@ -3,7 +3,37 @@
|
|||
def PROTECTED_BRANCH
|
||||
def FROM_GIT
|
||||
def RUN_TESTS
|
||||
def RUN_BUILD
|
||||
|
||||
pre: {
|
||||
switch (env.BRANCH_NAME) {
|
||||
case 'test':
|
||||
env.NODE_ENV = 'test'
|
||||
env.BACK_REPLICAS = 2
|
||||
break
|
||||
case 'master':
|
||||
env.NODE_ENV = 'production'
|
||||
env.BACK_REPLICAS = 4
|
||||
break
|
||||
default:
|
||||
env.NODE_ENV = 'dev'
|
||||
env.BACK_REPLICAS = 1
|
||||
}
|
||||
|
||||
PROTECTED_BRANCH = [
|
||||
'dev',
|
||||
'test',
|
||||
'master'
|
||||
].contains(env.BRANCH_NAME)
|
||||
|
||||
FROM_GIT = env.JOB_NAME.startsWith('gitea/')
|
||||
RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
|
||||
RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
|
||||
|
||||
// Uncomment to enable debugging
|
||||
// https://loopback.io/doc/en/lb3/Setting-debug-strings.html#debug-strings-reference
|
||||
//env.DEBUG = 'strong-remoting:shared-method'
|
||||
}
|
||||
pipeline {
|
||||
agent any
|
||||
options {
|
||||
|
|
@ -17,108 +47,120 @@ pipeline {
|
|||
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
|
||||
}
|
||||
stages {
|
||||
stage('Checkout') {
|
||||
steps {
|
||||
script {
|
||||
switch (env.BRANCH_NAME) {
|
||||
case 'dev':
|
||||
env.NODE_ENV = 'dev'
|
||||
env.BACK_REPLICAS = 1
|
||||
break
|
||||
case 'test':
|
||||
env.NODE_ENV = 'test'
|
||||
env.BACK_REPLICAS = 2
|
||||
break
|
||||
case 'master':
|
||||
env.NODE_ENV = 'production'
|
||||
env.BACK_REPLICAS = 4
|
||||
break
|
||||
}
|
||||
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = packageJson.version
|
||||
|
||||
env.GIT_COMMIT_MSG = sh(
|
||||
script: 'git log -1 --pretty=%B ${GIT_COMMIT}',
|
||||
returnStdout: true
|
||||
).trim()
|
||||
|
||||
PROTECTED_BRANCH = [
|
||||
'dev',
|
||||
'test',
|
||||
'master'
|
||||
].contains(env.BRANCH_NAME)
|
||||
|
||||
FROM_GIT = JOB_NAME.startsWith('gitea/')
|
||||
RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
|
||||
}
|
||||
setEnv()
|
||||
}
|
||||
}
|
||||
stage('Install') {
|
||||
environment {
|
||||
NODE_ENV = ""
|
||||
}
|
||||
parallel {
|
||||
stage('Backend') {
|
||||
steps {
|
||||
sh 'npm install --no-audit --prefer-offline'
|
||||
}
|
||||
}
|
||||
stage('Frontend') {
|
||||
when {
|
||||
expression { return FROM_GIT }
|
||||
}
|
||||
steps {
|
||||
sh 'npm install --no-audit --prefer-offline --prefix=front'
|
||||
}
|
||||
}
|
||||
stage('Print') {
|
||||
when {
|
||||
expression { return FROM_GIT }
|
||||
}
|
||||
steps {
|
||||
sh 'npm install --no-audit --prefer-offline --prefix=print'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Test') {
|
||||
when {
|
||||
expression { return RUN_TESTS }
|
||||
}
|
||||
stage('Stack') {
|
||||
environment {
|
||||
NODE_ENV = ""
|
||||
TZ = 'Europe/Madrid'
|
||||
}
|
||||
parallel {
|
||||
stage('Backend') {
|
||||
steps {
|
||||
sh 'npm run test:back:ci'
|
||||
stage('Back') {
|
||||
stages {
|
||||
stage('Install') {
|
||||
environment {
|
||||
NODE_ENV = ""
|
||||
}
|
||||
steps {
|
||||
sh 'pnpm install --prefer-offline'
|
||||
sh 'pnpm install --prefer-offline --prefix=print'
|
||||
}
|
||||
}
|
||||
stage('Test') {
|
||||
when {
|
||||
expression { RUN_TESTS }
|
||||
}
|
||||
environment {
|
||||
NODE_ENV = ""
|
||||
}
|
||||
steps {
|
||||
sh 'npm run test:back:ci'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
script {
|
||||
try {
|
||||
junit 'junitresults.xml'
|
||||
junit 'junit.xml'
|
||||
} catch (e) {
|
||||
echo e.toString()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
when {
|
||||
expression { RUN_BUILD }
|
||||
}
|
||||
steps {
|
||||
script {
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = packageJson.version
|
||||
}
|
||||
sh 'docker-compose build back'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Frontend') {
|
||||
steps {
|
||||
sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=6'
|
||||
stage('Front') {
|
||||
when {
|
||||
expression { FROM_GIT }
|
||||
}
|
||||
stages {
|
||||
stage('Install') {
|
||||
environment {
|
||||
NODE_ENV = ""
|
||||
}
|
||||
steps {
|
||||
sh 'pnpm install --prefer-offline --prefix=front'
|
||||
}
|
||||
}
|
||||
stage('Test') {
|
||||
when {
|
||||
expression { RUN_TESTS }
|
||||
}
|
||||
environment {
|
||||
NODE_ENV = ""
|
||||
}
|
||||
steps {
|
||||
sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
when {
|
||||
expression { RUN_BUILD }
|
||||
}
|
||||
steps {
|
||||
script {
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = packageJson.version
|
||||
}
|
||||
sh 'gulp build'
|
||||
sh 'docker-compose build front'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
stage('Push') {
|
||||
when {
|
||||
expression { return PROTECTED_BRANCH && FROM_GIT }
|
||||
expression { RUN_BUILD }
|
||||
}
|
||||
environment {
|
||||
CREDENTIALS = credentials('docker-registry')
|
||||
}
|
||||
steps {
|
||||
sh 'gulp build'
|
||||
dockerBuild()
|
||||
script {
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = packageJson.version
|
||||
}
|
||||
sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
|
||||
sh 'docker-compose push'
|
||||
}
|
||||
}
|
||||
stage('Deploy') {
|
||||
when {
|
||||
expression { return PROTECTED_BRANCH }
|
||||
expression { PROTECTED_BRANCH }
|
||||
}
|
||||
parallel {
|
||||
stage('Database') {
|
||||
|
|
@ -136,12 +178,16 @@ pipeline {
|
|||
}
|
||||
stage('Docker') {
|
||||
when {
|
||||
expression { return FROM_GIT }
|
||||
expression { FROM_GIT }
|
||||
}
|
||||
environment {
|
||||
DOCKER_HOST = "${env.SWARM_HOST}"
|
||||
}
|
||||
steps {
|
||||
script {
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = packageJson.version
|
||||
}
|
||||
sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
|
||||
}
|
||||
}
|
||||
|
|
@ -149,21 +195,14 @@ pipeline {
|
|||
}
|
||||
}
|
||||
post {
|
||||
always {
|
||||
script {
|
||||
if (RUN_TESTS) {
|
||||
try {
|
||||
junit 'junitresults.xml'
|
||||
junit 'junit.xml'
|
||||
} catch (e) {
|
||||
echo e.toString()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
success {
|
||||
script {
|
||||
if (env.BRANCH_NAME == 'master' && FROM_GIT) {
|
||||
env.GIT_COMMIT_MSG = sh(
|
||||
script: 'git log -1 --pretty=%B ${GIT_COMMIT}',
|
||||
returnStdout: true
|
||||
).trim()
|
||||
|
||||
String message = env.GIT_COMMIT_MSG
|
||||
int index = message.indexOf('\n')
|
||||
if (index != -1)
|
||||
|
|
@ -180,6 +219,7 @@ pipeline {
|
|||
}
|
||||
}
|
||||
unsuccessful {
|
||||
setEnv()
|
||||
sendEmail()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
/* eslint-disable no-console */
|
||||
const app = require('vn-loopback/server/server');
|
||||
let dataSources = require('../loopback/server/datasources.json');
|
||||
|
||||
async function init() {
|
||||
console.log('Initializing backend.');
|
||||
|
||||
dataSources = JSON.parse(JSON.stringify(dataSources));
|
||||
Object.assign(dataSources.vn, {
|
||||
host: process.env.DB_HOST,
|
||||
port: process.env.DB_PORT
|
||||
});
|
||||
|
||||
const bootOptions = {dataSources};
|
||||
await new Promise((resolve, reject) => {
|
||||
app.boot(bootOptions,
|
||||
err => err ? reject(err) : resolve());
|
||||
});
|
||||
// FIXME: Workaround to wait for loopback to be ready
|
||||
await app.models.Application.status();
|
||||
}
|
||||
|
||||
async function deinit() {
|
||||
console.log('Stopping backend.');
|
||||
await app.disconnect();
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
init,
|
||||
deinit
|
||||
};
|
||||
|
||||
if (require.main === module)
|
||||
init();
|
||||
136
back/tests.js
136
back/tests.js
|
|
@ -2,30 +2,21 @@
|
|||
const path = require('path');
|
||||
const Myt = require('@verdnatura/myt/myt');
|
||||
const Run = require('@verdnatura/myt/myt-run');
|
||||
let dataSources = require('../loopback/server/datasources.json');
|
||||
const helper = require('./tests-helper');
|
||||
|
||||
let server;
|
||||
const isCI = process.argv[2] === 'ci';
|
||||
const PARALLEL = false;
|
||||
const TIMEOUT = 900000;
|
||||
|
||||
process.on('warning', warning => {
|
||||
console.log(warning.name);
|
||||
console.log(warning.message);
|
||||
console.log(warning.stack);
|
||||
});
|
||||
process.on('SIGINT', teardown);
|
||||
process.on('exit', teardown);
|
||||
process.on('uncaughtException', onError);
|
||||
process.on('unhandledRejection', onError);
|
||||
|
||||
process.on('SIGUSR2', rmServer);
|
||||
process.on('exit', rmServer);
|
||||
|
||||
async function rmServer() {
|
||||
if (!server) return;
|
||||
await server.rm();
|
||||
server = null;
|
||||
}
|
||||
|
||||
async function test() {
|
||||
async function setup() {
|
||||
console.log('Building and running DB container.');
|
||||
|
||||
const isCI = process.argv[2] === 'ci';
|
||||
|
||||
const myt = new Myt();
|
||||
await myt.init({
|
||||
workspace: path.join(__dirname, '..'),
|
||||
|
|
@ -36,69 +27,76 @@ async function test() {
|
|||
});
|
||||
server = await myt.run(Run);
|
||||
await myt.deinit();
|
||||
|
||||
const {dbConfig} = server;
|
||||
process.env.DB_HOST = dbConfig.host;
|
||||
process.env.DB_PORT = dbConfig.port;
|
||||
|
||||
console.log('Initializing backend.');
|
||||
if (!PARALLEL)
|
||||
await helper.init();
|
||||
}
|
||||
|
||||
dataSources = JSON.parse(JSON.stringify(dataSources));
|
||||
Object.assign(dataSources.vn, {
|
||||
host: dbConfig.host,
|
||||
port: dbConfig.port
|
||||
});
|
||||
async function teardown() {
|
||||
if (!server) return;
|
||||
|
||||
const bootOptions = {dataSources};
|
||||
const app = require('vn-loopback/server/server');
|
||||
await new Promise((resolve, reject) => {
|
||||
app.boot(bootOptions,
|
||||
err => err ? reject(err) : resolve());
|
||||
});
|
||||
// FIXME: Workaround to wait for loopback to be ready
|
||||
await app.models.Application.status();
|
||||
if (!PARALLEL)
|
||||
await helper.deinit();
|
||||
|
||||
console.log('Running tests.');
|
||||
console.log('Stopping and removing DB container.');
|
||||
await server.rm();
|
||||
server = null;
|
||||
}
|
||||
|
||||
const Jasmine = require('jasmine');
|
||||
const jasmine = new Jasmine();
|
||||
async function onError(err) {
|
||||
await teardown();
|
||||
console.error(err);
|
||||
}
|
||||
|
||||
const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
|
||||
jasmine.addReporter(new SpecReporter({
|
||||
spec: {
|
||||
displaySuccessful: isCI,
|
||||
displayPending: isCI
|
||||
},
|
||||
summary: {
|
||||
displayPending: false,
|
||||
}
|
||||
}));
|
||||
async function test() {
|
||||
let runner;
|
||||
const config = {
|
||||
globalSetup: setup,
|
||||
globalSetupTimeout: TIMEOUT,
|
||||
globalTeardown: teardown,
|
||||
globalTeardownTimeout: TIMEOUT,
|
||||
spec_dir: '.',
|
||||
spec_files: [
|
||||
'back/**/*[sS]pec.js',
|
||||
'loopback/**/*[sS]pec.js',
|
||||
'modules/*/back/**/*.[sS]pec.js'
|
||||
],
|
||||
helpers: []
|
||||
};
|
||||
|
||||
if (PARALLEL) {
|
||||
const ParallelRunner = require('jasmine/parallel');
|
||||
runner = new ParallelRunner({numWorkers: 1});
|
||||
config.helpers.push(`back/tests-helper.js`);
|
||||
} else {
|
||||
const Jasmine = require('jasmine');
|
||||
runner = new Jasmine();
|
||||
|
||||
const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
|
||||
runner.addReporter(new SpecReporter({
|
||||
spec: {
|
||||
displaySuccessful: isCI,
|
||||
displayPending: isCI
|
||||
},
|
||||
summary: {
|
||||
displayPending: false,
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
if (isCI) {
|
||||
const JunitReporter = require('jasmine-reporters');
|
||||
jasmine.addReporter(new JunitReporter.JUnitXmlReporter());
|
||||
|
||||
jasmine.exitOnCompletion = true;
|
||||
jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 900000;
|
||||
runner.addReporter(new JunitReporter.JUnitXmlReporter());
|
||||
runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = TIMEOUT;
|
||||
}
|
||||
|
||||
const backSpecs = [
|
||||
'./back/**/*[sS]pec.js',
|
||||
'./loopback/**/*[sS]pec.js',
|
||||
'./modules/*/back/**/*.[sS]pec.js'
|
||||
];
|
||||
|
||||
jasmine.loadConfig({
|
||||
spec_dir: '.',
|
||||
spec_files: backSpecs,
|
||||
helpers: [],
|
||||
});
|
||||
|
||||
await jasmine.execute();
|
||||
|
||||
console.log('Stopping.');
|
||||
|
||||
if (app) await app.disconnect();
|
||||
await rmServer();
|
||||
|
||||
console.log('Tests ended.\n');
|
||||
// runner.loadConfigFile('back/jasmine.json');
|
||||
runner.loadConfig(config);
|
||||
await runner.execute();
|
||||
}
|
||||
|
||||
test();
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ INSERT INTO vn.buy (id,entryFk,itemFk,quantity,dispatched,buyingValue,freightVal
|
|||
(18,10,15,500,0,55.0,1.0,0,1,1,1,0,0.0,1.0,'5',0.0,78.3,75.6,0.0,0,0,1,0,'2022-06-20 00:00:00',0,2.5),
|
||||
(19,10,11,5000,0,50.0,1.0,0,1,1,1,1,0.0,1.0,'4',0.0,99.6,99.4,0.0,0,0,1,0,'2022-06-20 00:00:00',0,2.5);
|
||||
*/
|
||||
INSERT INTO vn2008.Splits (Id_Split,Id_Ticket,Id_Entrada,Fecha,Notas)
|
||||
INSERT INTO vn.split (id,ticketFk,entryFk,dated,note)
|
||||
VALUES
|
||||
(1,7,2,'00-00-0000 00:00:00.000','nota1'),
|
||||
(2,10,6,'00-00-0000 00:00:00.000','nota2'),
|
||||
|
|
|
|||
|
|
@ -942,25 +942,25 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
|
|||
('VT', 'Sales');
|
||||
|
||||
INSERT INTO `vn`.`item`(`id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenseFk`,
|
||||
`comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`, `weightByPiece`)
|
||||
`comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `weightByPiece`)
|
||||
VALUES
|
||||
(1, 2, 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 'EMB', 0, NULL, 'V', 0, 15,3),
|
||||
(2, 2, 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '2', NULL, 0, 'VT', 0, NULL, 'H', 0, 10,2),
|
||||
(3, 1, 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '3', NULL, 0, 'VT', 0, NULL, NULL, 0, 5,5),
|
||||
(4, 1, 1, 1, 'Increases block', 1, 05080000, 4751000000, NULL, 0, '4', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(5, 3, 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '5', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(6, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '6', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(7, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '7', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(8, 2, 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '8', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(9, 2, 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '9', NULL, 0, 'VT', 1, NULL, NULL, 0, NULL,NULL),
|
||||
(10, 1, 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(11, 1, 1, 1, NULL, 1, 05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(12, 3, 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(13, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT', 1, NULL, NULL, 1, NULL,NULL),
|
||||
(14, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'VT', 1, NULL, NULL, 0, NULL,NULL),
|
||||
(15, 4, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'EMB', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(16, 6, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'EMB', 0, NULL, NULL, 0, NULL,NULL),
|
||||
(71, 6, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL);
|
||||
(1, 2, 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 'EMB', 0, NULL, 'V', 0, 3),
|
||||
(2, 2, 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '2', NULL, 0, 'VT', 0, NULL, 'H', 0, 2),
|
||||
(3, 1, 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '3', NULL, 0, 'VT', 0, NULL, NULL, 0, 5),
|
||||
(4, 1, 1, 1, 'Increases block', 1, 05080000, 4751000000, NULL, 0, '4', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL),
|
||||
(5, 3, 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '5', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL),
|
||||
(6, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '6', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL),
|
||||
(7, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '7', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL),
|
||||
(8, 2, 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '8', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL),
|
||||
(9, 2, 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '9', NULL, 0, 'VT', 1, NULL, NULL, 0, NULL),
|
||||
(10, 1, 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL),
|
||||
(11, 1, 1, 1, NULL, 1, 05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL),
|
||||
(12, 3, 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL),
|
||||
(13, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT', 1, NULL, NULL, 1, NULL),
|
||||
(14, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'VT', 1, NULL, NULL, 0, NULL),
|
||||
(15, 4, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'EMB', 0, NULL, NULL, 0, NULL),
|
||||
(16, 6, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'EMB', 0, NULL, NULL, 0, NULL),
|
||||
(71, 6, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL);
|
||||
|
||||
-- Update the taxClass after insert of the items
|
||||
UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
|
||||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
|
||||
BEGIN
|
||||
DECLARE vLastMonth DATE;
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ BEGIN
|
|||
tm.year AS Año,
|
||||
tm.month AS Mes,
|
||||
tm.week AS Semana,
|
||||
v.vista AS Vista,
|
||||
dm.description AS Vista,
|
||||
bt.importe AS Importe
|
||||
FROM bs.ventas bt
|
||||
LEFT JOIN vn2008.Tipos tp ON tp.tipo_id = bt.tipo_id
|
||||
|
|
@ -44,10 +44,10 @@ BEGIN
|
|||
JOIN vn2008.Movimientos m ON m.Id_Movimiento = bt.Id_Movimiento
|
||||
LEFT JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
|
||||
JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
|
||||
LEFT JOIN vn2008.Vistas v ON v.vista_id = a.Vista
|
||||
LEFT JOIN vn.deliveryMethod dm ON dm.id = a.Vista
|
||||
LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
|
||||
LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
|
||||
LEFT JOIN vn2008.warehouse w ON w.id = t.warehouse_id
|
||||
LEFT JOIN vn.warehouse w ON w.id = t.warehouse_id
|
||||
WHERE bt.fecha >= vLastMonth AND r.mercancia;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ proc:BEGIN
|
|||
DECLARE vHasItemGroup BOOL;
|
||||
DECLARE vDescription VARCHAR(255);
|
||||
DECLARE vSaleFk INT;
|
||||
DECLARE vDefaultEntry INT;
|
||||
|
||||
-- Carga los datos necesarios del EKT
|
||||
SELECT e.ref, qty, package, putOrderFk MOD 1000000, i2.id , NOT ISNULL(eea.addressFk), NOT ISNULL(igto.group_code),
|
||||
|
|
@ -41,6 +42,9 @@ proc:BEGIN
|
|||
CALL vn.mail_insert('pako@verdnatura.es', 'nocontestar@verdnatura.es', CONCAT('Nuevo grupo en Floramondo: ', vDescription), vDescription);
|
||||
LEAVE proc;
|
||||
END IF;
|
||||
|
||||
SELECT defaultEntry INTO vDefaultEntry
|
||||
FROM vn.entryConfig;
|
||||
|
||||
-- Asigna la entrada
|
||||
SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
|
||||
|
|
@ -100,10 +104,9 @@ proc:BEGIN
|
|||
LEFT JOIN ekt l ON l.ref = e.ref
|
||||
LEFT JOIN vn.buy b ON b.ektFk = l.id
|
||||
LEFT JOIN vn.item i ON i.id = b.itemFk
|
||||
JOIN vn2008.config cfg
|
||||
WHERE e.id = vSelf
|
||||
AND l.id != vSelf
|
||||
AND b.itemFk != cfg.generic_item
|
||||
AND b.itemFk != vDefaultEntry
|
||||
AND IF(t.s1, l.s1 = e.s1, TRUE)
|
||||
AND IF(t.s2, l.s2 = e.s2, TRUE)
|
||||
AND IF(t.s3, l.s3 = e.s3, TRUE)
|
||||
|
|
@ -142,7 +145,7 @@ proc:BEGIN
|
|||
SELECT vEntryFk,
|
||||
vSelf,
|
||||
(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
|
||||
IFNULL(vItem, cfg.generic_item) itemFk,
|
||||
IFNULL(vItem, vDefaultEntry) itemFk,
|
||||
e.qty stickers,
|
||||
@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing,
|
||||
IFNULL(b.`grouping`, e.pac),
|
||||
|
|
@ -153,8 +156,7 @@ proc:BEGIN
|
|||
FROM ekt e
|
||||
LEFT JOIN vn.buy b ON b.id = vBuy
|
||||
LEFT JOIN vn.item i ON i.id = b.itemFk
|
||||
LEFT JOIN vn.supplier s ON e.pro = s.id
|
||||
JOIN vn2008.config cfg
|
||||
LEFT JOIN vn.supplier s ON e.pro = s.id
|
||||
WHERE e.id = vSelf
|
||||
LIMIT 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ DELIMITER $$
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_scan`(vBarcode VARCHAR(512))
|
||||
BEGIN
|
||||
/**
|
||||
* Busca transaciones a partir de un código de barras, las marca como escaneadas
|
||||
* Busca transaciones a partir de un codigo de barras, las marca como escaneadas
|
||||
* y las devuelve.
|
||||
* Ver https://wiki.verdnatura.es/index.php/Ekt#Algoritmos_de_lectura
|
||||
*
|
||||
|
|
@ -73,7 +73,7 @@ BEGIN
|
|||
INSERT INTO tmp.ekt
|
||||
SELECT id
|
||||
FROM ekt
|
||||
WHERE fec = vFec
|
||||
WHERE fec >= vFec - INTERVAL 1 DAY
|
||||
AND ((
|
||||
vKlo = vDefaultKlo
|
||||
AND (klo = vKlo OR klo IS NULL OR klo = 0)
|
||||
|
|
@ -82,7 +82,7 @@ BEGIN
|
|||
AND auction = vAuction
|
||||
AND agj = vShortAgj)
|
||||
)
|
||||
ORDER BY agj DESC
|
||||
ORDER BY agj DESC, fec DESC
|
||||
LIMIT 1;
|
||||
|
||||
SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `edi`.`ektK2`
|
||||
AS SELECT `eek`.`id` AS `id`,
|
||||
`eek`.`description` AS `description`
|
||||
FROM `edi`.`ektK1` `eek`
|
||||
|
|
@ -74,6 +74,8 @@ BEGIN
|
|||
WHERE b.id = vSelf;
|
||||
|
||||
END IF;
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
||||
SELECT vSelf id;
|
||||
CALL buy_checkItem();
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_checkItem`()
|
||||
BEGIN
|
||||
/**
|
||||
* Checks if the item has weightByPiece or size null on any buy.
|
||||
*
|
||||
* @param tmp.buysToCheck(id as INT).
|
||||
*/
|
||||
DECLARE hasVolumetricAgency INT;
|
||||
|
||||
SELECT a.hasWeightVolumetric INTO hasVolumetricAgency
|
||||
FROM entry e
|
||||
JOIN travel t ON t.id = e.travelFk
|
||||
JOIN agencyMode a ON a.id = t.agencyModeFk
|
||||
JOIN buy b ON b.entryFk = e.id
|
||||
JOIN item i ON i.id = b.itemFk
|
||||
JOIN tmp.buysToCheck bt ON bt.id = b.id
|
||||
WHERE (i.weightByPiece IS NULL OR i.`size` IS NULL)
|
||||
AND a.hasWeightVolumetric
|
||||
LIMIT 1;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.buysToCheck;
|
||||
|
||||
IF hasVolumetricAgency THEN
|
||||
CALL util.throw('Some purchase line has an item without size or weight per stem in the volumetric agency.');
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -88,6 +88,7 @@ BEGIN
|
|||
FROM vn.expeditionTruck
|
||||
WHERE eta < v3Month;
|
||||
|
||||
DELETE FROM XDiario WHERE FECHA < v3Month OR FECHA IS NULL;
|
||||
-- borrar travels sin entradas
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
|
||||
CREATE TEMPORARY TABLE tmp.thermographToDelete
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ BEGIN
|
|||
|
||||
IF vCounter > 0 OR vASIEN > 0 THEN
|
||||
|
||||
UPDATE vn2008.XDiario x
|
||||
UPDATE vn.XDiario x
|
||||
JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
|
||||
SET x.ASIEN = vASIEN;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_updatePackingShelve`(vSelf INT, vPacking INT)
|
||||
BEGIN
|
||||
|
||||
/**
|
||||
* Actualiza el valor de item.packingShelve
|
||||
*
|
||||
* @param vSelf Identificador de vn.item
|
||||
* @param vPacking Cantidad de unidades de venta que caben en una bandeja
|
||||
*/
|
||||
|
||||
UPDATE vn.item i
|
||||
SET i.packingShelve = vPacking
|
||||
WHERE i.id = vSelf;
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -77,7 +77,6 @@ DECLARE vIsCollection BOOL;
|
|||
s.isAdded,
|
||||
IF(c.workerFk IS NULL, getUser(), c.workerFk) workerFk,
|
||||
IF(SUM(iss.quantity) IS NULL, 0, SUM(iss.quantity)) pickedQuantity,
|
||||
i.packingShelve,
|
||||
MIN(iss.created) picked,
|
||||
IF(sm.id, TRUE, FALSE) hasMistake,
|
||||
sg.sectorFk
|
||||
|
|
|
|||
|
|
@ -21,11 +21,8 @@ BEGIN
|
|||
DECLARE vAgencyModeFk INT;
|
||||
DECLARE vNewPrice DECIMAL(10,2);
|
||||
DECLARE vOldPrice DECIMAL(10,2);
|
||||
DECLARE vOption INT DEFAULT NULL;
|
||||
DECLARE vOption VARCHAR(255);
|
||||
DECLARE vNewSaleFk INT;
|
||||
DECLARE vChangePrice INT DEFAULT 1;
|
||||
DECLARE vBuyerDiscount INT DEFAULT 4;
|
||||
DECLARE vManaDiscount INT DEFAULT 3;
|
||||
DECLARE vForceToGrouping INT DEFAULT 1;
|
||||
DECLARE vForceToPacking INT DEFAULT 2;
|
||||
DECLARE vFinalPrice DECIMAL(10,2);
|
||||
|
|
@ -85,16 +82,13 @@ BEGIN
|
|||
IF vNewPrice IS NULL THEN
|
||||
CALL util.throw('price retrieval failed');
|
||||
END IF;
|
||||
|
||||
IF vNewPrice > vOldPrice THEN
|
||||
SET vFinalPrice = vOldPrice;
|
||||
IF worker_isInDepartment('vt') THEN
|
||||
SET vOption = vManaDiscount;
|
||||
ELSE
|
||||
SET vOption = vBuyerDiscount;
|
||||
END IF;
|
||||
SET vOption = 'substitution';
|
||||
ELSE
|
||||
SET vFinalPrice = vNewPrice;
|
||||
SET vOption = vChangePrice;
|
||||
SET vOption = 'renewPrices';
|
||||
END IF;
|
||||
|
||||
START TRANSACTION;
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ BEGIN
|
|||
CALL util.throw('ASSIGN_ZONE_FIRST');
|
||||
END IF;
|
||||
|
||||
SET vCanChangeState = (
|
||||
vStateCode <> 'ON_CHECKING' OR
|
||||
SET vCanChangeState = ((
|
||||
vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR
|
||||
vticketAlertLevel < vPackedAlertLevel
|
||||
)AND NOT (
|
||||
vTicketStateCode IN ('CHECKED', 'CHECKING')
|
||||
|
|
@ -51,5 +51,6 @@ BEGIN
|
|||
ELSE
|
||||
CALL util.throw('INCORRECT_TICKET_STATE');
|
||||
END IF;
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -2,21 +2,23 @@ DELIMITER $$
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workerTimeControl_clockIn`(
|
||||
vWorkerFk INT,
|
||||
vTimed DATETIME,
|
||||
vDirection VARCHAR(10)
|
||||
vDirection VARCHAR(10),
|
||||
vDevice VARCHAR(255)
|
||||
)
|
||||
BEGIN
|
||||
/**
|
||||
* Verifica si el empleado puede fichar
|
||||
* @param vWorkerFk Identificador del trabajador
|
||||
* @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = NOW
|
||||
* @param vDirection solo se pueden pasa los valores del campo
|
||||
* workerTimeControl.direction ENUM('in', 'out', 'middle')
|
||||
* @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
|
||||
* Si hay algún problema, devuelve el mesaje que se debe mostrar al usuario
|
||||
* Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá
|
||||
* fichada a la tabla vn.workerTimeControl
|
||||
*/
|
||||
|
||||
* Verifica si el empleado puede fichar
|
||||
* @param vWorkerFk Identificador del trabajador
|
||||
* @param vTimed Balor de la fichada, IF vTimed IS NULL vTimed = NOW
|
||||
* @param vDirection Solo se pueden pasa los valores del campo
|
||||
* workerTimeControl.direction ENUM('in', 'out', 'middle')
|
||||
* @param vDevice Dispositivo en el que se ha fichado
|
||||
* @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
|
||||
* Si hay algún problema, devuelve el mesaje que se debe mostrar al usuario
|
||||
* Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá
|
||||
* fichada a la tabla vn.workerTimeControl
|
||||
*/
|
||||
|
||||
DECLARE vLastIn DATETIME;
|
||||
DECLARE vLastOut DATETIME;
|
||||
DECLARE vNextIn DATETIME;
|
||||
|
|
@ -269,16 +271,16 @@ BEGIN
|
|||
GROUP BY breakCounter
|
||||
HAVING hasError
|
||||
LIMIT 1;
|
||||
|
||||
|
||||
IF vIsError THEN
|
||||
SET vErrorCode = 'BREAK_WEEK';
|
||||
CALL util.throw(vErrorCode);
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
-- SE PERMITE FICHAR
|
||||
INSERT INTO workerTimeControl(userFk, timed, direction, `manual`)
|
||||
VALUES(vWorkerFk, vTimed, vDirection, vIsManual);
|
||||
|
||||
-- Se permite fichar
|
||||
INSERT INTO workerTimeControl(userFk, timed, direction, device, `manual`)
|
||||
VALUES(vWorkerFk, vTimed, vDirection, vDevice, vIsManual);
|
||||
|
||||
SELECT LAST_INSERT_ID() id;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`accountReconciliation_beforeInsert`
|
||||
BEFORE INSERT ON `accountReconciliation`
|
||||
FOR EACH ROW
|
||||
|
||||
SET NEW.calculatedCode = REPLACE(
|
||||
REPLACE(
|
||||
REPLACE(
|
||||
REPLACE(
|
||||
CONCAT(NEW.supplierAccountFk,NEW.operationDated,NEW.amount,NEW.concept,NEW.debitCredit)
|
||||
,' ','')
|
||||
,":",'')
|
||||
,'-','')
|
||||
,'.','')$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`awbInvoiceIn_afterDelete`
|
||||
AFTER DELETE ON `awbInvoiceIn`
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
IF (NOT(SELECT COUNT(*) FROM invoiceInTax where invoiceInFk = OLD.invoiceInFk))
|
||||
AND
|
||||
(NOT(SELECT COUNT(*) FROM invoiceInDueDay where invoiceInFk = OLD.invoiceInFk))
|
||||
AND
|
||||
(NOT(SELECT isBooked FROM invoiceIn WHERE id = OLD.invoiceInFk) )
|
||||
THEN
|
||||
DELETE FROM invoiceIn WHERE id = OLD.invoiceInFk;
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -41,8 +41,8 @@ trig:BEGIN
|
|||
FROM genericAllocation ga
|
||||
JOIN entry e ON e.id = NEW.entryFk
|
||||
JOIN travel tr on tr.id = e.travelFk
|
||||
WHERE ga.itemFk = vGenericFk
|
||||
AND tr.landed BETWEEN ga.startDated AND ga.endDated;
|
||||
WHERE ga.itemFk = vGenericFk
|
||||
AND tr.landed BETWEEN ga.startDated AND ga.endDated;
|
||||
IF vGenericInDate THEN
|
||||
SET NEW.itemOriginalFk = NEW.itemFk;
|
||||
SET NEW.itemFk = vGenericFk;
|
||||
|
|
@ -64,5 +64,12 @@ trig:BEGIN
|
|||
IF NEW.quantity < 0 THEN
|
||||
SET NEW.isIgnored = TRUE;
|
||||
END IF;
|
||||
|
||||
IF NOT (NEW.itemFk <=> OLD.itemFk) OR
|
||||
NOT (OLD.entryFk <=> NEW.entryFk) THEN
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
||||
SELECT NEW.id;
|
||||
CALL buy_checkItem();
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -13,5 +13,15 @@ BEGIN
|
|||
CALL travel_requestRecalc(OLD.travelFk);
|
||||
CALL travel_requestRecalc(NEW.travelFk);
|
||||
END IF;
|
||||
|
||||
|
||||
IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
||||
SELECT b.id
|
||||
FROM buy b
|
||||
WHERE b.entryFk = NEW.id;
|
||||
|
||||
CALL buy_checkItem();
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -6,15 +6,7 @@ BEGIN
|
|||
DECLARE vNewPackingShelve INT;
|
||||
|
||||
SET NEW.editorFk = account.myUser_getId();
|
||||
|
||||
IF ISNULL(NEW.packingShelve) AND NOT ISNULL(NEW.packingOut) THEN
|
||||
SELECT NEW.packingOut * vc.shelveVolume / vc.standardFlowerBox
|
||||
INTO vNewPackingShelve
|
||||
FROM vn.volumeConfig vc;
|
||||
|
||||
SET NEW.packingShelve = vNewPackingShelve;
|
||||
END IF;
|
||||
|
||||
|
||||
IF NEW.itemPackingTypeFk = '' THEN
|
||||
SET NEW.itemPackingTypeFk = NULL;
|
||||
END IF;
|
||||
|
|
|
|||
|
|
@ -10,5 +10,18 @@ BEGIN
|
|||
SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
|
||||
WHERE travelFk = NEW.id;
|
||||
END IF;
|
||||
|
||||
IF NOT (NEW.agencyModeFk <=> OLD.agencyModeFk) THEN
|
||||
IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
||||
SELECT b.id
|
||||
FROM entry e
|
||||
JOIN buy b ON b.entryFk = e.id
|
||||
JOIN item i ON i.id = b.itemFk
|
||||
WHERE e.travelFk = NEW.id;
|
||||
|
||||
CALL buy_checkItem();
|
||||
END IF;
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -4,15 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_beforeUpdate`
|
|||
FOR EACH ROW
|
||||
BEGIN
|
||||
SET NEW.editorFk = account.myUser_getId();
|
||||
/*
|
||||
IF ((NOT NEW.shipped <=> OLD.shipped )
|
||||
OR (NOT NEW.landed <=> OLD.landed )
|
||||
OR (NOT NEW.warehouseInFk <=> OLD.warehouseInFk )
|
||||
OR (NOT NEW.warehouseOutFk <=> OLD.warehouseOutFk ))
|
||||
AND (OLD.totalEntries AND OLD.landed < CURDATE()) THEN
|
||||
CALL util.throw("Cannot past travels with entries");
|
||||
END IF;
|
||||
*/
|
||||
|
||||
IF NOT (NEW.landed <=> OLD.landed)
|
||||
OR NOT (NEW.shipped <=> OLD.shipped) THEN
|
||||
CALL travel_checkDates(NEW.shipped, NEW.landed);
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn`.`bankPolicy`
|
||||
AS SELECT `bp`.`poliza_id` AS `id`,
|
||||
`bp`.`referencia` AS `ref`,
|
||||
`bp`.`importe` AS `amount`,
|
||||
`bp`.`com_dispuesto` AS `balanceInterestDrawn`,
|
||||
`bp`.`com_no_dispuesto` AS `commissionAvailableBalances`,
|
||||
`bp`.`com_anual` AS `openingCommission`,
|
||||
`bp`.`apertura` AS `started`,
|
||||
`bp`.`cierre` AS `ended`,
|
||||
`bp`.`Id_Banco` AS `bankFk`,
|
||||
`bp`.`empresa_id` AS `companyFk`,
|
||||
`bp`.`supplierFk` AS `supplierFk`,
|
||||
`bp`.`description` AS `description`,
|
||||
`bp`.`hasGuarantee` AS `hasGuarantee`,
|
||||
`bp`.`dmsFk` AS `dmsFk`,
|
||||
`bp`.`notaryFk` AS `notaryFk`,
|
||||
`bp`.`currencyFk` AS `currencyFk`,
|
||||
`bp`.`amortizationTypeFk` AS `amortizationTypeFk`,
|
||||
`bp`.`periodicityTypeFk` AS `periodicityTypeFk`,
|
||||
`bp`.`insuranceExpired` AS `insuranceExpired`
|
||||
FROM `vn2008`.`Bancos_poliza` `bp`
|
||||
ORDER BY `bp`.`poliza_id` DESC
|
||||
|
|
@ -31,7 +31,7 @@ FROM (
|
|||
)
|
||||
JOIN `vn`.`route` `r` ON(`r`.`id` = `t`.`routeFk`)
|
||||
)
|
||||
LEFT JOIN `vn2008`.`Rutas_monitor` `rm` ON(`rm`.`Id_Ruta` = `r`.`id`)
|
||||
LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `r`.`id`)
|
||||
)
|
||||
LEFT JOIN `vn`.`expeditionTruck` `et2` ON(`et2`.`id` = `rm`.`expeditionTruckFk`)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ FROM (
|
|||
)
|
||||
JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`)
|
||||
)
|
||||
JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`)
|
||||
JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticket` = `t`.`id`)
|
||||
)
|
||||
JOIN `vn`.`state` `st` ON(`st`.`id` = `tst`.`state`)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn`.`ticketStateToday`
|
||||
AS SELECT `ts`.`ticketFk` AS `ticket`,
|
||||
AS SELECT
|
||||
`ts`.`ticketFk` AS `ticketFk`,
|
||||
`ts`.`state` AS `state`,
|
||||
`ts`.`productionOrder` AS `productionOrder`,
|
||||
`ts`.`alertLevel` AS `alertLevel`,
|
||||
`ts`.`userFk` AS `worker`,
|
||||
`ts`.`userFk` AS `userFk`,
|
||||
`ts`.`code` AS `code`,
|
||||
`ts`.`updated` AS `updated`,
|
||||
`ts`.`isPicked` AS `isPicked`
|
||||
FROM (
|
||||
`vn`.`ticketState` `ts`
|
||||
JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
|
||||
)
|
||||
WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())
|
||||
FROM `ticketState` `ts`
|
||||
JOIN `ticket` `t` ON `t`.`id` = `ts`.`ticketFk`
|
||||
WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`());
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|||
lhp.m3,
|
||||
dl.minSpeed
|
||||
FROM ticket t
|
||||
JOIN ticketStateToday tst ON tst.ticket = t.id
|
||||
JOIN ticketStateToday tst ON tst.ticketFk = t.id
|
||||
JOIN state s ON s.id = tst.state
|
||||
JOIN saleVolume sv ON sv.ticketFk = t.id
|
||||
LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@ BEGIN
|
|||
group_concat(CONCAT(' Asiento: ', ASIEN, '- importe:', quadre) SEPARATOR ' \r\n ')
|
||||
FROM (
|
||||
SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) quadre
|
||||
FROM XDiario
|
||||
FROM vn.XDiario
|
||||
WHERE enlazado = FALSE
|
||||
GROUP BY ASIEN
|
||||
HAVING ABS(SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0))) > 0.01
|
||||
) t
|
||||
HAVING count(*) > 0;
|
||||
|
||||
UPDATE XDiario XD
|
||||
UPDATE vn.XDiario XD
|
||||
INNER JOIN(
|
||||
SELECT XD.id, SUBCTA, Quadre FROM XDiario XD
|
||||
SELECT XD.id, SUBCTA, Quadre FROM vn.XDiario XD
|
||||
INNER JOIN (
|
||||
SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) as Quadre
|
||||
FROM XDiario
|
||||
FROM vn.XDiario
|
||||
WHERE enlazado = FALSE
|
||||
GROUP BY ASIEN
|
||||
HAVING Quadre != 0
|
||||
|
|
|
|||
|
|
@ -20,14 +20,11 @@ proc: BEGIN
|
|||
SET vDate2000 = util.VN_CURDATE() + INTERVAL (2000 - YEAR(util.VN_CURDATE())) YEAR;
|
||||
SET vRangeDeleteTicket = 60;
|
||||
|
||||
DELETE FROM Rutas_monitor WHERE fecha < vDate;
|
||||
DELETE FROM cdr WHERE calldate < vDate18;
|
||||
DELETE FROM Monitoring WHERE ODBC_TIME < vDate;
|
||||
DELETE FROM Conteo WHERE Fecha < vDate;
|
||||
DELETE FROM XDiario WHERE FECHA < vDate3 OR FECHA IS NULL;
|
||||
DELETE FROM mail WHERE DATE_ODBC < vDate;
|
||||
DELETE FROM expeditions_deleted WHERE odbc_date < vDate26;
|
||||
DELETE FROM sms WHERE DATE_ODBC < vDate18;
|
||||
DELETE FROM Movimientos_mark WHERE odbc_date < vDate;
|
||||
DELETE FROM Splits WHERE Fecha < vDate18;
|
||||
|
||||
|
|
@ -47,8 +44,6 @@ proc: BEGIN
|
|||
JOIN Tickets t ON m.Id_Ticket = t.Id_Ticket WHERE t.Fecha < vDate;
|
||||
|
||||
DELETE FROM Remesas WHERE `Fecha Remesa` < vDate18;
|
||||
DELETE FROM sharingcart where datEND < vDate;
|
||||
DELETE FROM sharingclient where datEND < vDate;
|
||||
|
||||
DELETE tt.*
|
||||
FROM Tickets_turno tt
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ BEGIN
|
|||
FROM Clientes
|
||||
WHERE Id_Cliente = idCLI;
|
||||
CALL vn.ledger_next(max_asien);
|
||||
INSERT INTO XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id)
|
||||
INSERT INTO vn.XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id)
|
||||
SELECT max_asien,datFEC,SUBCTA,CONTRA,strCONCEPTO,EURODEBE,EUROHABER,idEMP
|
||||
FROM(SELECT cuenta_banco SUBCTA, cuenta_cliente CONTRA, 0 EURODEBE, dblIMPORTE EUROHABER
|
||||
UNION ALL
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ BEGIN
|
|||
stock.available
|
||||
FROM vn2008.Tickets t
|
||||
JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
|
||||
JOIN vn2008.warehouse wh ON wh.id = t.warehouse_id
|
||||
JOIN vn.warehouse wh ON wh.id = t.warehouse_id
|
||||
JOIN vn2008.Movimientos m ON m.Id_Ticket = t.Id_Ticket
|
||||
JOIN vn2008.Articles i ON i.Id_Article = m.Id_Article
|
||||
JOIN vn2008.Tipos tp ON tp.tipo_id = i.tipo_id
|
||||
|
|
@ -88,8 +88,8 @@ BEGIN
|
|||
FROM vn2008.Compres c
|
||||
JOIN vn2008.Entradas e ON e.Id_Entrada = c.Id_Entrada
|
||||
JOIN vn2008.travel tr ON tr.id = e.travel_id
|
||||
JOIN vn2008.warehouse whi ON whi.id = tr.warehouse_id
|
||||
JOIN vn2008.warehouse who ON who.id = tr.warehouse_id_out
|
||||
JOIN vn.warehouse whi ON whi.id = tr.warehouse_id
|
||||
JOIN vn.warehouse who ON who.id = tr.warehouse_id_out
|
||||
JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
|
||||
JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
|
||||
JOIN vn.confectionType ct ON ct.id = tp.confeccion
|
||||
|
|
|
|||
|
|
@ -17,7 +17,20 @@ BEGIN
|
|||
SELECT t.Id_Ticket, Alias, cast(amount as decimal(10,2)) Importe, Domicilio, POBLACION
|
||||
FROM Tickets t
|
||||
JOIN Consignatarios cs ON t.Id_Consigna = cs.Id_Consigna
|
||||
JOIN v_ticket_amount v ON v.Id_Ticket = t.Id_Ticket
|
||||
JOIN (
|
||||
SELECT `Movimientos`.`Id_Ticket` AS `Id_Ticket`,
|
||||
sum(
|
||||
`Movimientos`.`Cantidad` * `Movimientos`.`Preu` * (100 - `Movimientos`.`Descuento`) / 100
|
||||
) AS `amount`
|
||||
FROM (
|
||||
`vn2008`.`Movimientos`
|
||||
JOIN `vn2008`.`Tickets` ON(
|
||||
`Movimientos`.`Id_Ticket` = `Tickets`.`Id_Ticket`
|
||||
)
|
||||
)
|
||||
WHERE `Tickets`.`Fecha` >= `util`.`VN_CURDATE`() + INTERVAL -6 MONTH
|
||||
GROUP BY `Movimientos`.`Id_Ticket`
|
||||
) v ON v.Id_Ticket = t.Id_Ticket
|
||||
WHERE t.Fecha BETWEEN v_Date AND util.dayEnd(v_Date)
|
||||
AND t.Id_Cliente = v_Client_Id;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`Conteo_afterInsert`
|
||||
AFTER INSERT ON `Conteo`
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
DECLARE intTravel INTEGER;
|
||||
SELECT t.id INTO intTravel FROM Compres c JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada
|
||||
JOIN travel t ON t.id = e.travel_id
|
||||
WHERE landing = util.VN_CURDATE() AND c.Id_Article = NEW.Id_Article AND warehouse_id = NEW.warehouse_id AND received <> TRUE LIMIT 1;
|
||||
IF (intTravel) then
|
||||
UPDATE travel SET received = TRUE WHERE id = intTravel;
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`account_conciliacion_beforeInsert`
|
||||
BEFORE INSERT ON `account_conciliacion`
|
||||
FOR EACH ROW
|
||||
set new.id_calculated = replace(
|
||||
replace(
|
||||
replace(
|
||||
replace(
|
||||
concat(new.Id_Proveedores_account,new.Fechaoperacion,new.importe,new.Concepto,new.DebeHaber)
|
||||
,' ','')
|
||||
,":",'')
|
||||
,'-','')
|
||||
,'.','')$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`agency_hour_afterUpdate`
|
||||
AFTER UPDATE ON `agency_hour`
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE;
|
||||
|
||||
SELECT COUNT(*) INTO vAlreadyExists
|
||||
FROM vn2008.agency_hour
|
||||
WHERE NEW.week_day <=> week_day AND NEW.province_id <=> province_id
|
||||
AND NEW.warehouse_id <=> warehouse_id AND NEW.max_hour <=> max_hour
|
||||
AND NEW.agency_id <=> agency_id;
|
||||
|
||||
IF vAlreadyExists > 1 THEN
|
||||
CALL util.throw('ALREADY_EXISTS');
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`agency_hour_beforeInsert`
|
||||
BEFORE INSERT ON `agency_hour`
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE;
|
||||
IF NEW.week_day IS NULL AND NEW.province_id IS NULL AND NEW.subtract_day = 0 AND NEW.max_hour = 0 THEN
|
||||
CALL util.throw ('FILL_MORE_FIELDS');
|
||||
END IF;
|
||||
|
||||
SELECT COUNT(*) INTO vAlreadyExists
|
||||
FROM vn2008.agency_hour
|
||||
WHERE NEW.week_day <=> week_day AND NEW.province_id <=> province_id
|
||||
AND NEW.warehouse_id <=> warehouse_id AND NEW.max_hour <=> max_hour
|
||||
AND NEW.agency_id <=> agency_id;
|
||||
|
||||
IF vAlreadyExists > 1 THEN
|
||||
CALL util.throw('ALREADY_EXISTS');
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`awb_recibida_afterDelete`
|
||||
AFTER DELETE ON `awb_recibida`
|
||||
FOR EACH ROW
|
||||
IF (SELECT COUNT(*) FROM recibida_iva where recibida_id = OLD.recibida_id) = 0
|
||||
AND
|
||||
(SELECT COUNT(*) FROM recibida_vencimiento where recibida_id = OLD.recibida_id) = 0
|
||||
AND
|
||||
(SELECT contabilizada FROM recibida WHERE id = OLD.recibida_id) = 0
|
||||
THEN
|
||||
DELETE FROM recibida WHERE id = OLD.recibida_id;
|
||||
END IF$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Bancos_poliza`
|
||||
AS SELECT `bp`.`id` AS `poliza_id`,
|
||||
`bp`.`ref` AS `referencia`,
|
||||
`bp`.`amount` AS `importe`,
|
||||
`bp`.`committedFee` AS `com_dispuesto`,
|
||||
`bp`.`nonCommittedFee` AS `com_no_dispuesto`,
|
||||
`bp`.`annualFee` AS `com_anual`,
|
||||
`bp`.`started` AS `apertura`,
|
||||
`bp`.`ended` AS `cierre`,
|
||||
`bp`.`accountingFk` AS `Id_Banco`,
|
||||
`bp`.`companyFk` AS `empresa_id`,
|
||||
`bp`.`supplierFk` AS `supplierFk`,
|
||||
`bp`.`description` AS `description`,
|
||||
`bp`.`hasGuarantee` AS `hasGuarantee`,
|
||||
`bp`.`dmsFk` AS `dmsFk`,
|
||||
`bp`.`notaryFk` AS `notaryFk`,
|
||||
`bp`.`currencyFk` AS `currencyFk`,
|
||||
`bp`.`amortizationTypeFk` AS `amortizationTypeFk`,
|
||||
`bp`.`periodicityTypeFk` AS `periodicityTypeFk`,
|
||||
`bp`.`insuranceExpired` AS `insuranceExpired`
|
||||
FROM `vn`.`bankPolicy` `bp`
|
||||
ORDER BY `bp`.`id` DESC
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Entradas_orden`
|
||||
AS SELECT `eo`.`entryFk` AS `Id_Entrada`,
|
||||
`eo`.`order` AS `orden`
|
||||
FROM `vn`.`entryOrder` `eo`
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Equipos`
|
||||
AS SELECT `h`.`code` AS `alias`,
|
||||
`h`.`description` AS `descripcion`,
|
||||
`h`.`workerFk` AS `trabajador_id`,
|
||||
`h`.`windowsSerial` AS `windowsSerial`
|
||||
FROM `vn`.`host` `h`
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Prioridades`
|
||||
AS SELECT `qp`.`id` AS `Id_Prioridad`,
|
||||
`qp`.`priority` AS `Prioridad`
|
||||
FROM `vn`.`queuePriority` `qp`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Proveedores_gestdoc`
|
||||
AS SELECT `sd`.`supplierFk` AS `Id_Proveedor`,
|
||||
`sd`.`dmsFk` AS `gestdoc_id`
|
||||
FROM `vn`.`supplierDms` `sd`
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Remesas`
|
||||
AS SELECT `r`.`id` AS `Id_Remesa`,
|
||||
`r`.`dated` AS `Fecha Remesa`,
|
||||
`r`.`accountingFk` AS `Banco`,
|
||||
`r`.`companyFk` AS `empresa_id`
|
||||
FROM `vn`.`remittance` `r`
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
|
||||
CREATE OR REPLACE DEFINER = `root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Rutas_Master`
|
||||
AS SELECT
|
||||
`rm`.`id` AS `id`,
|
||||
`rm`.`warehoseFk` AS `warehouse_id`,
|
||||
`rm`.`km` AS `km`,
|
||||
`rm`.`packages` AS `bultos`,
|
||||
`rm`.`vehicleCost` AS `vehiculos_coste`,
|
||||
`rm`.`staffCost` AS `personal_coste`,
|
||||
`rm`.`vehicle` AS `vehiculos_numero`,
|
||||
`rm`.`staff` AS `personal_numero`,
|
||||
`rm`.`fuel` AS `gasoil`,
|
||||
`rm`.`freelancers` AS `autonomos`,
|
||||
`rm`.`year` AS `año`,
|
||||
`rm`.`mounth` AS `mes`,
|
||||
`rm`.`expense` AS `gastos`,
|
||||
`rm`.`freelancersPackages` AS `bultos_autonomos`,
|
||||
`rm`.`kmCost` AS `coste_km`,
|
||||
`rm`.`packageCost` AS `coste_bulto`,
|
||||
`rm`.`freelancerPackageCost` AS `coste_bulto_autonomo` ,
|
||||
`rm`.`created` AS `odbc_date`
|
||||
FROM `vn`.`routeMaster` `rm`
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Rutas_Master`
|
||||
AS SELECT `rm`.`id` AS `id`,
|
||||
`rm`.`warehouseFk` AS `warehouse_id`,
|
||||
`rm`.`km` AS `km`,
|
||||
`rm`.`packages` AS `bultos`,
|
||||
`rm`.`vehicleCost` AS `vehiculos_coste`,
|
||||
`rm`.`staffCost` AS `personal_coste`,
|
||||
`rm`.`vehicle` AS `vehiculos_numero`,
|
||||
`rm`.`staff` AS `personal_numero`,
|
||||
`rm`.`fuel` AS `gasoil`,
|
||||
`rm`.`freelancers` AS `autonomos`,
|
||||
`rm`.`year` AS `año`,
|
||||
`rm`.`month` AS `mes`,
|
||||
`rm`.`expense` AS `gastos`,
|
||||
`rm`.`freelancersPackages` AS `bultos_autonomos`,
|
||||
`rm`.`kmCost` AS `coste_km`,
|
||||
`rm`.`packageCost` AS `coste_bulto`,
|
||||
`rm`.`freelancerPackageCost` AS `coste_bulto_autonomo`,
|
||||
`rm`.`created` AS `odbc_date`
|
||||
FROM `vn`.`routeMaster` `rm`
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Rutas_monitor`
|
||||
AS SELECT `vn`.`routesMonitor`.`routeFk` AS `Id_Ruta`,
|
||||
`vn`.`routesMonitor`.`name` AS `name`,
|
||||
`vn`.`routesMonitor`.`beachFk` AS `Ubicacion`,
|
||||
`vn`.`routesMonitor`.`ticketPacked` AS `pedidosEncajados`,
|
||||
`vn`.`routesMonitor`.`ticketFree` AS `pedidosLibres`,
|
||||
`vn`.`routesMonitor`.`ticketProduction` AS `pedidosProduccion`,
|
||||
`vn`.`routesMonitor`.`packages` AS `bultos`,
|
||||
`vn`.`routesMonitor`.`note` AS `notas`,
|
||||
`vn`.`routesMonitor`.`dated` AS `fecha`,
|
||||
`vn`.`routesMonitor`.`dockFk` AS `dockFk`,
|
||||
`vn`.`routesMonitor`.`m3` AS `m3`,
|
||||
`vn`.`routesMonitor`.`priority` AS `priority`,
|
||||
`vn`.`routesMonitor`.`etd` AS `etd`,
|
||||
`vn`.`routesMonitor`.`expeditionTruckFk` AS `expeditionTruckFk`
|
||||
FROM `vn`.`routesMonitor`
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Saldos_Prevision`
|
||||
AS SELECT `fb`.`id` AS `Saldos_Prevision_id`,
|
||||
`fb`.`description` AS `Descripcion`,
|
||||
`fb`.`amount` AS `Importe`,
|
||||
`fb`.`dated` AS `Fecha`,
|
||||
`fb`.`accountingFk` AS `Id_Banco`,
|
||||
`fb`.`companyFk` AS `empresa_id`
|
||||
FROM `vn`.`forecastedBalance` `fb`
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Splits`
|
||||
AS SELECT `s`.`id` AS `Id_Split`,
|
||||
`s`.`ticketFk` AS `Id_Ticket`,
|
||||
`s`.`entryFk` AS `Id_Entrada`,
|
||||
`s`.`dated` AS `Fecha`,
|
||||
`s`.`note` AS `Notas`
|
||||
FROM `vn`.`split` `s`
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Split_lines`
|
||||
AS SELECT `sl`.`id` AS `Id_Split_lines`,
|
||||
`sl`.`splitFk` AS `Id_Split`,
|
||||
`sl`.`itemFk` AS `Id_Article`,
|
||||
`sl`.`buyFk` AS `Id_Compra`
|
||||
FROM `vn`.`splitLine` `sl`
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Vehiculos`
|
||||
AS SELECT `v`.`id` AS `Id_Vehiculo`,
|
||||
`v`.`numberPlate` AS `Matricula`,
|
||||
`v`.`tradeMark` AS `Marca`,
|
||||
`v`.`model` AS `Modelo`,
|
||||
`v`.`companyFk` AS `empresa_id`,
|
||||
`v`.`warehouseFk` AS `warehouseFk`,
|
||||
`v`.`description` AS `description`,
|
||||
`v`.`m3` AS `m3`,
|
||||
`v`.`isActive` AS `active`,
|
||||
`v`.`deliveryPointFk` AS `deliveryPointFk`
|
||||
FROM `vn`.`vehicle` `v`
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Vehiculos_consumo`
|
||||
AS SELECT `vc`.`id` AS `Vehiculos_consumo_id`,
|
||||
`vc`.`vehicleFk` AS `Id_Vehiculo`,
|
||||
`vc`.`dated` AS `fecha`,
|
||||
`vc`.`km` AS `km`,
|
||||
`vc`.`liters` AS `litros`,
|
||||
`vc`.`price` AS `precio`,
|
||||
`vc`.`adblue` AS `adblue`,
|
||||
`vc`.`tolls` AS `peajes`,
|
||||
`vc`.`discount` AS `descuento`,
|
||||
`vc`.`silla` AS `silla`,
|
||||
`vc`.`created` AS `odbc_date`,
|
||||
`vc`.`others` AS `otros`,
|
||||
`vc`.`fuelTypeFk` AS `fuelTypeFk`,
|
||||
`vc`.`supplierFk` AS `proveedoresFk`,
|
||||
`vc`.`liters100km` AS `liters100km`,
|
||||
`vc`.`gasoline` AS `gasoline`
|
||||
FROM `vn`.`vehicleConsumption` `vc`
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`VerEspionaje`
|
||||
AS SELECT `Trabajadores`.`CodigoTrabajador` AS `CodigoTrabajador`,
|
||||
`vn2008`.`Espionajes`.`Fecha` AS `Fecha`,
|
||||
`vn2008`.`Espionajes`.`HoraEntrada` AS `HoraEntrada`,
|
||||
`vn2008`.`Espionajes`.`HoraSalida` AS `HoraSalida`,
|
||||
`vn2008`.`Espionajes`.`Id_Equipo` AS `Id_Equipo`,
|
||||
`Trabajadores`.`Id_Trabajador` AS `Id_Trabajador`
|
||||
FROM (
|
||||
`vn2008`.`Espionajes`
|
||||
JOIN `vn2008`.`Trabajadores` ON(
|
||||
`vn2008`.`Espionajes`.`Id_Trabajador` = `Trabajadores`.`Id_Trabajador`
|
||||
)
|
||||
)
|
||||
ORDER BY `Trabajadores`.`CodigoTrabajador`,
|
||||
`vn2008`.`Espionajes`.`Fecha`
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Vistas`
|
||||
AS SELECT `dm`.`id` AS `vista_id`,
|
||||
`dm`.`code` AS `code`,
|
||||
`dm`.`description` AS `vista`
|
||||
FROM `vn`.`deliveryMethod` `dm`
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`XDiario`
|
||||
AS SELECT `d`.`id` AS `id`,
|
||||
`d`.`ASIEN` AS `ASIEN`,
|
||||
`d`.`FECHA` AS `FECHA`,
|
||||
`d`.`SUBCTA` AS `SUBCTA`,
|
||||
`d`.`CONTRA` AS `CONTRA`,
|
||||
`d`.`CONCEPTO` AS `CONCEPTO`,
|
||||
`d`.`EURODEBE` AS `EURODEBE`,
|
||||
`d`.`EUROHABER` AS `EUROHABER`,
|
||||
`d`.`BASEEURO` AS `BASEEURO`,
|
||||
`d`.`SERIE` AS `SERIE`,
|
||||
`d`.`FACTURA` AS `FACTURA`,
|
||||
`d`.`IVA` AS `IVA`,
|
||||
`d`.`RECEQUIV` AS `RECEQUIV`,
|
||||
`d`.`CLAVE` AS `CLAVE`,
|
||||
`d`.`CAMBIO` AS `CAMBIO`,
|
||||
`d`.`DEBEME` AS `DEBEME`,
|
||||
`d`.`HABERME` AS `HABERME`,
|
||||
`d`.`AUXILIAR` AS `AUXILIAR`,
|
||||
`d`.`MONEDAUSO` AS `MONEDAUSO`,
|
||||
`d`.`TIPOOPE` AS `TIPOOPE`,
|
||||
`d`.`NFACTICK` AS `NFACTICK`,
|
||||
`d`.`TERIDNIF` AS `TERIDNIF`,
|
||||
`d`.`TERNIF` AS `TERNIF`,
|
||||
`d`.`TERNOM` AS `TERNOM`,
|
||||
`d`.`OPBIENES` AS `OPBIENES`,
|
||||
`d`.`L340` AS `L340`,
|
||||
`d`.`enlazado` AS `enlazado`,
|
||||
`d`.`FECHA_EX` AS `FECHA_EX`,
|
||||
`d`.`LRECT349` AS `LRECT349`,
|
||||
`d`.`empresa_id` AS `empresa_id`,
|
||||
`d`.`LDIFADUAN` AS `LDIFADUAN`,
|
||||
`d`.`METAL` AS `METAL`,
|
||||
`d`.`METALIMP` AS `METALIMP`,
|
||||
`d`.`CLIENTE` AS `CLIENTE`,
|
||||
`d`.`METALEJE` AS `METALEJE`,
|
||||
`d`.`FECHA_OP` AS `FECHA_OP`,
|
||||
`d`.`FACTURAEX` AS `FACTURAEX`,
|
||||
`d`.`TIPOCLAVE` AS `TIPOCLAVE`,
|
||||
`d`.`TIPOEXENCI` AS `TIPOEXENCI`,
|
||||
`d`.`TIPONOSUJE` AS `TIPONOSUJE`,
|
||||
`d`.`TIPOFACT` AS `TIPOFACT`,
|
||||
`d`.`TIPORECTIF` AS `TIPORECTIF`,
|
||||
`d`.`SERIE_RT` AS `SERIE_RT`,
|
||||
`d`.`FACTU_RT` AS `FACTU_RT`,
|
||||
`d`.`BASEIMP_RT` AS `BASEIMP_RT`,
|
||||
`d`.`BASEIMP_RF` AS `BASEIMP_RF`,
|
||||
`d`.`RECTIFICA` AS `RECTIFICA`,
|
||||
`d`.`FECHA_RT` AS `FECHA_RT`,
|
||||
`d`.`created` AS `created`,
|
||||
`d`.`updated` AS `updated`,
|
||||
`d`.`FECREGCON` AS `FECREGCON`,
|
||||
`d`.`enlazadoSage` AS `enlazadoSage`
|
||||
FROM `vn`.`XDiario` `d`
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`account_conciliacion`
|
||||
AS SELECT `ar`.`id` AS `idaccount_conciliacion`,
|
||||
`ar`.`supplierAccountFk` AS `Id_Proveedores_account`,
|
||||
`ar`.`operationDated` AS `Fechaoperacion`,
|
||||
`ar`.`valueDated` AS `FechaValor`,
|
||||
`ar`.`amount` AS `importe`,
|
||||
`ar`.`concept` AS `Concepto`,
|
||||
`ar`.`debitCredit` AS `DebeHaber`,
|
||||
`ar`.`calculatedCode` AS `id_calculated`,
|
||||
`ar`.`created` AS `odbc_date`
|
||||
FROM `vn`.`accountReconciliation` `ar`
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`account_detail`
|
||||
AS SELECT `ac`.`id` AS `account_detail_id`,
|
||||
`ac`.`value` AS `value`,
|
||||
`ac`.`accountDetailTypeFk` AS `account_detail_type_id`,
|
||||
`ac`.`supplierAccountFk` AS `Id_Proveedores_account`
|
||||
FROM `vn`.`accountDetail` `ac`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`account_detail_type`
|
||||
AS SELECT `adt`.`id` AS `account_detail_type_id`,
|
||||
`adt`.`description` AS `description`
|
||||
FROM `vn`.`accountDetailType` `adt`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`airline`
|
||||
AS SELECT `a`.`id` AS `airline_id`,
|
||||
`a`.`name` AS `name`
|
||||
FROM `vn`.`airline` `a`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`airport`
|
||||
AS SELECT `a`.`id` AS `airport_id`,
|
||||
`a`.`name` AS `name`
|
||||
FROM `vn`.`airport` `a`
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`albaran`
|
||||
AS SELECT `dn`.`id` AS `albaran_id`,
|
||||
`dn`.`ref` AS `ref`,
|
||||
`dn`.`note` AS `note`,
|
||||
`dn`.`shipped` AS `fecha`,
|
||||
`dn`.`landed` AS `fecha_entrega`,
|
||||
`dn`.`amount` AS `valor`,
|
||||
`dn`.`supplierFk` AS `Id_Proveedor`,
|
||||
`dn`.`companyFk` AS `empresa_id`,
|
||||
`dn`.`warehouseFk` AS `warehouse_id`,
|
||||
`dn`.`stateFk` AS `albaran_state_id`,
|
||||
`dn`.`workerFk` AS `Id_Trabajador`,
|
||||
`dn`.`supervisorFk` AS `Id_Responsable`,
|
||||
`dn`.`departmentFk` AS `department_id`,
|
||||
`dn`.`invoiceInFk` AS `recibida_id`,
|
||||
`dn`.`farmingFk` AS `farmingFk`
|
||||
FROM `vn`.`deliveryNote` `dn`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`albaran_gestdoc`
|
||||
AS SELECT `dnd`.`dmsFk` AS `gestdoc_id`,
|
||||
`dnd`.`deliveryNoteFk` AS `albaran_id`
|
||||
FROM `vn`.`deliveryNoteDms` `dnd`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`albaran_state`
|
||||
AS SELECT `dn`.`id` AS `albaran_state_id`,
|
||||
`dn`.`state` AS `state`
|
||||
FROM `vn`.`deliveryNoteState` `dn`
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`awb_component`
|
||||
AS SELECT `ac`.`id` AS `id`,
|
||||
`ac`.`awbFk` AS `awb_id`,
|
||||
`ac`.`supplierFk` AS `Id_Proveedor`,
|
||||
`ac`.`typeFk` AS `awb_component_type_id`,
|
||||
`ac`.`awbRoleFk` AS `awb_role_id`,
|
||||
`ac`.`awbUnitFk` AS `awb_unit_id`,
|
||||
`ac`.`value` AS `value`,
|
||||
`ac`.`currencyFk` AS `Id_Moneda`,
|
||||
`ac`.`invoiceInFk` AS `recibida_id`
|
||||
FROM
|
||||
`vn`.`awbComponent` `ac`;
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`awb_component_template`
|
||||
AS SELECT`act`.`id` AS `awb_component_template_id`,
|
||||
`act`.`freightFk` AS `carguera_id`,
|
||||
`act`.`airportIn` AS `airport_in`,
|
||||
`act`.`airportOut` AS `airport_out`,
|
||||
`act`.`airlineFk` AS `airline_id`,
|
||||
`act`.`typeFk` AS `awb_component_type_id`,
|
||||
`act`.`dated` AS `Fecha`,
|
||||
`act`.`awbRoleFk` AS `awb_role_id`,
|
||||
`act`.`awbUnit` AS `awb_unit_id`,
|
||||
`act`.`value` AS `value`,
|
||||
`act`.`maxValue` AS `max_value`,
|
||||
`act`.`minValue` AS `min_value`,
|
||||
`act`.`currencyFk` AS `Id_Moneda`,
|
||||
`act`.`days` AS `days`
|
||||
FROM
|
||||
`vn`.`awbComponentTemplate` `act`;
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`awb_component_type`
|
||||
AS SELECT `act`.`id` AS `awb_component_type_id`,
|
||||
`act`.`description` AS `description`,
|
||||
`act`.`hasStems` AS `hasStems`
|
||||
FROM `vn`.`awbComponentType` `act`
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`awb_gestdoc`
|
||||
AS SELECT `ad`.`id` AS `awb_gestdoc_id`,
|
||||
`ad`.`awbFk` AS `awb_id`,
|
||||
`ad`.`dmsFk` AS `gestdoc_id`
|
||||
FROM `vn`.`awbDms` `ad`
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`awb_recibida`
|
||||
AS SELECT `aii`.`awbFk` AS `awb_id`,
|
||||
`aii`.`invoiceInFk` AS `recibida_id`,
|
||||
`aii`.`sad` AS `dua`
|
||||
FROM `vn`.`awbInvoiceIn` `aii`;
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`awb_role`
|
||||
AS SELECT `ar`.`id` AS `awb_role_id`,
|
||||
`ar`.`name` AS `name`
|
||||
FROM `vn`.`awbRole` `ar`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`awb_unit`
|
||||
AS SELECT `au`.`id` AS `awb_unit_id`,
|
||||
`au`.`operation` AS `operation`
|
||||
FROM `vn`.`awbUnit` `au`
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`balance_nest_tree`
|
||||
AS SELECT `bnt`.`lft` AS `lft`,
|
||||
`bnt`.`rgt` AS `rgt`,
|
||||
`bnt`.`name` AS `name`,
|
||||
`bnt`.`id` AS `id`,
|
||||
`bnt`.`expenseFk` AS `Id_Gasto`,
|
||||
`bnt`.`isSelected` AS `isSelected`
|
||||
FROM `vn`.`balanceNestTree` `bnt`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`buy_edi_k012`
|
||||
AS SELECT `eek`.`id` AS `buy_edi_k012_id`,
|
||||
`eek`.`description` AS `description`
|
||||
FROM `edi`.`ektK1` `eek`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`buy_edi_k03`
|
||||
AS SELECT `eek`.`id` AS `buy_edi_k03_id`,
|
||||
`eek`.`description` AS `description`
|
||||
FROM `edi`.`ektK3` `eek`
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`buy_edi_k04`
|
||||
AS SELECT `eek`.`id` AS `buy_edi_k04_id`,
|
||||
`eek`.`description` AS `description`
|
||||
FROM `edi`.`ektK4` `eek`
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`definitivo`
|
||||
AS SELECT `d`.`id` AS `definitivo_id`,
|
||||
`d`.`companyFk` AS `empresa_id`,
|
||||
`d`.`started` AS `desde`,
|
||||
`d`.`ended` AS `hasta`,
|
||||
`d`.`created` AS `fecha`
|
||||
FROM `vn`.`dmsStorageBox` `d`
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`deliveryPoint`
|
||||
AS SELECT `dp`.`id` AS `id`,
|
||||
`dp`.`name` AS `name`,
|
||||
`dp`.`ubication` AS `ubication`
|
||||
FROM `vn`.`deliveryPoint` `dp`
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`device_user`
|
||||
AS SELECT `dpu`.`deviceProductionFk` AS `device_id`,
|
||||
`dpu`.`userFk` AS `user_id`
|
||||
FROM `vn`.`deviceProductionUser` `dpu`
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`edi_feature`
|
||||
AS SELECT `edi`.`feature`.`item_id` AS `item_id`,
|
||||
`edi`.`feature`.`feature_type_id` AS `feature_type_id`,
|
||||
`edi`.`feature`.`feature_value` AS `feature_value`,
|
||||
`edi`.`feature`.`entry_date` AS `entry_date`,
|
||||
`edi`.`feature`.`expiry_date` AS `expiry_date`,
|
||||
`edi`.`feature`.`change_date_time` AS `change_date_time`
|
||||
FROM `edi`.`feature`
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`edi_genus`
|
||||
AS SELECT `edi`.`genus`.`genus_id` AS `genus_id`,
|
||||
`edi`.`genus`.`latin_genus_name` AS `latin_genus_name`,
|
||||
`edi`.`genus`.`entry_date` AS `entry_date`,
|
||||
`edi`.`genus`.`expiry_date` AS `expiry_date`,
|
||||
`edi`.`genus`.`change_date_time` AS `change_date_time`
|
||||
FROM `edi`.`genus`
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`edi_item_feature`
|
||||
AS SELECT `edi`.`item_feature`.`item_id` AS `item_id`,
|
||||
`edi`.`item_feature`.`presentation_order` AS `presentation_order`,
|
||||
`edi`.`item_feature`.`feature` AS `feature`,
|
||||
`edi`.`item_feature`.`regulation_type` AS `regulation_type`,
|
||||
`edi`.`item_feature`.`entry_date` AS `entry_date`,
|
||||
`edi`.`item_feature`.`expiry_date` AS `expiry_date`,
|
||||
`edi`.`item_feature`.`change_date_time` AS `change_date_time`
|
||||
FROM `edi`.`item_feature`
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`edi_plant`
|
||||
AS SELECT `edi`.`plant`.`plant_id` AS `plant_id`,
|
||||
`edi`.`plant`.`genus_id` AS `genus_id`,
|
||||
`edi`.`plant`.`specie_id` AS `specie_id`,
|
||||
`edi`.`plant`.`entry_date` AS `entry_date`,
|
||||
`edi`.`plant`.`expiry_date` AS `expiry_date`,
|
||||
`edi`.`plant`.`change_date_time` AS `change_date_time`
|
||||
FROM `edi`.`plant`
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`edi_type`
|
||||
AS SELECT `edi`.`type`.`type_id` AS `type_id`,
|
||||
`edi`.`type`.`type_group_id` AS `type_group_id`,
|
||||
`edi`.`type`.`description` AS `description`,
|
||||
`edi`.`type`.`entry_date` AS `entry_date`,
|
||||
`edi`.`type`.`expiry_date` AS `expiry_date`,
|
||||
`edi`.`type`.`change_date_time` AS `change_date_time`
|
||||
FROM `edi`.`type`
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`edi_value`
|
||||
AS SELECT `edi`.`value`.`type_id` AS `type_id`,
|
||||
`edi`.`value`.`type_value` AS `type_value`,
|
||||
`edi`.`value`.`type_description` AS `type_description`,
|
||||
`edi`.`value`.`entry_date` AS `entry_date`,
|
||||
`edi`.`value`.`expiry_date` AS `expiry_date`,
|
||||
`edi`.`value`.`change_date_time` AS `change_date_time`
|
||||
FROM `edi`.`value`
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`escritos`
|
||||
AS SELECT `s`.`id` AS `id`,
|
||||
`s`.`code` AS `abrev`,
|
||||
`s`.`description` AS `descripcion`,
|
||||
`s`.`isVisible` AS `visible`,
|
||||
`s`.`hasCompany` AS `hasCompany`
|
||||
FROM `vn`.`sample` `s`
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`observation_type`
|
||||
AS SELECT `co`.`id` AS `observation_type_id`,
|
||||
`co`.`description` AS `description`
|
||||
FROM `vn`.`observationType` `co`
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`order`
|
||||
AS SELECT `hedera`.`order`.`id` AS `id`,
|
||||
`hedera`.`order`.`date_make` AS `date_make`,
|
||||
`hedera`.`order`.`date_send` AS `date_send`,
|
||||
`hedera`.`order`.`customer_id` AS `customer_id`,
|
||||
`hedera`.`order`.`delivery_method_id` AS `delivery_method_id`,
|
||||
`hedera`.`order`.`agency_id` AS `agency_id`,
|
||||
`hedera`.`order`.`address_id` AS `address_id`,
|
||||
`hedera`.`order`.`note` AS `note`,
|
||||
`hedera`.`order`.`confirmed` AS `confirmed`,
|
||||
`hedera`.`order`.`is_bionic` AS `is_bionic`,
|
||||
`hedera`.`order`.`source_app` AS `source_app`
|
||||
FROM `hedera`.`order`
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`order_Tickets`
|
||||
AS SELECT `ot`.`orderFk` AS `order_id`,
|
||||
`ot`.`ticketFk` AS `Id_Ticket`
|
||||
FROM `vn`.`orderTicket` `ot`
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`order_component`
|
||||
AS SELECT `c`.`order_row_id` AS `order_row_id`,
|
||||
`c`.`component_id` AS `component_id`,
|
||||
`c`.`price` AS `price`
|
||||
FROM `hedera`.`order_component` `c`
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`order_row`
|
||||
AS SELECT `order_row`.`id` AS `id`,
|
||||
`order_row`.`order_id` AS `order_id`,
|
||||
`order_row`.`item_id` AS `item_id`,
|
||||
`order_row`.`warehouse_id` AS `warehouse_id`,
|
||||
`order_row`.`shipment` AS `shipment`,
|
||||
`order_row`.`amount` AS `amount`,
|
||||
`order_row`.`price` AS `price`,
|
||||
`order_row`.`rate` AS `rate`,
|
||||
`order_row`.`created` AS `created`,
|
||||
`order_row`.`Id_Movimiento` AS `Id_Movimiento`
|
||||
FROM `hedera`.`order_row`
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`person_user`
|
||||
AS SELECT `u`.`id` AS `id`,
|
||||
`u`.`role` AS `mysql_user_id`,
|
||||
`u`.`name` AS `name`,
|
||||
`u`.`password` AS `password`,
|
||||
`u`.`active` AS `active`,
|
||||
`u`.`lastPassChange` AS `last_pass_change`
|
||||
FROM `account`.`user` `u`
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`person_user_idtrabajador`
|
||||
AS SELECT `t`.`Id_Trabajador` AS `Id_Trabajador`
|
||||
FROM (
|
||||
`vn2008`.`person_user` `p`
|
||||
JOIN `vn2008`.`Trabajadores` `t` ON(`p`.`id` = `t`.`user_id`)
|
||||
)
|
||||
WHERE `t`.`user_id` = `account`.`myUser_getId`()
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`Pagares`
|
||||
AS SELECT `p`.`id` AS `Id_Pagare`,
|
||||
`p`.`issued` AS `Fechaemision`,
|
||||
`p`.`Concept` AS `Concepto`,
|
||||
`p`.`paymentFk` AS `pago_id`
|
||||
FROM `vn`.`promissoryNote` `p`
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`reference_min`
|
||||
AS SELECT `rc`.`dated` AS `date`,
|
||||
`rc`.`value` AS `rate`,
|
||||
`rc`.`currencyFk` AS `moneda_id`
|
||||
FROM `vn`.`referenceCurrent` `rc`
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`sharingcart`
|
||||
AS SELECT `sc`.`id` AS `id`,
|
||||
`sc`.`workerFk` AS `Id_Trabajador`,
|
||||
`sc`.`started` AS `datSTART`,
|
||||
`sc`.`ended` AS `datEND`,
|
||||
`sc`.`workerSubstitute` AS `Id_Suplente`,
|
||||
`sc`.`created` AS `odbc_date`
|
||||
FROM `vn`.`sharingCart` `sc`
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`sharingclient`
|
||||
AS SELECT `sc`.`id` AS `id`,
|
||||
`sc`.`workerFk` AS `Id_Trabajador`,
|
||||
`sc`.`started` AS `datSTART`,
|
||||
`sc`.`ended` AS `datEND`,
|
||||
`sc`.`clientFk` AS `Id_Cliente`
|
||||
FROM `vn`.`sharingClient` `sc`
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`sms`
|
||||
AS SELECT `t`.`id` AS `id`,
|
||||
`t`.`senderFk` AS `Id_trabajador`,
|
||||
`t`.`sender` AS `from`,
|
||||
`t`.`destination` AS `to`,
|
||||
`t`.`message` AS `text`,
|
||||
`t`.`statusCode` AS `sent`,
|
||||
`t`.`status` AS `response`,
|
||||
`t`.`created` AS `DATE_ODBC`
|
||||
FROM `vn`.`sms` `t`
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue