Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus

2024-02-06 10:09:11 +01:00 · 2024-02-06 10:09:11 +01:00 · 318f74072e
parent 6002c6cd7a 3c140266f4
commit 318f74072e
180 changed files with 19150 additions and 54207 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,299 +5,349 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [2408.01] - 2024-02-22
+
+### Added
+
+### Changed
+
+### Fixed
+
 ## [2406.01] - 2024-02-08

 ### Added
-### Changed
-### Fixed

+### Changed
+
+### Fixed

 ## [2404.01] - 2024-01-25

 ### Added
-### Changed
-### Fixed

+### Changed
+
+### Fixed

 ## [2402.01] - 2024-01-11

 ### Added
+
 ### Changed
+
 ### Fixed

 ## [2400.01] - 2024-01-04

 ### Added
+
 ### Changed
+
 ### Fixed

 ## [2350.01] - 2023-12-14

 ### Características Añadidas 🆕
- **Tickets → Expediciones:** Añadido soporte para Viaexpress

+-   **Tickets → Expediciones:** Añadido soporte para Viaexpress

 ## [2348.01] - 2023-11-30

 ### Características Añadidas 🆕
- **Tickets → Adelantar:** Permite mover lineas sin generar negativos
- **Tickets → Adelantar:** Permite modificar la fecha de los tickets
- **Trabajadores → Notificaciones:** Nueva sección (lilium)
+
+-   **Tickets → Adelantar:** Permite mover lineas sin generar negativos
+-   **Tickets → Adelantar:** Permite modificar la fecha de los tickets
+-   **Trabajadores → Notificaciones:** Nueva sección (lilium)

 ### Correcciones 🛠️
- **Tickets → RocketChat:** Arreglada detección de cambios

+-   **Tickets → RocketChat:** Arreglada detección de cambios

 ## [2346.01] - 2023-11-16

 ### Added
-### Changed
-### Fixed

+### Changed
+
+### Fixed

 ## [2342.01] - 2023-11-02

 ### Added
- (Usuarios -> Foto) Se muestra la foto del trabajador
-### Fixed
- (Usuarios -> Historial) Abre el descriptor del usuario correctamente

+-   (Usuarios -> Foto) Se muestra la foto del trabajador
+
+### Fixed
+
+-   (Usuarios -> Historial) Abre el descriptor del usuario correctamente

 ## [2340.01] - 2023-10-05

 ## [2338.01] - 2023-09-21

 ### Added
- (Ticket -> Servicios) Se pueden abonar servicios
- (Facturas -> Datos básicos) Muestra valores por defecto
- (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
+
+-   (Ticket -> Servicios) Se pueden abonar servicios
+-   (Facturas -> Datos básicos) Muestra valores por defecto
+-   (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
+
 ### Changed
- (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia
+
+-   (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia

 ## [2336.01] - 2023-09-07

 ## [2334.01] - 2023-08-24

 ### Added
- (General -> Errores) Botón para enviar cau con los datos del error

+-   (General -> Errores) Botón para enviar cau con los datos del error

 ## [2332.01] - 2023-08-10

 ### Added
- (Trabajadores -> Gestión documental) Soporte para Docuware
- (General -> Agencia) Soporte para Viaexpress
- (Tickets -> SMS) Nueva sección en Lilium
+
+-   (Trabajadores -> Gestión documental) Soporte para Docuware
+-   (General -> Agencia) Soporte para Viaexpress
+-   (Tickets -> SMS) Nueva sección en Lilium

 ### Changed
- (General -> Tickets) Devuelve el motivo por el cual no es editable
- (Desplegables -> Trabajadores) Mejorados
- (General -> Clientes) Razón social y dirección en mayúsculas
+
+-   (General -> Tickets) Devuelve el motivo por el cual no es editable
+-   (Desplegables -> Trabajadores) Mejorados
+-   (General -> Clientes) Razón social y dirección en mayúsculas

 ### Fixed
- (Clientes -> SMS) Al pasar el ratón por encima muestra el mensaje completo

+-   (Clientes -> SMS) Al pasar el ratón por encima muestra el mensaje completo

 ## [2330.01] - 2023-07-27

 ### Added
- (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
- (Rutas -> Troncales) Nueva sección
- (Tickets -> Opciones) Opción establecer peso
- (Clientes -> SMS) Nueva sección
+
+-   (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
+-   (Rutas -> Troncales) Nueva sección
+-   (Tickets -> Opciones) Opción establecer peso
+-   (Clientes -> SMS) Nueva sección

 ### Changed
- (General -> Iconos) Añadidos nuevos iconos
- (Clientes -> Razón social) Permite crear clientes con la misma razón social según el país

+-   (General -> Iconos) Añadidos nuevos iconos
+-   (Clientes -> Razón social) Permite crear clientes con la misma razón social según el país

 ## [2328.01] - 2023-07-13

 ### Added
- (Clientes -> Morosos) Añadida columna "es trabajador"
- (Trabajadores -> Departamentos) Nueva sección
- (Trabajadores -> Departamentos) Añadido listado de Trabajadores por departamento
- (Trabajadores -> Departamentos) Añadido características de departamento e información
+
+-   (Clientes -> Morosos) Añadida columna "es trabajador"
+-   (Trabajadores -> Departamentos) Nueva sección
+-   (Trabajadores -> Departamentos) Añadido listado de Trabajadores por departamento
+-   (Trabajadores -> Departamentos) Añadido características de departamento e información

 ### Changed

 ### Fixed
- (Trabajadores -> Departamentos) Arreglado búscador

+-   (Trabajadores -> Departamentos) Arreglado búscador

 ## [2326.01] - 2023-06-29

 ### Added
- (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas
- (General -> Históricos) Botón para ver el estado del registro en cada punto
- (General -> Históricos) Al filtar por registro se muestra todo el histórial desde que fue creado
- (Tickets -> Índice) Permite enviar varios albaranes a Docuware
+
+-   (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas
+-   (General -> Históricos) Botón para ver el estado del registro en cada punto
+-   (General -> Históricos) Al filtar por registro se muestra todo el histórial desde que fue creado
+-   (Tickets -> Índice) Permite enviar varios albaranes a Docuware

 ### Changed
- (General -> Históricos) Los registros se muestran agrupados por usuario y entidad
- (Facturas -> Facturación global) Optimizada, generación de PDFs y notificaciones en paralelo
+
+-   (General -> Históricos) Los registros se muestran agrupados por usuario y entidad
+-   (Facturas -> Facturación global) Optimizada, generación de PDFs y notificaciones en paralelo

 ### Fixed
- (General -> Históricos) Duplicidades eliminadas
- (Facturas -> Facturación global) Solucionados fallos que paran el proceso
+
+-   (General -> Históricos) Duplicidades eliminadas
+-   (Facturas -> Facturación global) Solucionados fallos que paran el proceso

 ## [2324.01] - 2023-06-15

 ### Added
- (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
- (General -> Desplegables) Mejorada eficiencia de carga de datos
- (General -> Históricos) Ahora, ademas de los ids, se muestra la descripión de los atributos
- (General -> Históricos) Botón para hacer más ágil mostrar sólo los cambios en un registro
- (General -> Históricos) Filtro por cambios
+
+-   (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
+-   (General -> Desplegables) Mejorada eficiencia de carga de datos
+-   (General -> Históricos) Ahora, ademas de los ids, se muestra la descripión de los atributos
+-   (General -> Históricos) Botón para hacer más ágil mostrar sólo los cambios en un registro
+-   (General -> Históricos) Filtro por cambios

 ### Changed
- (General -> Permisos) Mejorada seguridad
- (General -> Históricos) Elementos de la interfaz reorganizados para hacerla más ágil e intuitiva
+
+-   (General -> Permisos) Mejorada seguridad
+-   (General -> Históricos) Elementos de la interfaz reorganizados para hacerla más ágil e intuitiva

 ### Fixed
+
 -

-
-
 ## [2322.01] - 2023-06-01

 ### Added
- (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
+
+-   (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
+-   (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
+-   (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago

 ### Changed
- (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
- (Tickets -> Expediciones) Interfaz mejorada y contador añadido
+
+-   (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
+-   (Tickets -> Expediciones) Interfaz mejorada y contador añadido
+
 ### Fixed
- (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
- (Tickets -> Cambiar estado) Ahora muestra la lista completa de todos los estados
-

+-   (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
+-   (Tickets -> Cambiar estado) Ahora muestra la lista completa de todos los estados

 ## [2320.01] - 2023-05-25

 ### Added
- (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente

+-   (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente

 ### Changed
- (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
+
+-   (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'

 ### Fixed
+
 -

-
-
 ## [2318.01] - 2023-05-08

 ### Added
- (Usuarios -> Histórico) Nueva sección
- (Roles -> Histórico) Nueva sección
- (Trabajadores -> Dar de alta) Permite elegir el método de pago
+
+-   (Usuarios -> Histórico) Nueva sección
+-   (Roles -> Histórico) Nueva sección
+-   (Trabajadores -> Dar de alta) Permite elegir el método de pago

 ### Changed
- (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
+
+-   (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
+-   (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban

 ### Fixed
- (Ticket -> Boxing) Arreglado selección de horas
- (Cesta -> Índice) Optimizada búsqueda
-

+-   (Ticket -> Boxing) Arreglado selección de horas
+-   (Cesta -> Índice) Optimizada búsqueda

 ## [2314.01] - 2023-04-20

 ### Added
- (Clientes -> Morosos) Ahora se puede filtrar por las columnas "Desde" y "Fecha Ú. O.". También se envia un email al comercial cuando se añade una nota.
- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
- (Facturas recibidas -> Bases negativas) Nueva sección
+
+-   (Clientes -> Morosos) Ahora se puede filtrar por las columnas "Desde" y "Fecha Ú. O.". También se envia un email al comercial cuando se añade una nota.
+-   (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
+-   (Facturas recibidas -> Bases negativas) Nueva sección

 ### Fixed
- (Clientes -> Morosos) Ahora se mantienen los elementos seleccionados al hacer sroll.
+
+-   (Clientes -> Morosos) Ahora se mantienen los elementos seleccionados al hacer sroll.

 ## [2312.01] - 2023-04-06

 ### Added
- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
+
+-   (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia

 ### Changed
- (Monitor tickets) Cuando se filtra por 'Pendiente' ya no muestra los estados de 'Previa'
- (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe.
- (Envíos -> Índice) Cambiado el buscador superior por uno lateral
+
+-   (Monitor tickets) Cuando se filtra por 'Pendiente' ya no muestra los estados de 'Previa'
+-   (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe.
+-   (Envíos -> Índice) Cambiado el buscador superior por uno lateral

 ## [2310.01] - 2023-03-23

 ### Added
- (Trabajadores -> Control de horario) Ahora se puede confirmar/no confirmar el registro horario de cada semana desde esta sección
+
+-   (Trabajadores -> Control de horario) Ahora se puede confirmar/no confirmar el registro horario de cada semana desde esta sección

 ### Fixed
- (Clientes -> Listado extendido) Resuelto error al filtrar por clientes inactivos desde la columna "Activo"
- (General) Al pasar el ratón por encima del icono de "Borrar" en un campo, se hacía más grande afectando a la interfaz
+
+-   (Clientes -> Listado extendido) Resuelto error al filtrar por clientes inactivos desde la columna "Activo"
+-   (General) Al pasar el ratón por encima del icono de "Borrar" en un campo, se hacía más grande afectando a la interfaz

 ## [2308.01] - 2023-03-09

 ### Added
- (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
- (Trabajador -> PDA) Nueva sección
+
+-   (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
+-   (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
+-   (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
+-   (Trabajador -> PDA) Nueva sección

 ### Changed
- (Ticket -> Borrar ticket) Restringido el borrado de tickets con abono
+
+-   (Ticket -> Borrar ticket) Restringido el borrado de tickets con abono

 ## [2306.01] - 2023-02-23

 ### Added
- (Tickets -> Datos Básicos) Mensaje de confirmación al intentar generar tickets con negativos
- (Artículos) El visible y disponible se calcula a partir de un almacén diferente dependiendo de la sección en la que te encuentres. Se ha añadido un icono que informa sobre a partir de que almacén se esta calculando.
+
+-   (Tickets -> Datos Básicos) Mensaje de confirmación al intentar generar tickets con negativos
+-   (Artículos) El visible y disponible se calcula a partir de un almacén diferente dependiendo de la sección en la que te encuentres. Se ha añadido un icono que informa sobre a partir de que almacén se esta calculando.

 ### Changed
- (General -> Inicio) Ahora permite recuperar la contraseña tanto con el correo de recuperación como el usuario
+
+-   (General -> Inicio) Ahora permite recuperar la contraseña tanto con el correo de recuperación como el usuario

 ### Fixed
- (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
- (Zone -> Días de entrega) Al hacer click en un día, muestra correctamente las zonas
- (Artículos) El disponible en la vista previa se muestra correctamente
+
+-   (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
+-   (Zone -> Días de entrega) Al hacer click en un día, muestra correctamente las zonas
+-   (Artículos) El disponible en la vista previa se muestra correctamente

 ## [2304.01] - 2023-02-09

 ### Added
- (Rutas) Al descargar varias facturas se comprime en un zip
- (Trabajadores -> Nuevo trabajador)  Nueva sección
- (Tickets -> Adelantar tickets) Añadidos campos "líneas" y "litros" al ticket origen
- (Tickets -> Adelantar tickets) Nuevo icono muestra cuando las agencias de los tickets origen/destino son distintas
+
+-   (Rutas) Al descargar varias facturas se comprime en un zip
+-   (Trabajadores -> Nuevo trabajador) Nueva sección
+-   (Tickets -> Adelantar tickets) Añadidos campos "líneas" y "litros" al ticket origen
+-   (Tickets -> Adelantar tickets) Nuevo icono muestra cuando las agencias de los tickets origen/destino son distintas

 ### Changed
- (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
- (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
- (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
- (Proveedores -> Crear/Editar) Permite añadir Proveedores con la misma razón social pero con países distintos
- (Tickets -> Adelantar tickets) Cambiados selectores de estado por checks "Pendiente origen/destino"
- (Tickets -> Adelantar tickets) Cambiado stock de destino a origen.
+
+-   (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
+-   (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
+-   (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
+-   (Proveedores -> Crear/Editar) Permite añadir Proveedores con la misma razón social pero con países distintos
+-   (Tickets -> Adelantar tickets) Cambiados selectores de estado por checks "Pendiente origen/destino"
+-   (Tickets -> Adelantar tickets) Cambiado stock de destino a origen.

 ### Fixed
- (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
- (Cliente -> Datos Fiscales) No se permite seleccionar 'Notificar vía e-mail' a los clientes sin e-mail
- (Tickets -> Datos básicos) Permite guardar la hora de envío
- (Tickets -> Añadir pago) Eliminado "null" en las referencias
- (Tickets -> Adelantar tickets) Permite ordenar por importe
- (Tickets -> Adelantar tickets) El filtrado por encajado muestra también los tickets sin tipo de encajado
+
+-   (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
+-   (Cliente -> Datos Fiscales) No se permite seleccionar 'Notificar vía e-mail' a los clientes sin e-mail
+-   (Tickets -> Datos básicos) Permite guardar la hora de envío
+-   (Tickets -> Añadir pago) Eliminado "null" en las referencias
+-   (Tickets -> Adelantar tickets) Permite ordenar por importe
+-   (Tickets -> Adelantar tickets) El filtrado por encajado muestra también los tickets sin tipo de encajado

 ## [2302.01] - 2023-01-26

 ### Added
- (General -> Inicio) Permite recuperar la contraseña
- (Tickets -> Opciones) Subir albarán a Docuware
- (Tickets -> Opciones) Enviar correo con PDF de Docuware
- (Artículos -> Datos Básicos) Añadido campo Unidades/Caja
+
+-   (General -> Inicio) Permite recuperar la contraseña
+-   (Tickets -> Opciones) Subir albarán a Docuware
+-   (Tickets -> Opciones) Enviar correo con PDF de Docuware
+-   (Artículos -> Datos Básicos) Añadido campo Unidades/Caja

 ### Changed
- (Reclamaciones -> Descriptor) Cambiado el campo Agencia por Zona
- (Tickets -> Líneas preparadas) Actualizada sección para que sea más visual
+
+-   (Reclamaciones -> Descriptor) Cambiado el campo Agencia por Zona
+-   (Tickets -> Líneas preparadas) Actualizada sección para que sea más visual

 ### Fixed
- (General) Al utilizar el traductor de Google se descuadraban los iconos
+
+-   (General) Al utilizar el traductor de Google se descuadraban los iconos

 ### Removed
- (Tickets -> Control clientes) Eliminada sección
+
+-   (Tickets -> Control clientes) Eliminada sección
--- a/10
+++ b/10
@ -13,7 +13,7 @@ RUN apt-get update \
        graphicsmagick \
    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
    && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g npm@9.6.6
+    && corepack enable pnpm

 # Puppeteer

@ -39,12 +39,12 @@ RUN apt-get update \

 WORKDIR /salix

-COPY print/package.json print/package-lock.json print/
-RUN npm install --no-audit --prefer-offline --omit=dev --prefix=print
+COPY print/package.json print/pnpm-lock.yaml print/
+RUN pnpm install --prod --prefix=print

-COPY package.json package-lock.json ./
+COPY package.json pnpm-lock.yaml ./
 COPY loopback/package.json loopback/
-RUN npm install --no-audit --prefer-offline --omit=dev
+RUN pnpm install --prod

 COPY loopback loopback
 COPY back back
--- a/237
+++ b/237
@ -3,125 +3,164 @@
 def PROTECTED_BRANCH
 def FROM_GIT
 def RUN_TESTS
+def RUN_BUILD

+pre: {
+    switch (env.BRANCH_NAME) {
+        case 'test':
+            env.NODE_ENV = 'test'
+            env.BACK_REPLICAS = 2
+            break
+        case 'master':
+            env.NODE_ENV = 'production'
+            env.BACK_REPLICAS = 4
+            break
+        default:
+            env.NODE_ENV = 'dev'
+            env.BACK_REPLICAS = 1
+    }
+
+    PROTECTED_BRANCH = [
+        'dev',
+        'test',
+        'master'
+    ].contains(env.BRANCH_NAME)
+
+    FROM_GIT = env.JOB_NAME.startsWith('gitea/')
+    RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
+    RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
+
+    // Uncomment to enable debugging
+    // https://loopback.io/doc/en/lb3/Setting-debug-strings.html#debug-strings-reference
+    //env.DEBUG = 'strong-remoting:shared-method'
+}
 pipeline {
    agent any
    options {
        disableConcurrentBuilds()
    }
+    tools {
+        nodejs 'node-v20'
+    }
    environment {
        PROJECT_NAME = 'salix'
        STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
    }
-    tools {
-        nodejs 'node-v20'
-    }
    stages {
-        stage('Checkout') {
-            steps {
-                script {
-                    // Uncomment to enable debugging
-                    //env.DEBUG = 'strong-remoting:http-context,strong-remoting:shared-method'
-
-                    switch (env.BRANCH_NAME) {
-                        case 'dev':
-                            env.NODE_ENV = 'dev'
-                            env.BACK_REPLICAS = 1
-                            break
-                        case 'test':
-                            env.NODE_ENV = 'test'
-                            env.BACK_REPLICAS = 2
-                            break
-                        case 'master':
-                            env.NODE_ENV = 'production'
-                            env.BACK_REPLICAS = 4
-                            break
-                    }
-
-                    def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
-
-                    env.GIT_COMMIT_MSG = sh(
-                        script: 'git log -1 --pretty=%B ${GIT_COMMIT}',
-                        returnStdout: true
-                    ).trim()
-
-                    PROTECTED_BRANCH = [
-                        'dev',
-                        'test',
-                        'master'
-                    ].contains(env.BRANCH_NAME)
-
-                    FROM_GIT = JOB_NAME.startsWith('gitea/')
-                    RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
-                }
-                setEnv()
-            }
-        }
-        stage('Install') {
-            environment {
-                NODE_ENV = ""
-            }
-            parallel {
-                stage('Backend') {
-                    steps {
-                        sh 'npm install --no-audit --prefer-offline'
-                    }
-                }
-                stage('Frontend') {
-                    when {
-                        expression { return FROM_GIT }
-                    }
-                    steps {
-                        sh 'npm install --no-audit --prefer-offline --prefix=front'
-                    }
-                }
-                stage('Print') {
-                    when {
-                        expression { return FROM_GIT }
-                    }
-                    steps {
-                        sh 'npm install --no-audit --prefer-offline --prefix=print'
-                    }
-                }
-            }
-        }
-        stage('Test') {
-            when {
-                expression { return RUN_TESTS }
-            }
+        stage('Stack') {
            environment {
                NODE_ENV = ""
                TZ = 'Europe/Madrid'
            }
            parallel {
-                stage('Backend') {
-                    steps {
-                        sh 'npm run test:back:ci'
+                stage('Back') {
+                    stages {
+                        stage('Install') {
+                            environment {
+                                NODE_ENV = ""
+                            }
+                            steps {
+                                sh 'pnpm install --prefer-offline'
+                                sh 'pnpm install --prefer-offline --prefix=print'
+                            }
+                        }
+                        stage('Test') {
+                            when {
+                                expression { RUN_TESTS }
+                            }
+                            environment {
+                                NODE_ENV = ""
+                            }
+                            steps {
+                                sh 'npm run test:back:ci'
+                            }
+                            post {
+                                always {
+                                    script {
+                                        try {
+                                            junit 'junitresults.xml'
+                                            junit 'junit.xml'
+                                        } catch (e) {
+                                            echo e.toString()
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        stage('Build') {
+                            when {
+                                expression { RUN_BUILD }
+                            }
+                            steps {
+                                script {
+                                    def packageJson = readJSON file: 'package.json'
+                                    env.VERSION = packageJson.version
+                                }
+                                sh 'docker-compose build back'
+                            }
+                        }
                    }
                }
-                stage('Frontend') {
-                    steps {
-                        sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=6'
+                stage('Front') {
+                    when {
+                        expression { FROM_GIT }
+                    }
+                    stages {
+                        stage('Install') {
+                            environment {
+                                NODE_ENV = ""
+                            }
+                            steps {
+                                sh 'pnpm install --prefer-offline --prefix=front'
+                            }
+                        }
+                        stage('Test') {
+                            when {
+                                expression { RUN_TESTS }
+                            }
+                            environment {
+                                NODE_ENV = ""
+                            }
+                            steps {
+                                sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
+                            }
+                        }
+                        stage('Build') {
+                            when {
+                                expression { RUN_BUILD }
+                            }
+                            steps {
+                                script {
+                                    def packageJson = readJSON file: 'package.json'
+                                    env.VERSION = packageJson.version
+                                }
+                                sh 'gulp build'
+                                sh 'docker-compose build front'
+                            }
+                        }
                    }
                }
            }
        }
-        stage('Build') {
+        stage('Push') {
            when {
-                expression { return PROTECTED_BRANCH && FROM_GIT }
+                expression { RUN_BUILD }
            }
            environment {
                CREDENTIALS = credentials('docker-registry')
            }
            steps {
-                sh 'gulp build'
-                dockerBuild()
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = packageJson.version
+                }
+                sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
+                sh 'docker-compose push'
            }
        }
        stage('Deploy') {
            when {
-                expression { return PROTECTED_BRANCH }
+                expression { PROTECTED_BRANCH }
            }
            parallel {
                stage('Database') {
@ -139,12 +178,16 @@ pipeline {
                }
                stage('Docker') {
                    when {
-                        expression { return FROM_GIT }
+                        expression { FROM_GIT }
                    }
                    environment {
                        DOCKER_HOST = "${env.SWARM_HOST}"
                    }
                    steps {
+                        script {
+                            def packageJson = readJSON file: 'package.json'
+                            env.VERSION = packageJson.version
+                        }
                        sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
                    }
                }
@ -152,21 +195,14 @@ pipeline {
        }
    }
    post {
-        always {
-            script {
-                if (RUN_TESTS) {
-                    try {
-                        junit 'junitresults.xml'
-                        junit 'junit.xml'
-                    } catch (e) {
-                        echo e.toString()
-                    }
-                }
-            }
-        }
        success {
            script {
                if (env.BRANCH_NAME == 'master' && FROM_GIT) {
+                    env.GIT_COMMIT_MSG = sh(
+                        script: 'git log -1 --pretty=%B ${GIT_COMMIT}',
+                        returnStdout: true
+                    ).trim()
+
                    String message = env.GIT_COMMIT_MSG
                    int index = message.indexOf('\n')
                    if (index != -1)
@ -183,6 +219,7 @@ pipeline {
            }
        }
        unsuccessful {
+            setEnv()
            sendEmail()
        }
    }
--- a/back/tests-helper.js
+++ b/back/tests-helper.js
@ -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();
--- a/back/tests.js
+++ b/back/tests.js
@ -2,30 +2,21 @@
 const path = require('path');
 const Myt = require('@verdnatura/myt/myt');
 const Run = require('@verdnatura/myt/myt-run');
-let dataSources = require('../loopback/server/datasources.json');
+const helper = require('./tests-helper');

 let server;
+const isCI = process.argv[2] === 'ci';
+const PARALLEL = false;
+const TIMEOUT = 900000;

-process.on('warning', warning => {
-    console.log(warning.name);
-    console.log(warning.message);
-    console.log(warning.stack);
-});
+process.on('SIGINT', teardown);
+process.on('exit', teardown);
+process.on('uncaughtException', onError);
+process.on('unhandledRejection', onError);

-process.on('SIGUSR2', rmServer);
-process.on('exit', rmServer);
-
-async function rmServer() {
-    if (!server) return;
-    await server.rm();
-    server = null;
-}
-
-async function test() {
+async function setup() {
    console.log('Building and running DB container.');

-    const isCI = process.argv[2] === 'ci';
-
    const myt = new Myt();
    await myt.init({
        workspace: path.join(__dirname, '..'),
@ -36,69 +27,76 @@ async function test() {
    });
    server = await myt.run(Run);
    await myt.deinit();
+
    const {dbConfig} = server;
+    process.env.DB_HOST = dbConfig.host;
+    process.env.DB_PORT = dbConfig.port;

-    console.log('Initializing backend.');
+    if (!PARALLEL)
+        await helper.init();
+}

-    dataSources = JSON.parse(JSON.stringify(dataSources));
-    Object.assign(dataSources.vn, {
-        host: dbConfig.host,
-        port: dbConfig.port
-    });
+async function teardown() {
+    if (!server) return;

-    const bootOptions = {dataSources};
-    const app = require('vn-loopback/server/server');
-    await new Promise((resolve, reject) => {
-        app.boot(bootOptions,
-            err => err ? reject(err) : resolve());
-    });
-    // FIXME: Workaround to wait for loopback to be ready
-    await app.models.Application.status();
+    if (!PARALLEL)
+        await helper.deinit();

-    console.log('Running tests.');
+    console.log('Stopping and removing DB container.');
+    await server.rm();
+    server = null;
+}

-    const Jasmine = require('jasmine');
-    const jasmine = new Jasmine();
+async function onError(err) {
+    await teardown();
+    console.error(err);
+}

-    const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
-    jasmine.addReporter(new SpecReporter({
-        spec: {
-            displaySuccessful: isCI,
-            displayPending: isCI
-        },
-        summary: {
-            displayPending: false,
-        }
-    }));
+async function test() {
+    let runner;
+    const config = {
+        globalSetup: setup,
+        globalSetupTimeout: TIMEOUT,
+        globalTeardown: teardown,
+        globalTeardownTimeout: TIMEOUT,
+        spec_dir: '.',
+        spec_files: [
+            'back/**/*[sS]pec.js',
+            'loopback/**/*[sS]pec.js',
+            'modules/*/back/**/*.[sS]pec.js'
+        ],
+        helpers: []
+    };
+
+    if (PARALLEL) {
+        const ParallelRunner = require('jasmine/parallel');
+        runner = new ParallelRunner({numWorkers: 1});
+        config.helpers.push(`back/tests-helper.js`);
+    } else {
+        const Jasmine = require('jasmine');
+        runner = new Jasmine();
+
+        const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
+        runner.addReporter(new SpecReporter({
+            spec: {
+                displaySuccessful: isCI,
+                displayPending: isCI
+            },
+            summary: {
+                displayPending: false,
+            }
+        }));
+    }

    if (isCI) {
        const JunitReporter = require('jasmine-reporters');
-        jasmine.addReporter(new JunitReporter.JUnitXmlReporter());
-
-        jasmine.exitOnCompletion = true;
-        jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 900000;
+        runner.addReporter(new JunitReporter.JUnitXmlReporter());
+        runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = TIMEOUT;
    }

-    const backSpecs = [
-        './back/**/*[sS]pec.js',
-        './loopback/**/*[sS]pec.js',
-        './modules/*/back/**/*.[sS]pec.js'
-    ];
-
-    jasmine.loadConfig({
-        spec_dir: '.',
-        spec_files: backSpecs,
-        helpers: [],
-    });
-
-    await jasmine.execute();
-
-    console.log('Stopping.');
-
-    if (app) await app.disconnect();
-    await rmServer();
-
-    console.log('Tests ended.\n');
+    // runner.loadConfigFile('back/jasmine.json');
+    runner.loadConfig(config);
+    await runner.execute();
 }

 test();
--- a/db/dump/fixtures.after.sql
+++ b/db/dump/fixtures.after.sql
@ -30,7 +30,7 @@ INSERT INTO vn.buy (id,entryFk,itemFk,quantity,dispatched,buyingValue,freightVal
        (18,10,15,500,0,55.0,1.0,0,1,1,1,0,0.0,1.0,'5',0.0,78.3,75.6,0.0,0,0,1,0,'2022-06-20 00:00:00',0,2.5),
        (19,10,11,5000,0,50.0,1.0,0,1,1,1,1,0.0,1.0,'4',0.0,99.6,99.4,0.0,0,0,1,0,'2022-06-20 00:00:00',0,2.5);
 */
-INSERT INTO vn2008.Splits (Id_Split,Id_Ticket,Id_Entrada,Fecha,Notas)
+INSERT INTO vn.split (id,ticketFk,entryFk,dated,note)
    VALUES
        (1,7,2,'00-00-0000 00:00:00.000','nota1'),
        (2,10,6,'00-00-0000 00:00:00.000','nota2'),
--- a/db/routines/bi/procedures/analisis_ventas_update.sql
+++ b/db/routines/bi/procedures/analisis_ventas_update.sql
@ -47,7 +47,7 @@ BEGIN
            LEFT JOIN vn.deliveryMethod dm ON dm.id = a.Vista
            LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
            LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
-            LEFT JOIN vn2008.warehouse w ON w.id = t.warehouse_id
+            LEFT JOIN vn.warehouse w ON w.id = t.warehouse_id
        WHERE bt.fecha >= vLastMonth AND r.mercancia;
 END$$
 DELIMITER ;
--- a/db/routines/bs/procedures/comercialesCompleto.sql
+++ b/db/routines/bs/procedures/comercialesCompleto.sql
@ -20,16 +20,16 @@ BEGIN
 		c.movil,
 		c.POBLACION poblacion,
 		p.`name` provincia,
-		vn2008.red(f.futur) futur,
+		ROUND(f.futur, 2) futur,
 		c.Credito credito,
 		pm.`name` forma_pago,
-		vn2008.red(c365 / 12) consumo_medio365,
-		vn2008.red(c365) consumo365,
-		vn2008.red(CmLy.peso) peso_mes_año_pasado,
-		vn2008.red(CmLy.peso * 1.19) objetivo,
+		ROUND(c365 / 12, 2) consumo_medio365,
+		ROUND(c365, 2) consumo365,
+		ROUND(CmLy.peso, 2) peso_mes_año_pasado,
+		ROUND(CmLy.peso * 1.19, 2) objetivo,
 		tr.CodigoTrabajador,
-		vn2008.red(mes_actual.consumo) consumoMes,
-		vn2008.red(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0)) como_lo_llevo,
+		ROUND(mes_actual.consumo, 2) consumoMes,
+		ROUND(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0), 2) como_lo_llevo,
 		DATE(LastTicket) ultimo_ticket,
 		dead.muerto,
 		g.Greuge,
--- a/db/routines/cache/procedures/available_refresh.sql
+++ b/db/routines/cache/procedures/available_refresh.sql
@ -5,7 +5,8 @@ proc: BEGIN
 	DECLARE vReserveDate DATETIME;
 	DECLARE vParams CHAR(100);
 	DECLARE vInventoryDate DATE;
-	DECLARE vIsLogifloraDay BOOLEAN;
+	DECLARE vLifeScope DATE;
+	DECLARE vWarehouseFkInventory INT;

 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@ -26,43 +27,42 @@ proc: BEGIN
 		LEAVE proc;
 	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
 	SET vStartDate = TIMESTAMP(vDated, '00:00:00');
 	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
 		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
 	DROP TEMPORARY TABLE IF EXISTS itemRange;
 	CREATE TEMPORARY TABLE itemRange
 		(PRIMARY KEY (itemFk))
 		ENGINE = MEMORY
-		SELECT c.itemFk,
-				IF(it.life IS NULL,
-					NULL,
-					TIMESTAMP(TIMESTAMPADD(DAY, it.life, c.landing), '23:59:59')) ended
-			FROM (
-				SELECT b.itemFk, MAX(t.landed) landing
-					FROM vn.buy b
-						JOIN vn.entry e ON b.entryFk = e.id
-						JOIN vn.travel t ON t.id = e.travelFk
-						JOIN vn.warehouse w ON w.id = t.warehouseInFk
-					WHERE t.landed BETWEEN vInventoryDate AND vStartDate
-						AND t.warehouseInFk = vWarehouse
-						AND NOT e.isExcludedFromAvailable
-					GROUP BY b.itemFk
-				) c
-				JOIN vn.item i ON i.id = c.itemFk
+		SELECT i.id itemFk,
+				util.dayEnd(DATE_ADD(c.maxLanded, INTERVAL it.life DAY)) ended, it.life
+			FROM vn.item i
+				LEFT JOIN (
+					SELECT b.itemFk, MAX(t.landed) maxLanded
+						FROM vn.buy b
+							JOIN vn.entry e ON b.entryFk = e.id
+							JOIN vn.travel t ON t.id = e.travelFk
+							JOIN vn.warehouse w ON w.id = t.warehouseInFk
+							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.warehouseOutFk <> vWarehouseFkInventory
+							AND it.life
+							AND NOT e.isExcludedFromAvailable
+						GROUP BY b.itemFk
+					) c ON i.id = c.itemFk
 				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
 	DELETE FROM available WHERE calc_id = vCalc;
@ -86,7 +86,7 @@ proc: BEGIN
 					WHERE i.landed >= vStartDate
 						AND (ir.ended IS NULL OR i.landed <= ir.ended)
 						AND i.warehouseInFk = vWarehouse
-						AND (ISNULL(wf.entryFk) OR vIsLogifloraDay)
+						AND ISNULL(wf.entryFk)
 				UNION ALL
 				SELECT i.itemFk, i.shipped, i.quantity
 					FROM vn.itemEntryOut i
--- a/db/routines/edi/procedures/ekt_load.sql
+++ b/db/routines/edi/procedures/ekt_load.sql
@ -22,6 +22,7 @@ proc:BEGIN
 	DECLARE vHasItemGroup BOOL;
 	DECLARE vDescription VARCHAR(255);
 	DECLARE vSaleFk INT;
+	DECLARE vDefaultEntry INT;

 	-- Carga los datos necesarios del EKT
 	SELECT e.ref, qty, package, putOrderFk MOD 1000000, i2.id , NOT ISNULL(eea.addressFk), NOT ISNULL(igto.group_code),
@ -41,6 +42,9 @@ proc:BEGIN
 		CALL vn.mail_insert('pako@verdnatura.es', 'nocontestar@verdnatura.es', CONCAT('Nuevo grupo en Floramondo: ', vDescription), vDescription);
 		LEAVE proc;
 	END IF;
+
+	SELECT defaultEntry INTO vDefaultEntry
+		FROM vn.entryConfig;
 		
 	-- Asigna la entrada
 	SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
@ -100,10 +104,9 @@ proc:BEGIN
 				LEFT JOIN ekt l ON l.ref = e.ref
 				LEFT JOIN vn.buy b ON b.ektFk = l.id
 				LEFT JOIN vn.item i ON i.id = b.itemFk
-				JOIN vn2008.config cfg
 			WHERE e.id = vSelf
 				AND l.id != vSelf
-				AND b.itemFk != cfg.generic_item
+				AND b.itemFk != vDefaultEntry
 				AND IF(t.s1, l.s1 = e.s1, TRUE)
 				AND IF(t.s2, l.s2 = e.s2, TRUE)
 				AND IF(t.s3, l.s3 = e.s3, TRUE)
@ -142,7 +145,7 @@ proc:BEGIN
 		SELECT vEntryFk,
 				vSelf,
 				(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
-				IFNULL(vItem, cfg.generic_item) itemFk,
+				IFNULL(vItem, vDefaultEntry) itemFk,
 				e.qty stickers,
 				@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing,
 				IFNULL(b.`grouping`, e.pac),
@ -153,8 +156,7 @@ proc:BEGIN
 			FROM ekt e 
 				LEFT JOIN vn.buy b ON b.id = vBuy
 				LEFT JOIN vn.item i ON i.id = b.itemFk
-				LEFT JOIN vn.supplier s ON e.pro = s.id
-				JOIN vn2008.config cfg		
+				LEFT JOIN vn.supplier s ON e.pro = s.id	
 			WHERE e.id = vSelf
 			LIMIT 1;

--- a/db/routines/edi/procedures/ekt_scan.sql
+++ b/db/routines/edi/procedures/ekt_scan.sql
@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_scan`(vBarcode VARCHAR(512))
 BEGIN
 /**
- * Busca transaciones a partir de un código de barras, las marca como escaneadas
+ * Busca transaciones a partir de un codigo de barras, las marca como escaneadas
 * y las devuelve. 
 * Ver https://wiki.verdnatura.es/index.php/Ekt#Algoritmos_de_lectura
 *
@ -73,7 +73,7 @@ BEGIN
 			INSERT INTO tmp.ekt
 				SELECT id
 					FROM ekt
-					WHERE fec = vFec
+					WHERE fec >= vFec - INTERVAL 1 DAY
 					AND ((
 						vKlo = vDefaultKlo
 							AND (klo = vKlo OR klo IS NULL OR klo = 0)
@ -82,7 +82,7 @@ BEGIN
 							AND auction = vAuction
 							AND agj = vShortAgj)
 					)
-			ORDER BY agj DESC
+			ORDER BY agj DESC, fec DESC
 			LIMIT 1;

 			SELECT COUNT(*) FROM tmp.ekt INTO vIsFound;
--- a/db/routines/edi/views/ektK2.sql
+++ b/db/routines/edi/views/ektK2.sql
@ -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`
--- a/db/routines/vn/procedures/buy_afterUpsert.sql
+++ b/db/routines/vn/procedures/buy_afterUpsert.sql
@ -74,6 +74,8 @@ BEGIN
 				WHERE b.id = vSelf;

 	END IF;
-    
+    CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+		SELECT vSelf id;
+	CALL buy_checkItem();
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/buy_chekItem.sql
+++ b/db/routines/vn/procedures/buy_chekItem.sql
@ -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 ;
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@ -88,6 +88,7 @@ BEGIN
 		FROM vn.expeditionTruck
 		WHERE eta < v3Month;

+	DELETE FROM XDiario WHERE FECHA < v3Month OR FECHA IS NULL;
 	-- borrar travels sin entradas
 	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
 	CREATE TEMPORARY TABLE tmp.thermographToDelete
--- a/db/routines/vn/procedures/duaInvoiceInBooking.sql
+++ b/db/routines/vn/procedures/duaInvoiceInBooking.sql
@ -44,7 +44,7 @@ BEGIN
        
        IF vCounter > 0 OR vASIEN > 0 THEN
        
-			UPDATE vn2008.XDiario x
+			UPDATE vn.XDiario x
 				JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
                SET x.ASIEN = vASIEN;
        
--- a/db/routines/vn/procedures/invoiceIn_add.sql
+++ b/db/routines/vn/procedures/invoiceIn_add.sql
@ -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 ;
--- a/db/routines/vn/procedures/itemShelvingRadar.sql
+++ b/db/routines/vn/procedures/itemShelvingRadar.sql
@ -1,7 +1,13 @@
 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
-	
+/**
+ * Calcula la información detallada respecto un sector.
+ *
+ * @param vSectorFk Id de sector
+ */
 	DECLARE vCalcVisibleFk INT;
 	DECLARE vCalcAvailableFk INT;
 	DECLARE hasFatherSector BOOLEAN;
--- a/db/routines/vn/procedures/sale_replaceItem.sql
+++ b/db/routines/vn/procedures/sale_replaceItem.sql
@ -21,11 +21,8 @@ BEGIN
 	DECLARE vAgencyModeFk INT;
 	DECLARE vNewPrice DECIMAL(10,2);
 	DECLARE vOldPrice DECIMAL(10,2);
-	DECLARE vOption INT DEFAULT NULL;
+	DECLARE vOption VARCHAR(255);
 	DECLARE vNewSaleFk INT;
-	DECLARE vChangePrice INT DEFAULT 1;
-	DECLARE vBuyerDiscount INT DEFAULT 4;
-	DECLARE vManaDiscount INT DEFAULT 3;
 	DECLARE vForceToGrouping INT DEFAULT 1;
 	DECLARE vForceToPacking INT DEFAULT 2;
 	DECLARE vFinalPrice DECIMAL(10,2);
@ -85,16 +82,13 @@ BEGIN
 	IF vNewPrice IS NULL THEN
 		CALL util.throw('price retrieval failed');
 	END IF;
+
 	IF vNewPrice > vOldPrice THEN
 		SET vFinalPrice = vOldPrice;
-		IF worker_isInDepartment('vt') THEN
-			SET vOption = vManaDiscount;
-		ELSE
-			SET vOption = vBuyerDiscount;
-		END IF;
+		SET vOption = 'substitution';
 	ELSE
 		SET vFinalPrice = vNewPrice;
-		SET vOption = vChangePrice;
+		SET vOption = 'renewPrices';
 	END IF;

 	START TRANSACTION;
--- a/db/routines/vn/procedures/ticket_setState.sql
+++ b/db/routines/vn/procedures/ticket_setState.sql
@ -31,8 +31,8 @@ BEGIN
 		CALL util.throw('ASSIGN_ZONE_FIRST');
 	END IF;

-	SET vCanChangeState = (
-			vStateCode <> 'ON_CHECKING' OR 
+	SET vCanChangeState = ((
+			vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR 
 			vticketAlertLevel < vPackedAlertLevel
 		)AND NOT (
 			vTicketStateCode IN ('CHECKED', 'CHECKING')
@ -51,5 +51,6 @@ BEGIN
 	ELSE
 		CALL util.throw('INCORRECT_TICKET_STATE');
 	END IF;
+	
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/accountReconciliation_beforeInsert.sql
+++ b/db/routines/vn/triggers/accountReconciliation_beforeInsert.sql
@ -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 ;
--- a/db/routines/vn/triggers/awbInvoiceIn_afterDelete.sql
+++ b/db/routines/vn/triggers/awbInvoiceIn_afterDelete.sql
@ -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 ;
--- a/db/routines/vn/triggers/buy_beforeUpdate.sql
+++ b/db/routines/vn/triggers/buy_beforeUpdate.sql
@ -41,8 +41,8 @@ trig:BEGIN
 			FROM genericAllocation ga
 				JOIN entry e ON e.id = NEW.entryFk
 				JOIN travel tr on tr.id = e.travelFk
-				WHERE ga.itemFk = vGenericFk
-					AND tr.landed BETWEEN ga.startDated AND ga.endDated;
+			WHERE ga.itemFk = vGenericFk
+				AND tr.landed BETWEEN ga.startDated AND ga.endDated;
 		IF vGenericInDate THEN
 			SET NEW.itemOriginalFk = NEW.itemFk;
 			SET NEW.itemFk = vGenericFk;
@ -64,5 +64,12 @@ trig:BEGIN
 	IF NEW.quantity < 0 THEN
 		SET	NEW.isIgnored = TRUE;
 	END IF;
+
+	IF NOT (NEW.itemFk <=> OLD.itemFk) OR 
+		NOT (OLD.entryFk <=> NEW.entryFk) THEN		
+		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+		SELECT NEW.id;
+		CALL buy_checkItem();		
+	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/entry_afterUpdate.sql
+++ b/db/routines/vn/triggers/entry_afterUpdate.sql
@ -13,5 +13,15 @@ BEGIN
 		CALL travel_requestRecalc(OLD.travelFk);
 		CALL travel_requestRecalc(NEW.travelFk);
 	END IF;
+
+	
+	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
+		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+			SELECT b.id
+				FROM buy b
+				WHERE b.entryFk = NEW.id;
+		
+		CALL buy_checkItem();
+	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/travel_afterUpdate.sql
+++ b/db/routines/vn/triggers/travel_afterUpdate.sql
@ -10,5 +10,18 @@ BEGIN
 			SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
 			WHERE travelFk = NEW.id;
 	END IF;
+
+	IF NOT (NEW.agencyModeFk <=> OLD.agencyModeFk) THEN
+		IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN
+			CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+				SELECT b.id
+					FROM entry e 
+						JOIN buy b ON b.entryFk = e.id
+						JOIN item i ON i.id = b.itemFk
+					WHERE e.travelFk = NEW.id;
+		
+			CALL buy_checkItem();
+		END IF;
+	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/travel_beforeUpdate.sql
+++ b/db/routines/vn/triggers/travel_beforeUpdate.sql
@ -4,15 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_beforeUpdate`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-/*
-	IF ((NOT NEW.shipped <=> OLD.shipped )
-		OR (NOT NEW.landed <=> OLD.landed )
-		OR (NOT NEW.warehouseInFk <=> OLD.warehouseInFk )
-		OR (NOT NEW.warehouseOutFk <=> OLD.warehouseOutFk ))
-		AND (OLD.totalEntries AND OLD.landed < CURDATE()) THEN
-		CALL util.throw("Cannot past travels with entries");
-	END IF;
-*/
+
 	IF NOT (NEW.landed <=> OLD.landed)
 	OR NOT (NEW.shipped <=> OLD.shipped) THEN
 		CALL travel_checkDates(NEW.shipped, NEW.landed);
--- a/db/routines/vn/views/bankPolicy.sql
+++ b/db/routines/vn/views/bankPolicy.sql
@ -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
--- a/db/routines/vn/views/itemShelvingAvailable.sql
+++ b/db/routines/vn/views/itemShelvingAvailable.sql
@ -1,7 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`itemShelvingAvailable`
-AS SELECT `s`.`id` AS `saleFk`,
+AS SELECT `s`.`id` `saleFk`,
 	`tst`.`updated` AS `Modificado`,
 	`s`.`ticketFk` AS `ticketFk`,
 	0 AS `isPicked`,
--- a/db/routines/vn/views/ticketStateToday.sql
+++ b/db/routines/vn/views/ticketStateToday.sql
@ -1,16 +1,15 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`ticketStateToday`
-AS SELECT `ts`.`ticketFk` AS `ticket`,
+AS SELECT
+	`ts`.`ticketFk` AS `ticketFk`,
 	`ts`.`state` AS `state`,
 	`ts`.`productionOrder` AS `productionOrder`,
 	`ts`.`alertLevel` AS `alertLevel`,
-	`ts`.`userFk` AS `worker`,
+	`ts`.`userFk` AS `userFk`,
 	`ts`.`code` AS `code`,
 	`ts`.`updated` AS `updated`,
 	`ts`.`isPicked` AS `isPicked`
-FROM (
-		`vn`.`ticketState` `ts`
-		JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
-	)
-WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())
+FROM `ticketState` `ts`
+	JOIN `ticket` `t` ON `t`.`id` = `ts`.`ticketFk`
+WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`());
--- a/db/routines/vn/views/zoneEstimatedDelivery.sql
+++ b/db/routines/vn/views/zoneEstimatedDelivery.sql
@ -9,7 +9,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 		lhp.m3,
 		dl.minSpeed
 	FROM ticket t
-		JOIN ticketStateToday tst ON tst.ticket = t.id
+		JOIN ticketStateToday tst ON tst.ticketFk = t.id
 		JOIN state s ON	s.id = tst.state
 		JOIN saleVolume sv ON sv.ticketFk = t.id
 		LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
--- a/db/routines/vn2008/functions/red.sql
+++ b/db/routines/vn2008/functions/red.sql
@ -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 ;
--- a/db/routines/vn2008/procedures/XDiario_Quadrator.sql
+++ b/db/routines/vn2008/procedures/XDiario_Quadrator.sql
@ -7,19 +7,19 @@ BEGIN
 				group_concat(CONCAT(' Asiento: ', ASIEN, '- importe:', quadre) SEPARATOR ' \r\n ') 
 			FROM (
 				SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) quadre
-					FROM XDiario
+					FROM vn.XDiario
 					WHERE enlazado = FALSE
 					GROUP BY ASIEN
 					HAVING ABS(SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0))) > 0.01 
 			) t
 		HAVING count(*) > 0;
                
-	UPDATE XDiario XD 
+	UPDATE vn.XDiario XD 
 		INNER JOIN(
-			SELECT XD.id, SUBCTA, Quadre FROM XDiario XD
+			SELECT XD.id, SUBCTA, Quadre FROM vn.XDiario XD
 				INNER JOIN (
 					SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) as Quadre
-						FROM XDiario
+						FROM vn.XDiario
 						WHERE enlazado = FALSE
 						GROUP BY ASIEN
 						HAVING Quadre != 0
--- a/db/routines/vn2008/procedures/clean.sql
+++ b/db/routines/vn2008/procedures/clean.sql
@ -23,7 +23,6 @@ proc: BEGIN
 	DELETE FROM cdr WHERE calldate < vDate18;
 	DELETE FROM Monitoring WHERE ODBC_TIME < vDate;
 	DELETE FROM Conteo WHERE Fecha < vDate;
-	DELETE FROM XDiario WHERE FECHA < vDate3 OR FECHA IS NULL;
 	DELETE FROM mail WHERE DATE_ODBC < vDate;
 	DELETE FROM expeditions_deleted WHERE odbc_date < vDate26;
 	DELETE FROM Movimientos_mark WHERE odbc_date < vDate;
--- a/db/routines/vn2008/procedures/cobro.sql
+++ b/db/routines/vn2008/procedures/cobro.sql
@ -25,7 +25,7 @@ BEGIN
 			FROM Clientes 
 			WHERE Id_Cliente = idCLI;
 		CALL vn.ledger_next(max_asien);
-		INSERT INTO XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id)
+		INSERT INTO vn.XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id)
 			SELECT max_asien,datFEC,SUBCTA,CONTRA,strCONCEPTO,EURODEBE,EUROHABER,idEMP 
 				FROM(SELECT cuenta_banco SUBCTA, cuenta_cliente CONTRA, 0 EURODEBE, dblIMPORTE EUROHABER
 					 UNION ALL
--- a/db/routines/vn2008/procedures/confection_control_source.sql
+++ b/db/routines/vn2008/procedures/confection_control_source.sql
@ -31,7 +31,7 @@ BEGIN
            stock.available
 		FROM vn2008.Tickets t
 			JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
-			JOIN vn2008.warehouse wh ON wh.id = t.warehouse_id
+			JOIN vn.warehouse wh ON wh.id = t.warehouse_id
 			JOIN vn2008.Movimientos m ON m.Id_Ticket = t.Id_Ticket
            JOIN vn2008.Articles i ON i.Id_Article = m.Id_Article
 			JOIN vn2008.Tipos tp ON tp.tipo_id = i.tipo_id
@ -88,8 +88,8 @@ BEGIN
 			FROM vn2008.Compres c
 				JOIN vn2008.Entradas e ON e.Id_Entrada = c.Id_Entrada
 				JOIN vn2008.travel tr ON tr.id = e.travel_id
-				JOIN vn2008.warehouse whi ON whi.id = tr.warehouse_id
-				JOIN vn2008.warehouse who ON who.id = tr.warehouse_id_out
+				JOIN vn.warehouse whi ON whi.id = tr.warehouse_id
+				JOIN vn.warehouse who ON who.id = tr.warehouse_id_out
 				JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
 				JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
 				JOIN vn.confectionType ct ON ct.id = tp.confeccion
--- a/db/routines/vn2008/triggers/Conteo_afterInsert.sql
+++ b/db/routines/vn2008/triggers/Conteo_afterInsert.sql
@ -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 ;
--- a/db/routines/vn2008/triggers/account_conciliacion_beforeInsert.sql
+++ b/db/routines/vn2008/triggers/account_conciliacion_beforeInsert.sql
@ -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 ;
--- a/db/routines/vn2008/triggers/agency_hour_afterUpdate.sql
+++ b/db/routines/vn2008/triggers/agency_hour_afterUpdate.sql
@ -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 ;
--- a/db/routines/vn2008/triggers/agency_hour_beforeInsert.sql
+++ b/db/routines/vn2008/triggers/agency_hour_beforeInsert.sql
@ -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 ;
--- a/db/routines/vn2008/triggers/awb_recibida_afterDelete.sql
+++ b/db/routines/vn2008/triggers/awb_recibida_afterDelete.sql
@ -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 ;
--- a/db/routines/vn2008/views/Articles_botanical.sql
+++ b/db/routines/vn2008/views/Articles_botanical.sql
@ -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`
--- a/db/routines/vn2008/views/Bancos_poliza.sql
+++ b/db/routines/vn2008/views/Bancos_poliza.sql
@ -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
--- a/db/routines/vn2008/views/Entradas_orden.sql
+++ b/db/routines/vn2008/views/Entradas_orden.sql
@ -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`
--- a/db/routines/vn2008/views/Equipos.sql
+++ b/db/routines/vn2008/views/Equipos.sql
@ -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`
--- a/db/routines/vn2008/views/Prioridades.sql
+++ b/db/routines/vn2008/views/Prioridades.sql
@ -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`
--- a/db/routines/vn2008/views/Proveedores_gestdoc.sql
+++ b/db/routines/vn2008/views/Proveedores_gestdoc.sql
@ -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`
--- a/db/routines/vn2008/views/Remesas.sql
+++ b/db/routines/vn2008/views/Remesas.sql
@ -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`
--- a/db/routines/vn2008/views/Saldos_Prevision.sql
+++ b/db/routines/vn2008/views/Saldos_Prevision.sql
@ -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`
--- a/db/routines/vn2008/views/Split.sql
+++ b/db/routines/vn2008/views/Split.sql
@ -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`
--- a/db/routines/vn2008/views/Split_lines.sql
+++ b/db/routines/vn2008/views/Split_lines.sql
@ -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`
--- a/db/routines/vn2008/views/Vehiculos.sql
+++ b/db/routines/vn2008/views/Vehiculos.sql
@ -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`
--- a/db/routines/vn2008/views/Vehiculos_consumo.sql
+++ b/db/routines/vn2008/views/Vehiculos_consumo.sql
@ -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`
--- a/db/routines/vn2008/views/XDiario.sql
+++ b/db/routines/vn2008/views/XDiario.sql
@ -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`
--- a/db/routines/vn2008/views/account_conciliacion.sql
+++ b/db/routines/vn2008/views/account_conciliacion.sql
@ -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`
--- a/db/routines/vn2008/views/account_detail.sql
+++ b/db/routines/vn2008/views/account_detail.sql
@ -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`
--- a/db/routines/vn2008/views/account_detail_type.sql
+++ b/db/routines/vn2008/views/account_detail_type.sql
@ -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`
--- a/db/routines/vn2008/views/airline.sql
+++ b/db/routines/vn2008/views/airline.sql
@ -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`
--- a/db/routines/vn2008/views/airport.sql
+++ b/db/routines/vn2008/views/airport.sql
@ -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`
--- a/db/routines/vn2008/views/albaran.sql
+++ b/db/routines/vn2008/views/albaran.sql
@ -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`
--- a/db/routines/vn2008/views/albaran_gestdoc.sql
+++ b/db/routines/vn2008/views/albaran_gestdoc.sql
@ -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`
--- a/db/routines/vn2008/views/albaran_state.sql
+++ b/db/routines/vn2008/views/albaran_state.sql
@ -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`
--- a/db/routines/vn2008/views/awb_component.sql
+++ b/db/routines/vn2008/views/awb_component.sql
@ -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`;
--- a/db/routines/vn2008/views/awb_component_template.sql
+++ b/db/routines/vn2008/views/awb_component_template.sql
@ -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`;
--- a/db/routines/vn2008/views/awb_component_type.sql
+++ b/db/routines/vn2008/views/awb_component_type.sql
@ -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`
--- a/db/routines/vn2008/views/awb_gestdoc.sql
+++ b/db/routines/vn2008/views/awb_gestdoc.sql
@ -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`
--- a/db/routines/vn2008/views/awb_recibida.sql
+++ b/db/routines/vn2008/views/awb_recibida.sql
@ -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`;
--- a/db/routines/vn2008/views/awb_role.sql
+++ b/db/routines/vn2008/views/awb_role.sql
@ -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`
--- a/db/routines/vn2008/views/awb_unit.sql
+++ b/db/routines/vn2008/views/awb_unit.sql
@ -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`
--- a/db/routines/vn2008/views/balance_nest_tree.sql
+++ b/db/routines/vn2008/views/balance_nest_tree.sql
@ -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`
--- a/db/routines/vn2008/views/bionic_updating_options.sql
+++ b/db/routines/vn2008/views/bionic_updating_options.sql
@ -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`
--- a/db/routines/vn2008/views/businessReasonEnd.sql
+++ b/db/routines/vn2008/views/businessReasonEnd.sql
@ -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`
--- a/db/routines/vn2008/views/buy_edi_k012.sql
+++ b/db/routines/vn2008/views/buy_edi_k012.sql
@ -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`
--- a/db/routines/vn2008/views/buy_edi_k03.sql
+++ b/db/routines/vn2008/views/buy_edi_k03.sql
@ -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`
--- a/db/routines/vn2008/views/buy_edi_k04.sql
+++ b/db/routines/vn2008/views/buy_edi_k04.sql
@ -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`
--- a/db/routines/vn2008/views/cl_dev.sql
+++ b/db/routines/vn2008/views/cl_dev.sql
@ -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`
--- a/db/routines/vn2008/views/cl_est.sql
+++ b/db/routines/vn2008/views/cl_est.sql
@ -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`
--- a/db/routines/vn2008/views/definitivo.sql
+++ b/db/routines/vn2008/views/definitivo.sql
@ -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`
--- a/db/routines/vn2008/views/deliveryPoint.sql
+++ b/db/routines/vn2008/views/deliveryPoint.sql
@ -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`
--- a/db/routines/vn2008/views/device_user.sql
+++ b/db/routines/vn2008/views/device_user.sql
@ -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`
--- a/db/routines/vn2008/views/edi_feature.sql
+++ b/db/routines/vn2008/views/edi_feature.sql
@ -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`
--- a/db/routines/vn2008/views/edi_genus.sql
+++ b/db/routines/vn2008/views/edi_genus.sql
@ -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`
--- a/db/routines/vn2008/views/edi_item_feature.sql
+++ b/db/routines/vn2008/views/edi_item_feature.sql
@ -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`
--- a/db/routines/vn2008/views/edi_plant.sql
+++ b/db/routines/vn2008/views/edi_plant.sql
@ -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`
--- a/db/routines/vn2008/views/edi_type.sql
+++ b/db/routines/vn2008/views/edi_type.sql
@ -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`
--- a/db/routines/vn2008/views/edi_value.sql
+++ b/db/routines/vn2008/views/edi_value.sql
@ -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`
--- a/db/routines/vn2008/views/escritos.sql
+++ b/db/routines/vn2008/views/escritos.sql
@ -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`
--- a/db/routines/vn2008/views/person_user.sql
+++ b/db/routines/vn2008/views/person_user.sql
@ -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`
--- a/db/routines/vn2008/views/person_user_idtrabajador.sql
+++ b/db/routines/vn2008/views/person_user_idtrabajador.sql
@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`person_user_idtrabajador`
-AS SELECT `t`.`Id_Trabajador` AS `Id_Trabajador`
-FROM (
-		`vn2008`.`person_user` `p`
-		JOIN `vn2008`.`Trabajadores` `t` ON(`p`.`id` = `t`.`user_id`)
-	)
-WHERE `t`.`user_id` = `account`.`myUser_getId`()
--- a/db/routines/vn2008/views/promissoryNote.sql
+++ b/db/routines/vn2008/views/promissoryNote.sql
@ -0,0 +1,8 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Pagares`
+AS SELECT `p`.`id` AS `Id_Pagare`,
+	`p`.`issued` AS `Fechaemision`,
+	`p`.`Concept` AS `Concepto`,
+	`p`.`paymentFk` AS `pago_id`
+FROM `vn`.`promissoryNote` `p`
--- a/db/routines/vn2008/views/reference_min.sql
+++ b/db/routines/vn2008/views/reference_min.sql
@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`reference_min`
-AS SELECT `rc`.`dated` AS `date`,
-	`rc`.`value` AS `rate`,
-	`rc`.`currencyFk` AS `moneda_id`
-FROM `vn`.`referenceCurrent` `rc`
--- a/db/routines/vn2008/views/v_compres.sql
+++ b/db/routines/vn2008/views/v_compres.sql
@ -53,7 +53,7 @@ AS SELECT `TP`.`Id_Tipo` AS `Familia`,
 	`A`.`Color` AS `Color`,
 	`A`.`Min` AS `Min`,
 	`C`.`Costefijo` + `C`.`Embalajefijo` + `C`.`Comisionfija` + `C`.`Portefijo` AS `Coste`,
-	`W_OUT`.`fuente` AS `fuente`,
+	`W_OUT`.`isFeedStock` AS `fuente`,
 	IF(
 		`cb`.`Volumen` > 0,
 		`cb`.`Volumen`,
@ -73,9 +73,9 @@ FROM (
 								)
 								JOIN `vn2008`.`travel` `TR` ON(`TR`.`id` = `E`.`travel_id`)
 							)
-							JOIN `vn2008`.`warehouse` `W_IN` ON(`W_IN`.`id` = `TR`.`warehouse_id`)
+							JOIN `vn`.`warehouse` `W_IN` ON(`W_IN`.`id` = `TR`.`warehouse_id`)
 						)
-						JOIN `vn2008`.`warehouse` `W_OUT` ON(`W_OUT`.`id` = `TR`.`warehouse_id_out`)
+						JOIN `vn`.`warehouse` `W_OUT` ON(`W_OUT`.`id` = `TR`.`warehouse_id_out`)
 					)
 					JOIN `vn2008`.`Articles` `A` ON(`C`.`Id_Article` = `A`.`Id_Article`)
 				)
@ -85,6 +85,6 @@ FROM (
 		)
 		JOIN `vn2008`.`Cubos` `cb` ON(`cb`.`Id_Cubo` = `C`.`Id_Cubo`)
 	)
-WHERE `W_IN`.`fuente` = 0
+WHERE `W_IN`.`isFeedStock` = 0
 	AND `E`.`Inventario` = 0
 	AND `E`.`Redada` = 0
--- a/db/routines/vn2008/views/v_ventes.sql
+++ b/db/routines/vn2008/views/v_ventes.sql
@ -1,68 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_ventes`
-AS SELECT `Agencias`.`Agencia` AS `Agencia`,
-	`A`.`Categoria` AS `Categoria`,
-	`A`.`tipo_id` AS `tipo_id`,
-	`A`.`Medida` AS `Medida`,
-	`A`.`Article` AS `Article`,
-	`A`.`Color` AS `Color`,
-	`CS`.`Id_cliente` AS `Id_Cliente`,
-	`TP`.`Id_Tipo` AS `Tipo`,
-	`T`.`Factura` AS `Factura`,
-	`T`.`warehouse_id` AS `warehouse_id`,
-	`M`.`Id_Movimiento` AS `Id_Movimiento`,
-	`M`.`Id_Article` AS `Id_Article`,
-	`TP`.`Id_Tipo` AS `Familia`,
-	`M`.`Id_Ticket` AS `Id_Ticket`,
-	`M`.`Concepte` AS `Concepte`,
-	`M`.`Cantidad` AS `Cantidad`,
-	`M`.`quantity` AS `quantity`,
-	`M`.`Preu` AS `Preu`,
-	`M`.`Descuento` AS `Descuento`,
-	IF(
-		`T`.`Fecha` >= '2015-10-01',
-		`M`.`CostFixat`,
-		`M`.`Preu` * (100 - `M`.`Descuento`) / 100
-	) AS `CostFixat`,
-	`M`.`Reservado` AS `Reservado`,
-	`M`.`OK` AS `OK`,
-	`M`.`PrecioFijado` AS `PrecioFijado`,
-	`M`.`odbc_date` AS `odbc_date`,
-	cast(`T`.`Fecha` AS date) AS `Fecha`,
-	`T`.`Fecha` AS `FechaCompleta`,
-	`CS`.`consignatario` AS `Alias`,
-	`T`.`Id_Consigna` AS `Id_Consigna`,
-	`M`.`Cantidad` * `M`.`Preu` * (100 - `M`.`Descuento`) / 100 AS `Importe`,
-	`O`.`Origen` AS `Origen`,
-	`TP`.`reino_id` AS `reino_id`,
-	`C`.`invoice` AS `invoice`,
-	`A`.`producer_id` AS `producer_id`
-FROM (
-		(
-			(
-				(
-					(
-						(
-							(
-								(
-									`vn2008`.`Movimientos` `M`
-									JOIN `vn2008`.`Tickets` `T` ON(`M`.`Id_Ticket` = `T`.`Id_Ticket`)
-								)
-								JOIN `vn2008`.`Consignatarios` `CS` ON(`CS`.`id_consigna` = `T`.`Id_Consigna`)
-							)
-							JOIN `vn2008`.`Clientes` `C` ON(`CS`.`Id_cliente` = `C`.`id_cliente`)
-						)
-						JOIN `vn2008`.`Articles` `A` ON(`M`.`Id_Article` = `A`.`Id_Article`)
-					)
-					JOIN `vn2008`.`Origen` `O` ON(`O`.`id` = `A`.`id_origen`)
-				)
-				JOIN `vn2008`.`Tipos` `TP` ON(`A`.`tipo_id` = `TP`.`tipo_id`)
-			)
-			JOIN `vn2008`.`reinos` `r` ON(`TP`.`reino_id` = `r`.`id`)
-		)
-		JOIN `vn2008`.`Agencias` ON(`Agencias`.`Id_Agencia` = `T`.`Id_Agencia`)
-	)
-WHERE `T`.`Fecha` >= '2013-01-01'
-	AND `C`.`real` > 0
-	AND `r`.`id` <> 6
--- a/db/routines/vn2008/views/v_xsubcuentas.sql
+++ b/db/routines/vn2008/views/v_xsubcuentas.sql
@ -1,207 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_xsubcuentas`
-AS SELECT `Clientes`.`Cuenta` AS `COD`,
-	`Clientes`.`razonSocial` AS `TITULO`,
-	concat(
-		IF(
-			`p`.`CEE` = 1
-			AND ascii(left(`Clientes`.`if`, 1)) < 58,
-			`p`.`Codigo`,
-			''
-		),
-		`Clientes`.`if`
-	) AS `NIF`,
-	`Clientes`.`domicilio` AS `DOMICILIO`,
-	`Clientes`.`poblacion` AS `POBLACION`,
-	`province`.`name` AS `PROVINCIA`,
-	`Clientes`.`codPostal` AS `CODPOSTAL`,
-	`p`.`Codigo` AS `country_code`,
-	sub.`empresa_id` AS `empresa_id`,
-	substr(
-		`Clientes`.`e-mail`,
-		1,
-		coalesce(nullif(locate(',', `Clientes`.`e-mail`), 0), 99) - 1
-	) AS `EMAIL`,
-	IF(
-		`p`.`CEE` = 0
-		OR `p`.`CEE` = 1
-		AND `Clientes`.`vies` = 0,
-		1,
-		IF(
-			`p`.`CEE` = 1
-			AND `Clientes`.`vies` <> 0,
-			2,
-			4
-		)
-	) AS `IDNIF`
-FROM (
-		(
-			(
-				`vn2008`.`Clientes`
-				JOIN (
-					SELECT DISTINCT `Facturas`.`Id_Cliente` AS `Id_Cliente`,
-						`Facturas`.`empresa_id` AS `empresa_id`
-					FROM `vn2008`.`Facturas`
-					WHERE `Facturas`.`Fecha` > `util`.`VN_CURDATE`() + INTERVAL -2 MONTH
-					UNION
-					SELECT `Recibos`.`Id_Cliente` AS `Id_Cliente`,
-						`Recibos`.`empresa_id` AS `empresa_id`
-					FROM `vn2008`.`Recibos`
-					WHERE `Recibos`.`Fechacobro` > `util`.`VN_CURDATE`() + INTERVAL -2 MONTH
-				) sub ON(
-					`Clientes`.`id_cliente` = sub.`Id_Cliente`
-				)
-			)
-			LEFT JOIN `vn2008`.`Paises` `p` ON(`p`.`Id` = `Clientes`.`Id_Pais`)
-		)
-		JOIN `vn2008`.`province` ON(
-			`Clientes`.`province_id` = `province`.`province_id`
-		)
-	)
-GROUP BY `Clientes`.`id_cliente`,
-	sub.`empresa_id`
-UNION ALL
-SELECT `Proveedores`.`cuenta` AS `Cuenta`,
-	`Proveedores`.`Proveedor` AS `Proveedor`,
-	concat(
-		IF(
-			`p`.`CEE` = 1
-			AND ascii(left(`Proveedores`.`NIF`, 1)) < 58,
-			`p`.`Codigo`,
-			''
-		),
-		`Proveedores`.`NIF`
-	) AS `NIF`,
-	`Proveedores`.`Domicilio` AS `Domicilio`,
-	`Proveedores`.`Localidad` AS `Localidad`,
-	`prov`.`name` AS `Provincia`,
-	`Proveedores`.`codpos` AS `CP`,
-	`p`.`Codigo` AS `country_code`,
-	sub.`empresa_id` AS `empresa_id`,
-	substr(
-		`c`.`email`,
-		1,
-		coalesce(nullif(locate(',', `c`.`email`), 0), 99) - 1
-	) AS `EMAIL`,
-	IF(`p`.`CEE` = 0, 1, IF(`p`.`CEE` = 1, 2, 4)) AS `IDNIF`
-FROM (
-		(
-			(
-				(
-					`vn2008`.`Proveedores`
-					JOIN (
-						SELECT `recibida`.`proveedor_id` AS `proveedor_id`,
-							`recibida`.`empresa_id` AS `empresa_id`
-						FROM `vn2008`.`recibida`
-						WHERE `recibida`.`fecha` > `util`.`VN_CURDATE`() + INTERVAL -3 MONTH
-						GROUP BY `recibida`.`proveedor_id`,
-							`recibida`.`empresa_id`
-						UNION ALL
-						SELECT `pago`.`id_proveedor` AS `id_proveedor`,
-							`pago`.`empresa_id` AS `empresa_id`
-						FROM `vn2008`.`pago`
-						WHERE `pago`.`fecha` > `util`.`VN_CURDATE`() + INTERVAL -3 MONTH
-						GROUP BY `pago`.`id_proveedor`,
-							`pago`.`empresa_id`
-					) sub ON(
-						`Proveedores`.`Id_Proveedor` = sub.`proveedor_id`
-					)
-				)
-				LEFT JOIN `vn2008`.`Paises` `p` ON(`p`.`Id` = `Proveedores`.`pais_id`)
-			)
-			LEFT JOIN `vn2008`.`province` `prov` ON(
-				`prov`.`province_id` = `Proveedores`.`province_id`
-			)
-		)
-		LEFT JOIN `vn`.`supplierContact` `c` ON(`c`.`supplierFk` = `Proveedores`.`Id_Proveedor`)
-	)
-WHERE `Proveedores`.`oficial` <> 0
-GROUP BY sub.`proveedor_id`,
-	sub.`empresa_id`
-UNION ALL
-SELECT `Gastos`.`Id_Gasto` COLLATE utf8mb3_unicode_ci AS `Id_Gasto`,
-	`Gastos`.`Gasto` COLLATE utf8mb3_unicode_ci AS `Gasto`,
-	NULL AS `NULL`,
-	NULL AS `My_exp_NULL`,
-	NULL AS `My_exp_1_NULL`,
-	NULL AS `My_exp_2_NULL`,
-	NULL AS `My_exp_3_NULL`,
-	NULL AS `country_code`,
-	`e`.`id` AS `id`,
-	NULL AS `EMAIL`,
-	1 AS `IDNIF`
-FROM (
-		`vn2008`.`Gastos`
-		JOIN `vn2008`.`empresa` `e` ON(`e`.`id` = 442)
-	)
-UNION ALL
-SELECT `Bancos`.`Cuenta` AS `Cuenta`,
-	`Bancos`.`Banco` AS `Banco`,
-	NULL AS `NULL`,
-	NULL AS `My_exp_NULL`,
-	NULL AS `My_exp_1_NULL`,
-	NULL AS `My_exp_2_NULL`,
-	NULL AS `My_exp_3_NULL`,
-	NULL AS `country_code`,
-	`e`.`id` AS `id`,
-	NULL AS `EMAIL`,
-	1 AS `IDNIF`
-FROM (
-		`vn2008`.`Bancos`
-		JOIN `vn2008`.`empresa` `e` ON(`e`.`id` = 442)
-	)
-UNION ALL
-SELECT lpad(right(`Proveedores`.`cuenta`, 5), 10, '47510000') AS `Cuenta`,
-	`Proveedores`.`Proveedor` AS `Proveedor`,
-	`Proveedores`.`NIF` AS `NIF`,
-	`Proveedores`.`Domicilio` AS `Domicilio`,
-	`Proveedores`.`Localidad` AS `Localidad`,
-	`prov`.`name` AS `Provincia`,
-	`Proveedores`.`codpos` AS `CP`,
-	`p`.`Codigo` AS `country_code`,
-	sub.`empresa_id` AS `empresa_id`,
-	substr(
-		`c`.`email`,
-		1,
-		coalesce(nullif(locate(',', `c`.`email`), 0), 99) - 1
-	) AS `EMAIL`,
-	IF(`p`.`CEE` = 0, 1, IF(`p`.`CEE` = 1, 2, 4)) AS `IDNIF`
-FROM (
-		(
-			(
-				(
-					`vn2008`.`Proveedores`
-					JOIN (
-						SELECT `recibida`.`proveedor_id` AS `proveedor_id`,
-							`recibida`.`empresa_id` AS `empresa_id`
-						FROM `vn2008`.`recibida`
-						WHERE `recibida`.`fecha` > `util`.`VN_CURDATE`() + INTERVAL -3 MONTH
-						GROUP BY `recibida`.`proveedor_id`,
-							`recibida`.`empresa_id`
-						UNION ALL
-						SELECT `pago`.`id_proveedor` AS `id_proveedor`,
-							`pago`.`empresa_id` AS `empresa_id`
-						FROM `vn2008`.`pago`
-						WHERE `pago`.`fecha` > `util`.`VN_CURDATE`() + INTERVAL -3 MONTH
-						GROUP BY `pago`.`id_proveedor`,
-							`pago`.`empresa_id`
-					) sub ON(
-						`Proveedores`.`Id_Proveedor` = sub.`proveedor_id`
-					)
-				)
-				LEFT JOIN `vn2008`.`Paises` `p` ON(`p`.`Id` = `Proveedores`.`pais_id`)
-			)
-			LEFT JOIN `vn2008`.`province` `prov` ON(
-				`prov`.`province_id` = `Proveedores`.`province_id`
-			)
-		)
-		LEFT JOIN `vn`.`supplierContact` `c` ON(`c`.`supplierFk` = `Proveedores`.`Id_Proveedor`)
-	)
-WHERE (
-		`Proveedores`.`cuenta` LIKE '_____3____'
-		OR `Proveedores`.`cuenta` LIKE '_____2____'
-	)
-	AND `Proveedores`.`oficial` = 1
-GROUP BY sub.`proveedor_id`,
-	sub.`empresa_id`
--- a/db/routines/vn2008/views/versiones.sql
+++ b/db/routines/vn2008/views/versiones.sql
@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`versiones`
-AS SELECT `m`.`app` AS `programa`,
-	`m`.`version` AS `version`,
-	0 AS `critical`
-FROM `vn`.`mdbVersion` `m`
-WHERE `m`.`branchFk` = 'master'
--- a/db/routines/vn2008/views/warehouse.sql
+++ b/db/routines/vn2008/views/warehouse.sql
@ -1,21 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`warehouse`
-AS SELECT `w`.`id` AS `id`,
-	`w`.`name` AS `name`,
-	`w`.`isInventory` AS `inventario`,
-	`w`.`isFeedStock` AS `fuente`,
-	`w`.`isComparative` AS `is_comparative`,
-	`w`.`hasComission` AS `comisionantes`,
-	`w`.`hasAvailable` AS `reserve`,
-	`w`.`isManaged` AS `isManaged`,
-	`w`.`isForTicket` AS `tpv`,
-	`w`.`hasStowaway` AS `hasStowaway`,
-	`w`.`hasDms` AS `hasDms`,
-	`w`.`addressName` AS `address_name`,
-	`w`.`delay` AS `delay`,
-	`w`.`countryFk` AS `Id_Paises`,
-	`w`.`labelZone` AS `zone_label`,
-	`w`.`valuatedInventory` AS `valuatedInventory`,
-	`w`.`hasConfectionTeam` AS `hasConfectionTeam`
-FROM `vn`.`warehouse` `w`
--- a/db/routines/vn2008/views/workerDocument.sql
+++ b/db/routines/vn2008/views/workerDocument.sql
@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`workerDocument`
-AS SELECT `vn`.`workerDocument`.`id` AS `id`,
-	`vn`.`workerDocument`.`worker` AS `worker`,
-	`vn`.`workerDocument`.`document` AS `document`,
-	`vn`.`workerDocument`.`isReadableByWorker` AS `isReadableByWorker`
-FROM `vn`.`workerDocument`
--- a/db/routines/vn2008/views/workerTeam.sql
+++ b/db/routines/vn2008/views/workerTeam.sql
@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`workerTeam`
-AS SELECT `wt`.`team` AS `team`,
-	`wt`.`id` AS `id`,
-	`wt`.`workerFk` AS `user`
-FROM `vn`.`workerTeam` `wt`
--- a/db/versions/10835-brownCarnation/00-firstScript.sql
+++ b/db/versions/10835-brownCarnation/00-firstScript.sql
@ -0,0 +1,196 @@
+-- Place your SQL code here
+-- Place your SQL code here
+ALTER TABLE IF EXISTS vn2008.Agencias_province RENAME vn2008.Agencias_province__;
+ALTER TABLE IF EXISTS vn2008.Agencias_province__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+ALTER TABLE IF EXISTS vn2008.Baldas RENAME vn2008.Baldas__;
+ALTER TABLE IF EXISTS vn2008.Baldas__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+ALTER TABLE IF EXISTS vn2008.Brasa RENAME vn2008.Brasa__;
+ALTER TABLE IF EXISTS vn2008.Brasa__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clases
+ALTER TABLE IF EXISTS vn2008.Clases RENAME vn2008.Clases__;
+ALTER TABLE IF EXISTS vn2008.Clases__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clientes_dits
+ALTER TABLE IF EXISTS vn2008.Clientes_dits RENAME vn2008.Clientes_dits__;
+ALTER TABLE IF EXISTS vn2008.Clientes_dits__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clientes_empresa
+ALTER TABLE IF EXISTS vn2008.Clientes_empresa RENAME vn2008.Clientes_empresa__;
+ALTER TABLE IF EXISTS vn2008.Clientes_empresa__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clientes_event
+ALTER TABLE IF EXISTS vn2008.Clientes_event RENAME vn2008.Clientes_event__;
+ALTER TABLE IF EXISTS vn2008.Clientes_event__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clientes_potenciales
+ALTER TABLE IF EXISTS vn2008.Clientes_potenciales RENAME vn2008.Clientes_potenciales__;
+ALTER TABLE IF EXISTS vn2008.Clientes_potenciales__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Compres_ok
+ALTER TABLE IF EXISTS vn2008.Compres_ok RENAME vn2008.Compres_ok__;
+ALTER TABLE IF EXISTS vn2008.Compres_ok__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Consignatarios_devices
+ALTER TABLE IF EXISTS vn2008.Consignatarios_devices RENAME vn2008.Consignatarios_devices__;
+ALTER TABLE IF EXISTS vn2008.Consignatarios_devices__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Conteo
+ALTER TABLE IF EXISTS vn2008.Conteo RENAME vn2008.Conteo__;
+ALTER TABLE IF EXISTS vn2008.Conteo__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Entradas_kop
+ALTER TABLE IF EXISTS vn2008.Entradas_kop RENAME vn2008.Entradas_kop__;
+ALTER TABLE IF EXISTS vn2008.Entradas_kop__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Espionajes
+ALTER TABLE IF EXISTS vn2008.Espionajes RENAME vn2008.Espionajes__;
+ALTER TABLE IF EXISTS vn2008.Espionajes__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Estados
+ALTER TABLE IF EXISTS vn2008.Estados RENAME vn2008.Estados__;
+ALTER TABLE IF EXISTS vn2008.Estados__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Familias
+ALTER TABLE IF EXISTS vn2008.Familias RENAME vn2008.Familias__;
+ALTER TABLE IF EXISTS vn2008.Familias__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Forms
+ALTER TABLE IF EXISTS vn2008.Forms RENAME vn2008.Forms__;
+ALTER TABLE IF EXISTS vn2008.Forms__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Grupos
+ALTER TABLE IF EXISTS vn2008.Grupos RENAME vn2008.Grupos__;
+ALTER TABLE IF EXISTS vn2008.Grupos__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Informes
+ALTER TABLE IF EXISTS vn2008.Informes RENAME vn2008.Informes__;
+ALTER TABLE IF EXISTS vn2008.Informes__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla MoniRENAMEring
+ALTER TABLE IF EXISTS vn2008.MoniRENAMEring RENAME vn2008.MoniRENAMEring__;
+ALTER TABLE IF EXISTS vn2008.MoniRENAMEring__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla MovimienRENAMEs_avisar
+ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_avisar RENAME vn2008.MovimienRENAMEs_avisar__;
+ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_avisar__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla MovimienRENAMEs_revisar
+ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_revisar RENAME vn2008.MovimienRENAMEs_revisar__;
+ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_revisar__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Proveedores_cargueras
+ALTER TABLE IF EXISTS vn2008.Proveedores_cargueras RENAME vn2008.Proveedores_cargueras__;
+ALTER TABLE IF EXISTS vn2008.Proveedores_cargueras__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Proveedores_comunicados
+ALTER TABLE IF EXISTS vn2008.Proveedores_comunicados RENAME vn2008.Proveedores_comunicados__;
+ALTER TABLE IF EXISTS vn2008.Proveedores_comunicados__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Proveedores_escriRENAMEs
+ALTER TABLE IF EXISTS vn2008.Proveedores_escriRENAMEs RENAME vn2008.Proveedores_escriRENAMEs__;
+ALTER TABLE IF EXISTS vn2008.Proveedores_escriRENAMEs__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Tickets_stack
+ALTER TABLE IF EXISTS vn2008.Tickets_stack RENAME vn2008.Tickets_stack__;
+ALTER TABLE IF EXISTS vn2008.Tickets_stack__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Tipos_f11
+ALTER TABLE IF EXISTS vn2008.Tipos_f11 RENAME vn2008.Tipos_f11__;
+ALTER TABLE IF EXISTS vn2008.Tipos_f11__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Tramos
+ALTER TABLE IF EXISTS vn2008.Tramos RENAME vn2008.Tramos__;
+ALTER TABLE IF EXISTS vn2008.Tramos__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla accion_dits
+ALTER TABLE IF EXISTS vn2008.accion_dits RENAME vn2008.accion_dits__;
+ALTER TABLE IF EXISTS vn2008.accion_dits__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla agency_hour
+ALTER TABLE IF EXISTS vn2008.agency_hour RENAME vn2008.agency_hour__;
+ALTER TABLE IF EXISTS vn2008.agency_hour__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla agency_warehouse
+ALTER TABLE IF EXISTS vn2008.agency_warehouse RENAME vn2008.agency_warehouse__;
+ALTER TABLE IF EXISTS vn2008.agency_warehouse__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla call_information
+ALTER TABLE IF EXISTS vn2008.call_information RENAME vn2008.call_information__;
+ALTER TABLE IF EXISTS vn2008.call_information__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla call_option
+ALTER TABLE IF EXISTS vn2008.call_option RENAME vn2008.call_option__;
+ALTER TABLE IF EXISTS vn2008.call_option__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cl_dep
+ALTER TABLE IF EXISTS vn2008.cl_dep RENAME vn2008.cl_dep__;
+ALTER TABLE IF EXISTS vn2008.cl_dep__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cl_pet
+ALTER TABLE IF EXISTS vn2008.cl_pet RENAME vn2008.cl_pet__;
+ALTER TABLE IF EXISTS vn2008.cl_pet__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cl_que
+ALTER TABLE IF EXISTS vn2008.cl_que RENAME vn2008.cl_que__;
+ALTER TABLE IF EXISTS vn2008.cl_que__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla commission
+ALTER TABLE IF EXISTS vn2008.commission RENAME vn2008.commission__;
+ALTER TABLE IF EXISTS vn2008.commission__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla config_host_forms
+ALTER TABLE IF EXISTS vn2008.config_host_forms RENAME vn2008.config_host_forms__;
+ALTER TABLE IF EXISTS vn2008.config_host_forms__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla container
+ALTER TABLE IF EXISTS vn2008.container RENAME vn2008.container__;
+ALTER TABLE IF EXISTS vn2008.container__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cooler_path
+ALTER TABLE IF EXISTS vn2008.cooler_path RENAME vn2008.cooler_path__;
+ALTER TABLE IF EXISTS vn2008.cooler_path__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla credit_card
+ALTER TABLE IF EXISTS vn2008.credit_card RENAME vn2008.credit_card__;
+ALTER TABLE IF EXISTS vn2008.credit_card__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cyc
+ALTER TABLE IF EXISTS vn2008.cyc RENAME vn2008.cyc__;
+ALTER TABLE IF EXISTS vn2008.cyc__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cyc_declaration
+ALTER TABLE IF EXISTS vn2008.cyc_declaration RENAME vn2008.cyc_declaration__;
+ALTER TABLE IF EXISTS vn2008.cyc_declaration__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla dock
+ALTER TABLE IF EXISTS vn2008.dock RENAME vn2008.dock__;
+ALTER TABLE IF EXISTS vn2008.dock__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla edi_testigos
+ALTER TABLE IF EXISTS vn2008.edi_testigos RENAME vn2008.edi_testigos__;
+ALTER TABLE IF EXISTS vn2008.edi_testigos__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla emp_day_pay
+ALTER TABLE IF EXISTS vn2008.emp_day_pay RENAME vn2008.emp_day_pay__;
+ALTER TABLE IF EXISTS vn2008.emp_day_pay__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla expeditions_deleted
+ALTER TABLE IF EXISTS vn2008.expeditions_deleted RENAME vn2008.expeditions_deleted__;
+ALTER TABLE IF EXISTS vn2008.expeditions_deleted__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla expeditions_pictures
+ALTER TABLE IF EXISTS vn2008.expeditions_pictures RENAME vn2008.expeditions_pictures__;
+ALTER TABLE IF EXISTS vn2008.expeditions_pictures__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+ALTER TABLE IF EXISTS vn2008.cp RENAME vn2008.cp__;
+ALTER TABLE IF EXISTS vn2008.cp__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+ALTER TABLE IF EXISTS vn2008.duaDismissed RENAME vn2008.duaDismissed__;
+ALTER TABLE IF EXISTS vn2008.duaDismissed__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla config
+ALTER TABLE IF EXISTS vn2008.config RENAME vn2008.config__;
+ALTER TABLE IF EXISTS vn2008.config__ COMMENT='refs #6371 deprecated 2024-01-11';
--- a/db/versions/10835-brownCarnation/01-Bancos_poliza.sql
+++ b/db/versions/10835-brownCarnation/01-Bancos_poliza.sql
@ -0,0 +1,16 @@
+-- Bancos_poliza
+DROP VIEW IF EXISTS vn.bankPolicy;
+
+ALTER TABLE IF EXISTS `vn2008`.`Bancos_poliza` RENAME `vn`.`bankPolicy`;
+
+ALTER TABLE IF EXISTS `vn`.`bankPolicy`
+CHANGE COLUMN IF EXISTS `poliza_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `referencia` `ref` varchar(45) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `importe` `amount` double NOT NULL,
+CHANGE COLUMN IF EXISTS `com_dispuesto` `committedFee` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `com_no_dispuesto` `nonCommittedFee` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `com_anual` `annualFee` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `apertura` `started` date NOT NULL,
+CHANGE COLUMN IF EXISTS `cierre` `ended` date DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Id_Banco` `accountingFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(10) unsigned NOT NULL DEFAULT 442;
--- a/db/versions/10835-brownCarnation/03-Entradas_orden.sql
+++ b/db/versions/10835-brownCarnation/03-Entradas_orden.sql
@ -0,0 +1,5 @@
+ALTER TABLE IF EXISTS `vn2008`.`Entradas_orden` RENAME `vn`.`entryOrder`;
+
+ALTER TABLE IF EXISTS `vn`.`entryOrder`
+CHANGE COLUMN IF EXISTS `Id_Entrada` `entryFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `orden` `order` int(11) NOT NULL DEFAULT 1 COMMENT '1.- Ordenar por articulo\n2.- Ordenar por compra\n';
--- a/Show More
+++ b/Show More