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
+-   **Tickets → Adelantar:** Permite mover lineas sin generar negativos
-- **Trabajadores → Notificaciones:** Nueva sección (lilium)
+-   **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
+-   (Ticket -> Servicios) Se pueden abonar servicios
-- (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
+-   (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
+-   (Trabajadores -> Gestión documental) Soporte para Docuware
-- (Tickets -> SMS) Nueva sección en Lilium
+-   (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 -> Tickets) Devuelve el motivo por el cual no es editable
-- (General -> Clientes) Razón social y dirección en mayúsculas
+-   (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
+-   (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
-- (Tickets -> Opciones) Opción establecer peso
+-   (Rutas -> Troncales) Nueva sección
-- (Clientes -> SMS) 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
+-   (Clientes -> Morosos) Añadida columna "es trabajador"
-- (Trabajadores -> Departamentos) Añadido listado de Trabajadores por departamento
+-   (Trabajadores -> Departamentos) Nueva sección
-- (Trabajadores -> Departamentos) Añadido características de departamento e informació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
+-   (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas
-- (General -> Históricos) Al filtar por registro se muestra todo el histórial desde que fue creado
+-   (General -> Históricos) Botón para ver el estado del registro en cada punto
-- (Tickets -> Índice) Permite enviar varios albaranes a Docuware
+-   (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
+-   (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
-- (General -> Históricos) Ahora, ademas de los ids, se muestra la descripión de los atributos
+-   (General -> Desplegables) Mejorada eficiencia de carga de datos
-- (General -> Históricos) Botón para hacer más ágil mostrar sólo los cambios en un registro
+-   (General -> Históricos) Ahora, ademas de los ids, se muestra la descripión de los atributos
-- (General -> Históricos) Filtro por cambios
+-   (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
+-   (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
-- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
+-   (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
+-   (Usuarios -> Histórico) Nueva sección
-- (Trabajadores -> Dar de alta) Permite elegir el método de pago
+-   (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
+-   (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.
-- (Facturas recibidas -> Bases negativas) Nueva sección
+-   (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.
+-   (Monitor tickets) Cuando se filtra por 'Pendiente' ya no muestra los estados de 'Previa'
-- (Envíos -> Índice) Cambiado el buscador superior por uno lateral
+-   (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
+-   (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
-- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
+-   (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
-- (Trabajador -> PDA) Nueva sección
+-   (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
+-   (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
-- (Artículos) El disponible en la vista previa se muestra correctamente
+-   (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
+-   (Rutas) Al descargar varias facturas se comprime en un zip
-- (Tickets -> Adelantar tickets) Añadidos campos "líneas" y "litros" al ticket origen
+-   (Trabajadores -> Nuevo trabajador) Nueva sección
-- (Tickets -> Adelantar tickets) Nuevo icono muestra cuando las agencias de los tickets origen/destino son distintas
+-   (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"
+-   (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
-- (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
+-   (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
-- (Proveedores -> Crear/Editar) Permite añadir Proveedores con la misma razón social pero con países distintos
+-   (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
-- (Tickets -> Adelantar tickets) Cambiados selectores de estado por checks "Pendiente origen/destino"
+-   (Proveedores -> Crear/Editar) Permite añadir Proveedores con la misma razón social pero con países distintos
-- (Tickets -> Adelantar tickets) Cambiado stock de destino a origen.
+-   (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
+-   (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
-- (Tickets -> Datos básicos) Permite guardar la hora de envío
+-   (Cliente -> Datos Fiscales) No se permite seleccionar 'Notificar vía e-mail' a los clientes sin e-mail
-- (Tickets -> Añadir pago) Eliminado "null" en las referencias
+-   (Tickets -> Datos básicos) Permite guardar la hora de envío
-- (Tickets -> Adelantar tickets) Permite ordenar por importe
+-   (Tickets -> Añadir pago) Eliminado "null" en las referencias
-- (Tickets -> Adelantar tickets) El filtrado por encajado muestra también los tickets sin tipo de encajado
+-   (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
+-   (General -> Inicio) Permite recuperar la contraseña
-- (Tickets -> Opciones) Enviar correo con PDF de Docuware
+-   (Tickets -> Opciones) Subir albarán a Docuware
-- (Artículos -> Datos Básicos) Añadido campo Unidades/Caja
+-   (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

Dockerfile

@@ -40,11 +40,11 @@ RUN apt-get update \
 WORKDIR /salix
 
 COPY print/package.json print/package-lock.json print/
-RUN npm --prefix ./print install --omit=dev ./print
+RUN npm ci --no-audit --prefer-offline --omit=dev --prefix=print
 
 COPY package.json package-lock.json ./
 COPY loopback/package.json loopback/
-RUN npm install --omit=dev
+RUN npm ci --no-audit --prefer-offline --omit=dev
 
 COPY loopback loopback
 COPY back back

Jenkinsfile

@@ -1,120 +1,147 @@
 #!/usr/bin/env groovy
+
+def PROTECTED_BRANCH
+def FROM_GIT
+def RUN_TESTS
+
+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
+
+    // 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}"
+        STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
-        stage('Checkout') {
-            steps {
-                script {
-                    switch (env.BRANCH_NAME) {
-                        case 'master':
-                            env.NODE_ENV = 'production'
-                            env.BACK_REPLICAS = 4
-                            break
-                        case 'test':
-                            env.NODE_ENV = 'test'
-                            env.BACK_REPLICAS = 2
-                            break
-                    }
-                }
-
-                configFileProvider([
-                    configFile(fileId: "salix.groovy",
-                    variable: 'GROOVY_FILE')
-                ]) {
-                    load env.GROOVY_FILE
-                }
-
-                setEnv()
-            }
-        }
         stage('Install') {
             environment {
                 NODE_ENV = ""
             }
-            steps {
+            parallel {
-                nodejs('node-v20') {
+                stage('Backend') {
-                    sh 'npm install --no-audit --prefer-offline'
+                    steps {
-                    sh 'gulp install --ci'
+                        sh 'npm install --no-audit --prefer-offline'
+                    }
+                }
+                stage('Frontend') {
+                    when {
+                        expression { FROM_GIT }
+                    }
+                    steps {
+                        sh 'npm install --no-audit --prefer-offline --prefix=front'
+                    }
+                }
+                stage('Print') {
+                    when {
+                        expression { FROM_GIT }
+                    }
+                    steps {
+                        sh 'npm install --no-audit --prefer-offline --prefix=print'
+                    }
                 }
             }
         }
         stage('Test') {
-            when { not { anyOf {
+            when {
-                branch 'test'
+                expression { RUN_TESTS }
-                branch 'master'
+            }
-            }}}
             environment {
                 NODE_ENV = ""
                 TZ = 'Europe/Madrid'
             }
             parallel {
-                stage('Frontend') {
-                    steps {
-                        nodejs('node-v20') {
-                            sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=4'
-                        }
-                    }
-                }
                 stage('Backend') {
                     steps {
-                        nodejs('node-v20') {
+                        sh 'npm run test:back:ci'
-                            sh 'npm run test:back:ci'
+                    }
-                        }
+                }
+                stage('Frontend') {
+                    steps {
+                        sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=6'
                     }
                 }
             }
         }
         stage('Build') {
-            when { anyOf {
+            when {
-                branch 'test'
+                expression { PROTECTED_BRANCH && FROM_GIT }
-                branch 'master'
+            }
-            }}
             environment {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-v20') {
+                script {
-                    sh 'gulp build'
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = packageJson.version
                 }
-
+                sh 'gulp build'
                 dockerBuild()
             }
         }
         stage('Deploy') {
-            when { anyOf {
+            when {
-                branch 'test'
+                expression { PROTECTED_BRANCH }
-                branch 'master'
-            }}
-            environment {
-                DOCKER_HOST = "${env.SWARM_HOST}"
             }
-            steps {
+            parallel {
-                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
+                stage('Database') {
-            }
+                    steps {
-        }
+                        configFileProvider([
-        stage('Database') {
+                            configFile(fileId: "config.${env.NODE_ENV}.ini",
-            when { anyOf {
+                            variable: 'MYSQL_CONFIG')
-                branch 'dev'
+                        ]) {
-                branch 'test'
+                            sh 'mkdir -p db/remotes'
-                branch 'master'
+                            sh 'cp "$MYSQL_CONFIG" db/remotes/$NODE_ENV.ini'
-            }}
+                        }
-            steps {
+
-                configFileProvider([
+                        sh 'npx myt push $NODE_ENV --force --commit'
-                    configFile(fileId: "config.${NODE_ENV}.ini",
+                    }
-                    variable: 'MYSQL_CONFIG')
-                ]) {
-                    sh 'mkdir -p db/remotes'
-                    sh 'cp "$MYSQL_CONFIG" db/remotes/$NODE_ENV.ini'
                 }
-                nodejs('node-v20') {
+                stage('Docker') {
-                    sh 'npx myt push $NODE_ENV --force --commit'
+                    when {
+                        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}"
+                    }
                 }
             }
         }
@@ -122,7 +149,7 @@ pipeline {
     post {
         always {
             script {
-                if (!['master', 'test'].contains(env.BRANCH_NAME)) {
+                if (RUN_TESTS) {
                     try {
                         junit 'junitresults.xml'
                         junit 'junit.xml'
@@ -130,18 +157,34 @@ pipeline {
                         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()
 
-                if (!env.COMMITTER_EMAIL || currentBuild.currentResult == 'SUCCESS') return;
+                    String message = env.GIT_COMMIT_MSG
-                try {
+                    int index = message.indexOf('\n')
-                    mail(
+                    if (index != -1)
-                        to: env.COMMITTER_EMAIL,
+                        message = message.substring(0, index)
-                        subject: "Pipeline: ${env.JOB_NAME} (${env.BUILD_NUMBER}): ${currentBuild.currentResult}",
+
-                        body: "Check status at ${env.BUILD_URL}"
+                    rocketSend(
+                        channel: 'vn-database',
+                        message: "*DB version uploaded:* ${message}"
+                            +"\n$COMMITTER_EMAIL ($BRANCH_NAME)"
+                            +"\n$GIT_URL/commit/$GIT_COMMIT",
+                        rawMessage: true
                     )
-                } catch (e) {
-                    echo e.toString()
                 }
             }
         }
+        unsuccessful {
+            setEnv()
+            sendEmail()
+        }
     }
 }

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'),

db/dump/fixtures.before.sql

@@ -942,25 +942,25 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
         ('VT',  'Sales');
 
 INSERT INTO `vn`.`item`(`id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenseFk`,
-    `comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`, `weightByPiece`)
+    `comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `weightByPiece`)
     VALUES
-        (1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',   0,  NULL,   'V',  0, 15,3),
+        (1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',   0,  NULL,   'V',  0, 3),
-        (2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  0, 10,2),
+        (2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  0, 2),
-        (3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, 5,5),
+        (3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, 5),
-        (4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL),
-        (5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL),
-        (6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL),
-        (7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL),
-        (8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL),
-        (9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
+        (9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 0, NULL),
-        (10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL),
-        (11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL),
-        (12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL),
-        (13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 1, NULL,NULL),
+        (13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 1, NULL),
-        (14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
+        (14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 0, NULL),
-        (15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
+        (15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 0, NULL),
-        (16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
+        (16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 0, NULL),
-        (71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL);
+        (71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 0, NULL);
 
 -- Update the taxClass after insert of the items
 UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2

db/routines/bi/procedures/analisis_ventas_update.sql

@@ -32,7 +32,7 @@ BEGIN
 			tm.year AS Año,
 			tm.month AS Mes,
 			tm.week AS Semana,
-			v.vista AS Vista,
+			dm.description AS Vista,
 			bt.importe AS Importe
 		FROM bs.ventas bt
             LEFT JOIN vn2008.Tipos tp ON tp.tipo_id = bt.tipo_id
@@ -44,10 +44,10 @@ BEGIN
             JOIN vn2008.Movimientos m ON m.Id_Movimiento = bt.Id_Movimiento
             LEFT JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
             JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
-            LEFT JOIN vn2008.Vistas v ON v.vista_id = a.Vista
+            LEFT JOIN vn.deliveryMethod dm ON dm.id = a.Vista
             LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
             LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
-            LEFT JOIN vn2008.warehouse w ON w.id = t.warehouse_id
+            LEFT JOIN vn.warehouse w ON w.id = t.warehouse_id
         WHERE bt.fecha >= vLastMonth AND r.mercancia;
 END$$
 DELIMITER ;

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),
@@ -42,6 +43,9 @@ proc:BEGIN
 		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),
@@ -154,7 +157,6 @@ proc:BEGIN
 				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		
 			WHERE e.id = vSelf
 			LIMIT 1;
 

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;

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`

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 ;

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 ;

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

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;
         

db/routines/vn/procedures/item_updatePackingShelve.sql

@@ -1,17 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_updatePackingShelve`(vSelf INT, vPacking INT)
-BEGIN
-	
-	/**
-	 *  Actualiza el valor de item.packingShelve
-	 * 
-	 * @param vSelf Identificador de vn.item
-	 * @param vPacking Cantidad de unidades de venta que caben en una bandeja
-	 */
-	
-	UPDATE vn.item i 
-		SET i.packingShelve = vPacking
-		WHERE i.id = vSelf;
-	
-END$$
-DELIMITER ;

db/routines/vn/procedures/sale_getFromTicketOrCollection.sql

@@ -77,7 +77,6 @@ DECLARE vIsCollection BOOL;
 			s.isAdded,
 			IF(c.workerFk IS NULL, getUser(), c.workerFk) workerFk,
 			IF(SUM(iss.quantity) IS NULL, 0, SUM(iss.quantity)) pickedQuantity,
-			i.packingShelve,
 			MIN(iss.created) picked,
 			IF(sm.id, TRUE, FALSE) hasMistake,
 			sg.sectorFk

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 = 'substitution';
-			SET vOption = vManaDiscount;
-		ELSE
-			SET vOption = vBuyerDiscount;
-		END IF;
 	ELSE
 		SET vFinalPrice = vNewPrice;
-		SET vOption = vChangePrice;
+		SET vOption = 'renewPrices';
 	END IF;
 
 	START TRANSACTION;

db/routines/vn/procedures/ticket_setState.sql

@@ -31,8 +31,8 @@ BEGIN
 		CALL util.throw('ASSIGN_ZONE_FIRST');
 	END IF;
 
-	SET vCanChangeState = (
+	SET vCanChangeState = ((
-			vStateCode <> 'ON_CHECKING' OR 
+			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 ;

db/routines/vn/procedures/workerTimeControl_clockIn.sql

@@ -2,20 +2,22 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workerTimeControl_clockIn`(
 		vWorkerFk INT,
 		vTimed DATETIME,
-		vDirection VARCHAR(10)
+		vDirection VARCHAR(10),
+		vDevice VARCHAR(255)
 )
 BEGIN
 /**
- * Verifica si el empleado puede fichar
+* Verifica si el empleado puede fichar
- * @param vWorkerFk Identificador del trabajador
+* @param vWorkerFk Identificador del trabajador
- * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = NOW
+* @param vTimed Balor de la fichada, IF vTimed IS NULL vTimed = NOW
- * @param vDirection solo se pueden pasa los valores del campo
+* @param vDirection Solo se pueden pasa los valores del campo
- * 	workerTimeControl.direction ENUM('in', 'out', 'middle')
+* 		workerTimeControl.direction ENUM('in', 'out', 'middle')
- * @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
+* @param vDevice Dispositivo en el que se ha fichado
- * Si hay algún problema, devuelve el mesaje que se debe mostrar al usuario
+* @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
- * Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá
+* Si hay algún problema, devuelve el mesaje que se debe mostrar al usuario
- * fichada a la tabla vn.workerTimeControl
+* Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá
- */
+* fichada a la tabla vn.workerTimeControl
+*/
 
 	DECLARE vLastIn DATETIME;
 	DECLARE vLastOut DATETIME;
@@ -276,9 +278,9 @@ BEGIN
 		END IF;
 	END IF;
 
-	-- SE PERMITE FICHAR
+	-- Se permite fichar
-	INSERT INTO workerTimeControl(userFk, timed, direction, `manual`)
+	INSERT INTO workerTimeControl(userFk, timed, direction, device, `manual`)
-		VALUES(vWorkerFk, vTimed, vDirection, vIsManual);
+		VALUES(vWorkerFk, vTimed, vDirection, vDevice, vIsManual);
 
 	SELECT LAST_INSERT_ID() id;
 

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 ;

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 ;

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
+			WHERE ga.itemFk = vGenericFk
-					AND tr.landed BETWEEN ga.startDated AND ga.endDated;
+				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 ;

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 ;

db/routines/vn/triggers/item_beforeUpdate.sql

@@ -7,14 +7,6 @@ BEGIN
 
 	SET NEW.editorFk = account.myUser_getId();
 	
-	IF ISNULL(NEW.packingShelve) AND NOT ISNULL(NEW.packingOut) THEN
-		SELECT NEW.packingOut * vc.shelveVolume / vc.standardFlowerBox
-			INTO vNewPackingShelve
-			FROM vn.volumeConfig vc;
-
-		SET NEW.packingShelve = vNewPackingShelve;
-	END IF;
-
 	IF NEW.itemPackingTypeFk = '' THEN
 		SET NEW.itemPackingTypeFk = NULL;
 	END IF;

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 ;

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);

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

db/routines/vn/views/expeditionPallet_Print.sql

@@ -31,7 +31,7 @@ FROM (
 				)
 				JOIN `vn`.`route` `r` ON(`r`.`id` = `t`.`routeFk`)
 			)
-			LEFT JOIN `vn2008`.`Rutas_monitor` `rm` ON(`rm`.`Id_Ruta` = `r`.`id`)
+			LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `r`.`id`)
 		)
 		LEFT JOIN `vn`.`expeditionTruck` `et2` ON(`et2`.`id` = `rm`.`expeditionTruckFk`)
 	)

db/routines/vn/views/itemShelvingAvailable.sql

@@ -38,7 +38,7 @@ FROM (
 									)
 									JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`)
 								)
-								JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`)
+								JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticket` = `t`.`id`)
 							)
 							JOIN `vn`.`state` `st` ON(`st`.`id` = `tst`.`state`)
 						)

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

db/routines/vn2008/procedures/clean.sql

@@ -20,14 +20,11 @@ proc: BEGIN
 	SET vDate2000 = util.VN_CURDATE() + INTERVAL (2000 - YEAR(util.VN_CURDATE())) YEAR;
 	SET vRangeDeleteTicket = 60;
 
-	DELETE FROM Rutas_monitor WHERE fecha < vDate;
 	DELETE FROM cdr WHERE calldate < vDate18;
 	DELETE FROM Monitoring WHERE ODBC_TIME < vDate;
 	DELETE FROM Conteo WHERE Fecha < vDate;
-	DELETE FROM XDiario WHERE FECHA < vDate3 OR FECHA IS NULL;
 	DELETE FROM mail WHERE DATE_ODBC < vDate;
 	DELETE FROM expeditions_deleted WHERE odbc_date < vDate26;
-	DELETE FROM sms WHERE DATE_ODBC < vDate18;
 	DELETE FROM Movimientos_mark WHERE odbc_date < vDate;
 	DELETE FROM Splits WHERE Fecha < vDate18;
 
@@ -47,8 +44,6 @@ proc: BEGIN
 		JOIN Tickets t ON m.Id_Ticket = t.Id_Ticket WHERE t.Fecha < vDate;
 
 	DELETE FROM Remesas WHERE `Fecha Remesa` < vDate18;
-	DELETE FROM sharingcart where datEND < vDate;
-	DELETE FROM sharingclient where datEND < vDate;
 
 	DELETE tt.*
 		FROM Tickets_turno tt

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

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 vn.warehouse whi ON whi.id = tr.warehouse_id
-				JOIN vn2008.warehouse who ON who.id = tr.warehouse_id_out
+				JOIN vn.warehouse who ON who.id = tr.warehouse_id_out
 				JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
 				JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
 				JOIN vn.confectionType ct ON ct.id = tp.confeccion

db/routines/vn2008/procedures/emailYesterdayPurchasesByConsigna.sql

@@ -17,7 +17,20 @@ BEGIN
 		SELECT t.Id_Ticket, Alias, cast(amount as decimal(10,2)) Importe, Domicilio, POBLACION
 			FROM Tickets t
 				JOIN Consignatarios cs ON t.Id_Consigna = cs.Id_Consigna
-				JOIN v_ticket_amount v ON v.Id_Ticket = t.Id_Ticket
+				JOIN (
+					SELECT `Movimientos`.`Id_Ticket` AS `Id_Ticket`,
+						sum(
+							`Movimientos`.`Cantidad` * `Movimientos`.`Preu` * (100 - `Movimientos`.`Descuento`) / 100
+						) AS `amount`
+					FROM (
+							`vn2008`.`Movimientos`
+							JOIN `vn2008`.`Tickets` ON(
+								`Movimientos`.`Id_Ticket` = `Tickets`.`Id_Ticket`
+							)
+						)
+					WHERE `Tickets`.`Fecha` >= `util`.`VN_CURDATE`() + INTERVAL -6 MONTH
+					GROUP BY `Movimientos`.`Id_Ticket`
+				) v ON v.Id_Ticket = t.Id_Ticket
 			WHERE t.Fecha BETWEEN v_Date AND util.dayEnd(v_Date)
 				AND t.Id_Cliente = v_Client_Id;
 	

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 ;

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 ;

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 ;

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 ;

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 ;

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

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`

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`

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`

db/routines/vn2008/views/Rutas_Master

@@ -1,24 +0,0 @@
-
-CREATE OR REPLACE DEFINER = `root`@`localhost`
-    SQL SECURITY DEFINER
-    VIEW `vn2008`.`Rutas_Master` 
-AS SELECT 
-    `rm`.`id` AS `id`,
-    `rm`.`warehoseFk` AS `warehouse_id`,
-    `rm`.`km` AS `km`,
-    `rm`.`packages` AS `bultos`,
-    `rm`.`vehicleCost` AS `vehiculos_coste`,
-    `rm`.`staffCost` AS `personal_coste`,
-    `rm`.`vehicle` AS `vehiculos_numero`,
-    `rm`.`staff` AS `personal_numero`,
-    `rm`.`fuel` AS `gasoil`,
-    `rm`.`freelancers` AS `autonomos`,
-    `rm`.`year` AS `año`,
-    `rm`.`mounth` AS `mes`,
-    `rm`.`expense` AS `gastos`,
-    `rm`.`freelancersPackages` AS `bultos_autonomos`,
-    `rm`.`kmCost` AS `coste_km`,
-    `rm`.`packageCost` AS `coste_bulto`,
-    `rm`.`freelancerPackageCost` AS `coste_bulto_autonomo` ,
-    `rm`.`created` AS `odbc_date`
-    FROM `vn`.`routeMaster` `rm`

db/routines/vn2008/views/Rutas_Master.sql

@@ -1,22 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Rutas_Master`
-AS SELECT `rm`.`id` AS `id`,
-	`rm`.`warehouseFk` AS `warehouse_id`,
-	`rm`.`km` AS `km`,
-	`rm`.`packages` AS `bultos`,
-	`rm`.`vehicleCost` AS `vehiculos_coste`,
-	`rm`.`staffCost` AS `personal_coste`,
-	`rm`.`vehicle` AS `vehiculos_numero`,
-	`rm`.`staff` AS `personal_numero`,
-	`rm`.`fuel` AS `gasoil`,
-	`rm`.`freelancers` AS `autonomos`,
-	`rm`.`year` AS `año`,
-	`rm`.`month` AS `mes`,
-	`rm`.`expense` AS `gastos`,
-	`rm`.`freelancersPackages` AS `bultos_autonomos`,
-	`rm`.`kmCost` AS `coste_km`,
-	`rm`.`packageCost` AS `coste_bulto`,
-	`rm`.`freelancerPackageCost` AS `coste_bulto_autonomo`,
-	`rm`.`created` AS `odbc_date`
-FROM `vn`.`routeMaster` `rm`

db/routines/vn2008/views/Rutas_monitor.sql

@@ -1,18 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Rutas_monitor`
-AS SELECT `vn`.`routesMonitor`.`routeFk` AS `Id_Ruta`,
-	`vn`.`routesMonitor`.`name` AS `name`,
-	`vn`.`routesMonitor`.`beachFk` AS `Ubicacion`,
-	`vn`.`routesMonitor`.`ticketPacked` AS `pedidosEncajados`,
-	`vn`.`routesMonitor`.`ticketFree` AS `pedidosLibres`,
-	`vn`.`routesMonitor`.`ticketProduction` AS `pedidosProduccion`,
-	`vn`.`routesMonitor`.`packages` AS `bultos`,
-	`vn`.`routesMonitor`.`note` AS `notas`,
-	`vn`.`routesMonitor`.`dated` AS `fecha`,
-	`vn`.`routesMonitor`.`dockFk` AS `dockFk`,
-	`vn`.`routesMonitor`.`m3` AS `m3`,
-	`vn`.`routesMonitor`.`priority` AS `priority`,
-	`vn`.`routesMonitor`.`etd` AS `etd`,
-	`vn`.`routesMonitor`.`expeditionTruckFk` AS `expeditionTruckFk`
-FROM `vn`.`routesMonitor`

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`

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`

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`

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`

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`

db/routines/vn2008/views/VerEspionaje.sql

@@ -1,17 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`VerEspionaje`
-AS SELECT `Trabajadores`.`CodigoTrabajador` AS `CodigoTrabajador`,
-	`vn2008`.`Espionajes`.`Fecha` AS `Fecha`,
-	`vn2008`.`Espionajes`.`HoraEntrada` AS `HoraEntrada`,
-	`vn2008`.`Espionajes`.`HoraSalida` AS `HoraSalida`,
-	`vn2008`.`Espionajes`.`Id_Equipo` AS `Id_Equipo`,
-	`Trabajadores`.`Id_Trabajador` AS `Id_Trabajador`
-FROM (
-		`vn2008`.`Espionajes`
-		JOIN `vn2008`.`Trabajadores` ON(
-			`vn2008`.`Espionajes`.`Id_Trabajador` = `Trabajadores`.`Id_Trabajador`
-		)
-	)
-ORDER BY `Trabajadores`.`CodigoTrabajador`,
-	`vn2008`.`Espionajes`.`Fecha`

db/routines/vn2008/views/Vistas.sql

@@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Vistas`
-AS SELECT `dm`.`id` AS `vista_id`,
-	`dm`.`code` AS `code`,
-	`dm`.`description` AS `vista`
-FROM `vn`.`deliveryMethod` `dm`

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`

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`

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`

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`

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`

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`

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`

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`

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`

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`;

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`;

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`

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`

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`;

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`

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`

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`

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`

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`

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`

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`

db/routines/vn2008/views/observation_type.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`observation_type`
-AS SELECT `co`.`id` AS `observation_type_id`,
-	`co`.`description` AS `description`
-FROM `vn`.`observationType` `co`

db/routines/vn2008/views/order.sql

@@ -1,15 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`order`
-AS SELECT `hedera`.`order`.`id` AS `id`,
-	`hedera`.`order`.`date_make` AS `date_make`,
-	`hedera`.`order`.`date_send` AS `date_send`,
-	`hedera`.`order`.`customer_id` AS `customer_id`,
-	`hedera`.`order`.`delivery_method_id` AS `delivery_method_id`,
-	`hedera`.`order`.`agency_id` AS `agency_id`,
-	`hedera`.`order`.`address_id` AS `address_id`,
-	`hedera`.`order`.`note` AS `note`,
-	`hedera`.`order`.`confirmed` AS `confirmed`,
-	`hedera`.`order`.`is_bionic` AS `is_bionic`,
-	`hedera`.`order`.`source_app` AS `source_app`
-FROM `hedera`.`order`

db/routines/vn2008/views/order_Tickets.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`order_Tickets`
-AS SELECT `ot`.`orderFk` AS `order_id`,
-	`ot`.`ticketFk` AS `Id_Ticket`
-FROM `vn`.`orderTicket` `ot`

db/routines/vn2008/views/order_component.sql

@@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`order_component`
-AS SELECT `c`.`order_row_id` AS `order_row_id`,
-	`c`.`component_id` AS `component_id`,
-	`c`.`price` AS `price`
-FROM `hedera`.`order_component` `c`

db/routines/vn2008/views/order_row.sql

@@ -1,14 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`order_row`
-AS SELECT `order_row`.`id` AS `id`,
-	`order_row`.`order_id` AS `order_id`,
-	`order_row`.`item_id` AS `item_id`,
-	`order_row`.`warehouse_id` AS `warehouse_id`,
-	`order_row`.`shipment` AS `shipment`,
-	`order_row`.`amount` AS `amount`,
-	`order_row`.`price` AS `price`,
-	`order_row`.`rate` AS `rate`,
-	`order_row`.`created` AS `created`,
-	`order_row`.`Id_Movimiento` AS `Id_Movimiento`
-FROM `hedera`.`order_row`

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`

db/routines/vn2008/views/sharingcart.sql

@@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`sharingcart`
-AS SELECT `sc`.`id` AS `id`,
-	`sc`.`workerFk` AS `Id_Trabajador`,
-	`sc`.`started` AS `datSTART`,
-	`sc`.`ended` AS `datEND`,
-	`sc`.`workerSubstitute` AS `Id_Suplente`,
-	`sc`.`created` AS `odbc_date`
-FROM `vn`.`sharingCart` `sc`

db/routines/vn2008/views/sharingclient.sql

@@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`sharingclient`
-AS SELECT `sc`.`id` AS `id`,
-	`sc`.`workerFk` AS `Id_Trabajador`,
-	`sc`.`started` AS `datSTART`,
-	`sc`.`ended` AS `datEND`,
-	`sc`.`clientFk` AS `Id_Cliente`
-FROM `vn`.`sharingClient` `sc`

db/routines/vn2008/views/sms.sql

@@ -1,12 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`sms`
-AS SELECT `t`.`id` AS `id`,
-	`t`.`senderFk` AS `Id_trabajador`,
-	`t`.`sender` AS `from`,
-	`t`.`destination` AS `to`,
-	`t`.`message` AS `text`,
-	`t`.`statusCode` AS `sent`,
-	`t`.`status` AS `response`,
-	`t`.`created` AS `DATE_ODBC`
-FROM `vn`.`sms` `t`

db/routines/vn2008/views/tarifas.sql

@@ -1,11 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`tarifas`
-AS SELECT `r`.`id` AS `tarifa_id`,
-	`r`.`dated` AS `fecha`,
-	`r`.`warehouseFk` AS `warehouse_id`,
-	`r`.`rate0` AS `t0`,
-	`r`.`rate1` AS `t1`,
-	`r`.`rate2` AS `t2`,
-	`r`.`rate3` AS `t3`
-FROM `vn`.`rate` `r`

db/routines/vn2008/views/ticketCreationData.sql

@@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`ticketCreationData`
-AS SELECT dayname(`h`.`confirm_date`) AS `DiadelaSemana`,
-	HOUR(`h`.`confirm_date`) AS `Hora`,
-	cast(`h`.`confirm_date` AS date) AS `Fecha`,
-	`h`.`source_app` AS `Dispositivo`
-FROM `hedera`.`order` `h`
-WHERE `h`.`confirm_date` <> 0

db/routines/vn2008/views/ticketMRW.sql

@@ -1,38 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`ticketMRW`
-AS SELECT `Tickets`.`Id_Agencia` AS `id_Agencia`,
-	`Tickets`.`empresa_id` AS `empresa_id`,
-	`Consignatarios`.`consignatario` AS `Consignatario`,
-	`Consignatarios`.`domicilio` AS `DOMICILIO`,
-	`Consignatarios`.`poblacion` AS `POBLACION`,
-	`Consignatarios`.`codPostal` AS `CODPOSTAL`,
-	`Consignatarios`.`telefono` AS `telefono`,
-	`Consignatarios`.`movil` AS `movil`,
-	`Clientes`.`if` AS `IF`,
-	`Tickets`.`Id_Ticket` AS `Id_Ticket`,
-	`Tickets`.`warehouse_id` AS `warehouse_id`,
-	`Consignatarios`.`id_consigna` AS `Id_Consigna`,
-	`Paises`.`Codigo` AS `CodigoPais`,
-	`Tickets`.`Fecha` AS `Fecha`,
-	`province`.`province_id` AS `province_id`,
-	`Tickets`.`landing` AS `landing`
-FROM (
-		(
-			(
-				(
-					`vn2008`.`Clientes`
-					JOIN `vn2008`.`Consignatarios` ON(
-						`Clientes`.`id_cliente` = `Consignatarios`.`Id_cliente`
-					)
-				)
-				JOIN `vn2008`.`Tickets` ON(
-					`Consignatarios`.`id_consigna` = `Tickets`.`Id_Consigna`
-				)
-			)
-			JOIN `vn2008`.`province` ON(
-				`Consignatarios`.`province_id` = `province`.`province_id`
-			)
-		)
-		JOIN `vn2008`.`Paises` ON(`province`.`Paises_Id` = `Paises`.`Id`)
-	)

db/routines/vn2008/views/tr2.sql

@@ -1,19 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`tr2`
-AS SELECT `vn`.`travel`.`id` AS `id`,
-	`vn`.`travel`.`shipped` AS `shipped`,
-	`vn`.`travel`.`shipmentHour` AS `shipmentHour`,
-	`vn`.`travel`.`landed` AS `landed`,
-	`vn`.`travel`.`landingHour` AS `landingHour`,
-	`vn`.`travel`.`warehouseInFk` AS `warehouseInFk`,
-	`vn`.`travel`.`warehouseOutFk` AS `warehouseOutFk`,
-	`vn`.`travel`.`agencyModeFk` AS `agencyFk`,
-	`vn`.`travel`.`ref` AS `ref`,
-	`vn`.`travel`.`isDelivered` AS `isDelivered`,
-	`vn`.`travel`.`isReceived` AS `isReceived`,
-	`vn`.`travel`.`m3` AS `m3`,
-	`vn`.`travel`.`kg` AS `kg`,
-	`vn`.`travel`.`cargoSupplierFk` AS `cargoSupplierFk`,
-	`vn`.`travel`.`totalEntries` AS `totalEntries`
-FROM `vn`.`travel`

db/routines/vn2008/views/travel_thermograph.sql

@@ -1,11 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`travel_thermograph`
-AS SELECT `tt`.`thermographFk` AS `thermograph_id`,
-	`tt`.`created` AS `odbc_date`,
-	`tt`.`warehouseFk` AS `warehouse_id`,
-	`tt`.`travelFk` AS `travel_id`,
-	`tt`.`temperatureFk` AS `temperature`,
-	`tt`.`result` AS `result`,
-	`tt`.`dmsFk` AS `gestdoc_id`
-FROM `vn`.`travelThermograph` `tt`

db/routines/vn2008/views/v_account.sql

@@ -1,5 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_account`
-AS SELECT `a`.`id` AS `user_id`
-FROM `account`.`account` `a`

db/routines/vn2008/views/v_analisis_ventas.sql

@@ -1,15 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_analisis_ventas`
-AS SELECT `bi`.`analisis_ventas`.`Familia` AS `Familia`,
-	`bi`.`analisis_ventas`.`Reino` AS `Reino`,
-	`bi`.`analisis_ventas`.`Comercial` AS `Comercial`,
-	`bi`.`analisis_ventas`.`Comprador` AS `Comprador`,
-	`bi`.`analisis_ventas`.`Provincia` AS `Provincia`,
-	`bi`.`analisis_ventas`.`almacen` AS `almacen`,
-	`bi`.`analisis_ventas`.`Año` AS `Año`,
-	`bi`.`analisis_ventas`.`Mes` AS `Mes`,
-	`bi`.`analisis_ventas`.`Semana` AS `Semana`,
-	`bi`.`analisis_ventas`.`Vista` AS `Vista`,
-	`bi`.`analisis_ventas`.`Importe` AS `Importe`
-FROM `bi`.`analisis_ventas`

db/routines/vn2008/views/v_barcodes.sql

@@ -1,21 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_barcodes`
-AS SELECT `Articles`.`Id_Article` AS `code`,
-	`Articles`.`Id_Article` AS `Id_Article`
-FROM `vn2008`.`Articles`
-UNION ALL
-SELECT `barcodes`.`code` AS `code`,
-	`barcodes`.`Id_Article` AS `Id_Article`
-FROM `vn2008`.`barcodes`
-UNION ALL
-SELECT `c`.`Id_Compra` AS `Id_Compra`,
-	`c`.`Id_Article` AS `Id_Article`
-FROM (
-		(
-			`vn2008`.`Compres` `c`
-			JOIN `vn2008`.`Entradas` `e` ON(`c`.`Id_Entrada` = `e`.`Id_Entrada`)
-		)
-		JOIN `vn2008`.`travel` `tr` ON(`tr`.`id` = `e`.`travel_id`)
-	)
-WHERE `tr`.`landing` >= `util`.`VN_CURDATE`() + INTERVAL -15 DAY

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

db/routines/vn2008/views/v_departure_limit.sql

@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_departure_limit`
-AS SELECT `cache`.`departure_limit`.`warehouse_id` AS `warehouse_id`,
-	`cache`.`departure_limit`.`fecha` AS `fecha`,
-	`cache`.`departure_limit`.`hora` AS `hora`,
-	`cache`.`departure_limit`.`minSpeed` AS `minSpeed`
-FROM `cache`.`departure_limit`

db/routines/vn2008/views/v_descuadre_bionic.sql

@@ -1,41 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_descuadre_bionic`
-AS SELECT `t`.`Id_Ticket` AS `Id_Ticket`,
-	`t`.`Alias` AS `Alias`,
-	`m`.`Concepte` AS `Concepte`,
-	sum(`mc`.`Valor`) AS `suma_componente`,
-	`m`.`Preu` AS `Preu`,
-	`m`.`Descuento` AS `Descuento`,
-	`m`.`Preu` * (100 - `m`.`Descuento`) / 100 - sum(`mc`.`Valor`) AS `diferencia`,
-	`t`.`Fecha` AS `Fecha`,
-	`m`.`Preu` > 0
-	AND `tp`.`reino_id` <> 6
-	AND `a`.`tipo_id` NOT IN (7, 115) AS `benvenut`
-FROM (
-		(
-			(
-				(
-					(
-						(
-							`vn2008`.`Movimientos` `m`
-							JOIN `vn2008`.`Tickets` `t` ON(`m`.`Id_Ticket` = `t`.`Id_Ticket`)
-						)
-						JOIN `vn2008`.`Clientes` `c` ON(`t`.`Id_Cliente` = `c`.`id_cliente`)
-					)
-					JOIN `vn2008`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouse_id`)
-				)
-				JOIN `vn2008`.`Articles` `a` ON(`m`.`Id_Article` = `a`.`Id_Article`)
-			)
-			JOIN `vn2008`.`Tipos` `tp` ON(`a`.`tipo_id` = `tp`.`tipo_id`)
-		)
-		LEFT JOIN `vn2008`.`Movimientos_componentes` `mc` ON(`m`.`Id_Movimiento` = `mc`.`Id_Movimiento`)
-	)
-WHERE `t`.`Fecha` >= '2015-09-01'
-	AND `t`.`empresa_id` IN (442, 791, 567)
-	AND `w`.`reserve` <> 0
-	AND `c`.`real` <> 0
-	AND `tp`.`reino_id` <> 6
-GROUP BY `m`.`Id_Movimiento`
-HAVING abs(`diferencia`) > 0.01
-	OR `diferencia` IS NULL

db/routines/vn2008/views/v_inter.sql

@@ -1,11 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_inter`
-AS SELECT `tt`.`id` AS `inter_id`,
-	`tt`.`stateFk` AS `state_id`,
-	`tt`.`notes` AS `nota`,
-	`tt`.`created` AS `odbc_date`,
-	`tt`.`ticketFk` AS `Id_Ticket`,
-	`tt`.`userFk` AS `Id_Trabajador`,
-	`tt`.`supervisorFk` AS `Id_supervisor`
-FROM `vn`.`ticketTracking` `tt`

db/routines/vn2008/views/v_miriam.sql

@@ -1,23 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_miriam`
-AS SELECT `M`.`Id_Article` AS `Id_Article`,
-	`M`.`Concepte` AS `Concepte`,
-	`M`.`Cantidad` AS `Cantidad`,
-	`M`.`Preu` AS `Preu`,
-	`M`.`Descuento` AS `Descuento`,
-	`T`.`Fecha` AS `Fecha`,
-	`T`.`Id_Cliente` AS `Id_Cliente`,
-	`M`.`Cantidad` * `M`.`Preu` * (100 - `M`.`Descuento`) / 100 AS `Importe`
-FROM (
-		(
-			(
-				`vn2008`.`Tickets` `T`
-				JOIN `vn2008`.`Movimientos` `M` ON(`T`.`Id_Ticket` = `M`.`Id_Ticket`)
-			)
-			JOIN `vn2008`.`Articles` `A` ON(`M`.`Id_Article` = `A`.`Id_Article`)
-		)
-		JOIN `vn2008`.`Tipos` `TP` ON(`A`.`tipo_id` = `TP`.`tipo_id`)
-	)
-WHERE `T`.`Fecha` >= '2011-01-01'
-	AND `A`.`tipo_id` = 7

db/routines/vn2008/views/v_price_fixed.sql

@@ -1,35 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_price_fixed`
-AS SELECT `pf`.`warehouse_id` AS `warehouse_id`,
-	`pf`.`item_id` AS `item_id`,
-	`pf`.`rate_0` AS `rate_0`,
-	`pf`.`rate_1` AS `rate_1`,
-	`pf`.`rate_2` AS `rate_2`,
-	`pf`.`rate_3` AS `rate_3`,
-	`pf`.`date_start` AS `date_start`,
-	`pf`.`date_end` AS `date_end`,
-	`pf`.`bonus` AS `bonus`,
-	`pf`.`grouping` AS `grouping`,
-	`pf`.`Packing` AS `Packing`,
-	`pf`.`caja` AS `caja`
-FROM `vn2008`.`price_fixed` `pf`
-WHERE `pf`.`warehouse_id` < 1000
-UNION ALL
-SELECT `wg`.`warehouse_id` AS `warehouse_id`,
-	`pf`.`item_id` AS `item_id`,
-	`pf`.`rate_0` AS `rate_0`,
-	`pf`.`rate_1` AS `rate_1`,
-	`pf`.`rate_2` AS `rate_2`,
-	`pf`.`rate_3` AS `rate_3`,
-	`pf`.`date_start` AS `date_start`,
-	`pf`.`date_end` AS `date_end`,
-	`pf`.`bonus` AS `bonus`,
-	`pf`.`grouping` AS `grouping`,
-	`pf`.`Packing` AS `Packing`,
-	`pf`.`caja` AS `caja`
-FROM (
-		`vn2008`.`price_fixed` `pf`
-		JOIN `vn2008`.`warehouse_group` `wg`
-	)
-WHERE `wg`.`warehouse_alias_id` + 1000 = `pf`.`warehouse_id`

db/routines/vn2008/views/v_price_fixed_group.sql

@@ -1,20 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_price_fixed_group`
-AS SELECT `pf`.`warehouse_id` AS `warehouse_id`,
-	`pf`.`item_id` AS `item_id`,
-	`pf`.`rate_0` AS `rate_0`,
-	`pf`.`rate_1` AS `rate_1`,
-	`pf`.`rate_2` AS `rate_2`,
-	`pf`.`rate_3` AS `rate_3`,
-	`pf`.`date_start` AS `date_start`,
-	`pf`.`date_end` AS `date_end`,
-	`pf`.`bonus` AS `bonus`,
-	`pf`.`grouping` AS `grouping`,
-	`pf`.`Packing` AS `Packing`,
-	`pf`.`caja` AS `caja`
-FROM `vn2008`.`v_price_fixed` `pf`
-GROUP BY `pf`.`warehouse_id`,
-	`pf`.`item_id`,
-	`pf`.`date_start`,
-	`pf`.`date_end`

db/routines/vn2008/views/v_ticket_amount.sql

@@ -1,15 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_ticket_amount`
-AS SELECT `Movimientos`.`Id_Ticket` AS `Id_Ticket`,
-	sum(
-		`Movimientos`.`Cantidad` * `Movimientos`.`Preu` * (100 - `Movimientos`.`Descuento`) / 100
-	) AS `amount`
-FROM (
-		`vn2008`.`Movimientos`
-		JOIN `vn2008`.`Tickets` ON(
-			`Movimientos`.`Id_Ticket` = `Tickets`.`Id_Ticket`
-		)
-	)
-WHERE `Tickets`.`Fecha` >= `util`.`VN_CURDATE`() + INTERVAL -6 MONTH
-GROUP BY `Movimientos`.`Id_Ticket`

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

db/routines/vn2008/views/v_warehouse.sql

@@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_warehouse`
-AS SELECT `warehouse`.`id` AS `id`,
-	`warehouse`.`name` AS `almacen`
-FROM `vn2008`.`warehouse`
-UNION ALL
-SELECT 1000 + `warehouse_alias`.`warehouse_alias_id` AS `warehouse_alias_id`,
-	concat(`warehouse_alias`.`alias`, '(G)') AS `concat(alias, '(G)')`
-FROM `vn2008`.`warehouse_alias`