Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
This commit is contained in:
commit
6ebcb53863
98
CHANGELOG.md
98
CHANGELOG.md
|
|
@ -5,73 +5,94 @@ 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/),
|
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).
|
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
|
## [2406.01] - 2024-02-08
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
### Changed
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
## [2404.01] - 2024-01-25
|
## [2404.01] - 2024-01-25
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
### Changed
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
## [2402.01] - 2024-01-11
|
## [2402.01] - 2024-01-11
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
## [2400.01] - 2024-01-04
|
## [2400.01] - 2024-01-04
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
## [2350.01] - 2023-12-14
|
## [2350.01] - 2023-12-14
|
||||||
|
|
||||||
### Características Añadidas 🆕
|
### Características Añadidas 🆕
|
||||||
- **Tickets → Expediciones:** Añadido soporte para Viaexpress
|
|
||||||
|
|
||||||
|
- **Tickets → Expediciones:** Añadido soporte para Viaexpress
|
||||||
|
|
||||||
## [2348.01] - 2023-11-30
|
## [2348.01] - 2023-11-30
|
||||||
|
|
||||||
### Características Añadidas 🆕
|
### Características Añadidas 🆕
|
||||||
|
|
||||||
- **Tickets → Adelantar:** Permite mover lineas sin generar negativos
|
- **Tickets → Adelantar:** Permite mover lineas sin generar negativos
|
||||||
- **Tickets → Adelantar:** Permite modificar la fecha de los tickets
|
- **Tickets → Adelantar:** Permite modificar la fecha de los tickets
|
||||||
- **Trabajadores → Notificaciones:** Nueva sección (lilium)
|
- **Trabajadores → Notificaciones:** Nueva sección (lilium)
|
||||||
|
|
||||||
### Correcciones 🛠️
|
### Correcciones 🛠️
|
||||||
- **Tickets → RocketChat:** Arreglada detección de cambios
|
|
||||||
|
|
||||||
|
- **Tickets → RocketChat:** Arreglada detección de cambios
|
||||||
|
|
||||||
## [2346.01] - 2023-11-16
|
## [2346.01] - 2023-11-16
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
### Changed
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
## [2342.01] - 2023-11-02
|
## [2342.01] - 2023-11-02
|
||||||
|
|
||||||
### Added
|
### 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
|
## [2340.01] - 2023-10-05
|
||||||
|
|
||||||
## [2338.01] - 2023-09-21
|
## [2338.01] - 2023-09-21
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Ticket -> Servicios) Se pueden abonar servicios
|
- (Ticket -> Servicios) Se pueden abonar servicios
|
||||||
- (Facturas -> Datos básicos) Muestra valores por defecto
|
- (Facturas -> Datos básicos) Muestra valores por defecto
|
||||||
- (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
|
- (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
|
||||||
|
|
||||||
### Changed
|
### 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
|
## [2336.01] - 2023-09-07
|
||||||
|
|
@ -79,41 +100,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
## [2334.01] - 2023-08-24
|
## [2334.01] - 2023-08-24
|
||||||
|
|
||||||
### Added
|
### 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
|
## [2332.01] - 2023-08-10
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Trabajadores -> Gestión documental) Soporte para Docuware
|
- (Trabajadores -> Gestión documental) Soporte para Docuware
|
||||||
- (General -> Agencia) Soporte para Viaexpress
|
- (General -> Agencia) Soporte para Viaexpress
|
||||||
- (Tickets -> SMS) Nueva sección en Lilium
|
- (Tickets -> SMS) Nueva sección en Lilium
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- (General -> Tickets) Devuelve el motivo por el cual no es editable
|
- (General -> Tickets) Devuelve el motivo por el cual no es editable
|
||||||
- (Desplegables -> Trabajadores) Mejorados
|
- (Desplegables -> Trabajadores) Mejorados
|
||||||
- (General -> Clientes) Razón social y dirección en mayúsculas
|
- (General -> Clientes) Razón social y dirección en mayúsculas
|
||||||
|
|
||||||
### Fixed
|
### 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
|
## [2330.01] - 2023-07-27
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
|
- (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
|
||||||
- (Rutas -> Troncales) Nueva sección
|
- (Rutas -> Troncales) Nueva sección
|
||||||
- (Tickets -> Opciones) Opción establecer peso
|
- (Tickets -> Opciones) Opción establecer peso
|
||||||
- (Clientes -> SMS) Nueva sección
|
- (Clientes -> SMS) Nueva sección
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- (General -> Iconos) Añadidos nuevos iconos
|
- (General -> Iconos) Añadidos nuevos iconos
|
||||||
- (Clientes -> Razón social) Permite crear clientes con la misma razón social según el país
|
- (Clientes -> Razón social) Permite crear clientes con la misma razón social según el país
|
||||||
|
|
||||||
|
|
||||||
## [2328.01] - 2023-07-13
|
## [2328.01] - 2023-07-13
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Clientes -> Morosos) Añadida columna "es trabajador"
|
- (Clientes -> Morosos) Añadida columna "es trabajador"
|
||||||
- (Trabajadores -> Departamentos) Nueva sección
|
- (Trabajadores -> Departamentos) Nueva sección
|
||||||
- (Trabajadores -> Departamentos) Añadido listado de Trabajadores por departamento
|
- (Trabajadores -> Departamentos) Añadido listado de Trabajadores por departamento
|
||||||
|
|
@ -122,28 +147,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- (Trabajadores -> Departamentos) Arreglado búscador
|
|
||||||
|
|
||||||
|
- (Trabajadores -> Departamentos) Arreglado búscador
|
||||||
|
|
||||||
## [2326.01] - 2023-06-29
|
## [2326.01] - 2023-06-29
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas
|
- (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) 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
|
- (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
|
- (Tickets -> Índice) Permite enviar varios albaranes a Docuware
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- (General -> Históricos) Los registros se muestran agrupados por usuario y entidad
|
- (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
|
- (Facturas -> Facturación global) Optimizada, generación de PDFs y notificaciones en paralelo
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- (General -> Históricos) Duplicidades eliminadas
|
- (General -> Históricos) Duplicidades eliminadas
|
||||||
- (Facturas -> Facturación global) Solucionados fallos que paran el proceso
|
- (Facturas -> Facturación global) Solucionados fallos que paran el proceso
|
||||||
|
|
||||||
## [2324.01] - 2023-06-15
|
## [2324.01] - 2023-06-15
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
|
- (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 -> 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) Ahora, ademas de los ids, se muestra la descripión de los atributos
|
||||||
|
|
@ -151,77 +180,84 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
- (General -> Históricos) Filtro por cambios
|
- (General -> Históricos) Filtro por cambios
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- (General -> Permisos) Mejorada seguridad
|
- (General -> Permisos) Mejorada seguridad
|
||||||
- (General -> Históricos) Elementos de la interfaz reorganizados para hacerla más ágil e intuitiva
|
- (General -> Históricos) Elementos de la interfaz reorganizados para hacerla más ágil e intuitiva
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
-
|
-
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [2322.01] - 2023-06-01
|
## [2322.01] - 2023-06-01
|
||||||
|
|
||||||
### Added
|
### 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
|
||||||
- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
|
- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
|
||||||
- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
|
- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
|
||||||
|
|
||||||
### Changed
|
### 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'
|
||||||
- (Tickets -> Expediciones) Interfaz mejorada y contador añadido
|
- (Tickets -> Expediciones) Interfaz mejorada y contador añadido
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
|
- (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 -> Cambiar estado) Ahora muestra la lista completa de todos los estados
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [2320.01] - 2023-05-25
|
## [2320.01] - 2023-05-25
|
||||||
|
|
||||||
### Added
|
### 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
|
### 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
|
### Fixed
|
||||||
|
|
||||||
-
|
-
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [2318.01] - 2023-05-08
|
## [2318.01] - 2023-05-08
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Usuarios -> Histórico) Nueva sección
|
- (Usuarios -> Histórico) Nueva sección
|
||||||
- (Roles -> Histórico) Nueva sección
|
- (Roles -> Histórico) Nueva sección
|
||||||
- (Trabajadores -> Dar de alta) Permite elegir el método de pago
|
- (Trabajadores -> Dar de alta) Permite elegir el método de pago
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
|
- (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
|
||||||
- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
|
- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- (Ticket -> Boxing) Arreglado selección de horas
|
- (Ticket -> Boxing) Arreglado selección de horas
|
||||||
- (Cesta -> Índice) Optimizada búsqueda
|
- (Cesta -> Índice) Optimizada búsqueda
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [2314.01] - 2023-04-20
|
## [2314.01] - 2023-04-20
|
||||||
|
|
||||||
### Added
|
### 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.
|
- (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
|
- (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
|
- (Facturas recibidas -> Bases negativas) Nueva sección
|
||||||
|
|
||||||
### Fixed
|
### 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
|
## [2312.01] - 2023-04-06
|
||||||
|
|
||||||
### Added
|
### 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
|
### Changed
|
||||||
|
|
||||||
- (Monitor tickets) Cuando se filtra por 'Pendiente' ya no muestra los estados de 'Previa'
|
- (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 -> 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
|
- (Envíos -> Índice) Cambiado el buscador superior por uno lateral
|
||||||
|
|
@ -229,33 +265,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
## [2310.01] - 2023-03-23
|
## [2310.01] - 2023-03-23
|
||||||
|
|
||||||
### Added
|
### 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
|
### Fixed
|
||||||
|
|
||||||
- (Clientes -> Listado extendido) Resuelto error al filtrar por clientes inactivos desde la columna "Activo"
|
- (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
|
- (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
|
## [2308.01] - 2023-03-09
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
|
- (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
|
||||||
- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
|
- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
|
||||||
- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
|
- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
|
||||||
- (Trabajador -> PDA) Nueva sección
|
- (Trabajador -> PDA) Nueva sección
|
||||||
|
|
||||||
### Changed
|
### 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
|
## [2306.01] - 2023-02-23
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Tickets -> Datos Básicos) Mensaje de confirmación al intentar generar tickets con negativos
|
- (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.
|
- (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
|
### 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
|
### Fixed
|
||||||
|
|
||||||
- (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
|
- (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
|
- (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
|
- (Artículos) El disponible en la vista previa se muestra correctamente
|
||||||
|
|
@ -263,12 +306,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
## [2304.01] - 2023-02-09
|
## [2304.01] - 2023-02-09
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (Rutas) Al descargar varias facturas se comprime en un zip
|
- (Rutas) Al descargar varias facturas se comprime en un zip
|
||||||
- (Trabajadores -> Nuevo trabajador) Nueva sección
|
- (Trabajadores -> Nuevo trabajador) Nueva sección
|
||||||
- (Tickets -> Adelantar tickets) Añadidos campos "líneas" y "litros" al ticket origen
|
- (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
|
- (Tickets -> Adelantar tickets) Nuevo icono muestra cuando las agencias de los tickets origen/destino son distintas
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
|
- (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"
|
- (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
|
||||||
- (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
|
- (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
|
||||||
|
|
@ -277,6 +322,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
- (Tickets -> Adelantar tickets) Cambiado stock de destino a origen.
|
- (Tickets -> Adelantar tickets) Cambiado stock de destino a origen.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
|
- (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
|
- (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 -> Datos básicos) Permite guardar la hora de envío
|
||||||
|
|
@ -287,17 +333,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
## [2302.01] - 2023-01-26
|
## [2302.01] - 2023-01-26
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- (General -> Inicio) Permite recuperar la contraseña
|
- (General -> Inicio) Permite recuperar la contraseña
|
||||||
- (Tickets -> Opciones) Subir albarán a Docuware
|
- (Tickets -> Opciones) Subir albarán a Docuware
|
||||||
- (Tickets -> Opciones) Enviar correo con PDF de Docuware
|
- (Tickets -> Opciones) Enviar correo con PDF de Docuware
|
||||||
- (Artículos -> Datos Básicos) Añadido campo Unidades/Caja
|
- (Artículos -> Datos Básicos) Añadido campo Unidades/Caja
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- (Reclamaciones -> Descriptor) Cambiado el campo Agencia por Zona
|
- (Reclamaciones -> Descriptor) Cambiado el campo Agencia por Zona
|
||||||
- (Tickets -> Líneas preparadas) Actualizada sección para que sea más visual
|
- (Tickets -> Líneas preparadas) Actualizada sección para que sea más visual
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- (General) Al utilizar el traductor de Google se descuadraban los iconos
|
- (General) Al utilizar el traductor de Google se descuadraban los iconos
|
||||||
|
|
||||||
### Removed
|
### 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 \
|
graphicsmagick \
|
||||||
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
||||||
&& apt-get install -y --no-install-recommends nodejs \
|
&& apt-get install -y --no-install-recommends nodejs \
|
||||||
&& npm install -g npm@9.6.6
|
&& corepack enable pnpm
|
||||||
|
|
||||||
# Puppeteer
|
# Puppeteer
|
||||||
|
|
||||||
|
|
@ -39,12 +39,12 @@ RUN apt-get update \
|
||||||
|
|
||||||
WORKDIR /salix
|
WORKDIR /salix
|
||||||
|
|
||||||
COPY print/package.json print/package-lock.json print/
|
COPY print/package.json print/pnpm-lock.yaml print/
|
||||||
RUN npm --prefix ./print install --omit=dev ./print
|
RUN pnpm install --prod --prefix=print
|
||||||
|
|
||||||
COPY package.json package-lock.json ./
|
COPY package.json pnpm-lock.yaml ./
|
||||||
COPY loopback/package.json loopback/
|
COPY loopback/package.json loopback/
|
||||||
RUN npm install --omit=dev
|
RUN pnpm install --prod
|
||||||
|
|
||||||
COPY loopback loopback
|
COPY loopback loopback
|
||||||
COPY back back
|
COPY back back
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,42 @@
|
||||||
def PROTECTED_BRANCH
|
def PROTECTED_BRANCH
|
||||||
def FROM_GIT
|
def FROM_GIT
|
||||||
def RUN_TESTS
|
def RUN_TESTS
|
||||||
|
def RUN_BUILD
|
||||||
|
|
||||||
|
node {
|
||||||
|
stage('Setup') {
|
||||||
|
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'
|
||||||
|
|
||||||
|
echo "Node: ${NODE_NAME}"
|
||||||
|
echo "Workspace: ${WORKSPACE}"
|
||||||
|
}
|
||||||
|
}
|
||||||
pipeline {
|
pipeline {
|
||||||
agent any
|
agent any
|
||||||
options {
|
options {
|
||||||
|
|
@ -17,108 +52,130 @@ pipeline {
|
||||||
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
|
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
|
||||||
}
|
}
|
||||||
stages {
|
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') {
|
stage('Install') {
|
||||||
environment {
|
environment {
|
||||||
NODE_ENV = ""
|
NODE_ENV = ''
|
||||||
}
|
}
|
||||||
parallel {
|
parallel {
|
||||||
stage('Backend') {
|
stage('Back') {
|
||||||
steps {
|
steps {
|
||||||
sh 'npm install --no-audit --prefer-offline'
|
sh 'pnpm install --prefer-offline'
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('Frontend') {
|
|
||||||
when {
|
|
||||||
expression { return FROM_GIT }
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
sh 'npm install --no-audit --prefer-offline --prefix=front'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage('Print') {
|
stage('Print') {
|
||||||
when {
|
when {
|
||||||
expression { return FROM_GIT }
|
expression { FROM_GIT }
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
sh 'npm install --no-audit --prefer-offline --prefix=print'
|
sh 'pnpm install --prefer-offline --prefix=print'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
stage('Front') {
|
||||||
}
|
|
||||||
stage('Test') {
|
|
||||||
when {
|
when {
|
||||||
expression { return RUN_TESTS }
|
expression { FROM_GIT }
|
||||||
}
|
}
|
||||||
|
steps {
|
||||||
|
sh 'pnpm install --prefer-offline --prefix=front'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Stack') {
|
||||||
environment {
|
environment {
|
||||||
NODE_ENV = ""
|
|
||||||
TZ = 'Europe/Madrid'
|
TZ = 'Europe/Madrid'
|
||||||
}
|
}
|
||||||
parallel {
|
parallel {
|
||||||
stage('Backend') {
|
stage('Back') {
|
||||||
|
stages {
|
||||||
|
stage('Test') {
|
||||||
|
when {
|
||||||
|
expression { RUN_TESTS }
|
||||||
|
}
|
||||||
|
environment {
|
||||||
|
NODE_ENV = ''
|
||||||
|
}
|
||||||
steps {
|
steps {
|
||||||
sh 'npm run test:back:ci'
|
sh 'npm run test:back:ci'
|
||||||
}
|
}
|
||||||
|
post {
|
||||||
|
always {
|
||||||
|
script {
|
||||||
|
try {
|
||||||
|
junit 'junitresults.xml'
|
||||||
|
junit 'junit.xml'
|
||||||
|
} catch (e) {
|
||||||
|
echo e.toString()
|
||||||
}
|
}
|
||||||
stage('Frontend') {
|
|
||||||
steps {
|
|
||||||
sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=6'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage('Build') {
|
stage('Build') {
|
||||||
when {
|
when {
|
||||||
expression { return PROTECTED_BRANCH && FROM_GIT }
|
expression { RUN_BUILD }
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
def packageJson = readJSON file: 'package.json'
|
||||||
|
env.VERSION = packageJson.version
|
||||||
|
}
|
||||||
|
sh 'docker-compose build back'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Front') {
|
||||||
|
when {
|
||||||
|
expression { FROM_GIT }
|
||||||
|
}
|
||||||
|
stages {
|
||||||
|
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('Push') {
|
||||||
|
when {
|
||||||
|
expression { RUN_BUILD }
|
||||||
}
|
}
|
||||||
environment {
|
environment {
|
||||||
CREDENTIALS = credentials('docker-registry')
|
CREDENTIALS = credentials('docker-registry')
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
sh 'gulp build'
|
script {
|
||||||
dockerBuild()
|
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') {
|
stage('Deploy') {
|
||||||
when {
|
when {
|
||||||
expression { return PROTECTED_BRANCH }
|
expression { PROTECTED_BRANCH }
|
||||||
}
|
}
|
||||||
parallel {
|
parallel {
|
||||||
stage('Database') {
|
stage('Database') {
|
||||||
|
|
@ -136,12 +193,16 @@ pipeline {
|
||||||
}
|
}
|
||||||
stage('Docker') {
|
stage('Docker') {
|
||||||
when {
|
when {
|
||||||
expression { return FROM_GIT }
|
expression { FROM_GIT }
|
||||||
}
|
}
|
||||||
environment {
|
environment {
|
||||||
DOCKER_HOST = "${env.SWARM_HOST}"
|
DOCKER_HOST = "${env.SWARM_HOST}"
|
||||||
}
|
}
|
||||||
steps {
|
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}"
|
sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -149,21 +210,14 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
|
||||||
script {
|
|
||||||
if (RUN_TESTS) {
|
|
||||||
try {
|
|
||||||
junit 'junitresults.xml'
|
|
||||||
junit 'junit.xml'
|
|
||||||
} catch (e) {
|
|
||||||
echo e.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
success {
|
success {
|
||||||
script {
|
script {
|
||||||
if (env.BRANCH_NAME == 'master' && FROM_GIT) {
|
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
|
String message = env.GIT_COMMIT_MSG
|
||||||
int index = message.indexOf('\n')
|
int index = message.indexOf('\n')
|
||||||
if (index != -1)
|
if (index != -1)
|
||||||
|
|
@ -180,6 +234,7 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
unsuccessful {
|
unsuccessful {
|
||||||
|
setEnv()
|
||||||
sendEmail()
|
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();
|
||||||
116
back/tests.js
116
back/tests.js
|
|
@ -2,30 +2,21 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const Myt = require('@verdnatura/myt/myt');
|
const Myt = require('@verdnatura/myt/myt');
|
||||||
const Run = require('@verdnatura/myt/myt-run');
|
const Run = require('@verdnatura/myt/myt-run');
|
||||||
let dataSources = require('../loopback/server/datasources.json');
|
const helper = require('./tests-helper');
|
||||||
|
|
||||||
let server;
|
let server;
|
||||||
|
const isCI = process.argv[2] === 'ci';
|
||||||
|
const PARALLEL = false;
|
||||||
|
const TIMEOUT = 900000;
|
||||||
|
|
||||||
process.on('warning', warning => {
|
process.on('SIGINT', teardown);
|
||||||
console.log(warning.name);
|
process.on('exit', teardown);
|
||||||
console.log(warning.message);
|
process.on('uncaughtException', onError);
|
||||||
console.log(warning.stack);
|
process.on('unhandledRejection', onError);
|
||||||
});
|
|
||||||
|
|
||||||
process.on('SIGUSR2', rmServer);
|
async function setup() {
|
||||||
process.on('exit', rmServer);
|
|
||||||
|
|
||||||
async function rmServer() {
|
|
||||||
if (!server) return;
|
|
||||||
await server.rm();
|
|
||||||
server = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function test() {
|
|
||||||
console.log('Building and running DB container.');
|
console.log('Building and running DB container.');
|
||||||
|
|
||||||
const isCI = process.argv[2] === 'ci';
|
|
||||||
|
|
||||||
const myt = new Myt();
|
const myt = new Myt();
|
||||||
await myt.init({
|
await myt.init({
|
||||||
workspace: path.join(__dirname, '..'),
|
workspace: path.join(__dirname, '..'),
|
||||||
|
|
@ -36,32 +27,57 @@ async function test() {
|
||||||
});
|
});
|
||||||
server = await myt.run(Run);
|
server = await myt.run(Run);
|
||||||
await myt.deinit();
|
await myt.deinit();
|
||||||
|
|
||||||
const {dbConfig} = server;
|
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));
|
async function teardown() {
|
||||||
Object.assign(dataSources.vn, {
|
if (!server) return;
|
||||||
host: dbConfig.host,
|
|
||||||
port: dbConfig.port
|
|
||||||
});
|
|
||||||
|
|
||||||
const bootOptions = {dataSources};
|
if (!PARALLEL)
|
||||||
const app = require('vn-loopback/server/server');
|
await helper.deinit();
|
||||||
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();
|
|
||||||
|
|
||||||
console.log('Running tests.');
|
console.log('Stopping and removing DB container.');
|
||||||
|
await server.rm();
|
||||||
|
server = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onError(err) {
|
||||||
|
await teardown();
|
||||||
|
console.error(err);
|
||||||
|
}
|
||||||
|
|
||||||
|
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');
|
const Jasmine = require('jasmine');
|
||||||
const jasmine = new Jasmine();
|
runner = new Jasmine();
|
||||||
|
|
||||||
const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
|
const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
|
||||||
jasmine.addReporter(new SpecReporter({
|
runner.addReporter(new SpecReporter({
|
||||||
spec: {
|
spec: {
|
||||||
displaySuccessful: isCI,
|
displaySuccessful: isCI,
|
||||||
displayPending: isCI
|
displayPending: isCI
|
||||||
|
|
@ -70,35 +86,17 @@ async function test() {
|
||||||
displayPending: false,
|
displayPending: false,
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
if (isCI) {
|
if (isCI) {
|
||||||
const JunitReporter = require('jasmine-reporters');
|
const JunitReporter = require('jasmine-reporters');
|
||||||
jasmine.addReporter(new JunitReporter.JUnitXmlReporter());
|
runner.addReporter(new JunitReporter.JUnitXmlReporter());
|
||||||
|
runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = TIMEOUT;
|
||||||
jasmine.exitOnCompletion = true;
|
|
||||||
jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 900000;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const backSpecs = [
|
// runner.loadConfigFile('back/jasmine.json');
|
||||||
'./back/**/*[sS]pec.js',
|
runner.loadConfig(config);
|
||||||
'./loopback/**/*[sS]pec.js',
|
await runner.execute();
|
||||||
'./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');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
test();
|
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),
|
(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);
|
(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
|
VALUES
|
||||||
(1,7,2,'00-00-0000 00:00:00.000','nota1'),
|
(1,7,2,'00-00-0000 00:00:00.000','nota1'),
|
||||||
(2,10,6,'00-00-0000 00:00:00.000','nota2'),
|
(2,10,6,'00-00-0000 00:00:00.000','nota2'),
|
||||||
|
|
@ -73,9 +73,10 @@ INSERT INTO vn.cmr (id, truckPlate, observations, senderInstruccions, paymentIns
|
||||||
|
|
||||||
UPDATE `vn`.`claimRatio` SET `claimAmount` = '10' WHERE (`clientFk` = '1101');
|
UPDATE `vn`.`claimRatio` SET `claimAmount` = '10' WHERE (`clientFk` = '1101');
|
||||||
|
|
||||||
INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `warehouseAliasFk`, `isOwn`, `isAnyVolumeAllowed`) VALUES
|
INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
|
||||||
('Agencia', '1', '1', '1', '1'),
|
VALUES
|
||||||
('Otra agencia ', '1', '2', '0', '0');
|
('Agencia', '1', '1', '1'),
|
||||||
|
('Otra agencia ', '1', '0', '0');
|
||||||
|
|
||||||
INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
|
INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
|
||||||
('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),
|
('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),
|
||||||
|
|
|
||||||
|
|
@ -174,20 +174,15 @@ INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`,
|
||||||
(19,'Francia', 1, 'FR', 1, 27, 4, 0, 1),
|
(19,'Francia', 1, 'FR', 1, 27, 4, 0, 1),
|
||||||
(30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);
|
(30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);
|
||||||
|
|
||||||
INSERT INTO `vn`.`warehouseAlias`(`id`, `name`)
|
INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `countryFk`, `hasProduction`, `isOrigin`, `isDestiny`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Main Warehouse'),
|
(1, 'Warehouse One', 'ALG', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
|
||||||
(2, 'Gotham');
|
(2, 'Warehouse Two', NULL, 1, 1, 1, 1, 0, 1, 13, 1, 1, 0),
|
||||||
|
(3, 'Warehouse Three', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0),
|
||||||
INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `aliasFk`, `countryFk`, `hasProduction`)
|
(4, 'Warehouse Four', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1),
|
||||||
VALUES
|
(5, 'Warehouse Five', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0),
|
||||||
(1, 'Warehouse One', 'ALG', 1, 1, 1, 1, 1, 1, 2, 1, 1),
|
(13, 'Inventory', 'inv', 1, 1, 1, 0, 0, 0, 1, 0, 0, 0),
|
||||||
(2, 'Warehouse Two', NULL, 1, 1, 1, 1, 0, 1, 2, 13, 1),
|
(60, 'Algemesi', NULL, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0);
|
||||||
(3, 'Warehouse Three', NULL, 1, 1, 1, 1, 0, 0, 2, 1, 1),
|
|
||||||
(4, 'Warehouse Four', NULL, 1, 1, 1, 1, 0, 0, 2, 1, 1),
|
|
||||||
(5, 'Warehouse Five', NULL, 1, 1, 1, 1, 0, 0, 2, 1, 1),
|
|
||||||
(13, 'Inventory', 'inv', 1, 1, 1, 0, 0, 0, 2, 1, 0),
|
|
||||||
(60, 'Algemesi', NULL, 1, 1, 1, 0, 0, 0, 2, 1, 0);
|
|
||||||
|
|
||||||
INSERT INTO `vn`.`sectorType` (id,description)
|
INSERT INTO `vn`.`sectorType` (id,description)
|
||||||
VALUES (1,'First type');
|
VALUES (1,'First type');
|
||||||
|
|
@ -271,18 +266,18 @@ INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
|
||||||
(3, 'PICKUP', 'Recogida'),
|
(3, 'PICKUP', 'Recogida'),
|
||||||
(4, 'OTHER', 'Otros');
|
(4, 'OTHER', 'Otros');
|
||||||
|
|
||||||
INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`, `warehouseAliasFk`)
|
INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'inhouse pickup' , 1, 1),
|
(1, 'inhouse pickup' , 1),
|
||||||
(2, 'Super-Man delivery' , 1, 1),
|
(2, 'Super-Man delivery' , 1),
|
||||||
(3, 'Teleportation device' , 1, 1),
|
(3, 'Teleportation device' , 1),
|
||||||
(4, 'Entanglement' , 1, 1),
|
(4, 'Entanglement' , 1),
|
||||||
(5, 'Quantum break device' , 1, 1),
|
(5, 'Quantum break device' , 1),
|
||||||
(6, 'Walking' , 1, 1),
|
(6, 'Walking' , 1),
|
||||||
(7, 'Gotham247' , 1, 1),
|
(7, 'Gotham247' , 1),
|
||||||
(8, 'Gotham247Expensive' , 1, 1),
|
(8, 'Gotham247Expensive' , 1),
|
||||||
(9, 'Refund' , 1, 1),
|
(9, 'Refund' , 1),
|
||||||
(10, 'Other agency' , 1, 1);
|
(10, 'Other agency' , 1);
|
||||||
|
|
||||||
UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup';
|
UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup';
|
||||||
UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery';
|
UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery';
|
||||||
|
|
@ -569,13 +564,13 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`)
|
||||||
|
|
||||||
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
|
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
|
(1, 'PLANTS SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
|
||||||
(2, 'Farmer King', 'The farmer', 4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM', 2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
|
(2, 'FARMER KING', 'The farmer', 4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM', 2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
|
||||||
(69, 'Packaging', 'Packaging nick', 4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD', 3, 46600, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
|
(69, 'PACKAGING', 'Packaging nick', 4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD', 3, 46600, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
|
||||||
(442, 'Verdnatura Levante SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
|
(442, 'VERDNATURA LEVANTE SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
|
||||||
(567, 'Holland', 'Holland nick', 4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD', 3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
|
(567, 'HOLLAND', 'Holland nick', 4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD', 3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
|
||||||
(791, 'Bros SL', 'Bros nick', 5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD', 3, 46600, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
|
(791, 'BROS SL', 'Bros nick', 5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD', 3, 46600, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
|
||||||
(1381, 'Ornamentales', 'Ornamentales', 7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V');
|
(1381, 'ORNAMENTALES', 'Ornamentales', 7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V');
|
||||||
|
|
||||||
INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
|
INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
|
||||||
VALUES
|
VALUES
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ BEGIN
|
||||||
LEFT JOIN vn.deliveryMethod dm ON dm.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.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
|
||||||
LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
|
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;
|
WHERE bt.fecha >= vLastMonth AND r.mercancia;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -20,16 +20,16 @@ BEGIN
|
||||||
c.movil,
|
c.movil,
|
||||||
c.POBLACION poblacion,
|
c.POBLACION poblacion,
|
||||||
p.`name` provincia,
|
p.`name` provincia,
|
||||||
vn2008.red(f.futur) futur,
|
ROUND(f.futur, 2) futur,
|
||||||
c.Credito credito,
|
c.Credito credito,
|
||||||
pm.`name` forma_pago,
|
pm.`name` forma_pago,
|
||||||
vn2008.red(c365 / 12) consumo_medio365,
|
ROUND(c365 / 12, 2) consumo_medio365,
|
||||||
vn2008.red(c365) consumo365,
|
ROUND(c365, 2) consumo365,
|
||||||
vn2008.red(CmLy.peso) peso_mes_año_pasado,
|
ROUND(CmLy.peso, 2) peso_mes_año_pasado,
|
||||||
vn2008.red(CmLy.peso * 1.19) objetivo,
|
ROUND(CmLy.peso * 1.19, 2) objetivo,
|
||||||
tr.CodigoTrabajador,
|
tr.CodigoTrabajador,
|
||||||
vn2008.red(mes_actual.consumo) consumoMes,
|
ROUND(mes_actual.consumo, 2) consumoMes,
|
||||||
vn2008.red(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0)) como_lo_llevo,
|
ROUND(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0), 2) como_lo_llevo,
|
||||||
DATE(LastTicket) ultimo_ticket,
|
DATE(LastTicket) ultimo_ticket,
|
||||||
dead.muerto,
|
dead.muerto,
|
||||||
g.Greuge,
|
g.Greuge,
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,8 @@ proc: BEGIN
|
||||||
DECLARE vReserveDate DATETIME;
|
DECLARE vReserveDate DATETIME;
|
||||||
DECLARE vParams CHAR(100);
|
DECLARE vParams CHAR(100);
|
||||||
DECLARE vInventoryDate DATE;
|
DECLARE vInventoryDate DATE;
|
||||||
DECLARE vIsLogifloraDay BOOLEAN;
|
DECLARE vLifeScope DATE;
|
||||||
|
DECLARE vWarehouseFkInventory INT;
|
||||||
|
|
||||||
DECLARE EXIT HANDLER FOR SQLEXCEPTION
|
DECLARE EXIT HANDLER FOR SQLEXCEPTION
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
@ -26,43 +27,42 @@ proc: BEGIN
|
||||||
LEAVE proc;
|
LEAVE proc;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
-- Invoca al procedimiento que genera el stock virtual de Logiflora, si coincide con la peticion de refresco del disponible
|
|
||||||
IF vn.isLogifloraDay(vDated, vWarehouse) THEN
|
|
||||||
-- CALL edi.floramondo_offerRefresh;
|
|
||||||
SET vIsLogifloraDay = TRUE;
|
|
||||||
ELSE
|
|
||||||
SET vIsLogifloraDay = FALSE;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
-- Calcula algunos parámetros necesarios
|
-- Calcula algunos parámetros necesarios
|
||||||
SET vStartDate = TIMESTAMP(vDated, '00:00:00');
|
SET vStartDate = TIMESTAMP(vDated, '00:00:00');
|
||||||
SELECT inventoried INTO vInventoryDate FROM vn.config;
|
SELECT inventoried INTO vInventoryDate FROM vn.config;
|
||||||
|
SELECT DATE_SUB(vStartDate, INTERVAL MAX(life) DAY) INTO vLifeScope FROM vn.itemType;
|
||||||
SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vReserveDate
|
SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vReserveDate
|
||||||
FROM hedera.orderConfig;
|
FROM hedera.orderConfig;
|
||||||
|
|
||||||
|
SELECT w.id INTO vWarehouseFkInventory
|
||||||
|
FROM vn.warehouse w
|
||||||
|
WHERE w.code = 'inv';
|
||||||
|
|
||||||
-- Calcula el ultimo dia de vida para cada producto
|
-- Calcula el ultimo dia de vida para cada producto
|
||||||
DROP TEMPORARY TABLE IF EXISTS itemRange;
|
DROP TEMPORARY TABLE IF EXISTS itemRange;
|
||||||
CREATE TEMPORARY TABLE itemRange
|
CREATE TEMPORARY TABLE itemRange
|
||||||
(PRIMARY KEY (itemFk))
|
(PRIMARY KEY (itemFk))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT c.itemFk,
|
SELECT i.id itemFk,
|
||||||
IF(it.life IS NULL,
|
util.dayEnd(DATE_ADD(c.maxLanded, INTERVAL it.life DAY)) ended, it.life
|
||||||
NULL,
|
FROM vn.item i
|
||||||
TIMESTAMP(TIMESTAMPADD(DAY, it.life, c.landing), '23:59:59')) ended
|
LEFT JOIN (
|
||||||
FROM (
|
SELECT b.itemFk, MAX(t.landed) maxLanded
|
||||||
SELECT b.itemFk, MAX(t.landed) landing
|
|
||||||
FROM vn.buy b
|
FROM vn.buy b
|
||||||
JOIN vn.entry e ON b.entryFk = e.id
|
JOIN vn.entry e ON b.entryFk = e.id
|
||||||
JOIN vn.travel t ON t.id = e.travelFk
|
JOIN vn.travel t ON t.id = e.travelFk
|
||||||
JOIN vn.warehouse w ON w.id = t.warehouseInFk
|
JOIN vn.warehouse w ON w.id = t.warehouseInFk
|
||||||
WHERE t.landed BETWEEN vInventoryDate AND vStartDate
|
JOIN vn.item i ON i.id = b.itemFk
|
||||||
|
JOIN vn.itemType it ON it.id = i.typeFk
|
||||||
|
WHERE t.landed BETWEEN vLifeScope AND vStartDate
|
||||||
AND t.warehouseInFk = vWarehouse
|
AND t.warehouseInFk = vWarehouse
|
||||||
|
AND t.warehouseOutFk <> vWarehouseFkInventory
|
||||||
|
AND it.life
|
||||||
AND NOT e.isExcludedFromAvailable
|
AND NOT e.isExcludedFromAvailable
|
||||||
GROUP BY b.itemFk
|
GROUP BY b.itemFk
|
||||||
) c
|
) c ON i.id = c.itemFk
|
||||||
JOIN vn.item i ON i.id = c.itemFk
|
|
||||||
JOIN vn.itemType it ON it.id = i.typeFk
|
JOIN vn.itemType it ON it.id = i.typeFk
|
||||||
HAVING ended >= vStartDate OR ended IS NULL;
|
HAVING ended >= vStartDate OR life IS NULL;
|
||||||
|
|
||||||
-- Calcula el ATP
|
-- Calcula el ATP
|
||||||
DELETE FROM available WHERE calc_id = vCalc;
|
DELETE FROM available WHERE calc_id = vCalc;
|
||||||
|
|
@ -86,7 +86,7 @@ proc: BEGIN
|
||||||
WHERE i.landed >= vStartDate
|
WHERE i.landed >= vStartDate
|
||||||
AND (ir.ended IS NULL OR i.landed <= ir.ended)
|
AND (ir.ended IS NULL OR i.landed <= ir.ended)
|
||||||
AND i.warehouseInFk = vWarehouse
|
AND i.warehouseInFk = vWarehouse
|
||||||
AND (ISNULL(wf.entryFk) OR vIsLogifloraDay)
|
AND ISNULL(wf.entryFk)
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT i.itemFk, i.shipped, i.quantity
|
SELECT i.itemFk, i.shipped, i.quantity
|
||||||
FROM vn.itemEntryOut i
|
FROM vn.itemEntryOut i
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ proc:BEGIN
|
||||||
DECLARE vHasItemGroup BOOL;
|
DECLARE vHasItemGroup BOOL;
|
||||||
DECLARE vDescription VARCHAR(255);
|
DECLARE vDescription VARCHAR(255);
|
||||||
DECLARE vSaleFk INT;
|
DECLARE vSaleFk INT;
|
||||||
|
DECLARE vDefaultEntry INT;
|
||||||
|
|
||||||
-- Carga los datos necesarios del EKT
|
-- 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),
|
SELECT e.ref, qty, package, putOrderFk MOD 1000000, i2.id , NOT ISNULL(eea.addressFk), NOT ISNULL(igto.group_code),
|
||||||
|
|
@ -42,6 +43,9 @@ proc:BEGIN
|
||||||
LEAVE proc;
|
LEAVE proc;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
SELECT defaultEntry INTO vDefaultEntry
|
||||||
|
FROM vn.entryConfig;
|
||||||
|
|
||||||
-- Asigna la entrada
|
-- Asigna la entrada
|
||||||
SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
|
SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
|
||||||
|
|
||||||
|
|
@ -100,10 +104,9 @@ proc:BEGIN
|
||||||
LEFT JOIN ekt l ON l.ref = e.ref
|
LEFT JOIN ekt l ON l.ref = e.ref
|
||||||
LEFT JOIN vn.buy b ON b.ektFk = l.id
|
LEFT JOIN vn.buy b ON b.ektFk = l.id
|
||||||
LEFT JOIN vn.item i ON i.id = b.itemFk
|
LEFT JOIN vn.item i ON i.id = b.itemFk
|
||||||
JOIN vn2008.config cfg
|
|
||||||
WHERE e.id = vSelf
|
WHERE e.id = vSelf
|
||||||
AND l.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.s1, l.s1 = e.s1, TRUE)
|
||||||
AND IF(t.s2, l.s2 = e.s2, TRUE)
|
AND IF(t.s2, l.s2 = e.s2, TRUE)
|
||||||
AND IF(t.s3, l.s3 = e.s3, TRUE)
|
AND IF(t.s3, l.s3 = e.s3, TRUE)
|
||||||
|
|
@ -142,7 +145,7 @@ proc:BEGIN
|
||||||
SELECT vEntryFk,
|
SELECT vEntryFk,
|
||||||
vSelf,
|
vSelf,
|
||||||
(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
|
(@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,
|
e.qty stickers,
|
||||||
@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing,
|
@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing,
|
||||||
IFNULL(b.`grouping`, e.pac),
|
IFNULL(b.`grouping`, e.pac),
|
||||||
|
|
@ -154,7 +157,6 @@ proc:BEGIN
|
||||||
LEFT JOIN vn.buy b ON b.id = vBuy
|
LEFT JOIN vn.buy b ON b.id = vBuy
|
||||||
LEFT JOIN vn.item i ON i.id = b.itemFk
|
LEFT JOIN vn.item i ON i.id = b.itemFk
|
||||||
LEFT JOIN vn.supplier s ON e.pro = s.id
|
LEFT JOIN vn.supplier s ON e.pro = s.id
|
||||||
JOIN vn2008.config cfg
|
|
||||||
WHERE e.id = vSelf
|
WHERE e.id = vSelf
|
||||||
LIMIT 1;
|
LIMIT 1;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_scan`(vBarcode VARCHAR(512))
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_scan`(vBarcode VARCHAR(512))
|
||||||
BEGIN
|
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.
|
* y las devuelve.
|
||||||
* Ver https://wiki.verdnatura.es/index.php/Ekt#Algoritmos_de_lectura
|
* Ver https://wiki.verdnatura.es/index.php/Ekt#Algoritmos_de_lectura
|
||||||
*
|
*
|
||||||
|
|
@ -73,7 +73,7 @@ BEGIN
|
||||||
INSERT INTO tmp.ekt
|
INSERT INTO tmp.ekt
|
||||||
SELECT id
|
SELECT id
|
||||||
FROM ekt
|
FROM ekt
|
||||||
WHERE fec = vFec
|
WHERE fec >= vFec - INTERVAL 1 DAY
|
||||||
AND ((
|
AND ((
|
||||||
vKlo = vDefaultKlo
|
vKlo = vDefaultKlo
|
||||||
AND (klo = vKlo OR klo IS NULL OR klo = 0)
|
AND (klo = vKlo OR klo IS NULL OR klo = 0)
|
||||||
|
|
@ -82,7 +82,7 @@ BEGIN
|
||||||
AND auction = vAuction
|
AND auction = vAuction
|
||||||
AND agj = vShortAgj)
|
AND agj = vShortAgj)
|
||||||
)
|
)
|
||||||
ORDER BY agj DESC
|
ORDER BY agj DESC, fec DESC
|
||||||
LIMIT 1;
|
LIMIT 1;
|
||||||
|
|
||||||
SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
|
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;
|
WHERE b.id = vSelf;
|
||||||
|
|
||||||
END IF;
|
END IF;
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
||||||
|
SELECT vSelf id;
|
||||||
|
CALL buy_checkItem();
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
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
|
FROM vn.expeditionTruck
|
||||||
WHERE eta < v3Month;
|
WHERE eta < v3Month;
|
||||||
|
|
||||||
|
DELETE FROM XDiario WHERE FECHA < v3Month OR FECHA IS NULL;
|
||||||
-- borrar travels sin entradas
|
-- borrar travels sin entradas
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
|
DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
|
||||||
CREATE TEMPORARY TABLE tmp.thermographToDelete
|
CREATE TEMPORARY TABLE tmp.thermographToDelete
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ BEGIN
|
||||||
|
|
||||||
IF vCounter > 0 OR vASIEN > 0 THEN
|
IF vCounter > 0 OR vASIEN > 0 THEN
|
||||||
|
|
||||||
UPDATE vn2008.XDiario x
|
UPDATE vn.XDiario x
|
||||||
JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
|
JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
|
||||||
SET x.ASIEN = vASIEN;
|
SET x.ASIEN = vASIEN;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,79 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`fustControl`(vFromDated DATE, vToDated DATE)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE vSijsnerClientFk INT DEFAULT 19752;
|
|
||||||
|
|
||||||
DECLARE vDateStart DATETIME;
|
|
||||||
DECLARE vDateEnd DATETIME;
|
|
||||||
|
|
||||||
SET vDateStart = vFromDated;
|
|
||||||
SET vDateEnd = util.Dayend(vToDated);
|
|
||||||
|
|
||||||
SELECT p.id FustCode,
|
|
||||||
CAST(sent.stucks AS DECIMAL(10,0)) FH,
|
|
||||||
CAST(tp.stucks AS DECIMAL(10,0)) Tickets,
|
|
||||||
CAST(-sj.stucks AS DECIMAL(10,0)) Sijsner,
|
|
||||||
CAST(IFNULL(sent.stucks,0) - IFNULL(tp.stucks,0) + IFNULL(sj.stucks,0) AS DECIMAL(10,0)) saldo
|
|
||||||
FROM vn.packaging p
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT FustCode, sum(fustQuantity) stucks
|
|
||||||
FROM (
|
|
||||||
SELECT IFNULL(pe.equivalentFk ,b.packagingFk) FustCode, s.quantity / b.packing AS fustQuantity
|
|
||||||
FROM vn.sale s
|
|
||||||
JOIN vn.ticket t ON t.id = s.ticketFk
|
|
||||||
JOIN vn.warehouse w ON w.id = t.warehouseFk
|
|
||||||
JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
|
|
||||||
JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk
|
|
||||||
JOIN vn.buy b ON b.id = lb.buy_id
|
|
||||||
JOIN vn.packaging p ON p.id = b.packagingFk
|
|
||||||
LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
|
|
||||||
JOIN vn.address a ON a.id = t.addressFk
|
|
||||||
JOIN vn.province p2 ON p2.id = a.provinceFk
|
|
||||||
JOIN vn.country c ON c.id = p2.countryFk
|
|
||||||
WHERE t.shipped BETWEEN vDateStart AND vDateEnd
|
|
||||||
AND wa.name = 'VNH'
|
|
||||||
AND p.isPackageReturnable
|
|
||||||
AND c.country = 'FRANCIA') sub
|
|
||||||
GROUP BY FustCode) sent ON sent.FustCode = p.id
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT FustCode, sum(quantity) stucks
|
|
||||||
FROM (
|
|
||||||
SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
|
|
||||||
FROM vn.ticketPackaging tp
|
|
||||||
JOIN vn.ticket t ON t.id = tp.ticketFk
|
|
||||||
JOIN vn.warehouse w ON w.id = t.warehouseFk
|
|
||||||
JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
|
|
||||||
JOIN vn.packaging p ON p.id = tp.packagingFk
|
|
||||||
LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
|
|
||||||
JOIN vn.address a ON a.id = t.addressFk
|
|
||||||
JOIN vn.province p2 ON p2.id = a.provinceFk
|
|
||||||
JOIN vn.country c ON c.id = p2.countryFk
|
|
||||||
WHERE t.shipped BETWEEN vDateStart AND vDateEnd
|
|
||||||
AND wa.name = 'VNH'
|
|
||||||
AND p.isPackageReturnable
|
|
||||||
AND c.country = 'FRANCIA'
|
|
||||||
AND t.clientFk != vSijsnerClientFk
|
|
||||||
AND tp.quantity > 0) sub
|
|
||||||
GROUP BY FustCode) tp ON tp.FustCode = p.id
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT FustCode, sum(quantity) stucks
|
|
||||||
FROM (
|
|
||||||
SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
|
|
||||||
FROM vn.ticketPackaging tp
|
|
||||||
JOIN vn.ticket t ON t.id = tp.ticketFk
|
|
||||||
JOIN vn.warehouse w ON w.id = t.warehouseFk
|
|
||||||
JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
|
|
||||||
JOIN vn.packaging p ON p.id = tp.packagingFk
|
|
||||||
LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
|
|
||||||
WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, 1, vDateStart ) AND TIMESTAMPADD(DAY, 1, vDateEnd )
|
|
||||||
AND wa.name = 'VNH'
|
|
||||||
AND p.isPackageReturnable
|
|
||||||
AND t.clientFk = vSijsnerClientFk) sub
|
|
||||||
GROUP BY FustCode) sj ON sj.FustCode = p.id
|
|
||||||
WHERE sent.stucks
|
|
||||||
OR tp.stucks
|
|
||||||
OR sj.stucks;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`fustControlDetail`(vFromDated DATE, vToDated DATE)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE vSijsnerClientFk INT DEFAULT 19752;
|
|
||||||
|
|
||||||
DECLARE vDateStart DATETIME;
|
|
||||||
DECLARE vDateEnd DATETIME;
|
|
||||||
|
|
||||||
SET vDateStart = vFromDated;
|
|
||||||
SET vDateEnd = util.Dayend(vToDated);
|
|
||||||
|
|
||||||
SELECT a.nickname shopName,
|
|
||||||
a.city ,
|
|
||||||
IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode,
|
|
||||||
tp.quantity,
|
|
||||||
tp.ticketFk,
|
|
||||||
CONCAT('From ', vFromDated,' to ', vToDated) AS dateRange
|
|
||||||
FROM vn.ticketPackaging tp
|
|
||||||
JOIN vn.ticket t ON t.id = tp.ticketFk
|
|
||||||
JOIN vn.warehouse w ON w.id = t.warehouseFk
|
|
||||||
JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk
|
|
||||||
JOIN vn.packaging p ON p.id = tp.packagingFk
|
|
||||||
LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
|
|
||||||
JOIN vn.address a ON a.id = t.addressFk
|
|
||||||
JOIN vn.province p2 ON p2.id = a.provinceFk
|
|
||||||
JOIN vn.country c ON c.id = p2.countryFk
|
|
||||||
WHERE t.shipped BETWEEN vFromDated AND util.dayend(vToDated)
|
|
||||||
AND wa.name = 'VNH'
|
|
||||||
AND p.isPackageReturnable
|
|
||||||
AND c.country = 'FRANCIA'
|
|
||||||
AND t.clientFk != vSijsnerClientFk
|
|
||||||
AND tp.quantity > 0;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -0,0 +1,234 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Traslada la info de contabilidad relacionada con las facturas recibidas
|
||||||
|
*
|
||||||
|
* @vInvoiceInFk Factura recibida
|
||||||
|
* @vXDiarioFk Id tabla XDiario
|
||||||
|
*/
|
||||||
|
DECLARE vInvoiceInOriginalFk INT;
|
||||||
|
DECLARE vDone BOOL DEFAULT FALSE;
|
||||||
|
DECLARE vBase DOUBLE;
|
||||||
|
DECLARE vVat DOUBLE;
|
||||||
|
DECLARE vRate DOUBLE;
|
||||||
|
DECLARE vTransactionCode INT;
|
||||||
|
DECLARE vCounter INT DEFAULT 0;
|
||||||
|
DECLARE vTransactionCodeOld INT;
|
||||||
|
DECLARE vTaxCode INT;
|
||||||
|
DECLARE vTaxCodeOld INT;
|
||||||
|
DECLARE vOperationCode VARCHAR(1);
|
||||||
|
DECLARE vIsIntracommunity BOOL DEFAULT FALSE;
|
||||||
|
DECLARE vSerialDua VARCHAR(1) DEFAULT 'D';
|
||||||
|
DECLARE vInvoiceTypeReceived VARCHAR(1);
|
||||||
|
DECLARE vInvoiceTypeInformative VARCHAR(1);
|
||||||
|
DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
|
||||||
|
|
||||||
|
DECLARE vCursor CURSOR FOR
|
||||||
|
SELECT it.taxableBase,
|
||||||
|
CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
|
||||||
|
t.PorcentajeIva,
|
||||||
|
it.transactionTypeSageFk,
|
||||||
|
it.taxTypeSageFk,
|
||||||
|
tty.isIntracommunity,
|
||||||
|
tt.ClaveOperacionDefecto
|
||||||
|
FROM vn.invoiceIn i
|
||||||
|
JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
|
||||||
|
JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
|
||||||
|
JOIN taxType tty ON tty.id = t.CodigoIva
|
||||||
|
JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
|
||||||
|
LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
|
||||||
|
WHERE i.id = vInvoiceInFk
|
||||||
|
AND d.id IS NULL;
|
||||||
|
|
||||||
|
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
|
||||||
|
|
||||||
|
DELETE FROM movContaIVA
|
||||||
|
WHERE id = vXDiarioFk;
|
||||||
|
|
||||||
|
SELECT codeSage INTO vInvoiceTypeReceived
|
||||||
|
FROM invoiceType WHERE code ='received';
|
||||||
|
|
||||||
|
SELECT codeSage INTO vInvoiceTypeInformative
|
||||||
|
FROM invoiceType WHERE code ='informative';
|
||||||
|
|
||||||
|
INSERT INTO movContaIVA(id, LibreA1)
|
||||||
|
VALUES (vXDiarioFk, vInvoiceInFk);
|
||||||
|
|
||||||
|
OPEN vCursor;
|
||||||
|
|
||||||
|
l: LOOP
|
||||||
|
FETCH vCursor INTO vBase,
|
||||||
|
vVat,
|
||||||
|
vRate,
|
||||||
|
vTransactionCode,
|
||||||
|
vTaxCode,
|
||||||
|
vIsIntracommunity,
|
||||||
|
vOperationCode;
|
||||||
|
|
||||||
|
IF vDone THEN
|
||||||
|
LEAVE l;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
SET vTransactionCodeOld = vTransactionCode;
|
||||||
|
SET vTaxCodeOld = vTaxCode;
|
||||||
|
|
||||||
|
IF vOperationCode IS NOT NULL THEN
|
||||||
|
UPDATE movContaIVA
|
||||||
|
SET ClaveOperacionFactura = vOperationCode
|
||||||
|
WHERE id = vXDiarioFk;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
SET vCounter = vCounter + 1;
|
||||||
|
CASE vCounter
|
||||||
|
WHEN 1 THEN
|
||||||
|
UPDATE movContaIVA
|
||||||
|
SET BaseIva1 = vBase,
|
||||||
|
PorIva1 = vRate,
|
||||||
|
CuotaIva1 = vVat,
|
||||||
|
CodigoTransaccion1 = vTransactionCode,
|
||||||
|
CodigoIva1 = vTaxCode
|
||||||
|
WHERE id = vXDiarioFk;
|
||||||
|
|
||||||
|
WHEN 2 THEN
|
||||||
|
UPDATE movContaIVA
|
||||||
|
SET BaseIva2 = vBase,
|
||||||
|
PorIva2 = vRate,
|
||||||
|
CuotaIva2 = vVat,
|
||||||
|
CodigoTransaccion2 = vTransactionCode,
|
||||||
|
CodigoIva2 = vTaxCode
|
||||||
|
WHERE id = vXDiarioFk;
|
||||||
|
WHEN 3 THEN
|
||||||
|
UPDATE movContaIVA
|
||||||
|
SET BaseIva3 = vBase,
|
||||||
|
PorIva3 = vRate,
|
||||||
|
CuotaIva3 = vVat,
|
||||||
|
CodigoTransaccion3 = vTransactionCode,
|
||||||
|
CodigoIva3 = vTaxCode
|
||||||
|
WHERE id = vXDiarioFk;
|
||||||
|
WHEN 4 THEN
|
||||||
|
UPDATE movContaIVA
|
||||||
|
SET BaseIva4 = vBase,
|
||||||
|
PorIva4 = vRate,
|
||||||
|
CuotaIva4 = vVat,
|
||||||
|
CodigoTransaccion4 = vTransactionCode,
|
||||||
|
CodigoIva4 = vTaxCode
|
||||||
|
WHERE id = vXDiarioFk;
|
||||||
|
ELSE
|
||||||
|
SELECT vXDiarioFk INTO vXDiarioFk;
|
||||||
|
END CASE;
|
||||||
|
|
||||||
|
IF vIsIntracommunity THEN
|
||||||
|
UPDATE movContaIVA
|
||||||
|
SET Intracomunitaria = TRUE
|
||||||
|
WHERE id = vXDiarioFk;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
SET vTransactionCodeOld = vTransactionCode;
|
||||||
|
SET vTaxCodeOld = vTaxCode;
|
||||||
|
|
||||||
|
END LOOP;
|
||||||
|
|
||||||
|
CLOSE vCursor;
|
||||||
|
|
||||||
|
SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
|
||||||
|
FROM vn.dua d
|
||||||
|
LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
|
||||||
|
AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
|
||||||
|
WHERE d.ASIEN = (
|
||||||
|
SELECT ASIEN
|
||||||
|
FROM vn.XDiario
|
||||||
|
WHERE id = vXDiarioFk)
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
UPDATE movContaIVA mci
|
||||||
|
JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
|
||||||
|
JOIN vn.XDiario x ON x.id = mci.id
|
||||||
|
LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
|
||||||
|
JOIN vn.supplier s ON s.id = ii.supplierFk
|
||||||
|
JOIN Naciones n ON n.countryFk = s.countryFk
|
||||||
|
SET mci.CodigoDivisa = ii.currencyFk,
|
||||||
|
mci.Año = YEAR(ii.issued),
|
||||||
|
mci.Serie = ii.serial,
|
||||||
|
mci.Factura = ii.id,
|
||||||
|
mci.FechaFactura = ii.issued,
|
||||||
|
mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
|
||||||
|
IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
|
||||||
|
IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
|
||||||
|
IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
|
||||||
|
mci.TipoFactura = IF(id.id,
|
||||||
|
IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
|
||||||
|
IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
|
||||||
|
mci.CodigoCuentaFactura = x.SUBCTA,
|
||||||
|
mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
|
||||||
|
mci.Nombre = s.name,
|
||||||
|
mci.SiglaNacion = n.SiglaNacion,
|
||||||
|
mci.EjercicioFactura = YEAR(ii.issued),
|
||||||
|
mci.FechaOperacion = ii.issued,
|
||||||
|
mci.MantenerAsiento = TRUE,
|
||||||
|
mci.SuFacturaNo = ii.supplierRef,
|
||||||
|
mci.IvaDeducible1 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva1, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
|
||||||
|
mci.IvaDeducible2 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva2, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
|
||||||
|
mci.IvaDeducible3 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva3, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
|
||||||
|
mci.IvaDeducible4 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva4, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
|
||||||
|
mci.FechaFacturaOriginal = x.FECHA_EX
|
||||||
|
WHERE mci.id = vXDiarioFk;
|
||||||
|
|
||||||
|
-- RETENCIONES
|
||||||
|
UPDATE movContaIVA mci
|
||||||
|
JOIN vn.invoiceIn ii ON ii.id = vInvoiceInFk
|
||||||
|
JOIN vn.XDiario x ON x.id = mci.id
|
||||||
|
JOIN vn.supplier s ON s.id = supplierFk
|
||||||
|
JOIN vn.invoiceInTax iit ON iit.invoiceInFk = ii.id
|
||||||
|
JOIN vn.expense e ON e.id = iit.expenseFk
|
||||||
|
JOIN TiposRetencion t ON t.CodigoRetencion = ii.withholdingSageFk
|
||||||
|
LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
|
||||||
|
JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
|
||||||
|
FROM vn.XDiario x1
|
||||||
|
JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
|
||||||
|
WHERE x2.BASEEURO <> 0
|
||||||
|
AND x1.id = vXDiarioFk
|
||||||
|
)sub
|
||||||
|
JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
|
||||||
|
SET mci.CodigoRetencion = t.CodigoRetencion,
|
||||||
|
mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
|
||||||
|
mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
|
||||||
|
mci.PorRetencion = t.PorcentajeRetencion,
|
||||||
|
mci.ImporteRetencion = iit.taxableBase * - 1
|
||||||
|
WHERE mci.id = vXDiarioFk
|
||||||
|
AND e.name = 'Retenciones'
|
||||||
|
AND id.id IS NULL;
|
||||||
|
|
||||||
|
SELECT correctedFk INTO vInvoiceInOriginalFk
|
||||||
|
FROM vn.invoiceInCorrection
|
||||||
|
WHERE correctingFk = vInvoiceInFk;
|
||||||
|
|
||||||
|
IF vInvoiceInOriginalFk THEN
|
||||||
|
|
||||||
|
UPDATE movContaIVA mci
|
||||||
|
JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
|
||||||
|
JOIN (SELECT issued,
|
||||||
|
SUM(sub.taxableBase) taxableBase,
|
||||||
|
SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
|
||||||
|
FROM(SELECT issued,
|
||||||
|
SUM(iit.taxableBase) taxableBase,
|
||||||
|
ti.PorcentajeIva
|
||||||
|
FROM vn.invoiceIn i
|
||||||
|
JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
|
||||||
|
JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
|
||||||
|
WHERE i.id = vInvoiceInOriginalFk
|
||||||
|
GROUP BY ti.CodigoIva)sub
|
||||||
|
)invoiceInOriginal
|
||||||
|
JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
|
||||||
|
SET mci.TipoRectificativa = iir.refundCategoryFk,
|
||||||
|
mci.ClaseAbonoRectificativas = iir.refundType,
|
||||||
|
mci.FechaFacturaOriginal = invoiceInOriginal.issued,
|
||||||
|
mci.FechaOperacion = invoiceInOriginal.issued,
|
||||||
|
mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
|
||||||
|
mci.CuotaIvaOriginal = invoiceInOriginal.vat,
|
||||||
|
mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
|
||||||
|
WHERE mci.id = vXDiarioFk;
|
||||||
|
|
||||||
|
END IF;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
|
@ -8,16 +8,9 @@ BEGIN
|
||||||
* @param vItemFk Identificador de vn.item
|
* @param vItemFk Identificador de vn.item
|
||||||
* @param vSectorFk Identificador de vn.sector
|
* @param vSectorFk Identificador de vn.sector
|
||||||
*/
|
*/
|
||||||
DECLARE vWarehouseAliasFk INT;
|
|
||||||
|
|
||||||
SELECT w.aliasFk INTO vWarehouseAliasFk
|
|
||||||
FROM vn.sector s
|
|
||||||
JOIN vn.warehouse w ON w.id = s.warehouseFk
|
|
||||||
WHERE s.id = vSectorFk;
|
|
||||||
|
|
||||||
SELECT ish.shelvingFk shelving,
|
SELECT ish.shelvingFk shelving,
|
||||||
p.code parking,
|
p.code parking,
|
||||||
sum(ish.visible) as stockTotal,
|
SUM(ish.visible) stockTotal,
|
||||||
ish.created,
|
ish.created,
|
||||||
p.pickingOrder
|
p.pickingOrder
|
||||||
FROM vn.itemShelving ish
|
FROM vn.itemShelving ish
|
||||||
|
|
@ -25,10 +18,12 @@ BEGIN
|
||||||
JOIN vn.parking p ON p.id = sh.parkingFk
|
JOIN vn.parking p ON p.id = sh.parkingFk
|
||||||
JOIN vn.sector sc ON sc.id = p.sectorFk
|
JOIN vn.sector sc ON sc.id = p.sectorFk
|
||||||
JOIN vn.warehouse w ON w.id = sc.warehouseFk
|
JOIN vn.warehouse w ON w.id = sc.warehouseFk
|
||||||
WHERE w.aliasFk = vWarehouseAliasFk
|
WHERE sc.id = vSectorFk
|
||||||
AND ish.visible > 0
|
AND ish.visible > 0
|
||||||
AND ish.itemFk = vItemFk
|
AND ish.itemFk = vItemFk
|
||||||
GROUP BY ish.id
|
GROUP BY ish.id
|
||||||
ORDER BY (sc.id = vSectorFk) DESC, sh.priority DESC, ish.created, p.pickingOrder;
|
ORDER BY sh.priority DESC,
|
||||||
|
ish.created,
|
||||||
|
p.pickingOrder;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
@ -1,7 +1,13 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(vSectorFk INT)
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(
|
||||||
|
vSectorFk INT
|
||||||
|
)
|
||||||
proc:BEGIN
|
proc:BEGIN
|
||||||
|
/**
|
||||||
|
* Calcula la información detallada respecto un sector.
|
||||||
|
*
|
||||||
|
* @param vSectorFk Id de sector
|
||||||
|
*/
|
||||||
DECLARE vCalcVisibleFk INT;
|
DECLARE vCalcVisibleFk INT;
|
||||||
DECLARE vCalcAvailableFk INT;
|
DECLARE vCalcAvailableFk INT;
|
||||||
DECLARE hasFatherSector BOOLEAN;
|
DECLARE hasFatherSector BOOLEAN;
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,8 @@ BEGIN
|
||||||
DECLARE vAgencyModeFk INT;
|
DECLARE vAgencyModeFk INT;
|
||||||
DECLARE vNewPrice DECIMAL(10,2);
|
DECLARE vNewPrice DECIMAL(10,2);
|
||||||
DECLARE vOldPrice DECIMAL(10,2);
|
DECLARE vOldPrice DECIMAL(10,2);
|
||||||
DECLARE vOption INT DEFAULT NULL;
|
DECLARE vOption VARCHAR(255);
|
||||||
DECLARE vNewSaleFk INT;
|
DECLARE vNewSaleFk INT;
|
||||||
DECLARE vChangePrice INT DEFAULT 1;
|
|
||||||
DECLARE vBuyerDiscount INT DEFAULT 4;
|
|
||||||
DECLARE vManaDiscount INT DEFAULT 3;
|
|
||||||
DECLARE vForceToGrouping INT DEFAULT 1;
|
DECLARE vForceToGrouping INT DEFAULT 1;
|
||||||
DECLARE vForceToPacking INT DEFAULT 2;
|
DECLARE vForceToPacking INT DEFAULT 2;
|
||||||
DECLARE vFinalPrice DECIMAL(10,2);
|
DECLARE vFinalPrice DECIMAL(10,2);
|
||||||
|
|
@ -85,16 +82,13 @@ BEGIN
|
||||||
IF vNewPrice IS NULL THEN
|
IF vNewPrice IS NULL THEN
|
||||||
CALL util.throw('price retrieval failed');
|
CALL util.throw('price retrieval failed');
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
IF vNewPrice > vOldPrice THEN
|
IF vNewPrice > vOldPrice THEN
|
||||||
SET vFinalPrice = vOldPrice;
|
SET vFinalPrice = vOldPrice;
|
||||||
IF worker_isInDepartment('vt') THEN
|
SET vOption = 'substitution';
|
||||||
SET vOption = vManaDiscount;
|
|
||||||
ELSE
|
|
||||||
SET vOption = vBuyerDiscount;
|
|
||||||
END IF;
|
|
||||||
ELSE
|
ELSE
|
||||||
SET vFinalPrice = vNewPrice;
|
SET vFinalPrice = vNewPrice;
|
||||||
SET vOption = vChangePrice;
|
SET vOption = 'renewPrices';
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
START TRANSACTION;
|
START TRANSACTION;
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ BEGIN
|
||||||
CALL util.throw('ASSIGN_ZONE_FIRST');
|
CALL util.throw('ASSIGN_ZONE_FIRST');
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SET vCanChangeState = (
|
SET vCanChangeState = ((
|
||||||
vStateCode <> 'ON_CHECKING' OR
|
vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR
|
||||||
vticketAlertLevel < vPackedAlertLevel
|
vticketAlertLevel < vPackedAlertLevel
|
||||||
)AND NOT (
|
)AND NOT (
|
||||||
vTicketStateCode IN ('CHECKED', 'CHECKING')
|
vTicketStateCode IN ('CHECKED', 'CHECKING')
|
||||||
|
|
@ -51,5 +51,6 @@ BEGIN
|
||||||
ELSE
|
ELSE
|
||||||
CALL util.throw('INCORRECT_TICKET_STATE');
|
CALL util.throw('INCORRECT_TICKET_STATE');
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -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 ;
|
||||||
|
|
@ -64,5 +64,12 @@ trig:BEGIN
|
||||||
IF NEW.quantity < 0 THEN
|
IF NEW.quantity < 0 THEN
|
||||||
SET NEW.isIgnored = TRUE;
|
SET NEW.isIgnored = TRUE;
|
||||||
END IF;
|
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$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -13,5 +13,15 @@ BEGIN
|
||||||
CALL travel_requestRecalc(OLD.travelFk);
|
CALL travel_requestRecalc(OLD.travelFk);
|
||||||
CALL travel_requestRecalc(NEW.travelFk);
|
CALL travel_requestRecalc(NEW.travelFk);
|
||||||
END IF;
|
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$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -10,5 +10,18 @@ BEGIN
|
||||||
SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
|
SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
|
||||||
WHERE travelFk = NEW.id;
|
WHERE travelFk = NEW.id;
|
||||||
END IF;
|
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$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -4,15 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_beforeUpdate`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NEW.editorFk = account.myUser_getId();
|
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)
|
IF NOT (NEW.landed <=> OLD.landed)
|
||||||
OR NOT (NEW.shipped <=> OLD.shipped) THEN
|
OR NOT (NEW.shipped <=> OLD.shipped) THEN
|
||||||
CALL travel_checkDates(NEW.shipped, NEW.landed);
|
CALL travel_checkDates(NEW.shipped, NEW.landed);
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`warehouse_afterUpdate`
|
|
||||||
AFTER UPDATE ON `warehouse`
|
|
||||||
FOR EACH ROW
|
|
||||||
BEGIN
|
|
||||||
IF NEW.isFeedStock IS TRUE AND OLD.isFeedStock IS FALSE THEN
|
|
||||||
INSERT IGNORE INTO warehouseAlias(`name`) VALUES(NEW.`name`);
|
|
||||||
INSERT IGNORE INTO warehouseJoined(warehouseFk, warehouseAliasFk)
|
|
||||||
VALUES(NEW.id,LAST_INSERT_ID());
|
|
||||||
END IF;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||||
SQL SECURITY DEFINER
|
SQL SECURITY DEFINER
|
||||||
VIEW `vn`.`itemShelvingAvailable`
|
VIEW `vn`.`itemShelvingAvailable`
|
||||||
AS SELECT `s`.`id` AS `saleFk`,
|
AS SELECT `s`.`id` `saleFk`,
|
||||||
`tst`.`updated` AS `Modificado`,
|
`tst`.`updated` AS `Modificado`,
|
||||||
`s`.`ticketFk` AS `ticketFk`,
|
`s`.`ticketFk` AS `ticketFk`,
|
||||||
0 AS `isPicked`,
|
0 AS `isPicked`,
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,15 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||||
SQL SECURITY DEFINER
|
SQL SECURITY DEFINER
|
||||||
VIEW `vn`.`ticketStateToday`
|
VIEW `vn`.`ticketStateToday`
|
||||||
AS SELECT `ts`.`ticketFk` AS `ticket`,
|
AS SELECT
|
||||||
|
`ts`.`ticketFk` AS `ticketFk`,
|
||||||
`ts`.`state` AS `state`,
|
`ts`.`state` AS `state`,
|
||||||
`ts`.`productionOrder` AS `productionOrder`,
|
`ts`.`productionOrder` AS `productionOrder`,
|
||||||
`ts`.`alertLevel` AS `alertLevel`,
|
`ts`.`alertLevel` AS `alertLevel`,
|
||||||
`ts`.`userFk` AS `worker`,
|
`ts`.`userFk` AS `userFk`,
|
||||||
`ts`.`code` AS `code`,
|
`ts`.`code` AS `code`,
|
||||||
`ts`.`updated` AS `updated`,
|
`ts`.`updated` AS `updated`,
|
||||||
`ts`.`isPicked` AS `isPicked`
|
`ts`.`isPicked` AS `isPicked`
|
||||||
FROM (
|
FROM `ticketState` `ts`
|
||||||
`vn`.`ticketState` `ts`
|
JOIN `ticket` `t` ON `t`.`id` = `ts`.`ticketFk`
|
||||||
JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
|
WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`());
|
||||||
)
|
|
||||||
WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn`.`warehouseJoined`
|
|
||||||
AS SELECT `wj`.`warehouse_id` AS `warehouseFk`,
|
|
||||||
`wj`.`warehouse_alias_id` AS `warehouseAliasFk`
|
|
||||||
FROM `vn2008`.`warehouse_joined` `wj`
|
|
||||||
|
|
@ -9,12 +9,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||||
lhp.m3,
|
lhp.m3,
|
||||||
dl.minSpeed
|
dl.minSpeed
|
||||||
FROM ticket t
|
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 state s ON s.id = tst.state
|
||||||
JOIN saleVolume sv ON sv.ticketFk = t.id
|
JOIN saleVolume sv ON sv.ticketFk = t.id
|
||||||
LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
|
LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
|
||||||
JOIN warehouse w ON w.id = t.warehouseFk
|
JOIN warehouse w ON w.id = t.warehouseFk
|
||||||
JOIN warehouseAlias wa ON wa.id = w.aliasFk
|
|
||||||
STRAIGHT_JOIN `zone` z ON z.id = t.zoneFk
|
STRAIGHT_JOIN `zone` z ON z.id = t.zoneFk
|
||||||
LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
|
LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
|
||||||
AND zc.dated = util.VN_CURDATE()
|
AND zc.dated = util.VN_CURDATE()
|
||||||
|
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn2008`.`red`(intCANTIDAD DOUBLE)
|
|
||||||
RETURNS double
|
|
||||||
DETERMINISTIC
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE n DOUBLE;
|
|
||||||
|
|
||||||
SET n = SIGN(intCANTIDAD) * TRUNCATE( (ABS(intCANTIDAD) * 100) + 0.5001 ,0) /100 ;
|
|
||||||
|
|
||||||
RETURN n;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -7,19 +7,19 @@ BEGIN
|
||||||
group_concat(CONCAT(' Asiento: ', ASIEN, '- importe:', quadre) SEPARATOR ' \r\n ')
|
group_concat(CONCAT(' Asiento: ', ASIEN, '- importe:', quadre) SEPARATOR ' \r\n ')
|
||||||
FROM (
|
FROM (
|
||||||
SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) quadre
|
SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) quadre
|
||||||
FROM XDiario
|
FROM vn.XDiario
|
||||||
WHERE enlazado = FALSE
|
WHERE enlazado = FALSE
|
||||||
GROUP BY ASIEN
|
GROUP BY ASIEN
|
||||||
HAVING ABS(SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0))) > 0.01
|
HAVING ABS(SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0))) > 0.01
|
||||||
) t
|
) t
|
||||||
HAVING count(*) > 0;
|
HAVING count(*) > 0;
|
||||||
|
|
||||||
UPDATE XDiario XD
|
UPDATE vn.XDiario XD
|
||||||
INNER JOIN(
|
INNER JOIN(
|
||||||
SELECT XD.id, SUBCTA, Quadre FROM XDiario XD
|
SELECT XD.id, SUBCTA, Quadre FROM vn.XDiario XD
|
||||||
INNER JOIN (
|
INNER JOIN (
|
||||||
SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) as Quadre
|
SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) as Quadre
|
||||||
FROM XDiario
|
FROM vn.XDiario
|
||||||
WHERE enlazado = FALSE
|
WHERE enlazado = FALSE
|
||||||
GROUP BY ASIEN
|
GROUP BY ASIEN
|
||||||
HAVING Quadre != 0
|
HAVING Quadre != 0
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ proc: BEGIN
|
||||||
DELETE FROM cdr WHERE calldate < vDate18;
|
DELETE FROM cdr WHERE calldate < vDate18;
|
||||||
DELETE FROM Monitoring WHERE ODBC_TIME < vDate;
|
DELETE FROM Monitoring WHERE ODBC_TIME < vDate;
|
||||||
DELETE FROM Conteo WHERE Fecha < 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 mail WHERE DATE_ODBC < vDate;
|
||||||
DELETE FROM expeditions_deleted WHERE odbc_date < vDate26;
|
DELETE FROM expeditions_deleted WHERE odbc_date < vDate26;
|
||||||
DELETE FROM Movimientos_mark WHERE odbc_date < vDate;
|
DELETE FROM Movimientos_mark WHERE odbc_date < vDate;
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ BEGIN
|
||||||
FROM Clientes
|
FROM Clientes
|
||||||
WHERE Id_Cliente = idCLI;
|
WHERE Id_Cliente = idCLI;
|
||||||
CALL vn.ledger_next(max_asien);
|
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
|
SELECT max_asien,datFEC,SUBCTA,CONTRA,strCONCEPTO,EURODEBE,EUROHABER,idEMP
|
||||||
FROM(SELECT cuenta_banco SUBCTA, cuenta_cliente CONTRA, 0 EURODEBE, dblIMPORTE EUROHABER
|
FROM(SELECT cuenta_banco SUBCTA, cuenta_cliente CONTRA, 0 EURODEBE, dblIMPORTE EUROHABER
|
||||||
UNION ALL
|
UNION ALL
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ BEGIN
|
||||||
stock.available
|
stock.available
|
||||||
FROM vn2008.Tickets t
|
FROM vn2008.Tickets t
|
||||||
JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
|
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.Movimientos m ON m.Id_Ticket = t.Id_Ticket
|
||||||
JOIN vn2008.Articles i ON i.Id_Article = m.Id_Article
|
JOIN vn2008.Articles i ON i.Id_Article = m.Id_Article
|
||||||
JOIN vn2008.Tipos tp ON tp.tipo_id = i.tipo_id
|
JOIN vn2008.Tipos tp ON tp.tipo_id = i.tipo_id
|
||||||
|
|
@ -88,8 +88,8 @@ BEGIN
|
||||||
FROM vn2008.Compres c
|
FROM vn2008.Compres c
|
||||||
JOIN vn2008.Entradas e ON e.Id_Entrada = c.Id_Entrada
|
JOIN vn2008.Entradas e ON e.Id_Entrada = c.Id_Entrada
|
||||||
JOIN vn2008.travel tr ON tr.id = e.travel_id
|
JOIN vn2008.travel tr ON tr.id = e.travel_id
|
||||||
JOIN vn2008.warehouse whi ON whi.id = tr.warehouse_id
|
JOIN vn.warehouse whi ON whi.id = tr.warehouse_id
|
||||||
JOIN vn2008.warehouse who ON who.id = tr.warehouse_id_out
|
JOIN vn.warehouse who ON who.id = tr.warehouse_id_out
|
||||||
JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
|
JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
|
||||||
JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
|
JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
|
||||||
JOIN vn.confectionType ct ON ct.id = tp.confeccion
|
JOIN vn.confectionType ct ON ct.id = tp.confeccion
|
||||||
|
|
|
||||||
|
|
@ -1,82 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`desglose_volume`(IN vAgencyFk INT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE vStarted DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE());
|
|
||||||
DECLARE vEnded DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE(), '23:59:59');
|
|
||||||
DECLARE vIsHolland BOOL;
|
|
||||||
|
|
||||||
SELECT (wa.name = 'Holanda') INTO vIsHolland
|
|
||||||
FROM vn.agency a
|
|
||||||
JOIN vn.warehouseAlias wa ON wa.id = a.warehouseAliasFk
|
|
||||||
WHERE a.id = vAgencyFk;
|
|
||||||
|
|
||||||
IF vIsHolland THEN
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
|
|
||||||
CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
|
|
||||||
(
|
|
||||||
ticketFk INT PRIMARY KEY
|
|
||||||
,carros DECIMAL(5,1) DEFAULT 0
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, carros)
|
|
||||||
SELECT sv.ticketFk, ROUND(vc.dutchCompressionRate * sum(sv.volume) / vc.trolleyM3,0)
|
|
||||||
FROM vn.ticket t
|
|
||||||
JOIN vn.saleVolume sv ON sv.ticketFk = t.id
|
|
||||||
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
|
|
||||||
JOIN vn.volumeConfig vc
|
|
||||||
WHERE t.shipped BETWEEN vStarted AND vEnded
|
|
||||||
AND am.agencyFk = vAgencyFk
|
|
||||||
GROUP BY t.id;
|
|
||||||
|
|
||||||
SELECT a.nickname Provincia,
|
|
||||||
count(*) expediciones,
|
|
||||||
0 Bultos,
|
|
||||||
sum(tpe.carros) Prevision
|
|
||||||
FROM vn.ticket t
|
|
||||||
JOIN vn.address a ON a.id = t.addressFk
|
|
||||||
JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
|
|
||||||
GROUP BY a.nickname;
|
|
||||||
|
|
||||||
ELSE
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
|
|
||||||
CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
|
|
||||||
(
|
|
||||||
ticketFk INT PRIMARY KEY
|
|
||||||
,boxes INT DEFAULT 0
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, boxes)
|
|
||||||
SELECT sv.ticketFk, CEIL(1000 * sum(sv.volume) / vc.standardFlowerBox)
|
|
||||||
FROM vn.ticket t
|
|
||||||
JOIN vn.saleVolume sv ON sv.ticketFk = t.id
|
|
||||||
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
|
|
||||||
JOIN vn.volumeConfig vc
|
|
||||||
WHERE t.shipped BETWEEN vStarted AND vEnded
|
|
||||||
AND IFNULL(t.packages,0) = 0
|
|
||||||
AND am.agencyFk = vAgencyFk
|
|
||||||
GROUP BY t.id;
|
|
||||||
|
|
||||||
|
|
||||||
SELECT p.name Provincia,
|
|
||||||
count(*) expediciones,
|
|
||||||
sum(t.packages) Bultos,
|
|
||||||
sum(tpe.boxes) Prevision
|
|
||||||
FROM vn.ticket t
|
|
||||||
JOIN vn.address a ON a.id = t.addressFk
|
|
||||||
JOIN vn.province p ON a.provinceFk = p.id
|
|
||||||
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
|
|
||||||
JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
|
|
||||||
WHERE t.warehouseFk = 60
|
|
||||||
AND t.shipped BETWEEN vStarted AND vEnded
|
|
||||||
AND am.agencyFk = vAgencyFk
|
|
||||||
GROUP BY p.name;
|
|
||||||
|
|
||||||
END IF;
|
|
||||||
SELECT * FROM tmp.ticket_PackagingEstimated;
|
|
||||||
DROP TEMPORARY TABLE tmp.ticket_PackagingEstimated;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -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 ;
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn2008`.`Articles_botanical`
|
|
||||||
AS SELECT `ab`.`itemFk` AS `Id_Article`,
|
|
||||||
`ab`.`genusFk` AS `genus_id`,
|
|
||||||
`ab`.`specieFk` AS `specie_id`
|
|
||||||
FROM `vn`.`itemBotanical` `ab`
|
|
||||||
|
|
@ -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`
|
||||||
|
|
@ -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,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`
|
||||||
|
|
@ -4,7 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||||
AS SELECT `a`.`id` AS `agency_id`,
|
AS SELECT `a`.`id` AS `agency_id`,
|
||||||
`a`.`name` AS `name`,
|
`a`.`name` AS `name`,
|
||||||
`a`.`warehouseFk` AS `warehouse_id`,
|
`a`.`warehouseFk` AS `warehouse_id`,
|
||||||
`a`.`warehouseAliasFk` AS `warehouse_alias_id`,
|
|
||||||
`a`.`isOwn` AS `propios`,
|
`a`.`isOwn` AS `propios`,
|
||||||
`a`.`workCenterFk` AS `workCenterFk`
|
`a`.`workCenterFk` AS `workCenterFk`
|
||||||
FROM `vn`.`agency` `a`
|
FROM `vn`.`agency` `a`
|
||||||
|
|
|
||||||
|
|
@ -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`
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn2008`.`bionic_updating_options`
|
|
||||||
AS SELECT `t`.`id` AS `buo_id`,
|
|
||||||
`t`.`description` AS `description`
|
|
||||||
FROM `vn`.`ticketUpdateAction` `t`
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn2008`.`businessReasonEnd`
|
|
||||||
AS SELECT `b`.`id` AS `id`,
|
|
||||||
`b`.`reason` AS `reason`
|
|
||||||
FROM `vn`.`businessReasonEnd` `b`
|
|
||||||
|
|
@ -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`
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn2008`.`cl_dev`
|
|
||||||
AS SELECT `c`.`id` AS `id`,
|
|
||||||
`c`.`description` AS `devolucion`
|
|
||||||
FROM `vn`.`claimRedelivery` `c`
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `vn2008`.`cl_est`
|
|
||||||
AS SELECT `c`.`id` AS `id`,
|
|
||||||
`c`.`description` AS `estado`,
|
|
||||||
`c`.`roleFk` AS `roleFk`
|
|
||||||
FROM `vn`.`claimState` `c`
|
|
||||||
|
|
@ -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`
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue