build: init version

Reviewed-on: #3474
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

Jenkinsfile

@@ -8,6 +8,7 @@ def RUN_BUILD
 def BRANCH_ENV = [
     test: 'test',
     master: 'production',
+    main: 'production',
     beta: 'production'
 ]
 
@@ -20,12 +21,14 @@ node {
             'dev',
             'test',
             'master',
+            'main',
             'beta'
         ].contains(env.BRANCH_NAME)
 
         FROM_GIT = env.JOB_NAME.startsWith('gitea/')
         RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
         RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
+        IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
 
         // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
@@ -73,6 +76,7 @@ pipeline {
                     def packageJson = readJSON file: 'package.json'
                     def version = "${packageJson.version}-build${env.BUILD_ID}"
                     writeFile(file: 'VERSION.txt', text: version)
+                    echo "VERSION: ${version}"
                 }
             }
         }
@@ -105,93 +109,72 @@ pipeline {
                 }
             }
         }
-        stage('Stack') {
+        stage('Test') {
+            when {
+                expression { RUN_TESTS }
+            }
+            environment {
+                NODE_ENV = ''
+            }
             parallel {
                 stage('Back') {
-                    stages {
-                        stage('Test') {
-                            when {
-                                expression { RUN_TESTS }
-                            }
-                            environment {
-                                NODE_ENV = ''
-                            }
-                            steps {
-                                sh 'node back/tests.js --junit'
-                            }
-                            post {
-                                always {
-                                    junit(
-                                        testResults: 'junitresults.xml',
-                                        allowEmptyResults: true
-                                    )
-                                }
-                            }
-                        }
-                        stage('Build') {
-                            when {
-                                expression { RUN_BUILD }
-                            }
-                            environment {
-                                VERSION = readFile 'VERSION.txt'
-                            }
-                            steps {
-                                sh 'docker-compose build back'
-                            }
+                    steps {
+                        sh 'node back/tests.js --junit'
+                    }
+                    post {
+                        always {
+                            junit(
+                                testResults: 'junitresults.xml',
+                                allowEmptyResults: true
+                            )
                         }
                     }
                 }
                 stage('Front') {
-                    when {
-                        expression { FROM_GIT }
+                    steps {
+                        sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
                     }
-                    stages {
-                        stage('Test') {
-                            when {
-                                expression { RUN_TESTS }
-                            }
-                            environment {
-                                NODE_ENV = ''
-                            }
-                            steps {
-                                sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
-                            }
-                            post {
-                                always {
-                                    junit(
-                                        testResults: 'junit.xml',
-                                        allowEmptyResults: true
-                                    )
-                                }
-                            }
-                        }
-                        stage('Build') {
-                            when {
-                                expression { RUN_BUILD }
-                            }
-                            environment {
-                                VERSION = readFile 'VERSION.txt'
-                            }
-                            steps {
-                                sh 'gulp build'
-                                sh 'docker-compose build front'
-                            }
+                    post {
+                        always {
+                            junit(
+                                testResults: 'junit.xml',
+                                allowEmptyResults: true
+                            )
                         }
                     }
                 }
             }
         }
-        stage('Push') {
+        stage('Build') {
             when {
                 expression { RUN_BUILD }
             }
             environment {
-                CREDENTIALS = credentials('docker-registry')
                 VERSION = readFile 'VERSION.txt'
+                CREDENTIALS = credentials('docker-registry')
             }
-            steps {
-                sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
-                sh 'docker-compose push'
+            parallel {
+                stage('Back') {
+                    steps {
+                        dockerBuild 'salix-back', '.', 'back/Dockerfile'
+                    }
+                }
+                stage('Front') {
+                    steps {
+                        sh 'gulp build'
+                        dockerBuild 'salix-front', 'front'
+                    }
+                }
+                stage('DB') {
+                    steps {
+                        sh 'npx myt run -t'
+                        sh 'docker exec vn-database sh -c "rm -rf /mysql-template"'
+                        sh 'docker exec vn-database sh -c "cp -a /var/lib/mysql /mysql-template"'
+                        sh 'docker commit vn-database salix-db:$VERSION'
+                        sh 'docker rm -f vn-database'
+                        dockerPush docker.image("salix-db:${VERSION}")
+                    }
+                }
             }
         }
         stage('Deploy') {
@@ -264,3 +247,19 @@ pipeline {
         }
     }
 }
+
+def dockerBuild(imageName, context, dockerfile = null) {
+    if (dockerfile == null)
+        dockerfile = "${context}/Dockerfile"
+    def baseImage = "${imageName}:${env.VERSION}"
+    def image = docker.build(baseImage, "-f ${dockerfile} ${context}")
+    dockerPush(image)
+}
+
+def dockerPush(image) {
+    docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
+        image.push()
+        image.push(env.BRANCH_NAME)
+        if (IS_LATEST) image.push('latest')
+    }
+}

back/Dockerfile

@@ -25,7 +25,7 @@ RUN apt-get update \
         libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 \
         libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 \
         libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
-        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
+        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 build-essential \
         fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
 
 # Extra dependencies
@@ -55,4 +55,4 @@ COPY \
     README.md \
     ./
 
-CMD ["node", "--tls-min-v1.0", "--openssl-legacy-provider", "./loopback/server/server.js"]
+CMD ["node", "--tls-min-v1.0", "--openssl-legacy-provider", "./loopback/server/server.js"]

back/methods/osticket/sendToSupport.js

@@ -33,25 +33,52 @@ module.exports = Self => {
         const emailUser =
             await Self.app.models.EmailUser.findById(userId, {fields: ['email']});
 
-        let html = `<h2>Motivo: ${reason}</h2>`;
-        html += `<h3>Usuario: ${userId} ${emailUser.email}</h3>`;
-        html += `<h3>Additional Data:</h3>`;
-        html += '<ul>';
+        const tableStyle = 'width:100%; border-collapse: collapse; text-align: left;';
+        const thStyle = 'padding: 8px; border: 1px solid #ddd; background-color: #f4f4f4;';
+        const tdStyle = 'padding: 8px; border: 1px solid #ddd;';
+        const tdBoldStyle = 'padding: 8px; border: 1px solid #ddd; font-weight: bold;';
+        const subTdStyle = 'padding: 6px; border: 1px solid #ddd;';
+        const subTdBoldStyle = 'padding: 6px; border: 1px solid #ddd; font-weight: bold;';
+
+        let html = `
+        <h2>Motivo: ${reason}</h2>
+        <h3>Usuario: ${userId} ${emailUser.email}</h3>
+        <h3>Additional Data:</h3>
+        <table style="${tableStyle}">
+            <thead>
+                <tr>
+                <th style="${thStyle}">Clave</th><th style="${thStyle}">Valor</th></tr>
+            </thead>
+            <tbody>`;
         for (const [key, val] of Object.entries(additionalData)) {
-            if (key !== 'config') html += `<li>${key}: ${parse(val)}</li>`;
-            else {
-                html += `<li>${key}:</li><ul style="list-style-type: square;">`;
-                for (const [confKey, confVal] of Object.entries(val))
-                    html += `<li>${confKey}: ${parse(confVal)}</li>`;
-                html += '</ul>';
+            if (key !== 'config') {
+                html += `<tr>
+                            <td style="${tdBoldStyle}">${key}</td>
+                            <td style="${tdStyle}">${parse(val)}</td>
+                        </tr>`;
+            } else {
+                html += `<tr>
+                            <td style="${tdBoldStyle}">${key}</td>
+                            <td style="${tdStyle}">
+                                <table style="${tableStyle}">
+                <tbody>`;
+                for (const [confKey, confVal] of Object.entries(val)) {
+                    html += `<tr>
+                                <td style="${subTdBoldStyle}">${confKey}</td>
+                                <td style="${subTdStyle}">${parse(confVal)}</td>
+                            </tr>`;
+                }
+                html += `</tbody></table></td></tr>`;
             }
         }
-        html += '</ul>';
+        html += `</tbody></table>`;
 
         const {message, path, name} = additionalData;
+        const err = name && message ? `${name}: ${message}` : name || message || '';
+
         await smtp.send({
             to: `${config.app.reportEmail}, ${emailUser.email}`,
-            subject: `[Support-Salix] ${path} ${name}: ${message}`,
+            subject: `[Support-Salix] ${path.split('?')[0]} ${err}`,
             html
         });
     };

back/model-config.json

@@ -219,26 +219,5 @@
     },
     "MrwService": {
         "dataSource": "vn"
-    },
-    "CompanyI18n": {
-        "dataSource": "vn"
-    },
-    "ItemTypeI18n": {
-        "dataSource": "vn"
-    },
-    "InkI18n": {
-        "dataSource": "vn"
-    },
-    "OriginI18n": {
-        "dataSource": "vn"
-    },
-    "StateI18n": {
-        "dataSource": "vn"
-    },
-    "TagI18n": {
-        "dataSource": "vn"
-    },
-    "ItemCategoryI18n": {
-        "dataSource": "vn"
     }
-}
+}

back/models/companyI18n.json

@@ -1,26 +0,0 @@
-{
-	"name": "CompanyI18n",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "companyI18n"
-		}
-	},
-	"properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "companyFk": {
-            "type": "number",
-            "id": 1
-        },
-        "lang": {
-            "type": "string",
-            "id": 2
-        },
-        "footnotes": {
-            "type": "string"
-        }
-    }
-}

back/models/inkI18n.json

@@ -1,26 +0,0 @@
-{
-	"name": "InkI18n",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "inkI18n"
-		}
-	},
-	"properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "inkFk": {
-            "type": "number",
-            "id": 1
-        },
-        "lang": {
-            "type": "string",
-            "id": 2
-        },
-        "name": {
-            "type": "string"
-        }
-    }
-}

back/models/itemCategoryI18n.json

@@ -1,26 +0,0 @@
-{
-	"name": "ItemCategoryI18n",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "itemCategoryI18n"
-		}
-	},
-	"properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "categoryFk": {
-            "type": "number",
-            "id": 1
-        },
-        "lang": {
-            "type": "string",
-            "id": 2
-        },
-        "name": {
-            "type": "string"
-        }
-    }
-}

back/models/itemTypeI18n.json

@@ -1,27 +0,0 @@
-{
-	"name": "ItemTypeI18n",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "itemTypeI18n"
-		}
-	},
-	"properties": {
-
-        "typeFk": {
-            "type": "number",
-            "id": 1
-        },
-        "lang": {
-            "type": "string",
-            "id": 2
-        },
-        "name": {
-            "type": "string"
-        },
-        "id": {
-            "type": "number",
-            "id": true
-        }
-    }
-}

back/models/originI18n.json

@@ -1,26 +0,0 @@
-{
-	"name": "OriginI18n",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "originI18n"
-		}
-	},
-	"properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "originFk": {
-            "type": "number",
-            "id": 1
-        },
-        "lang": {
-            "type": "string",
-            "id": 2
-        },
-        "name": {
-            "type": "string"
-        }
-    }
-}

back/models/stateI18n.json

@@ -1,26 +0,0 @@
-{
-	"name": "StateI18n",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "stateI18n"
-		}
-	},
-	"properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "stateFk": {
-            "type": "number",
-            "id": 1
-        },
-        "lang": {
-            "type": "string",
-            "id": 2
-        },
-        "name": {
-            "type": "string"
-        }
-    }
-}

back/models/tagI18n.json

@@ -1,26 +0,0 @@
-{
-	"name": "TagI18n",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "tagI18n"
-		}
-	},
-	"properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "tagFk": {
-            "type": "number",
-            "id": 1
-        },
-        "lang": {
-            "type": "string",
-            "id": 2
-        },
-        "name": {
-            "type": "string"
-        }
-    }
-}

back/models/vn-user.json

@@ -54,7 +54,8 @@
             "type": "string"
         },
         "hasGrant": {
-            "type": "boolean"
+            "type": "boolean",
+            "default": false
         },
         "passExpired": {
             "type": "date"
@@ -168,6 +169,7 @@
                 "emailVerified",
                 "twoFactor"
             ]
+
         }
     }
 }

db/dump/.dump/data.sql

@@ -4,7 +4,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `version` VALUES ('vn-database','11410','7a02af9a3acae14a658de1557baa44542c24d480','2025-01-28 07:44:02','11423');
+INSERT INTO `version` VALUES ('vn-database','11436','f83055057e5eb15c800033882ea117e6ee646673','2025-02-18 09:15:11','11445');
 
 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@@ -853,6 +853,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11071','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11073','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-09 07:39:38',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11074','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:35',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11075','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-28 12:54:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11076','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:24',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11078','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:35',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11079','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-31 08:22:10',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11080','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-31 12:01:58',NULL,NULL);
@@ -990,6 +991,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11196','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11197','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11198','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 07:42:49',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11201','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-08-27 13:04:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11202','01-updateStateAlertLevel.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:24',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11204','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11205','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-04 13:54:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11206','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:42',NULL,NULL);
@@ -1139,11 +1141,15 @@ INSERT INTO `versionLog` VALUES ('vn-database','11377','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11378','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11379','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11379','01-secScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11383','00-town.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:25',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11383','01-postCode.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11383','02-province.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:36',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11384','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11385','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:33',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11387','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11390','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:08',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11391','00-itemAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:08',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11393','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:36',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11396','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11398','00-zoneEventPriceOptimum.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11398','00-zonePriceOptimum.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
@@ -1156,9 +1162,35 @@ INSERT INTO `versionLog` VALUES ('vn-database','11406','00-currrencyAlter.sql','
 INSERT INTO `versionLog` VALUES ('vn-database','11406','01-currrencyUpdate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11407','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11410','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11411','00-agencyIncomingForeign.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:36',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11411','01-travelThermographAlter.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:37',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11415','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-20 08:12:38',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:37',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:37',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','02-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:37',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','03-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:38',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','04-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:40',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','05-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:40',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','06-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:40',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','07-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','08-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','09-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11418','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-21 11:03:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11419','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11422','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11423','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-23 15:19:32',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11424','00-travel.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:45',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11425','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:45',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11427','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:46',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11428','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11429','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11430','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11432','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-02-06 13:34:31',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11433','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-06 13:45:28',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11436','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11436','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11436','02-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11436','03-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1258,6 +1290,7 @@ INSERT INTO `role` VALUES (129,'buyerAssistant','Comprador que tienes mas permis
 INSERT INTO `role` VALUES (130,'reviewer','Revisor de producción',1,'2024-06-11 00:00:00','2024-06-11 00:00:00',10578);
 INSERT INTO `role` VALUES (131,'supplier','Privilegios básicos de un proveedor',1,'2024-07-05 10:18:58','2024-07-05 10:18:58',19295);
 INSERT INTO `role` VALUES (132,'salesPersonClaim','Departamento de ventas con funciones de reclamaciones',1,'2025-01-17 07:07:40','2025-01-17 07:07:40',19295);
+INSERT INTO `role` VALUES (133,'deliveryFreelancer','Repartidor autónomo',1,'2025-02-18 08:53:36','2025-02-18 08:53:36',10578);
 
 INSERT INTO `roleInherit` VALUES (1,1,2,NULL);
 INSERT INTO `roleInherit` VALUES (2,1,3,NULL);
@@ -1530,7 +1563,6 @@ INSERT INTO `roleInherit` VALUES (373,131,2,19295);
 INSERT INTO `roleInherit` VALUES (375,120,131,1437);
 INSERT INTO `roleInherit` VALUES (376,124,21,19336);
 INSERT INTO `roleInherit` VALUES (377,47,49,19295);
-INSERT INTO `roleInherit` VALUES (378,101,15,19294);
 INSERT INTO `roleInherit` VALUES (379,103,121,19294);
 INSERT INTO `roleInherit` VALUES (381,119,123,19295);
 INSERT INTO `roleInherit` VALUES (382,48,72,783);
@@ -1538,6 +1570,9 @@ INSERT INTO `roleInherit` VALUES (383,114,111,19295);
 INSERT INTO `roleInherit` VALUES (384,132,18,19295);
 INSERT INTO `roleInherit` VALUES (385,132,72,19295);
 INSERT INTO `roleInherit` VALUES (386,109,132,19295);
+INSERT INTO `roleInherit` VALUES (387,101,122,19295);
+INSERT INTO `roleInherit` VALUES (388,59,58,13657);
+INSERT INTO `roleInherit` VALUES (389,59,111,19295);
 
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
 
@@ -2096,7 +2131,7 @@ INSERT INTO `ACL` VALUES (664,'MailForward','*','*','ALLOW','ROLE','itManagement
 INSERT INTO `ACL` VALUES (667,'VnUser','*','*','ALLOW','ROLE','itManagement',NULL);
 INSERT INTO `ACL` VALUES (668,'VnUser','__get__preview','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (669,'VnUser','preview','*','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (670,'VnUser','create','*','ALLOW','ROLE','itManagement',NULL);
+INSERT INTO `ACL` VALUES (670,'VnUser','create','*','ALLOW','ROLE','developerBoss',19295);
 INSERT INTO `ACL` VALUES (672,'PackingSiteAdvanced','*','*','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (673,'InvoiceOut','makePdfAndNotify','WRITE','ALLOW','ROLE','invoicing',NULL);
 INSERT INTO `ACL` VALUES (674,'InvoiceOutConfig','*','READ','ALLOW','ROLE','invoicing',NULL);
@@ -2408,6 +2443,31 @@ INSERT INTO `ACL` VALUES (1013,'Route','optimizePriority','*','ALLOW','ROLE','em
 INSERT INTO `ACL` VALUES (1014,'Worker','canModifyAbsenceInPast','WRITE','ALLOW','ROLE','hr',10578);
 INSERT INTO `ACL` VALUES (1015,'Worker','__get__sip','READ','ALLOW','ROLE','employee',19294);
 INSERT INTO `ACL` VALUES (1016,'VnUser','adminUser','WRITE','ALLOW','ROLE','sysadmin',10578);
+INSERT INTO `ACL` VALUES (1017,'BusinessReasonEnd','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1018,'CalendarType','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1019,'OccupationCode','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1020,'BusinessReasonEnd','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1021,'WorkerBusinessProfessionalCategory','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1022,'WorkerBusinessAgreement','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1023,'WorkerBusinessType','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1024,'PayrollCategory','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1025,'Worker','__get__business','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1026,'Worker','__create__business','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1027,'Business','crud','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1028,'Route','getTickets','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1029,'AgencyTerm','filter','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1030,'Route','summary','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1031,'Route','getRouteByAgency','WRITE','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1032,'Route','filter','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1033,'UserConfig','getUserConfig','*','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1034,'Route','getTickets','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1035,'Route','guessPriority','WRITE','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1036,'Route','getDeliveryPoint','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1037,'Route','findById','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1038,'Route','sendSms','WRITE','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1039,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1040,'Client','findById','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1041,'Entry','transfer','WRITE','ALLOW','ROLE','coolerBoss',10578);
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2706,77 +2766,79 @@ INSERT INTO `continent` VALUES (3,'África','AF');
 INSERT INTO `continent` VALUES (4,'Europa','EU');
 INSERT INTO `continent` VALUES (5,'Oceanía','OC');
 
-INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,132,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,134,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,5,NULL,72,0,0,1,1,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (23,'CMA','CAMARA',15,16,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (31,'it','INFORMATICA',6,7,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (35,'finance','FINANZAS',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (36,'labor','LABORAL',12,13,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,39,NULL,72,1,1,1,12,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,41,NULL,72,1,1,1,13,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (38,'picking','SACADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,1,NULL,NULL,NULL,'ON_PREPARATION');
 INSERT INTO `department` VALUES (39,'packing','ENCAJADO',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PACKING');
-INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',40,41,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (43,'VT','VENTAS',42,91,NULL,0,0,0,1,24,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (46,'delivery','REPARTO',96,97,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',98,99,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',104,105,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',42,43,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',44,93,NULL,0,0,0,1,24,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (44,'management','GERENCIA',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',96,97,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',100,101,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
+INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',104,105,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',45,46,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',106,107,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',21,22,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',23,24,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (58,'CMP','CAMPOS',106,109,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',110,111,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',45,46,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
-INSERT INTO `department` VALUES (61,NULL,'VNH',112,115,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',116,117,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',108,111,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
+INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',112,113,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',47,48,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
+INSERT INTO `department` VALUES (61,NULL,'VNH',114,117,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',118,119,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',25,26,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',118,119,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',47,48,4250,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',120,121,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (89,NULL,'COORDINACION',122,123,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (90,NULL,'TRAILER',113,114,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',120,121,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',49,50,4250,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',122,123,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (89,NULL,'COORDINACION',124,125,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (90,NULL,'TRAILER',115,116,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',27,28,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PREVIOUS');
-INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',49,50,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',51,52,3797,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',53,54,24065,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',55,56,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',57,58,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',59,60,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',124,125,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',61,62,1118,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',51,52,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',53,54,3797,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',55,56,24065,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',57,58,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',59,60,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',61,62,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',126,127,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',63,64,1118,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (126,'preserved','PRESERVADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PALLETIZING');
 INSERT INTO `department` VALUES (130,'reviewers','REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
-INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',107,108,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',63,64,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (133,'franceTeamManagement','EQUIPO GESTIÓN FRANCIA',65,66,9751,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
-INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',67,68,8964,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
-INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',126,127,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',128,129,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (137,'sorter','SORTER',130,131,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',69,70,3803,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',71,72,24065,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',109,110,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',65,66,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (133,'franceTeamManagement','EQUIPO GESTIÓN FRANCIA',67,68,9751,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
+INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',69,70,8964,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
+INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',128,129,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',130,131,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (137,'sorter','SORTER',132,133,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',71,72,3803,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',73,74,24065,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (141,NULL,'PREVIA',35,36,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,22,'/1/22/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',73,74,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',1,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
-INSERT INTO `department` VALUES (148,'franceTeamCatchment','EQUIPO CAPTACIÓN FRANCIA',75,76,25178,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
-INSERT INTO `department` VALUES (149,'spainTeamCatchment','EQUIPO ESPAÑA CAPTACIÓN',77,78,1203,0,0,0,2,0,43,'/1/43/','es_captacion_equipo',1,'es_captacion@verdnatura.es',0,0,0,0,NULL,NULL,'5700',NULL);
-INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',79,80,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'es_levante@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
-INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',81,82,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'es_noroeste@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
-INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',83,84,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'es_noreste@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
-INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',85,86,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'es_sur@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
-INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',87,88,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'es_centro@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
-INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',89,90,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'es_vip@verdnatura.es',0,0,0,0,NULL,NULL,'5600',NULL);
+INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',75,76,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',1,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
+INSERT INTO `department` VALUES (148,'franceTeamCatchment','EQUIPO CAPTACIÓN FRANCIA',77,78,25178,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
+INSERT INTO `department` VALUES (149,'spainTeamCatchment','EQUIPO ESPAÑA CAPTACIÓN',79,80,1203,0,0,0,2,0,43,'/1/43/','es_captacion_equipo',1,'es_captacion@verdnatura.es',0,0,0,0,NULL,NULL,'5700',NULL);
+INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',81,82,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'es_levante@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
+INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',83,84,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'es_noroeste@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
+INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',85,86,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'es_noreste@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
+INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',87,88,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'es_sur@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
+INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',89,90,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'es_centro@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
+INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',91,92,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'es_vip@verdnatura.es',0,0,0,0,NULL,NULL,'5600',NULL);
 INSERT INTO `department` VALUES (156,NULL,'COCINA',37,38,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (157,NULL,'RECICLAJE',39,40,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 
 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (3,'hr','RRHH','find','Búsqueda','N__DOCUMENTO',3);
 
+INSERT INTO `itemPackingType` VALUES ('A','Altillo',1);
 INSERT INTO `itemPackingType` VALUES ('F','Fruta y Verdura',0);
 INSERT INTO `itemPackingType` VALUES ('H','Horizontal',1);
 INSERT INTO `itemPackingType` VALUES ('P','Pienso',0);
@@ -2878,21 +2940,21 @@ INSERT INTO `state` VALUES (13,'En Reparto',11,4,'ON_DELIVERY',13,0,1,0,0,0,0,0,
 INSERT INTO `state` VALUES (14,'Preparado',6,2,'PREPARED',14,0,1,0,2,0,0,1,0,'warning');
 INSERT INTO `state` VALUES (15,'Pte Recogida',12,4,'WAITING_FOR_PICKUP',15,0,1,0,0,0,0,0,0,NULL);
 INSERT INTO `state` VALUES (16,'Entregado',13,4,'DELIVERED',16,0,1,0,0,0,0,0,0,NULL);
-INSERT INTO `state` VALUES (20,'Asignado',4,0,'PICKER_DESIGNED',20,1,0,0,0,0,0,2,0,'success');
+INSERT INTO `state` VALUES (20,'Asignado',4,1,'PICKER_DESIGNED',20,1,0,0,0,0,0,2,0,'success');
 INSERT INTO `state` VALUES (21,'Retornado',4,2,'PRINTED_BACK',21,0,0,0,0,0,0,2,0,'success');
 INSERT INTO `state` VALUES (22,'Pte. Ampliar',2,0,'EXPANDABLE',22,0,0,0,0,0,0,4,1,'alert');
-INSERT INTO `state` VALUES (23,'URGENTE',5,2,'LAST_CALL',23,1,0,1,0,0,0,4,1,'success');
+INSERT INTO `state` VALUES (23,'URGENTE',5,1,'LAST_CALL',23,1,0,1,0,0,0,4,1,'success');
 INSERT INTO `state` VALUES (24,'Encadenado',4,0,'CHAINED',24,0,0,0,0,0,0,3,1,'success');
 INSERT INTO `state` VALUES (25,'Embarcando',3,0,'BOARDING',25,1,0,0,0,0,0,3,0,'alert');
-INSERT INTO `state` VALUES (26,'Prep Previa',5,0,'PREVIOUS_PREPARATION',28,1,0,0,1,0,0,2,0,'warning');
-INSERT INTO `state` VALUES (28,'Previa OK',3,0,'OK PREVIOUS',28,1,0,1,1,1,1,3,0,'warning');
-INSERT INTO `state` VALUES (29,'Previa Impreso',4,0,'PRINTED PREVIOUS',29,1,0,1,0,0,1,2,0,'success');
-INSERT INTO `state` VALUES (31,'Polizon Impreso',4,2,'PRINTED STOWAWAY',29,1,0,1,0,0,1,2,0,'success');
-INSERT INTO `state` VALUES (33,'Auto_Impreso',4,0,'PRINTED_AUTO',29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (26,'Prep Previa',5,1,'PREVIOUS_PREPARATION',28,1,0,0,1,0,0,2,0,'warning');
+INSERT INTO `state` VALUES (28,'Previa OK',3,1,'OK PREVIOUS',28,1,0,1,1,1,1,3,0,'warning');
+INSERT INTO `state` VALUES (29,'Previa Impreso',4,1,'PRINTED PREVIOUS',29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (31,'Polizon Impreso',4,1,'PRINTED STOWAWAY',29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (33,'Auto_Impreso',4,1,'PRINTED_AUTO',29,1,0,1,0,0,1,2,0,'success');
 INSERT INTO `state` VALUES (34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',34,0,0,0,0,0,0,4,1,'alert');
 INSERT INTO `state` VALUES (35,'Semi-Encajado',9,3,'HALF_PACKED',10,0,1,0,0,0,0,1,0,NULL);
-INSERT INTO `state` VALUES (36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',37,1,0,0,4,0,1,2,0,'warning');
-INSERT INTO `state` VALUES (37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',29,1,0,1,0,0,1,2,0,'warning');
+INSERT INTO `state` VALUES (36,'Previa Revisando',3,1,'PREVIOUS_CONTROL',37,1,0,0,4,0,1,2,0,'warning');
+INSERT INTO `state` VALUES (37,'Previa Revisado',3,1,'PREVIOUS_CONTROLLED',29,1,0,1,0,0,1,2,0,'warning');
 INSERT INTO `state` VALUES (38,'Prep Cámara',6,2,'COOLER_PREPARATION',14,0,0,0,2,0,0,2,0,'warning');
 INSERT INTO `state` VALUES (42,'Entregado en parte',13,3,'PARTIAL_DELIVERED',16,0,1,0,0,0,0,0,0,NULL);
 INSERT INTO `state` VALUES (43,'Preparación por caja',6,2,'BOX_PICKING',42,0,0,0,2,0,0,2,0,'warning');
@@ -2902,7 +2964,7 @@ INSERT INTO `ticketUpdateAction` VALUES (2,'Convertir en maná','mana');
 
 INSERT INTO `ticketCanAdvanceConfig` VALUES (1,5);
 
-INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,167.0);
+INSERT INTO `volumeConfig` VALUES (1,2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,167.0);
 
 INSERT INTO `workerActivityType` VALUES ('CLAIM','RECLAMACIONES');
 INSERT INTO `workerActivityType` VALUES ('DELIVERY','REPARTO');

db/dump/.dump/privileges.sql

@@ -326,7 +326,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','printQueue','juan@db
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','preservedBoss','travel','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','travel','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyerAssistant','itemType','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','itemType','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','state','alexm@%','0000-00-00 00:00:00','Select','');
@@ -561,7 +561,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component_t
 INSERT IGNORE INTO `tables_priv` VALUES ('','vncontrol','employee','accion','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','volumeConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','currency','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyerBoss','tag','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','currency','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financial','creditClassification','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financial','creditInsurance','alexm@%','0000-00-00 00:00:00','Select','');
@@ -752,11 +751,11 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','dua','alexm@%','0000-0
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','duaEntry','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','expeditionTruck','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','moving','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDetail','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDms','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDms','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','vehicle','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','awb','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machine','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machine','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Entradas_dits','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerTimeControlMail','alexm@%','0000-00-00 00:00:00','Select,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bi','coolerBoss','rotacion','alexm@%','0000-00-00 00:00:00','Select','');
@@ -835,6 +834,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','bi','salesPerson','tarifa_component
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','employee','expeditionLog','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bs','salesPerson','clientNewBorn','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleItemShelving__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','ticketDms','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','employee','expedition','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingStock','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleParking__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
@@ -889,7 +889,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','supplierAgenc
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packager','franceExpressConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','manager','ticketLog','juan@10.5.1.2','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','ticketCollection','alexm@%','0000-00-00 00:00:00','Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','ticketDms','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketObservation','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logistic','ticketPackaging','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketPackaging','alexm@%','0000-00-00 00:00:00','Select','');
@@ -1240,7 +1239,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','hedera','grafana','visitAccess','ro
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','v_botanic_export','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','itemCost','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bs','deliveryAssistant','m3','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','ticketDms','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','marketingBoss','itemTypeI18n','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','time','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','v_Articles_botanical','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','inventoryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1285,7 +1284,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','company','juan@db-pr
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','grafana','buffer','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','greuge','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','item','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Select,Update');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','itemShelving','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','cooler','itemShelving','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','agencyIncoming','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','addressObservation','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','negativeOrigin','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1505,6 +1504,29 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemSoldOutTa
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemDurationTag','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemGrowingTag','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','receipt','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','machine','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packagerBoss','awb','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','machineDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','machineDms','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','tag','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packagerBoss','buy','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packagerBoss','genericAllocation','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','packagerBoss','Tintas','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','productionCountry','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','teamBoss','workerTimeControlConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','packagerBoss','Entradas','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','packagerBoss','Compres','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','packagerBoss','buySource','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','payment','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Tickets','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Update');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','payMethod','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','roadmap','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','roadmapStop','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','roadmapAddress','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','roadmap','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','roadmapStop','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','roadmapAddress','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','volumeConfig','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Update');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1564,6 +1586,8 @@ INSERT IGNORE INTO `columns_priv` VALUES ('','pbx','grafana','sip','user_id','00
 INSERT IGNORE INTO `columns_priv` VALUES ('','pbx','grafana','sip','extension','0000-00-00 00:00:00','Select');
 INSERT IGNORE INTO `columns_priv` VALUES ('','account','grafana','user','name','0000-00-00 00:00:00','Select');
 INSERT IGNORE INTO `columns_priv` VALUES ('','account','grafana','user','active','0000-00-00 00:00:00','Select');
+INSERT IGNORE INTO `columns_priv` VALUES ('','vn','deliveryBoss','volumeConfig','palletM3','0000-00-00 00:00:00','Update');
+INSERT IGNORE INTO `columns_priv` VALUES ('','vn2008','administrative','Tickets','Bultos','0000-00-00 00:00:00','Update');
 INSERT IGNORE INTO `columns_priv` VALUES ('','vn','employee','business','workerFk','0000-00-00 00:00:00','Select');
 INSERT IGNORE INTO `columns_priv` VALUES ('','vn','employee','business','id','0000-00-00 00:00:00','Select');
 INSERT IGNORE INTO `columns_priv` VALUES ('','vn','employee','business','departmentFk','0000-00-00 00:00:00','Select');
@@ -1975,9 +1999,8 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','util','productionAssi','midnight','F
 INSERT IGNORE INTO `procs_priv` VALUES ('','dipole','employee','expedition_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelving_transfer','PROCEDURE','alexm@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','coolerBoss','itempacking','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesPerson','ticket_clone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','cache','employee','available_refresh','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','logistic','ticket_clone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_doCmr','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','coolerBoss','ticket_clone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','financial','payment_add','PROCEDURE','jgallego@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','hr','timebusiness_calculatebyuser','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1992,7 +2015,6 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','cache','buyer','last_buy_refresh','P
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','supplierpackaging_reportsource','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','cache','buyer','stock_refresh','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','itemshelvingproblem','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','itemshelvingradar','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','cache','employee','visible_refresh','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','grafana','quarterfirstday','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','hr','workertimecontrol_sendmailbydepartment','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -2162,6 +2184,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','collection_printstic
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','deviceproductionuser_getworker','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_printlabelprevious','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_isoutclosurezone','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','entry_lock','PROCEDURE','jgallego@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticketstatetoday_setstate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','device_checklogin','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','worker_getfromhasmistake','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -2212,6 +2235,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','entry_getTransfe
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','entry_getTransfer','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','intrastat_estimateNet','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','artificialBoss','confection_controlSource','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','item_comparative','PROCEDURE','carlosap@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','developer','connection_kill','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','financial','client_getRisk','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','account','developer','user_hasRole','FUNCTION','root@localhost','Execute','0000-00-00 00:00:00');
@@ -2243,6 +2267,12 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_secto
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','saleSplit','PROCEDURE','carlosap@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemShelvingSale_deleteAdded','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_getUltimate','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','entry_isintrastat','FUNCTION','carlosap@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','entry_clone','PROCEDURE','carlosap@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','buy_getUltimate','PROCEDURE','carlosap@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','ticket_clone','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','deliveryBoss','roadmap_cloneDay','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','deliveryBoss','getTimeBetweenRoadmapAddresses','FUNCTION','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 /*!40000 ALTER TABLE `procs_priv` ENABLE KEYS */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -2257,6 +2287,7 @@ USE `mysql`;
 
 /*!40000 ALTER TABLE `global_priv` DISABLE KEYS */;
 INSERT IGNORE INTO `global_priv` VALUES ('','account','{\"access\": 0, \"is_role\": true,\"version_id\":100707}');
+INSERT IGNORE INTO `global_priv` VALUES ('','adminAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','adminBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','adminOfficer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','administrative','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
@@ -2307,6 +2338,7 @@ INSERT IGNORE INTO `global_priv` VALUES ('','marketing','{\"access\": 0, \"is_ro
 INSERT IGNORE INTO `global_priv` VALUES ('','marketingBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','officeBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','packager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT IGNORE INTO `global_priv` VALUES ('','packagerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','palletizer','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','palletizerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','preservedBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');

db/dump/.dump/triggers.sql

@@ -2668,6 +2668,7 @@ trig:BEGIN
 		THEN
 
 		CALL entry_isEditable(OLD.entryFk);
+		CALL entry_isEditable(NEW.entryFk);
 	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();
@@ -2736,11 +2737,11 @@ trig:BEGIN
 		SET NEW.buyerFk = vBuyerFk;
 	END IF;
 
-	IF NOT (NEW.itemFk <=> OLD.itemFk) OR 
-		NOT (OLD.entryFk <=> NEW.entryFk) THEN		
+	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();		
+		CALL buy_checkItem();
 	END IF;
 END */;;
 DELIMITER ;
@@ -4979,7 +4980,6 @@ BEGIN
 
 	IF NEW.isBooked = OLD.isBooked AND (
 			NOT (NEW.supplierFk <=> OLD.supplierFk) OR
-			NOT (NEW.dated <=> OLD.dated) OR
 			NOT (NEW.travelFk <=> OLD.travelFk) OR
 			NOT (NEW.companyFk <=> OLD.companyFk) OR
 			NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) OR
@@ -6994,11 +6994,57 @@ DELIMITER ;;
 	BEFORE INSERT ON `mandate`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
 	IF (NEW.code IS NULL) THEN
-		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT 
-		    FROM information_schema.TABLES 
-		    WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
-    END IF;
+		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT
+			FROM information_schema.TABLES
+			WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
+	END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`mandate_beforeUpdate`
+	BEFORE INSERT ON `mandate`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`mandate_afterDelete`
+	AFTER DELETE ON `mandate`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO mandateLog
+		SET `action` = 'delete',
+			`changedModel` = 'mandate',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -7978,10 +8024,31 @@ DELIMITER ;;
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.name IS NOT NULL THEN
+		SET NEW.name = UCASE(NEW.name);
+	END IF;
+
+	IF NEW.trailerPlate IS NOT NULL OR NEW.tugPlate IS NOT NULL THEN
+		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
+	END IF;
+
 	IF NEW.driver1Fk IS NOT NULL THEN
-		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
-	ELSE
-		SET NEW.driverName = NULL;
+		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+								FROM worker w
+								WHERE w.id = NEW.driver1Fk);
+
+		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
+							FROM worker w
+								LEFT JOIN client c ON c.id = w.id
+							WHERE w.id = NEW.driver1Fk);
+	END IF;
+
+	IF NEW.driverChangeFk IS NOT NULL THEN
+		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+										FROM worker w
+										WHERE w.id = NEW.driverChangeFk);
 	END IF;
 END */;;
 DELIMITER ;
@@ -8002,10 +8069,51 @@ DELIMITER ;;
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	IF NEW.driver1Fk IS NOT NULL THEN
-		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
-	ELSE
-		SET NEW.driverName = NULL;
+	DECLARE vSeconds INT;
+
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF NOT (NEW.name <=> OLD.name) THEN
+		SET NEW.name = UCASE(NEW.name);
+	END IF;
+
+	IF NOT (NEW.trailerPlate <=> OLD.trailerPlate) OR NOT (NEW.tugPlate <=> OLD.tugPlate) THEN
+		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
+	END IF;
+
+	IF NOT (NEW.driverName <=> OLD.driverName) THEN
+		SET NEW.driver1Fk = NULL;
+	END IF;
+
+	IF NOT (NEW.driver1Fk <=> OLD.driver1Fk) AND NEW.driver1Fk IS NOT NULL THEN
+		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+								FROM worker w
+								WHERE w.id = NEW.driver1Fk);
+
+		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
+							FROM worker w
+								LEFT JOIN client c ON c.id = w.id
+							WHERE w.id = NEW.driver1Fk);
+	END IF;
+
+	IF NOT (NEW.driverChangeName <=> OLD.driverChangeName) THEN
+		SET NEW.driverChangeFk = NULL;
+	END IF;
+
+	IF NOT (NEW.driverChangeFk <=> OLD.driverChangeFk) AND NEW.driverChangeFk IS NOT NULL THEN
+		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+										FROM worker w
+										WHERE w.id = NEW.driverChangeFk);
+	END IF;
+
+	IF NOT (NEW.etd <=> OLD.etd) THEN
+		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
+		
+		IF vSeconds <> 0 THEN
+			UPDATE roadmapStop
+				SET eta = eta + INTERVAL vSeconds SECOND
+				WHERE roadmapFk = NEW.id;
+		END IF;
 	END IF;
 END */;;
 DELIMITER ;
@@ -8026,9 +8134,17 @@ DELIMITER ;;
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
 
-	SET NEW.description = UCASE(NEW.description);
+	IF NEW.description IS NOT NULL THEN
+		SET NEW.description = UCASE(NEW.description);
+	END IF;
 
+	IF NEW.roadmapFk IS NOT NULL THEN
+		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+			CALL util.throw('Departure time can not be after arrival time');
+		END IF;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -8048,9 +8164,18 @@ DELIMITER ;;
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
 
-	SET NEW.description = UCASE(NEW.description);
+	IF NOT (NEW.description <=> OLD.description) THEN
+		SET NEW.description = UCASE(NEW.description);
+	END IF;
 
+	IF NOT (NEW.roadmapFk <=> OLD.roadmapFk) OR NOT (NEW.eta <=> OLD.eta) THEN
+
+		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+			CALL util.throw('Departure time can not be after arrival time');
+		END IF;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10577,6 +10702,10 @@ BEGIN
 	IF NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
+
+	IF NEW.availabled < NEW.landed THEN
+		CALL util.throw('The travel availabled cannot be earlier than landed');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10633,6 +10762,10 @@ BEGIN
 	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
+
+	IF NEW.availabled < NEW.landed THEN
+		CALL util.throw('The travel availabled cannot be earlier than landed');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11526,9 +11659,8 @@ BEGIN
 	INSERT INTO zoneLog
 		SET `action` = 'delete',
 			`changedModel` = 'zoneIncluded',
-			`changedModelId` = OLD.zoneFk,
+			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11611,4 +11743,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-01-28  7:09:01
+-- Dump completed on 2025-02-18  8:16:03

db/dump/fixtures.after.sql

@@ -77,8 +77,8 @@ INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
     ('Otra agencia ', '1', '0', '0');
 
 INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
-    ('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),
-    ('1', '1', 1, '2', '1', '1', '1', 'pc00', 'F', 0);
+    ('1', '1', 1, '1', '1', '1', '1', 'pc1', 'F', 0),
+    ('1', '1', 1, '2', '1', '1', '1', 'pc1', 'F', 0);
 
 INSERT INTO vn.client (id,name,defaultAddressFk,street,fi,email,dueDay,isTaxDataChecked,accountingAccount,city,provinceFk,postcode,socialName,contact,credit,countryFk,quality,riskCalculated) VALUES
     (100,'root',110,'Valle de la muerte','74974747G','root@mydomain.com',0,1,'4300000078','ALGEMESI',1,'46680','rootSocial','rootContact',500.0,1,10,'2025-01-01');

db/dump/fixtures.before.sql

@@ -761,44 +761,45 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen
         (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE());
 
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`, `problem`, `risk`)
-	VALUES
-		(1 , 3,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      121, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      1,         1,                      'hasHighRisk',          901.4),
-		(2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      1,   NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2,         2,                      'hasHighRisk',          901.4),
-		(3 , 1,     7,  1, 6,       DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),      NULL,      3,                               NULL,          NULL),
-		(4 , 3,     2,  1, 2,       DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 9,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),      NULL,      NULL,                            NULL,          NULL),
-		(5 , 3,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),      NULL,      NULL,                            NULL,          NULL),
-		(6 , 1,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Mountain Drive Gotham',                         1,   NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      NULL,      NULL,                   'hasHighRisk',          901.4),
-		(7 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'Mountain Drive Gotham',                         1,   NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
-		(8 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'Bat cave',                                      121, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
-		(9 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(10, 1,     1,  5, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'Ingram Street',                                 2,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'isTooLittle',          NULL),
-		(11, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,              'hasTicketRequest',          NULL),
-		(12, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(13, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(14, 1,     2,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1104, 'Malibu Point',                                  4,   NULL,     0, 9,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(15, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1105, 'An incredibly long alias for testing purposes', 125, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                     'isFreezed',          NULL),
-		(16, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          388.7),
-		(17, 1,     7,  2, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          388.7),
-		(18, 1,     4,  4, 4,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1108, 'Cerebro',                                       128, NULL,     0, 12,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +12 HOUR),      NULL,      NULL,                     'isFreezed',          NULL),
-		(19, 1,     5,  5, NULL,    util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1109, 'Somewhere in Thailand',                         129, NULL,     1, NULL,   5, 1, util.VN_CURDATE(),                                   NULL,      NULL,              'isTaxDataChecked',          NULL),
-		(20, 1,     5,  5, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Thailand',                         129, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL,      NULL,              'isTaxDataChecked',          NULL),
-		(21, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Holland',                          102, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL,      NULL,              'isTaxDataChecked',          NULL),
-		(22, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Japan',                            103, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL,      NULL,              'isTaxDataChecked',          NULL),
-		(23, NULL,  8,  1, 7,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'address 21',                                    121, NULL,     0, 5,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL, 'hasTicketRequest, hasHighRisk',          901.4),
-		(24 ,NULL,  8,  1, 7,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,     0, 5,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
-		(25 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
-		(26 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'An incredibly long alias for testing purposes', 1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
-		(27 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Wolverine',                                     1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          901.4),
-		(28, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(33, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(34, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1103, 'BEJAR',                                         123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(35, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Somewhere in Philippines',                      123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(36, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Ant-Man Adventure',                             123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-		(37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL);
+    VALUES
+        (1 , 3,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      121, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      1,         1,                      'hasHighRisk',          901.4),
+        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      1,   NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2,         2,                      'hasHighRisk',          901.4),
+        (3 , 1,     7,  1, 6,       DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),      NULL,      3,                               NULL,          NULL),
+        (4 , 3,     2,  1, 2,       DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 9,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),      NULL,      NULL,                            NULL,          NULL),
+        (5 , 3,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),      NULL,      NULL,                            NULL,          NULL),
+        (6 , 1,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Mountain Drive Gotham',                         1,   NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      NULL,      NULL,                   'hasHighRisk',          901.4),
+        (7 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'Mountain Drive Gotham',                         1,   NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
+        (8 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'Bat cave',                                      121, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
+        (9 , NULL,  7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (10, 1,     1,  5, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'Ingram Street',                                 2,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'isTooLittle',          NULL),
+        (11, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,              'hasTicketRequest',          NULL),
+        (12, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (13, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (14, 1,     2,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1104, 'Malibu Point',                                  4,   NULL,     0, 9,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (15, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1105, 'An incredibly long alias for testing purposes', 125, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                     'isFreezed',          NULL),
+        (16, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          388.7),
+        (17, 1,     7,  2, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          388.7),
+        (18, 1,     4,  4, 4,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1108, 'Cerebro',                                       128, NULL,     0, 12,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +12 HOUR),      NULL,      NULL,                     'isFreezed',          NULL),
+        (19, 1,     5,  5, NULL,    util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1109, 'Somewhere in Thailand',                         129, NULL,     1, NULL,   5, 1, util.VN_CURDATE(),                                   NULL,      NULL,              'isTaxDataChecked',          NULL),
+        (20, 1,     5,  5, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Thailand',                         129, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL,      NULL,              'isTaxDataChecked',          NULL),
+        (21, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Holland',                          102, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL,      NULL,              'isTaxDataChecked',          NULL),
+        (22, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Japan',                            103, NULL,     0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),      NULL,      NULL,              'isTaxDataChecked',          NULL),
+        (23, NULL,  8,  1, 7,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1101, 'address 21',                                    121, NULL,     0, 5,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL, 'hasTicketRequest, hasHighRisk',          901.4),
+        (24 ,NULL,  8,  1, 7,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,     0, 5,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
+        (25 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
+        (26 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'An incredibly long alias for testing purposes', 1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                   'hasHighRisk',          901.4),
+        (27 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Wolverine',                                     1,   NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          901.4),
+        (28, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (33, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (34, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1103, 'BEJAR',                                         123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (35, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Somewhere in Philippines',                      123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (36, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Ant-Man Adventure',                             123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+		(1000000, NULL, 1, 1, NULL, util.VN_CURDATE(),                                 util.VN_CURDATE(),                                                        1, 'employee',                                      121, NULL, 0, 1, 1.00, 0.00, CURDATE(),                                              NULL, NULL,                                   '',          NULL);
 
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
 	VALUES
@@ -923,17 +924,18 @@ INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`, `workerF
 		(5, 'CON', 'Container',      3, NULL,   35, 1, 'warm', 0),
 		(6, 'ALS', 'Alstroemeria',   1, 31,     16, 0, 'warm', 1);
 
-INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`)
+INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`, `hexJson`)
 	VALUES
-		('YEL', 'Yellow',       1, 1, 'F4D03F'),
-		('BLU', 'Blue',         1, 2, '5DADE2'),
-		('RED', 'Red',          1, 3, 'EC7063'),
-		('SLV', 'Silver',       1, 4, 'CACFD2'),
-		('BRW', 'Brown',        1, 5, 'DC7633'),
-		('BLK', 'Black',        1, 6, '000000'),
-		('BAS', 'Blue/Silver',  1, 7, '5DADE2'),
-		('GRN', 'Green',        1, 8, '28A745'),
-		('WHT', 'White',        1, 9, 'FFFFFF');
+		('YEL', 'Yellow',         1, 1, 'F4D03F', '{"value": ["F4D03F"]}'),
+		('BLU', 'Blue',           1, 2, '5DADE2', '{"value": ["5DADE2"]}'),
+		('RED', 'Red',            1, 3, 'EC7063', '{"value": ["EC7063"]}'),
+		('SLV', 'Silver',         1, 4, 'CACFD2', '{"value": ["CACFD2"]}'),
+		('BRW', 'Brown',          1, 5, 'DC7633', '{"value": ["DC7633"]}'),
+		('BLK', 'Black',          1, 6, '000000', '{"value": ["000000"]}'),
+		('BAS', 'Blue/Silver',    1, 7, '5DADE2', '{"value": ["5DADE2"]}'),
+		('GRN', 'Green',          1, 8, '28A745', '{"value": ["28A745"]}'),
+		('WHT', 'White',          1, 9, 'FFFFFF', '{"value": ["FFFFFF"]}'),
+        ('RGB', 'Red/Green/Blue', 1, 9, 'FFFFFF', '{"value": ["EC7063","5DADE2","28A745"]}');
 
 INSERT INTO `vn`.`origin`(`id`,`code`, `name`)
 	VALUES
@@ -981,28 +983,30 @@ 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`, `weightByPiece`, `isCustomInspectionRequired`
+	`id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenseFk`,
+	`comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`,
+	`itemPackingTypeFk`, `hasMinPrice`, `packingOut`, `weightByPiece`, `isCustomInspectionRequired`
 )
 VALUES
-    (1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',  0,  NULL,	'V',	0, 3, 		1),
-    (2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  	0, 2, 		1),
-    (3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, 5, 		0),
-    (4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-    (5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-    (6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-    (7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-    (8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-    (9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL,	0),
-    (10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-    (11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-    (12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-    (13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 	1, NULL,	0),
-    (14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL,	0),
-    (15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL,	0),
-    (16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL,	0),
-    (71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0);
+	(1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',  0,  NULL,	'V',	0, NULL,    3, 	1),
+	(2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  	0, NULL,    2, 	1),
+	(3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,    5,  0),
+	(4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 	1, NULL, NULL,	0),
+	(14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+	(72, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, NULL, NULL, 1, 'VT',   0,  NULL,   NULL, 	1,    1, NULL, 	0),
+	(88, 1,    1, 2, NULL,              NULL, 06021010, 4751000000, NULL, 0, NULL, NULL,10, 'VT',   0,  NULL,   NULL,   1, NULL, NULL,  0);
 
 
 -- Update the taxClass after insert of the items
@@ -1125,7 +1129,8 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
         (40, 2, 34, 'Melee weapon combat fist 15cm', 10.00, 3.91, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
         (41, 2, 35, 'Melee weapon combat fist 15cm', 8.00, 3.01, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasRounding,hasItemLost'),
-        (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasRounding,hasItemLost');
+        (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasRounding,hasItemLost'),
+		(43, 88, 1000000, 'Chest medical box 2', 15.00, 10.00, 0, 0, 0, CURDATE(), '');
 
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
 	VALUES
@@ -1356,108 +1361,122 @@ INSERT INTO `vn`.`tag`(`id`, `code`, `name`, `isFree`, `isQuantitatif`, `sourceT
 	(92,    NULL,       'Nombre temporal',  1, 0, NULL,     NULL, NULL, NULL);
 
 INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
-	VALUES
-		(1,     1,  56, 'Ranged weapon',            1),
-		(2,     1,  58, 'longbow',                  2),
-		(3,     1,  27, '200cm',                    3),
-		(4,     1,  36, 'Stark Industries',         4),
-		(5,     1,  1,  'Brown',                    5),
-		(6,     1,  67, '+1 precission',            6),
-		(7,     1,  23, '1',                        7),
-		(8,     2,  56, 'Melee weapon',             1),
-		(9,     2,  58, 'combat fist',              2),
-		(10,    2,  27, '15cm',                     3),
-		(11,    2,  36, 'Stark Industries',         4),
-		(12,    2,  1,  'Silver',                   5),
-		(13,    2,  67, 'Concussion',               6),
-		(14,    2,  23, '2',                        7),
-		(15,    3,  56, 'Ranged weapon',            1),
-		(16,    3,  58, 'sniper rifle',             2),
-		(17,    3,  4,  '113cm',                    3),
-		(18,    3,  36, 'Stark Industries',         4),
-		(19,    3,  1,  'Green',                    5),
-		(20,    3,  67, 'precission',               6),
-		(21,    3,  23, '3',                        7),
-		(22,    4,  56, 'Melee weapon',             1),
-		(23,    4,  58, 'heavy shield',             2),
-		(24,    4,  4,  '100cm',                    3),
-		(25,    4,  36, 'Stark Industries',         4),
-		(26,    4,  1,  'Black',                    5),
-		(27,    4,  67, 'containtment',             6),
-		(28,    4,  23, '4',                        7),
-		(29,    5,  56, 'Ranged weapon',            1),
-		(30,    5,  58, 'pistol',                   2),
-		(31,    5,  67, '9mm',                      3),
-		(32,    5,  36, 'Stark Industries',         4),
-		(33,    5,  1,  'Silver',                   5),
-		(34,    5,  27, '15cm',                     6),
-		(35,    5,  23, '5',                        7),
-		(36,    6,  56, 'Container',                1),
-		(37,    6,  58, 'ammo box',                 2),
-		(38,    6,  27, '100cm',                    3),
-		(39,    6,  36, 'Stark Industries',         4),
-		(40,    6,  1,  'Green',                    5),
-		(41,    6,  67, 'supply',                   6),
-		(42,    6,  23, '6',                        7),
-		(43,    7,  56, 'Container',                1),
-		(44,    7,  58, 'medical box',              2),
-		(45,    7,  27, '100cm',                     3),
-		(46,    7,  36, 'Stark Industries',         4),
-		(47,    7,  1,  'White',                    5),
-		(48,    7,  67, 'supply',                   6),
-		(49,    7,  23, '7',                        7),
-		(50,    8,  56, 'Ranged Reinforced weapon', 1),
-		(51,    8,  58, '+1 longbow',               2),
-		(52,    8,  27, '200cm',                    3),
-		(53,    8,  36, 'Stark Industries',         4),
-		(54,    8,  1,  'Brown',                    5),
-		(55,    8,  67, 'precission',               6),
-		(56,    8,  23, '8',                        7),
-		(57,    9,  56, 'Melee Reinforced weapon',  1),
-		(58,    9,  58, 'combat fist',              2),
-		(59,    9,  27, '15cm',                     3),
-		(60,    9,  36, 'Stark Industries',         4),
-		(61,    9,  1,  'Silver',                   5),
-		(62,    9,  67, 'Concussion',               6),
-		(63,    9,  23, '9',                        7),
-		(64,    10, 56, 'Ranged Reinforced weapon', 1),
-		(65,    10, 58, 'sniper rifle',             2),
-		(66,    10, 67, '700mm',                    3),
-		(67,    10, 36, 'Stark Industries',         4),
-		(68,    10, 1,  'Green',                    5),
-		(69,    10, 27, '130cm',                    6),
-		(70,    10, 23, '10',                       7),
-		(71,    11, 56, 'Melee Reinforced weapon',  1),
-		(72,    11, 58, 'heavy shield',             2),
-		(73,    11, 4,  '120cm',                    3),
-		(74,    11, 36, 'Stark Industries',         4),
-		(75,    11, 1,  'Black',                    5),
-		(76,    11, 67, 'containtment',             6),
-		(77,    11, 23, '11',                       7),
-		(78,    12, 56, 'Ranged Reinforced weapon', 1),
-		(79,    12, 58, 'pistol',                   2),
-		(80,    12, 27, '9mm',                      3),
-		(81,    12, 36, 'Stark Industries',         4),
-		(82,    12, 1,  'Silver',                   5),
-		(83,    12, 67, '23cm',                     6),
-		(84,    12, 23, '12',                       7),
-		(85,    13, 56, 'Chest',                    1),
-		(86,    13, 58, 'ammo box',                 2),
-		(87,    13, 27, '100cm',                    3),
-		(88,    13, 36, 'Stark Industries',         4),
-		(89,    13, 1,  'Green',                    5),
-		(90,    13, 67, 'supply',                   6),
-		(91,    13, 23, '13',                       7),
-		(92,    14, 56, 'Chest',                    1),
-		(93,    14, 58, 'medical box',              2),
-		(94,    14, 27, '100cm',                    3),
-		(95,    14, 36, 'Stark Industries',         4),
-		(96,    14, 1,  'White',                    5),
-		(97,    14, 67, 'supply',                   6),
-		(98,    14, 23, '1',                        7),
-		(99,    15, 92, 'Trolley',                  2),
-		(100,   16, 92, 'Pallet',                   2),
-		(101,   71, 92, 'Shipping cost',            2);
+    VALUES
+        (1,     1,  56, 'Ranged weapon',            1),
+        (2,     1,  58, 'longbow',                  2),
+        (3,     1,  27, '200cm',                    3),
+        (4,     1,  36, 'Stark Industries',         4),
+        (5,     1,  1,  'Brown',                    5),
+        (6,     1,  67, '+1 precission',            6),
+        (7,     1,  23, '1',                        7),
+        (8,     2,  56, 'Melee weapon',             1),
+        (9,     2,  58, 'combat fist',              2),
+        (10,    2,  27, '15cm',                     3),
+        (11,    2,  36, 'Stark Industries',         4),
+        (12,    2,  1,  'Silver',                   5),
+        (13,    2,  67, 'Concussion',               6),
+        (14,    2,  23, '2',                        7),
+        (15,    3,  56, 'Ranged weapon',            1),
+        (16,    3,  58, 'sniper rifle',             2),
+        (17,    3,  4,  '113cm',                    3),
+        (18,    3,  36, 'Stark Industries',         4),
+        (19,    3,  1,  'Green',                    5),
+        (20,    3,  67, 'precission',               6),
+        (21,    3,  23, '3',                        7),
+        (22,    4,  56, 'Melee weapon',             1),
+        (23,    4,  58, 'heavy shield',             2),
+        (24,    4,  4,  '100cm',                    3),
+        (25,    4,  36, 'Stark Industries',         4),
+        (26,    4,  1,  'Black',                    5),
+        (27,    4,  67, 'containtment',             6),
+        (28,    4,  23, '4',                        7),
+        (29,    5,  56, 'Ranged weapon',            1),
+        (30,    5,  58, 'pistol',                   2),
+        (31,    5,  67, '9mm',                      3),
+        (32,    5,  36, 'Stark Industries',         4),
+        (33,    5,  1,  'Silver',                   5),
+        (34,    5,  27, '15cm',                     6),
+        (35,    5,  23, '5',                        7),
+        (36,    6,  56, 'Container',                1),
+        (37,    6,  58, 'ammo box',                 2),
+        (38,    6,  27, '100cm',                    3),
+        (39,    6,  36, 'Stark Industries',         4),
+        (40,    6,  1,  'Green',                    5),
+        (41,    6,  67, 'supply',                   6),
+        (42,    6,  23, '6',                        7),
+        (43,    7,  56, 'Container',                1),
+        (44,    7,  58, 'medical box',              2),
+        (45,    7,  27, '100cm',                     3),
+        (46,    7,  36, 'Stark Industries',         4),
+        (47,    7,  1,  'White',                    5),
+        (48,    7,  67, 'supply',                   6),
+        (49,    7,  23, '7',                        7),
+        (50,    8,  56, 'Ranged Reinforced weapon', 1),
+        (51,    8,  58, '+1 longbow',               2),
+        (52,    8,  27, '200cm',                    3),
+        (53,    8,  36, 'Stark Industries',         4),
+        (54,    8,  1,  'Brown',                    5),
+        (55,    8,  67, 'precission',               6),
+        (56,    8,  23, '8',                        7),
+        (57,    9,  56, 'Melee Reinforced weapon',  1),
+        (58,    9,  58, 'combat fist',              2),
+        (59,    9,  27, '15cm',                     3),
+        (60,    9,  36, 'Stark Industries',         4),
+        (61,    9,  1,  'Silver',                   5),
+        (62,    9,  67, 'Concussion',               6),
+        (63,    9,  23, '9',                        7),
+        (64,    10, 56, 'Ranged Reinforced weapon', 1),
+        (65,    10, 58, 'sniper rifle',             2),
+        (66,    10, 67, '700mm',                    3),
+        (67,    10, 36, 'Stark Industries',         4),
+        (68,    10, 1,  'Green',                    5),
+        (69,    10, 27, '130cm',                    6),
+        (70,    10, 23, '10',                       7),
+        (71,    11, 56, 'Melee Reinforced weapon',  1),
+        (72,    11, 58, 'heavy shield',             2),
+        (73,    11, 4,  '120cm',                    3),
+        (74,    11, 36, 'Stark Industries',         4),
+        (75,    11, 1,  'Black',                    5),
+        (76,    11, 67, 'containtment',             6),
+        (77,    11, 23, '11',                       7),
+        (78,    12, 56, 'Ranged Reinforced weapon', 1),
+        (79,    12, 58, 'pistol',                   2),
+        (80,    12, 27, '9mm',                      3),
+        (81,    12, 36, 'Stark Industries',         4),
+        (82,    12, 1,  'Silver',                   5),
+        (83,    12, 67, '23cm',                     6),
+        (84,    12, 23, '12',                       7),
+        (85,    13, 56, 'Chest',                    1),
+        (86,    13, 58, 'ammo box',                 2),
+        (87,    13, 27, '100cm',                    3),
+        (88,    13, 36, 'Stark Industries',         4),
+        (89,    13, 1,  'Green',                    5),
+        (90,    13, 67, 'supply',                   6),
+        (91,    13, 23, '13',                       7),
+        (92,    14, 56, 'Chest',                    1),
+        (93,    14, 58, 'medical box',              2),
+        (94,    14, 27, '100cm',                    3),
+        (95,    14, 36, 'Stark Industries',         4),
+        (96,    14,  1, 'White',                    5),
+        (97,    14, 67, 'supply',                   6),
+        (98,    14, 23, '1',                        7),
+        (99,    15, 92, 'Trolley',                  2),
+        (100,   16, 92, 'Pallet',                   2),
+        (101,   71, 92, 'Shipping cost',            2),
+        (102,   88, 56, 'Chest',                    1),
+        (103,   88, 58, 'ammo box',                 2),
+        (104,   88, 27, '100cm',                    3),
+        (105,   88, 36, 'Stark Industries',         4),
+        (106,   88, 1,  'White',                    5),
+        (107,   88, 67, 'supply',                   6),
+        (108,   88, 23, '13',                       7),
+		(109,   72, 56, 'Mistic weapon',            1),
+        (110,   72, 58, 'Stormbreaker',             2),
+        (111,   72, 27, '200cm',                    3),
+        (112,   72, 36, 'Stark Industries',         4),
+        (113,   72, 1,  'Red/Green/Blue',           5),
+        (114,   72, 67, '-1 precission',            6),
+        (115,   72, 23, '1',                        7);
 
 INSERT INTO `vn`.`itemTypeTag`(`id`, `itemTypeFk`, `tagFk`, `priority`)
 	VALUES
@@ -1527,7 +1546,8 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
         (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10, TRUE, 2),
         (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
         (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
-        (13,  util.VN_CURDATE() - INTERVAL 1 MONTH - INTERVAL 1 DAY, util.VN_CURDATE() - INTERVAL 1 MONTH,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
+        (13,  util.VN_CURDATE() - INTERVAL 1 MONTH - INTERVAL 1 DAY, util.VN_CURDATE() - INTERVAL 1 MONTH,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
+        (14, util.VN_CURDATE() - INTERVAL 1 DAY          ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
 
 INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`, `typeFk`)
 	VALUES
@@ -1543,10 +1563,11 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
 		(10,	2,	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2010', 'Movement 10',1,                  '', 'product'),
         (11,    4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),  1, 1, 442, 'IN2011', 'Movement 11',0,                  '', 'product'),
         (12,    4,  util.VN_CURDATE() - INTERVAL 1 MONTH,            13, 1, 442, 'IN2012', 'Movement 12',0,                 '', 'product'),
-		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99',0,                  '', 'product');
+		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99',0,                  '', 'product'),
+        (100,    1, util.VN_CURDATE()                   ,           14, 0, 442, 'IN2009','Movement 100',0,                  '', 'product');
 
-INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
-	VALUES (2, 4, 1);
+INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `maxLockTime`, `defaultSupplierFk`)
+	VALUES (2, 4, 300, 1);
 
 INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleExternalWaste`, `saleFaultWaste`, `saleContainerWaste`, `saleBreakWaste`, `saleOtherWaste`)
 	VALUES
@@ -1566,26 +1587,35 @@ INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `sal
 		('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
 		('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');
 
-	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,weight,created)
-	VALUES
-		(1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-		(2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
-		(3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  NULL, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
-		(4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, NULL, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-		(5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  NULL, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-		(6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-		(7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-		(8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-		(9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-		(10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-		(11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-		(12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-		(13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-		(14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-		(15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (16, 99,1,50.0000,  5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.60, 99.40,  0, 1, 0, 1.00, '2024-07-30 08:13:51.000'),
-        (17, 11, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-        (18, 12, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH);
+    INSERT INTO edi.supplier (supplier_id,company_name,entry_date,expiry_date,change_date_time,isAllowedDirectSales,isBanned)
+	    VALUES (1,'MV', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 0);
+    INSERT INTO edi.ekt (id,`ref`,qty,pro,pri,ok,scanned)
+        VALUES (1, 1234, 1, 1, 1.1, 1, 1);
+
+	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,ektFk,weight,created)
+    	VALUES
+    		( 1,   1, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+    		( 2,   2, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 1 MONTH),
+    		( 3,   3, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1,       NULL, NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1,                    util.VN_CURDATE()),
+    		( 4,   2, 2,       5,  450, 3, 1, 1.000, 1.000, 0.000, 10, 10,       NULL, NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+    		( 5,   3, 3,      55,  500, 5, 1, 1.000, 1.000, 0.000,  1,  1,       NULL, NULL, 0.00,  78.3,  75.6, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+    		( 6,   4, 8,      50, 1000, 4, 1, 1.000, 1.000, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+    		( 7,   4, 9,      20, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10,  'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+    		( 8,   4, 4,    1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+    		( 9,   4, 4,    1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+    		(10,   5, 1,      50,   10, 4, 1, 2.500, 2.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+    		(11,   5, 4,    1.25,   10, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+    		(12,   6, 4,    1.25,    0, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+    		(13,   7, 1,      50,    0, 3, 1, 2.000, 2.000, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+    		(14,   7, 2,       5,    0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+            (15,   7, 4,    1.25,    0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+            (16,  99, 1, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00, 99.60, 99.40, 0, 1, 0, NULL, 1.00,                    util.VN_CURDATE()),
+            (17,  11, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+            (18,  12, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+            (19, 100, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1,                    util.VN_CURDATE()),
+            (20, 100, 2,       5,  450, 3, 2, 1.000, 1.000, 0.000, 10, 10,       NULL, NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+            (21, 100,72,      55,  500, 5, 3, 1.000, 1.000, 0.000,  1,  1,  'packing', NULL, 0.00,  78.3,  75.6, 0, 1, 0,    1,    3,                    util.VN_CURDATE()),
+	  (10000002,  12,88, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00, 99.60, 99.40, 0, 1, 0, 1.00,    1,util.VN_CURDATE()  - INTERVAL 2 MONTH);
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
 	VALUES
@@ -2755,11 +2785,11 @@ INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
 		(3),
 		(4);
 
-INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `eta`, `observations`, `editorFk`, `price`, `driverName`)
+INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `editorFk`, `price`, `driverName`)
     VALUES
-        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(), DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY),                           'this is test observation', 1, 15, 'Batman'),
-        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), DATE_ADD(util.VN_NOW(), INTERVAL 5 DAY),                           'test observation',         1, 20, 'Robin'),
-        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), DATE_ADD(util.VN_NOW(), INTERVAL 6 DAY), 'observations...',          2, 25, 'Driverman');
+        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
+        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(),                           'test observation',         1, 20, 'Robin'),
+        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), 'observations...',          2, 25, 'Driverman');
 
 INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `roadmapAddressFk`, `eta`, `description`, `editorFk`)
     VALUES
@@ -4047,149 +4077,6 @@ INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
 			(8, '1183'),
 			(1, '1320');
 
-INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
-	VALUES (19, 1169),
-			(8, 1183),
-            (NULL, 1320);
-
-INSERT IGNORE INTO vn.saySimpleConfig (url)
-	VALUES ('saysimle-url-mock');
-INSERT INTO vn.itemTypeI18n (typeFk, lang, name)
-VALUES
-	(1, 'ca', 'Alstroemeria'),
-	(1, 'en', 'Alstroemeria'),
-	(1, 'fr', 'Alstroemeria'),
-	(1, 'pt', 'Alstroemeria'),
-	(2, 'ca', 'Anthurium'),
-	(2, 'en', 'Anthurium'),
-	(2, 'fr', 'Anthurium'),
-	(2, 'pt', 'Antúrios'),
-	(3, 'ca', 'Bulbs'),
-	(3, 'en', 'Bulbs'),
-	(3, 'fr', 'Bulbes'),
-	(3, 'pt', 'Bulbos'),
-	(4, 'ca', 'Cales'),
-	(4, 'en', 'Calla Lilies'),
-	(4, 'fr', 'Calas'),
-	(4, 'pt', 'Jarros (callas)'),
-	(5, 'ca', 'Clavell'),
-	(5, 'en', 'Carnation'),
-	(5, 'fr', 'Oeillet'),
-	(5, 'pt', 'Cravo'),
-	(6, 'ca', 'Crisantem'),
-	(6, 'en', 'Chrysanthemum'),
-	(6, 'fr', 'Chrysanthème'),
-	(6, 'pt', 'Margaridas'),
-	(7, 'ca', 'Rams Variats'),
-	(7, 'en', 'Mixed Bouquets'),
-	(7, 'fr', 'Bouquets divers'),
-	(7, 'pt', 'Bouquet Variados'),
-	(8, 'ca', 'Flor Variada'),
-	(8, 'en', 'Assorted Flowers'),
-	(8, 'fr', 'Fleurs varié'),
-	(8, 'pt', 'Flores Variadas'),
-	(9, 'ca', 'Crisantem Santa Dorotea'),
-	(9, 'en', 'Santa Dorotea Chrysanthemum'),
-	(9, 'fr', 'Chrysanthème Santa Dorotea'),
-	(9, 'pt', 'Crisântemo Santa Dorotea');
-
-INSERT INTO vn.inkI18n (inkFk, lang, name)
-VALUES
-	('?', 'ca', 'Sense especificar'),
-	('?', 'en', 'Unspecified'),
-	('?', 'fr', 'Indéterminé'),
-	('?', 'mn', 'тодорхойгүй'),
-	('?', 'pt', 'Não especificado'),
-	('2C', 'ca', '2 Colors'),
-	('2C', 'en', '2 Colour'),
-	('2C', 'fr', '2 Couleur'),
-	('2C', 'mn', '2 Өнгө'),
-	('2C', 'pt', '2 Cor'),
-	('A/M', 'ca', 'Groc / Marró'),
-	('A/M', 'en', 'Yellow / Brown'),
-	('A/M', 'fr', 'Yellow / Brown'),
-	('A/M', 'mn', 'Шар / Браун'),
-	('A/M', 'pt', 'Yellow / Brown'),
-	('A/N', 'ca', 'Groc / Taronja'),
-	('A/N', 'en', 'Yellow orange'),
-	('A/N', 'fr', 'Jaune / Orange'),
-	('A/N', 'mn', 'Шар / Улбар шар'),
-	('A/N', 'pt', 'Amarelo / Laranja');
-
-INSERT INTO vn.itemCategoryI18n (categoryFk, lang, name)
-VALUES
-	(1, 'ca', 'Flor'),
-	(1, 'en', 'Flower'),
-	(1, 'fr', 'Fleur'),
-	(1, 'mn', 'цэцэг'),
-	(1, 'pt', 'Flores'),
-	(2, 'ca', 'Planta'),
-	(2, 'en', 'Plant'),
-	(2, 'fr', 'Plante'),
-	(2, 'mn', 'станц'),
-	(2, 'pt', 'Plantas'),
-	(3, 'ca', 'Complements'),
-	(3, 'en', 'Accessories'),
-	(3, 'fr', 'Accessoires'),
-	(3, 'mn', 'Дагалдах хэрэгсэл'),
-	(3, 'pt', 'Acessórios'),
-	(4, 'ca', 'Artificial'),
-	(4, 'en', 'Artificial'),
-	(4, 'fr', 'Artificielle'),
-	(4, 'mn', 'Хиймэл'),
-	(4, 'pt', 'Artificial'),
-	(5, 'ca', 'Verds'),
-	(5, 'en', 'Green'),
-	(5, 'fr', 'Vert'),
-	(5, 'mn', 'ногоон'),
-	(5, 'pt', 'Verdes');
-
-INSERT INTO vn.originI18n (originFk, lang, name)
-VALUES
-	(1, 'ca', 'Chollolandia'),
-	(1, 'en', 'Chollolandia'),
-	(1, 'fr', 'Chollolandia'),
-	(1, 'mn', 'Chollolandia'),
-	(1, 'pt', 'Chollolandia'),
-	(2, 'ca', 'Alemanya'),
-	(2, 'en', 'Germany'),
-	(2, 'fr', 'Allemagne'),
-	(2, 'mn', 'Герман'),
-	(2, 'pt', 'Alemanha'),
-	(3, 'ca', 'Almeria'),
-	(3, 'en', 'Almeria'),
-	(3, 'fr', 'Almeria'),
-	(3, 'mn', 'Зугаа'),
-	(3, 'pt', 'Almeria'),
-	(4, 'ca', 'Austràlia'),
-	(4, 'en', 'Australia'),
-	(4, 'fr', 'Australie'),
-	(4, 'mn', 'Австрали'),
-	(4, 'pt', 'Austrália'),
-	(5, 'ca', 'canada'),
-	(5, 'en', 'Canada'),
-	(5, 'fr', 'Canada'),
-	(5, 'mn', 'Канад'),
-	(5, 'pt', 'Canadá');
-
-INSERT INTO vn.stateI18n (stateFk, lang, name)
-VALUES
-	(1, 'en', 'Fix'),
-	(1, 'es', 'Arreglar'),
-	(2, 'en', 'Free'),
-	(2, 'es', 'Libre'),
-	(3, 'en', 'OK'),
-	(3, 'es', 'OK'),
-	(4, 'en', 'Printed'),
-	(4, 'es', 'Impreso'),
-	(5, 'en', 'Preparation'),
-	(5, 'es', 'Preparación'),
-	(6, 'en', 'In Review'),
-	(6, 'es', 'En Revisión'),
-	(7, 'en', 'Unfinished'),
-	(7, 'es', 'Sin Acabar');
-
-
 INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
 	VALUES ('saysimle-url-mock', '1819');
 
@@ -4254,4 +4141,4 @@ INSERT IGNORE INTO vn.vehicleType (id, name)
     VALUES (1,'vehículo empresa'),
         (2, 'furgoneta'),
         (3, 'cabeza tractora'),
-        (4, 'remolque');
+        (4, 'remolque');

db/routines/cache/procedures/available_refresh.sql

@@ -89,12 +89,12 @@ proc: BEGIN
 						AND (ir.ended IS NULL OR i.shipped <= ir.ended)
 						AND i.warehouseFk = vWarehouse
 				UNION ALL
-				SELECT i.itemFk, i.landed, i.quantity
+				SELECT i.itemFk, IFNULL(i.availabled, i.landed), i.quantity
 					FROM vn.itemEntryIn i
 						JOIN itemRange ir ON ir.itemFk = i.itemFk
-					WHERE i.landed >= vStartDate
+					WHERE IFNULL(i.availabled, i.landed) >= vStartDate
 						AND IFNULL(i.availabled, i.landed) <= vAvailabled
-						AND (ir.ended IS NULL OR i.landed <= ir.ended)
+						AND (ir.ended IS NULL OR IFNULL(i.availabled, i.landed) <= ir.ended)
 						AND i.warehouseInFk = vWarehouse
 				UNION ALL
 				SELECT i.itemFk, i.shipped, i.quantity

db/routines/vn/procedures/collection_new.sql

@@ -160,9 +160,11 @@ BEGIN
 				OR (NOT s.isPreparable AND NOT s.isPrintable)
 				OR pb.collectionH IS NOT NULL
 				OR pb.collectionV IS NOT NULL
+				OR pb.collectionA IS NOT NULL
 				OR pb.collectionN IS NOT NULL
-				OR (NOT pb.H AND pb.V > 0 AND vItemPackingTypeFk = 'H')
+				OR (NOT pb.H AND pb.V + pb.A > 0 AND vItemPackingTypeFk = 'H')
 				OR (NOT pb.V AND vItemPackingTypeFk = 'V')
+				OR (NOT pb.A AND vItemPackingTypeFk = 'A')
 				OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking)
 				OR LENGTH(pb.problem)
 				OR pb.lines > vLinesLimit

db/routines/vn/procedures/item_getBalance.sql

@@ -30,7 +30,7 @@ BEGIN
 		WITH entriesIn AS (
 			SELECT 'entry' originType,
 					e.id originId,
-					tr.landed shipped,
+					IFNULL(tr.availabled, tr.landed) shipped,
 					b.quantity `in`,
 					NULL `out`,
 					st.alertLevel ,
@@ -54,7 +54,7 @@ BEGIN
 						OR (util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-				WHERE tr.landed >= vDateInventory
+				WHERE IFNULL(tr.availabled, tr.landed) >= vDateInventory
 					AND tr.warehouseInFk = vWarehouseFk
 					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 					AND b.itemFk = vItemFk
@@ -99,7 +99,7 @@ BEGIN
 		),
 		sales AS (
 			WITH itemSales AS (
-				SELECT DATE(t.shipped) shipped,
+				SELECT DATE(t.shipped) + INTERVAL HOUR(z.`hour`) HOUR shipped,
 						s.quantity,
 						st2.alertLevel,
 						st2.name,
@@ -114,6 +114,7 @@ BEGIN
 						cb.claimFk
 					FROM vn.sale s
 						JOIN vn.ticket t ON t.id = s.ticketFk
+						JOIN vn.`zone` z ON z.id = t.zoneFk
 						LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
 						LEFT JOIN vn.state st ON st.code = ts.code
 						JOIN vn.client c ON c.id = t.clientFk
@@ -189,14 +190,15 @@ BEGIN
 			SELECT * FROM sales
 			UNION ALL
 			SELECT * FROM orders
-			ORDER BY shipped,
+			ORDER BY DATE(shipped),
 				(inventorySupplierFk = entityId) DESC,
 				alertLevel DESC,
 				isTicket,
 				`order` DESC,
 				isPicked DESC,
 				`in` DESC,
-				`out` DESC;
+				`out` DESC,
+				shipped;
 
 	IF vDated IS NULL THEN
 		SET @a := 0;
@@ -205,7 +207,7 @@ BEGIN
 
 		SELECT t.originType,
 			t.originId,
-			DATE(@shipped:= t.shipped) shipped,
+			@shipped:= t.shipped shipped,
 			t.alertLevel,
 			t.stateName,
 			t.reference,

db/routines/vn/procedures/item_getLack.sql

@@ -1,9 +1,20 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getLack`(IN vForce BOOLEAN, IN vDays INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getLack`(
+	vSelf INT,
+    vForce BOOLEAN,
+    vDays INT,
+    vLongname VARCHAR(255),
+    vProducerName VARCHAR(255),
+    vColor VARCHAR(255),
+    vSize INT,
+    vOrigen INT,
+    vLack INT,
+    vWarehouseFk INT
+    )
 BEGIN
 /**
  * Calcula una tabla con el máximo negativo visible para cada producto y almacen
- * 
+ *
  * @param vForce Fuerza el recalculo del stock
  * @param vDays Numero de dias a considerar
 **/
@@ -13,33 +24,33 @@ BEGIN
 	CALL item_getMinETD();
 	CALL item_zoneClosure();
 
-	SELECT i.id itemFk, 
+	SELECT i.id itemFk,
 			i.longName,
 			w.id warehouseFk,
-			p.`name` producer, 
+			p.`name` producer,
 			i.`size`,
 			i.category,
-			w.name warehouse, 
+			w.name warehouse,
 			SUM(IFNULL(sub.amount,0)) lack,
 			i.inkFk,
 			IFNULL(im.timed, util.midnight()) timed,
 			IFNULL(izc.timed, util.midnight()) minTimed,
 			o.name originFk
-		FROM (SELECT item_id, 
-						warehouse_id, 
+		FROM (SELECT item_id,
+						warehouse_id,
 						amount
 					FROM cache.stock
 					WHERE amount > 0
 				UNION ALL
-				SELECT itemFk, 
-						warehouseFk, 
+				SELECT itemFk,
+						warehouseFk,
 						amount
 					FROM tmp.itemMinacum
 			) sub
 			JOIN warehouse w ON w.id = sub.warehouse_id
 			JOIN item i ON i.id = sub.item_id
-			LEFT JOIN producer p ON p.id = i.producerFk 
-			JOIN itemType it ON it.id = i.typeFk 
+			LEFT JOIN producer p ON p.id = i.producerFk
+			JOIN itemType it ON it.id = i.typeFk
 			JOIN itemCategory ic ON ic.id = it.categoryFk
 			LEFT JOIN tmp.itemMinETD im ON im.itemFk = i.id
 			LEFT JOIN tmp.itemZoneClosure izc ON izc.itemFk = i.id
@@ -47,6 +58,14 @@ BEGIN
 		WHERE w.isForTicket
 			AND ic.display
 			AND it.code != 'GEN'
+            AND (vSelf IS NULL OR i.id = vSelf)
+			AND (vLongname IS NULL OR i.name = vLongname)
+			AND (vProducerName IS NULL OR p.`name` LIKE CONCAT('%', vProducerName, '%'))
+			AND (vColor IS NULL OR vColor = i.inkFk)
+			AND (vSize IS NULL OR vSize = i.`size`)
+			AND (vOrigen IS NULL OR vOrigen = w.id)
+			AND (vLack IS NULL OR vLack = sub.amount)
+			AND (vWarehouseFk IS NULL OR vWarehouseFk = w.id)
 		GROUP BY i.id, w.id
 		HAVING lack < 0;
 

db/routines/vn/procedures/item_getSimilar.sql

@@ -82,21 +82,26 @@ BEGIN
 				AND it.priority = vPriority
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
 			LEFT JOIN vn.buy b ON b.id = bu.buyFk
+			LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
+				AND iss.warehouseFk = vWarehouseFk
+			LEFT JOIN vn.ink ink ON ink.id = i.tag5
 			JOIN itemTags its
 		WHERE a.available > 0
 			AND (i.typeFk = its.typeFk OR NOT vShowType)
 			AND i.id <> vSelf
-		ORDER BY `counter` DESC,
-			(t.name = its.name) DESC,
-			(it.value = its.value) DESC,
-			(i.tag5 = its.tag5) DESC,
-			match5 DESC,
-			(i.tag6 = its.tag6) DESC,
-			match6 DESC,
-			(i.tag7 = its.tag7) DESC,
-			match7 DESC,
-			(i.tag8 = its.tag8) DESC,
-			match8 DESC
+		ORDER BY (a.available > 0) DESC,
+				`counter` DESC,
+				(t.name = its.name) DESC,
+				(it.value = its.value) DESC,
+				(i.tag5 = its.tag5) DESC,
+				(ink.`showOrder`) DESC,
+				match5 DESC,
+				(i.tag6 = its.tag6) DESC,
+				match6 DESC,
+				(i.tag7 = its.tag7) DESC,
+				match7 DESC,
+				(i.tag8 = its.tag8) DESC,
+				match8 DESC
 		LIMIT 100;
 
 	DROP TEMPORARY TABLE tmp.buyUltimate;

db/routines/vn/procedures/item_getStock.sql

@@ -35,8 +35,8 @@ BEGIN
 				SELECT iei.itemFk, iei.quantity
 					FROM itemEntryIn iei
 						JOIN item i ON i.id = iei.itemFk
-					WHERE iei.landed >= util.VN_CURDATE()
-						AND iei.landed < vDated
+					WHERE IFNULL(iei.availabled, iei.landed) >= util.VN_CURDATE()
+						AND IFNULL(iei.availabled, iei.landed) < vDated
 						AND iei.warehouseInFk = vWarehouseFk
 						AND (vItemFk IS NULL OR iei.itemFk = vItemFk)
 				UNION ALL

db/routines/vn/procedures/productionControl.sql

@@ -72,7 +72,7 @@ proc: BEGIN
 					IF(tpr.isFreezed, ' CONGELADO',''),
 					IF(tpr.hasHighRisk, ' RIESGO',''),
 					IF(tpr.hasTicketRequest, ' COD 100',''),
-					IF(tpr.isTaxDataChecked, '',' FICHA INCOMPLETA'),
+					IF(tpr.isTaxDataChecked, ' FICHA INCOMPLETA', ''),
 					IF(tpr.hasComponentLack, ' COMPONENTES', ''),
 					IF(HOUR(util.VN_NOW()) < IF(HOUR(t.shipped), HOUR(t.shipped), COALESCE(HOUR(zc.hour),HOUR(z.hour))) 
 						AND tpr.isTooLittle, ' PEQUEÑO', '')
@@ -91,6 +91,7 @@ proc: BEGIN
 				pk.code parking,
 				0 H,
 				0 V,
+				0 A,
 				0 N,
 				st.isOk,
 				ag.isOwn,
@@ -138,6 +139,7 @@ proc: BEGIN
 		CHANGE COLUMN `problem` `problem` VARCHAR(255),
 		ADD COLUMN `collectionH` INT,
 		ADD COLUMN `collectionV` INT,
+		ADD COLUMN `collectionA` INT,
 		ADD COLUMN `collectionN` INT;
 
 	-- Clientes Nuevos o Recuperados
@@ -178,12 +180,14 @@ proc: BEGIN
 		ENGINE = MEMORY
 		SELECT ticketFk,
 				SUM(sub.H) H,
-				SUM(sub.V) V,
+				SUM(sub.V) V,				
+				SUM(sub.A) A,
 				SUM(sub.N) N
 			FROM (
 				SELECT t.ticketFk,
 						SUM(i.itemPackingTypeFk = 'H') H,
 						SUM(i.itemPackingTypeFk = 'V') V,
+						SUM(i.itemPackingTypeFk = 'A') A,
 						SUM(i.itemPackingTypeFk IS NULL) N
 					FROM tmp.productionTicket t
 						JOIN sale s ON s.ticketFk = t.ticketFk
@@ -196,6 +200,7 @@ proc: BEGIN
 			JOIN tItemPackingType ti ON ti.ticketFk = pb.ticketFk
 		SET pb.H = ti.H,
 			pb.V = ti.V,
+			pb.A = ti.A,
 			pb.N = ti.N;
 
 	-- Colecciones segun tipo de encajado
@@ -203,6 +208,7 @@ proc: BEGIN
 			JOIN ticketCollection tc ON pb.ticketFk = tc.ticketFk
 		SET pb.collectionH = IF(pb.H, tc.collectionFk, NULL),
 			pb.collectionV = IF(pb.V, tc.collectionFk, NULL),
+			pb.collectionA = IF(pb.A, tc.collectionFk, NULL),
 			pb.collectionN = IF(pb.N, tc.collectionFk, NULL);
 
 	-- Previa pendiente

db/routines/vn/procedures/sale_replaceItem.sql

@@ -25,9 +25,11 @@ BEGIN
 	DECLARE vNewSaleFk INT;
 	DECLARE vFinalPrice DECIMAL(10,2);
 
+
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		ROLLBACK;
+		CALL util.tx_rollback(vIsRequiredTx);
 		RESIGNAL;
 	END;
 
@@ -62,7 +64,7 @@ BEGIN
 		WHERE tmp.itemFk = vNewItemFk AND tmp.WarehouseFk = vWarehouseFk;
 
 	DROP TEMPORARY TABLE tmp.buyUltimate;
-	
+
 	IF vGroupingMode = 'packing' AND vPacking > 0 THEN
 		SET vRoundQuantity = vPacking;
 	END IF;
@@ -129,6 +131,6 @@ BEGIN
 		VALUES(vItemFk, vNewItemFk, 1)
 		ON DUPLICATE KEY UPDATE counter = counter + 1;
 
-	COMMIT;
+	CALL util.tx_commit(vIsRequiredTx);
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_close.sql

@@ -9,15 +9,12 @@ BEGIN
  */
 	DECLARE vDone BOOL;
 	DECLARE vClientFk INT;
-    DECLARE vCurTicketFk INT;
-	DECLARE vIsTaxDataChecked BOOL;
-	DECLARE vCompanyFk INT;
-	DECLARE vShipped DATE;
+	DECLARE vCurTicketFk INT;
 	DECLARE vNewInvoiceId INT;
 	DECLARE vHasDailyInvoice BOOL;
 	DECLARE vWithPackage BOOL;
-    DECLARE vHasToInvoice BOOL;
-	DECLARE vSerial VARCHAR(2);
+	DECLARE vHasToInvoice BOOL;
+	DECLARE vStateCode VARCHAR(45);
 
 	DECLARE cur CURSOR FOR
 		SELECT ticketFk FROM tmp.ticket_close;
@@ -38,18 +35,11 @@ BEGIN
 			LEAVE proc;
 		END IF;
 
-		SELECT
-				c.id,
-				c.isTaxDataChecked,
-				t.companyFk,
-				t.shipped,
+		SELECT c.id,
 				c.hasDailyInvoice,
 				w.isManaged,
 				c.hasToInvoice
 			INTO vClientFk,
-				vIsTaxDataChecked,
-				vCompanyFk,
-				vShipped,
 				vHasDailyInvoice,
 				vWithPackage,
 				vHasToInvoice
@@ -59,7 +49,7 @@ BEGIN
 			WHERE t.id = vCurTicketFk;
 
 		INSERT INTO ticketPackaging (ticketFk, packagingFk, quantity)
-			(SELECT vCurTicketFk, p.id, COUNT(*)
+			SELECT vCurTicketFk, p.id, COUNT(*)
 				FROM expedition e
 					JOIN packaging p ON p.id = e.packagingFk
 					JOIN ticket t ON t.id = e.ticketFk
@@ -68,39 +58,35 @@ BEGIN
 				WHERE e.ticketFk = vCurTicketFk AND p.isPackageReturnable
 					AND vWithPackage
 					AND NOT dm.`code`= 'PICKUP'
-				GROUP BY p.itemFk);
+				GROUP BY p.itemFk;
 
 		-- No retornables o no catalogados
-		INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed)
-			(SELECT e.freightItemFk, vCurTicketFk, i.name, COUNT(*) AS amount, getSpecialPrice(e.freightItemFk, vClientFk), 1
+		INSERT INTO sale (
+				itemFk,
+				ticketFk,
+				concept,
+				quantity,
+				price, isPriceFixed
+			)SELECT e.freightItemFk,
+					vCurTicketFk,
+					i.name,
+					COUNT(*) amount,
+					getSpecialPrice(e.freightItemFk, vClientFk),
+					TRUE
 				FROM expedition e
 					JOIN item i ON i.id = e.freightItemFk
 					LEFT JOIN packaging p ON p.itemFk = i.id
-				WHERE e.ticketFk = vCurTicketFk AND IFNULL(p.isPackageReturnable, 0) = 0
+				WHERE e.ticketFk = vCurTicketFk
+					AND (p.isPackageReturnable = 0 OR p.isPackageReturnable IS NULL)
 					AND getSpecialPrice(e.freightItemFk, vClientFk) > 0
-				GROUP BY e.freightItemFk);
+				GROUP BY e.freightItemFk;
 
-		IF(vHasDailyInvoice) AND vHasToInvoice THEN
-			SELECT invoiceSerial(vClientFk, vCompanyFk, 'quick') INTO vSerial;
-			IF vSerial IS NULL THEN
-				CALL util.throw('Cannot booking without a serial');
-			END IF;
-
-			CALL ticket_setState(vCurTicketFk, 'DELIVERED');
-
-			IF vIsTaxDataChecked THEN
-				CALL invoiceOut_newFromClient(
-					vClientFk,
-					vSerial,
-					vShipped,
-					vCompanyFk,
-					NULL,
-					NULL,
-					vNewInvoiceId);
-			END IF;
+		IF vHasDailyInvoice AND vHasToInvoice THEN
+			SET vStateCode = 'DELIVERED';
 		ELSE
-			CALL ticket_setState(vCurTicketFk, (SELECT vn.getAlert3State(vCurTicketFk)));
+			SELECT getAlert3State(vCurTicketFk) INTO vStateCode;
 		END IF;
+		CALL ticket_setState(vCurTicketFk, vStateCode);
 	END LOOP;
 
 	CLOSE cur;

db/routines/vn/procedures/ticket_doCmr.sql

@@ -1,5 +1,7 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(
+	vSelf INT
+)
 BEGIN
 /**
 * Crea u actualiza la información del CMR asociado con
@@ -19,6 +21,7 @@ BEGIN
 				a.id addressFk,
 				c2.defaultAddressFk,
 				IFNULL(sat.supplierFk, su.id) supplierFk,
+				t.packages,
 				t.landed
 			FROM ticket t
 				JOIN client c ON c.id = t.clientFk
@@ -52,9 +55,10 @@ BEGIN
 				c.addressToFk = t.addressFk,
 				c.addressFromFk = t.defaultAddressFk,
 				c.supplierFk = t.supplierFk,
+				c.packagesList = t.packages,
 				c.ead = t.landed
 			WHERE id = vCmrFk;
-	ELSE		
+	ELSE
 		INSERT INTO cmr (
 			senderInstruccions,
 			truckPlate,
@@ -62,6 +66,7 @@ BEGIN
 			addressToFk,
 			addressFromFk,
 			supplierFk,
+			packagesList,
 			ead
 		)
 			SELECT * FROM tTicket;

db/routines/vn/procedures/ticket_setState.sql

@@ -3,54 +3,61 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setState`(
 	vSelf INT,
 	vStateCode VARCHAR(255) COLLATE utf8_general_ci
 )
-BEGIN
+proc:BEGIN
 /**
  * Modifica el estado de un ticket si se cumplen las condiciones necesarias.
  *
  * @param vSelf el id del ticket
  * @param vStateCode estado a modificar del ticket
  */
-	DECLARE vticketAlertLevel INT;
-	DECLARE vTicketStateCode VARCHAR(255);
+	DECLARE vTicketAlertLevel INT;
+	DECLARE vTicketStateCode VARCHAR(255) COLLATE utf8_general_ci;
 	DECLARE vCanChangeState BOOL;
 	DECLARE vPackedAlertLevel INT;
 	DECLARE vZoneFk INT;
+	DECLARE vOldWorkerFk INT;
+	DECLARE vNewWorkerFk INT;
 
-	SELECT s.alertLevel, s.`code`, t.zoneFk
-		INTO vticketAlertLevel, vTicketStateCode,  vZoneFk
+	SET vNewWorkerFk = account.myUser_getId();
+
+	SELECT s.alertLevel, s.`code`, t.zoneFk, tt.userFk
+		INTO vTicketAlertLevel, vTicketStateCode, vZoneFk, vOldWorkerFk
 		FROM state s
 			JOIN ticketTracking tt ON tt.stateFk = s.id
 			JOIN ticket t ON t.id = tt.ticketFk
 		WHERE tt.ticketFk = vSelf
-		ORDER BY tt.created DESC
+		ORDER BY tt.created DESC, tt.id DESC
 		LIMIT 1;
 
-	SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED'; 
+	SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED';
 
 	IF vStateCode = 'OK' AND vZoneFk IS NULL THEN
 		CALL util.throw('ASSIGN_ZONE_FIRST');
 	END IF;
 
 	SET vCanChangeState = ((
-			vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR 
-			vticketAlertLevel < vPackedAlertLevel
-		)AND NOT (
+			vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR
+			vTicketAlertLevel < vPackedAlertLevel
+		) AND NOT (
 			vTicketStateCode IN ('CHECKED', 'CHECKING')
 			AND vStateCode IN ('PREPARED', 'ON_PREPARATION')
 		);
 
 	IF vCanChangeState THEN
-		INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
-			SELECT id, vSelf, account.myUser_getId()
-				FROM state
-				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
-				
 		IF vStateCode = 'PACKED' THEN
 			CALL ticket_doCmr(vSelf);
 		END IF;
+
+		IF vStateCode = vTicketStateCode AND vOldWorkerFk = vNewWorkerFk THEN
+			LEAVE proc;
+		END IF;
+
+		INSERT INTO ticketTracking (stateFk, ticketFk, userFk, created)
+			SELECT id, vSelf, vNewWorkerFk, util.VN_NOW()
+				FROM state
+				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
 	ELSE
 		CALL util.throw('INCORRECT_TICKET_STATE');
 	END IF;
-	
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeDelete.sql

@@ -1,26 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeDelete`
-	BEFORE DELETE ON `roadmapStop`
-	FOR EACH ROW
-BEGIN
-	DECLARE vMaxEta DATETIME;
-	DECLARE vRoadmapEta DATETIME;
-
-	IF OLD.roadmapFk IS NOT NULL THEN
-		SELECT MAX(eta) INTO vMaxEta
-			FROM roadmapStop
-			WHERE roadmapFk = OLD.roadmapFk
-				AND id <> OLD.id;
-
-		SELECT eta INTO vRoadmapEta
-			FROM roadmap
-			WHERE id = OLD.roadmapFk;
-
-		IF vMaxEta <> vRoadmapEta OR vMaxEta IS NULL THEN
-			UPDATE roadmap
-				SET eta = vMaxEta
-				WHERE id = OLD.roadmapFk;
-		END IF;
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeInsert.sql

@@ -3,8 +3,6 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeInser
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
-	DECLARE vRoadmapEta DATETIME;
-
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NEW.description IS NOT NULL THEN
@@ -16,17 +14,5 @@ BEGIN
 			CALL util.throw('Departure time can not be after arrival time');
 		END IF;
 	END IF;
-
-	IF NEW.roadmapFk IS NOT NULL AND NEW.eta IS NOT NULL THEN
-		SELECT eta INTO vRoadmapEta
-			FROM roadmap
-			WHERE id = NEW.roadmapFk;
-
-		IF vRoadmapEta < NEW.eta OR vRoadmapEta IS NULL THEN
-			UPDATE roadmap
-				SET eta = NEW.eta
-				WHERE id = NEW.roadmapFk;
-		END IF;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeUpdate.sql

@@ -3,40 +3,17 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeUpdat
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
-	DECLARE vMaxEta DATETIME;
-	DECLARE vCurrentEta DATETIME;
-
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NOT (NEW.description <=> OLD.description) THEN
 		SET NEW.description = UCASE(NEW.description);
 	END IF;
 
-	IF (NOT (NEW.roadmapFk <=> OLD.roadmapFk) AND NEW.roadmapFk IS NOT NULL)
-		OR (NOT (NEW.eta <=> OLD.eta)) THEN
+	IF NOT (NEW.roadmapFk <=> OLD.roadmapFk) OR NOT (NEW.eta <=> OLD.eta) THEN
 
 		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
 			CALL util.throw('Departure time can not be after arrival time');
 		END IF;
-
-		SELECT MAX(eta) INTO vMaxEta
-			FROM roadmapStop
-			WHERE roadmapFk = NEW.roadmapFk
-				AND id <> OLD.id;
-
-		IF vMaxEta < NEW.eta OR vMaxEta IS NULL THEN
-			SET vMaxEta = NEW.eta;
-		END IF;
-
-		SELECT eta INTO vCurrentEta
-			FROM roadmap
-			WHERE id = NEW.roadmapFk;
-
-		IF (vMaxEta <> vCurrentEta OR vMaxEta IS NULL) OR vMaxEta IS NOT NULL THEN
-			UPDATE roadmap
-				SET eta = vMaxEta
-				WHERE id = NEW.roadmapFk;
-		END IF;
 	END IF;
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/triggers/roadmap_afterUpdate.sql

@@ -1,17 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_afterUpdate`
-	AFTER UPDATE ON `roadmap`
-	FOR EACH ROW
-BEGIN
-	DECLARE vSeconds INT;
-
-	IF NOT (NEW.etd <=> OLD.etd) THEN
-		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
-		IF vSeconds IS NOT NULL AND vSeconds <> 0 THEN
-			UPDATE roadmapStop
-				SET eta = eta + INTERVAL vSeconds SECOND
-				WHERE roadmapFk = NEW.id;
-		END IF;
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/roadmap_beforeUpdate.sql

@@ -3,6 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
+	DECLARE vSeconds INT;
+
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NOT (NEW.name <=> OLD.name) THEN
@@ -37,5 +39,15 @@ BEGIN
 										FROM worker w
 										WHERE w.id = NEW.driverChangeFk);
 	END IF;
+
+	IF NOT (NEW.etd <=> OLD.etd) THEN
+		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
+		
+		IF vSeconds <> 0 THEN
+			UPDATE roadmapStop
+				SET eta = eta + INTERVAL vSeconds SECOND
+				WHERE roadmapFk = NEW.id;
+		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/zone_beforeInsert.sql

@@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`zone_beforeInsert`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.priceOptimum = 0 THEN
+		SET NEW.priceOptimum = NEW.price;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/zone_beforeUpdate.sql

@@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`zone_beforeUpdate`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.priceOptimum = 0 THEN
+		CALL util.throw('The priceOptimum cannot be 0');
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/views/expeditionTruck.sql

@@ -7,5 +7,5 @@ AS SELECT `rs`.`id` AS `id`,
 	`rs`.`description` AS `description`,
 	`rs`.`bufferFk` AS `bufferFk`,
 	`rs`.`created` AS `created`,
-	`rs`.`userFk` AS `userFk`
+	`rs`.`editorFk` AS `userFk`
 FROM `vn`.`roadmapStop` `rs`;

db/routines/vn/views/roadmapEta.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn`.`roadmapEta`
+AS SELECT `roadmapFk` AS id,
+	MAX(`eta`) AS `eta`
+FROM `vn`.`roadmapStop`
+WHERE `roadmapFk` IS NOT NULL
+GROUP BY `roadmapFk`;

db/versions/10936-wheatAnthurium/00-updateACL.sql

@@ -0,0 +1,6 @@
+INSERT IGNORE INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES
+        ('Ticket','itemLack','READ','ALLOW','ROLE','employee'),
+        ('Ticket','itemLackDetail','READ','ALLOW','ROLE','employee'),
+        ('Ticket','split','WRITE','ALLOW','ROLE','employee'),
+        ('Sale','replaceItem','WRITE','ALLOW','ROLE','employee');

db/versions/11132-aquaDracena/00-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.ticketConfig ADD lackAlertPrice int(11) DEFAULT 30 NOT NULL COMMENT 'Value to alert when item proposal exceed price';
+ALTER TABLE vn.ticketConfig ADD lackScopeDays int(11) DEFAULT 2 NOT NULL COMMENT 'Number of days to look back for ticket with negatives';

db/versions/11309-pinkGalax/00-firstScript.sql

@@ -1,46 +0,0 @@
-
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES
-		('CompanyI18n','find','READ','ALLOW','ROLE','administrative'),
-		('CompanyI18n','crud','WRITE','ALLOW','ROLE','administrative'),
-		('CompanyI18n','create','WRITE','ALLOW','ROLE','administrative'),
-		('ItemTypeI18n','find','READ','ALLOW','ROLE','buyer'),
-		('ItemTypeI18n','crud','WRITE','ALLOW','ROLE','buyer'),
-		('ItemTypeI18n','create','WRITE','ALLOW','ROLE','buyer'),
-		('InkI18n','find','READ','ALLOW','ROLE','buyer'),
-		('InkI18n','crud','WRITE','ALLOW','ROLE','buyer'),
-		('InkI18n','create','WRITE','ALLOW','ROLE','buyer'),
-		('OriginI18n','find','READ','ALLOW','ROLE','buyer'),
-		('OriginI18n','crud','WRITE','ALLOW','ROLE','buyer'),
-		('OriginI18n','create','WRITE','ALLOW','ROLE','buyer'),
-		('StateI18n','find','READ','ALLOW','ROLE','salesPerson'),
-		('StateI18n','crud','WRITE','ALLOW','ROLE','salesPerson'),
-		('StateI18n','create','WRITE','ALLOW','ROLE','salesPerson'),
-		('TagI18n','find','READ','ALLOW','ROLE','buyer'),
-		('TagI18n','crud','WRITE','ALLOW','ROLE','buyer'),
-		('TagI18n','create','WRITE','ALLOW','ROLE','buyer'),
-		('itemCategoryI18n','find','READ','ALLOW','ROLE','buyer'),
-		('itemCategoryI18n','crud','WRITE','ALLOW','ROLE','buyer'),
-		('itemCategoryI18n','create','WRITE','ALLOW','ROLE','buyer'),
-		('Application','getI18nTables','*','ALLOW','ROLE','employee');
-
-ALTER TABLE vn.companyI18n
-	ADD id INT AUTO_INCREMENT UNIQUE;
-
-ALTER TABLE vn.inkI18n
-	ADD id INT AUTO_INCREMENT UNIQUE;
-
-ALTER TABLE vn.itemCategoryI18n
-	ADD id INT AUTO_INCREMENT UNIQUE;
-
-ALTER TABLE vn.itemTypeI18n
-	ADD id INT AUTO_INCREMENT UNIQUE;
-
-ALTER TABLE vn.originI18n
-	ADD id INT AUTO_INCREMENT UNIQUE;
-
-ALTER TABLE vn.stateI18n
-	ADD id INT AUTO_INCREMENT UNIQUE;
-
-ALTER TABLE vn.tagI18n
-	ADD id INT AUTO_INCREMENT UNIQUE;

db/versions/11399-bronzeOak/00-firstScript.sql

@@ -0,0 +1,90 @@
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Entry','getBuyList','READ','ALLOW','ROLE','buyer'),
+		('Entry','getBuyUltimate','READ','ALLOW','ROLE','buyer'),
+		('Entry','search','READ','ALLOW','ROLE','buyer'),
+		('Entry','create','WRITE','ALLOW','ROLE','buyer'),
+		('Entry','cloneEntry','WRITE','ALLOW','ROLE','buyer'),
+		('Entry','deleteEntry','WRITE','ALLOW','ROLE','buyer'),
+		('Entry','recalcEntryPrices','WRITE','ALLOW','ROLE','buyer'),
+		('EntryType','find','READ','ALLOW','ROLE','buyer'),
+		('EntryConfig','findOne','READ','ALLOW','ROLE','buyer');
+
+ALTER TABLE vn.ink ADD IF NOT EXISTS hexJson TEXT NOT NULL;
+
+UPDATE vn.ink
+	SET hexJson = CONCAT('{"value": ["',hex,'"]}');
+
+UPDATE vn.ink
+SET hexJson = CASE `name`
+    WHEN 'Blanco/Naranja' THEN '{"value": ["FFFFFF", "FFA500"]}'
+    WHEN 'Sin especificar' THEN '{"value": ["808080"]}'
+    WHEN '2 Colores' THEN '{"value": ["000000", "FFFFFF"]}'
+    WHEN 'Amarillo/Marrón' THEN '{"value": ["FFFF00", "8B4513"]}'
+    WHEN 'Amarillo/Naranja' THEN '{"value": ["FFFF00", "FFA500"]}'
+    WHEN 'Rosa/Blanco/Amarillo' THEN '{"value": ["FFC0CB", "FFFFFF", "FFFF00"]}'
+    WHEN 'Rosa/Amarillo' THEN '{"value": ["FFC0CB", "FFFF00"]}'
+    WHEN 'Antracita' THEN '{"value": ["2F2F2F"]}'
+    WHEN 'Azul/Amarillo' THEN '{"value": ["0000FF", "FFFF00"]}'
+    WHEN 'Azul Claro' THEN '{"value": ["ADD8E6"]}'
+    WHEN 'Azul/Marron' THEN '{"value": ["0000FF", "8B4513"]}'
+    WHEN 'Azul/Verde' THEN '{"value": ["0000FF", "008000"]}'
+    WHEN 'Blanco/Amarillo' THEN '{"value": ["FFFFFF", "FFFF00"]}'
+    WHEN 'Blaugrana' THEN '{"value": ["A50044", "004D98"]}'
+    WHEN 'Blanco/Negro' THEN '{"value": ["FFFFFF", "000000"]}'
+    WHEN 'Blanco/Verde' THEN '{"value": ["FFFFFF", "008000"]}'
+    WHEN 'Blanco/Azul' THEN '{"value": ["FFFFFF", "0000FF"]}'
+    WHEN 'Blanco/Rosa' THEN '{"value": ["FFFFFF", "FFC0CB"]}'
+    WHEN 'Cognac/Verde' THEN '{"value": ["9A463D", "008000"]}'
+    WHEN 'Champagne/Verde' THEN '{"value": ["F7E7CE", "008000"]}'
+    WHEN 'Camuflaje' THEN '{"value": ["6B8E23", "556B2F", "8B4513"]}'
+    WHEN 'Crema/Rosa' THEN '{"value": ["FFFDD0", "FFC0CB"]}'
+    WHEN 'Fucsia/Amarillo' THEN '{"value": ["FF00FF", "FFFF00"]}'
+    WHEN 'Fucsia/Blanco' THEN '{"value": ["FF00FF", "FFFFFF"]}'
+    WHEN 'Fucsia/Crema' THEN '{"value": ["FF00FF", "FFFDD0"]}'
+    WHEN 'Fucsia/Rosa' THEN '{"value": ["FF00FF", "FFC0CB"]}'
+    WHEN 'Fucsia/Verde' THEN '{"value": ["FF00FF", "008000"]}'
+    WHEN 'Granate/Blanco' THEN '{"value": ["800000", "FFFFFF"]}'
+    WHEN 'Gris Lila' THEN '{"value": ["808080", "C8A2C8"]}'
+    WHEN 'Lavanda/Amarillo' THEN '{"value": ["E6E6FA", "FFFF00"]}'
+    WHEN 'Lavanda/Gris' THEN '{"value": ["E6E6FA", "808080"]}'
+    WHEN 'Lividum' THEN '{"value": ["702963"]}'
+    WHEN 'Morado/Amarillo' THEN '{"value": ["800080", "FFFF00"]}'
+    WHEN 'Marrón/Blanco' THEN '{"value": ["8B4513", "FFFFFF"]}'
+    WHEN 'Marron/Gris' THEN '{"value": ["8B4513", "808080"]}'
+    WHEN 'Marron/Negro' THEN '{"value": ["8B4513", "000000"]}'
+    WHEN 'Marrón/Verde' THEN '{"value": ["8B4513", "008000"]}'
+    WHEN 'Matizado' THEN '{"value": ["D3D3D3", "808080", "FFFFFF"]}'
+    WHEN 'Mixto' THEN '{"value": ["FF0000", "0000FF", "008000", "FFFF00"]}'
+    WHEN 'Marrón Oscuro' THEN '{"value": ["654321"]}'
+    WHEN 'Naranja/Marron' THEN '{"value": ["FFA500", "8B4513"]}'
+    WHEN 'Naranja/Rosa' THEN '{"value": ["FFA500", "FFC0CB"]}'
+    WHEN 'Ocre/Burgundi' THEN '{"value": ["CC7722", "800020"]}'
+    WHEN 'Oro/Plata' THEN '{"value": ["FFD700", "C0C0C0"]}'
+    WHEN 'Oro/Negro' THEN '{"value": ["FFD700", "000000"]}'
+    WHEN 'Oro/Verde' THEN '{"value": ["FFD700", "008000"]}'
+    WHEN 'Purpura/Blanco' THEN '{"value": ["800080", "FFFFFF"]}'
+    WHEN 'Purpura/Rosa' THEN '{"value": ["800080", "FFC0CB"]}'
+    WHEN 'Pastel' THEN '{"value": ["FFB6C1", "87CEFA", "98FB98"]}'
+    WHEN 'Plata' THEN '{"value": ["C0C0C0"]}'
+    WHEN 'Plata/Verde' THEN '{"value": ["C0C0C0", "008000"]}'
+    WHEN 'Rojo/Amarillo' THEN '{"value": ["FF0000", "FFFF00"]}'
+    WHEN 'Rojo/Blanco' THEN '{"value": ["FF0000", "FFFFFF"]}'
+    WHEN 'Rojo/Naranja' THEN '{"value": ["FF0000", "FFA500"]}'
+    WHEN 'Rojo/Oro' THEN '{"value": ["FF0000", "FFD700"]}'
+    WHEN 'Rojo/Verde' THEN '{"value": ["FF0000", "008000"]}'
+    WHEN 'Rosa/Lila' THEN '{"value": ["FFC0CB", "C8A2C8"]}'
+    WHEN 'Rosa/Naranja' THEN '{"value": ["FFC0CB", "FFA500"]}'
+    WHEN 'Rojo/Rosa' THEN '{"value": ["FF0000", "FFC0CB"]}'
+    WHEN 'Rosa empolvado' THEN '{"value": ["E6B8AF"]}'
+    WHEN 'Rosa/Verde' THEN '{"value": ["FFC0CB", "008000"]}'
+    WHEN 'Topo/Blanco' THEN '{"value": ["8B8589", "FFFFFF"]}'
+    WHEN 'Topo' THEN '{"value": ["8B8589"]}'
+    WHEN 'Transparente' THEN '{"value": ["00000000"]}'
+    WHEN 'Verde/Amarillo' THEN '{"value": ["008000", "FFFF00"]}'
+    WHEN 'Verde/Negro' THEN '{"value": ["008000", "000000"]}'
+    WHEN 'Variado' THEN '{"value": ["FF0000", "0000FF", "008000", "FFFF00", "FFA500"]}'
+    WHEN 'Verde Claro/Morado' THEN '{"value": ["90EE90", "800080"]}'
+    WHEN 'Verde/Lila' THEN '{"value": ["008000", "C8A2C8"]}'
+    WHEN 'Vaquero Neon' THEN '{"value": ["1560BD", "FFFF00"]}'
+    ELSE hexJson 
+END;

db/versions/11436-bronzeMonstera/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.roadmap
+    MODIFY COLUMN dollyPlate varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT
+        'Vehículo sin motor diseñado para conectarse a una unidad tractora, un camión o un vehículo tractor con fuerte potencia de tracción';

db/versions/11436-bronzeMonstera/01-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.volumeConfig ADD COLUMN id INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
+
+GRANT UPDATE (palletM3) ON vn.volumeConfig TO deliveryBoss;

db/versions/11436-bronzeMonstera/02-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.vehicle
+    MODIFY COLUMN typeFk enum('car','van','truck','trailer','tug','dolly','trailerLink')
+        CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'van' NOT NULL;

db/versions/11436-bronzeMonstera/03-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.roadmap DROP COLUMN eta;

db/versions/11441-limeCyca/00-firstScript.sql

@@ -0,0 +1,8 @@
+UPDATE vn.expedition e
+        JOIN (
+            SELECT id
+            FROM vn.expedition
+            WHERE hostFk COLLATE utf8mb3_unicode_ci NOT IN 
+                (SELECT code COLLATE utf8mb3_unicode_ci FROM vn.host WHERE code IS NOT NULL)
+        ) s ON e.id = s.id
+    SET e.hostFk = 'pc336';

db/versions/11441-limeCyca/01-firstScript.sql

@@ -0,0 +1,9 @@
+ALTER TABLE vn.expedition
+    MODIFY COLUMN hostFk VARCHAR(30) COLLATE utf8mb3_general_ci;
+
+ALTER TABLE vn.expedition
+    ADD CONSTRAINT fk_expedition_host_code
+    FOREIGN KEY (hostFk)
+    REFERENCES host(code)
+    ON UPDATE CASCADE
+    ON DELETE CASCADE;

db/versions/11445-brownDendro/00-firstScript.sql

@@ -0,0 +1,3 @@
+UPDATE vn.zone
+	SET priceOptimum = price
+	WHERE priceOptimum = 0;

docker-compose.yml

@@ -1,11 +0,0 @@
-version: '3.7'
-services:
-  front:
-    image: registry.verdnatura.es/salix-front:${VERSION:?}
-    build:
-      context: front
-  back:
-    image: registry.verdnatura.es/salix-back:${VERSION:?}
-    build:
-      context: .
-      dockerfile: back/Dockerfile

loopback/common/methods/application/getI18nTables.js

@@ -1,39 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethod('getI18nTables', {
-        description: 'Return tables with name end with i18n',
-        accessType: 'READ',
-        accepts: [],
-        returns: {
-            type: 'Array',
-            root: true
-        },
-        http: {
-            path: `/get-i18n-tables`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getI18nTables = async() => {
-        const tables = await Self.rawSql(`
-            SELECT c.table_name tableName, c.column_name primaryKey
-                FROM information_schema.columns c
-                WHERE
-                    c.table_name LIKE '%i18n'
-                    AND c.COLUMN_KEY = 'PRI'
-                    AND c.column_name <> 'id'
-                    AND c.COLUMN_NAME <> 'lang'`);
-
-        const columns = await Self.rawSql(`
-            SELECT c.table_name tableName, c.column_name field
-                FROM information_schema.columns c
-                WHERE
-                    c.table_name LIKE '%i18n'
-                    AND c.COLUMN_KEY <> 'PRI'
-                    AND c.column_name <> 'id'
-            `);
-
-        for (const column of columns)
-            tables.find(t => t.tableName == column.tableName).field = column.field;
-        return tables;
-    };
-};

loopback/common/models/application.js

@@ -5,5 +5,4 @@ module.exports = function(Self) {
     require('../methods/application/executeProc')(Self);
     require('../methods/application/executeFunc')(Self);
     require('../methods/application/getEnumValues')(Self);
-    require('../methods/application/getI18nTables')(Self);
 };

loopback/locale/en.json

@@ -234,6 +234,7 @@
 	"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated",
 	"Cannot add holidays on this day": "Cannot add holidays on this day",
 	"Cannot send mail": "Cannot send mail",
+	"This worker already exists": "This worker already exists",
 	"CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`": "CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`",
 	"This postcode already exists": "This postcode already exists",
 	"Original invoice not found": "Original invoice not found",
@@ -254,5 +255,8 @@
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
 	"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order.",
-    "clonedFromTicketWeekly": ", that is a cloned sale from ticket {{ ticketWeekly }}"
+    "clonedFromTicketWeekly": ", that is a cloned sale from ticket {{ ticketWeekly }}",
+	"negativeReplaced": "Replaced item [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} with [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} from ticket [{{ticketId}}]({{{ticketUrl}}})",
+  	"The tag and priority can't be repeated": "The tag and priority can't be repeated",
+	"duplicateWarehouse": "The introduced warehouse already exists"
 }

loopback/locale/es.json

@@ -22,7 +22,7 @@
     "Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
     "can't be blank": "El campo no puede estar vacío",
     "Observation type must be unique": "El tipo de observación no puede repetirse",
-    "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
+	"The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
     "The grade must be similar to the last one": "El grade debe ser similar al último",
     "Only manager can change the credit": "Solo el gerente puede cambiar el credito de este cliente",
     "Name cannot be blank": "El nombre no puede estar en blanco",
@@ -397,5 +397,7 @@
     "Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
     "Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
     "Price cannot be blank": "El precio no puede estar en blanco",
-    "clonedFromTicketWeekly": ", que es una linea clonada del ticket {{ticketWeekly}}"
+    "clonedFromTicketWeekly": ", que es una linea clonada del ticket {{ticketWeekly}}",
+    "negativeReplaced": "Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
+    "duplicateWarehouse": "El almacén seleccionado ya existe en la zona"
 }

loopback/locale/fr.json

@@ -368,5 +368,6 @@
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
 	"The web user's email already exists": "L'email de l'internaute existe déjà",
 	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
-	"Ticket has been delivered out of order": "Le ticket {{ticket}} de la route {{{fullUrl}}} a été livré hors service."
-}
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} de la route {{{fullUrl}}} a été livré hors service.",
+	"negativeReplaced": "Remplacé l'article [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} par [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} du ticket [{{ticketId}}]({{{ticketUrl}}})"
+}

loopback/locale/pt.json

@@ -367,5 +367,6 @@
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
 	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
 	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "O ticket {{ticket}} da rota {{{fullUrl}}} foi entregue fora de ordem."
-}
+	"Ticket has been delivered out of order": "O ticket {{ticket}} da rota {{{fullUrl}}} foi entregue fora de ordem.",
+	"negativeReplaced": "Substituído o artigo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} do ticket [{{ticketId}}]({{{ticketUrl}}})"
+}

modules/entry/back/methods/entry-buys/getBuyList.js

@@ -0,0 +1,303 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+    Self.remoteMethodCtx('getBuyList', {
+        description: 'Returns buys for editing of one entry',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'entryFk',
+            type: 'number',
+            required: true,
+            description: 'The entry id',
+            http: {source: 'path'}
+        },
+        {
+            arg: 'filter',
+            type: 'object',
+            description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
+        },
+        {
+            arg: 'isIgnored',
+            type: 'boolean',
+            description: 'check if the buy is ignored',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'itemFk',
+            type: 'number',
+            description: 'item id',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'name',
+            type: 'string',
+            description: 'item name',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'size',
+            type: 'number',
+            description: 'item size',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'stickers',
+            type: 'number',
+            description: 'sticker quantity',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'packagingFk',
+            type: 'number',
+            description: 'packaging id',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'weight',
+            type: 'number',
+            description: 'weight',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'packing',
+            type: 'number',
+            description: 'packing quantity',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'grouping',
+            type: 'number',
+            description: 'grouping quantity',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'quantity',
+            type: 'number',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'buyingValue',
+            type: 'number',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'amount',
+            type: 'number',
+            description: 'buying value * quantity',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'price2',
+            type: 'number',
+            description: 'price for the package',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'price3',
+            type: 'number',
+            description: 'price for the box',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'minPrice',
+            type: 'number',
+            description: 'item minimum price',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'packingOut',
+            type: 'number',
+            description: 'quantity of package on a vn box',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'comment',
+            type: 'string',
+            description: 'item comment',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'subName',
+            type: 'string',
+            description: 'supplier name',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'subName',
+            type: 'string',
+            description: 'supplier name',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'company_name',
+            type: 'string',
+            description: 'company name',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'workerFk',
+            type: 'number',
+            description: 'buyer id',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'itemTypeFk',
+            type: 'number',
+            description: 'item family id',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'groupingMode',
+            type: 'string',
+            description: 'grouping mode',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'hasMinPrice',
+            type: 'boolean',
+            description: 'grouping mode',
+            http: {source: 'query'}
+        },
+        {
+            arg: 'groupBy',
+            type: 'string',
+            description: 'group by',
+            http: {source: 'query'}
+        },
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/:entryFk/getBuyList`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getBuyList = async(ctx, entryFk, filter, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        let conn = Self.dataSource.connector;
+        let where = buildFilter(ctx.args, (param, value) => {
+            switch (param) {
+            case 'name':
+            case 'subName':
+            case 'company_name':
+            case 'comment':
+                return {[param]: {like: `%${value}%`}};
+            case 'size':
+            case 'isIgnored':
+            case 'itemFk':
+            case 'stickers':
+            case 'packagingFk':
+            case 'weight':
+            case 'packing':
+            case 'grouping':
+            case 'quantity':
+            case 'buyingValue':
+            case 'amount':
+            case 'price2':
+            case 'price3':
+            case 'packingOut':
+            case 'minPrice':
+            case 'workerFk':
+            case 'itemTypeFk':
+            case 'groupingMode':
+            case 'hasMinPrice':
+                return {[param]: value};
+            }
+        });
+
+        filter = mergeFilters(filter, {where});
+
+        let stmts = [];
+        let stmt;
+
+        const selectFields = `b.id,
+            b.isIgnored,
+            b.itemFk,
+            b.printedStickers,
+            b.stickers,
+            b.packagingFk,
+            b.weight,
+            b.packing,
+            b.groupingMode,
+            b.grouping,
+            b.quantity,
+            b.buyingValue,
+            ROUND(b.buyingValue * b.quantity, 2) amount,
+            b.isChecked,
+            b.price2,
+            b.price3,
+            i.name,
+            i.size,
+            i.minPrice,
+            i.hasMinPrice,
+            i.packingOut,
+            i.comment,
+            i.subName,
+            i.tag5,
+            i.value5,
+            i.tag6,
+            i.value6,
+            i.tag7,
+            i.value7,
+            i.tag8,
+            i.value8,
+            i.tag9,
+            i.value9,
+            i.tag10,
+            i.value10,
+            s.company_name,
+            ik.hexJson,
+            it.workerFk,
+            it.id itemTypeFk
+            `;
+
+        const groupByFields = `SUM(b.printedStickers) printedStickers,
+            SUM(b.packing) packing,
+            SUM(b.stickers) stickers,
+            SUM(b.weight) weight,
+            SUM(b.quantity) quantity,
+            SUM(ROUND(b.buyingValue * b.quantity, 2)) amount
+            `;
+
+        const groupBy = ctx.args.groupBy;
+
+        stmt = new ParameterizedSQL(
+            `SELECT *
+                FROM(
+                    SELECT 
+                        ${ groupBy ? groupByFields : selectFields}
+                    FROM item i
+                        LEFT JOIN ink ik ON ik.id = i.inkFk
+                        LEFT JOIN buy b ON b.itemFk = i.id
+                        LEFT JOIN edi.ekt e ON e.id = b.ektFk
+                        LEFT JOIN edi.supplier s ON e.pro = s.supplier_id
+                        LEFT JOIN itemType it ON it.id = i.typeFk
+                    WHERE b.entryFk = ?
+                    ${groupBy ?? ''}
+                ) sub`,
+            [entryFk]
+        );
+
+        stmt.merge(conn.makeSuffix(filter));
+        let itemsIndex = stmts.push(stmt) - 1;
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await conn.executeStmt(sql, myOptions);
+
+        if (groupBy && result.length) {
+            const buys = await Self.app.models.Buy.find({where: {entryFk}}, myOptions);
+            const buysChecked = buys.filter(buy => buy?.isChecked);
+            result[0].isChecked = buysChecked.length === buys.length;
+        }
+        return itemsIndex === 0 ? result : result[itemsIndex];
+    };
+};

modules/entry/back/methods/entry-buys/getBuyUltimate.js

@@ -0,0 +1,46 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('getBuyUltimate', {
+        description: 'Returns the last buy of the item',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'itemFk',
+                type: 'number',
+                required: true
+            }, {
+                arg: 'warehouseFk',
+                type: 'number',
+                required: true
+            }, {
+                arg: 'date',
+                type: 'date',
+                required: true
+            }
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/getBuyUltimate`,
+            verb: 'GET'
+        }
+    });
+    Self.getBuyUltimate = async(ctx, itemFk, warehouseFk, date, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        await Self.rawSql('CALL vn.buy_getUltimate(?, ?, ?)', [itemFk, warehouseFk, date], myOptions);
+        return Self.rawSql(
+            `SELECT b.* 
+                FROM cache.last_buy lb 
+                    JOIN buy b ON b.id = lb.buy_id 
+                WHERE lb.item_id = ? 
+                ORDER BY (lb.warehouse_id = ?) desc 
+                LIMIT 1`,
+            [itemFk, warehouseFk], myOptions
+        );
+    };
+};

modules/entry/back/methods/entry/cloneEntry.js

@@ -0,0 +1,46 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('cloneEntry', {
+        description: 'Clones an entry',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The entry id',
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:id/cloneEntry`,
+            verb: 'POST'
+        }
+    });
+
+    Self.cloneEntry = async(ctx, id, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+        let tx;
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+        try {
+            await Self.rawSql('CALL entry_clone(?, @newEntryId)', [id], myOptions);
+            const result = await Self.rawSql('SELECT @newEntryId', [], myOptions);
+            const newEntryId = result[0]['@newEntryId'];
+
+            if (tx) await tx.commit();
+            return newEntryId;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/methods/entry/deleteEntry.js

@@ -0,0 +1,48 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('deleteEntry', {
+        description: 'Clones an entry',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The entry id',
+            http: {source: 'path'}
+        }],
+        http: {
+            path: `/:id/deleteEntry`,
+            verb: 'POST'
+        }
+    });
+
+    Self.deleteEntry = async(ctx, id, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+        let tx;
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const entry = await Self.findById(id, null, myOptions);
+            await entry.updateAttribute('travelFk', null, myOptions);
+            await Self.rawSql('DELETE FROM vn.duaEntry WHERE entryFk = ?;', [id], myOptions);
+            await Self.rawSql(`
+                DELETE i.*
+                FROM vn.invoiceIn i
+                    JOIN vn.entry e ON e.invoiceInFk = i.id
+                WHERE e.id = ?`, [id], myOptions
+            );
+
+            if (tx) await tx.commit();
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/methods/entry/filter.js

@@ -129,7 +129,68 @@ module.exports = Self => {
                 arg: 'finalTemperature',
                 type: 'number',
                 description: 'Final temperature value'
-            }
+            },
+            {
+                arg: 'isExcludedFromAvailable',
+                type: 'boolean',
+                description: `landing date`
+            },
+            {
+                arg: 'isReceived',
+                type: 'boolean',
+                description: `travel received`
+            },
+            {
+                arg: 'isRaid',
+                type: 'boolean',
+                description: `travel isRaid`
+            },
+            {
+                arg: 'landed',
+                type: 'date',
+                description: `landing date`
+            },
+            {
+                arg: 'invoiceNumber',
+                type: 'string',
+                description: `entry invoice`
+            },
+            {
+                arg: 'reference',
+                type: 'string',
+                description: `entry reference`
+            },
+            {
+                arg: 'awbCode',
+                type: 'string',
+                description: `awb code`
+            },
+            {
+                arg: 'agencyModeId',
+                type: 'number',
+                description: `agency mode id`
+            },
+            {
+                arg: 'evaNotes',
+                type: 'string',
+                description: `observation`
+            },
+            {
+                arg: 'warehouseInFk',
+                type: 'number',
+                description: `warehouse in id`
+            },
+            {
+                arg: 'warehouseOutFk',
+                type: 'number',
+                description: `warehouse out id`
+            },
+            {
+                arg: 'entryTypeCode',
+                type: 'string',
+                description: 'entry type code'
+            },
+
         ],
         returns: {
             type: ['object'],
@@ -156,19 +217,12 @@ module.exports = Self => {
                         {'s.name': {like: `%${value}%`}},
                         {'s.nickname': {like: `%${value}%`}}
                     ]};
+            case 'invoiceNumber':
+            case 'reference':
             case 'ref':
+            case 'evaNotes':
                 param = `e.${param}`;
                 return {[param]: {like: `%${value}%`}};
-            case 'created':
-                return {'e.created': {gte: value}};
-            case 'from':
-                return {'t.landed': {gte: value}};
-            case 'fromShipped':
-                return {'t.shipped': {gte: value}};
-            case 'to':
-                return {'t.landed': {lte: value}};
-            case 'toShipped':
-                return {'t.shipped': {lte: value}};
             case 'id':
             case 'isBooked':
             case 'isConfirmed':
@@ -178,8 +232,20 @@ module.exports = Self => {
             case 'currencyFk':
             case 'supplierFk':
             case 'invoiceInFk':
-                param = `e.${param}`;
-                return {[param]: value};
+            case 'isExcludedFromAvailable':
+                return {[`e.${param}`]: value};
+            case 'isReceived':
+            case 'landed':
+            case 'isRaid':
+            case 'warehouseInFk':
+            case 'warehouseOutFk':
+                return {[`t.${param}`]: value};
+            case 'awbCode':
+                return {'a.code': {like: `%${value}%`}};
+            case 'agencyModeId':
+                return {[`am.id`]: value};
+            case 'entryTypeCode':
+                return {[`et.code`]: value};
             case 'initialTemperature':
                 return {'e.initialTemperature': {lte: value}};
             case 'finalTemperature':
@@ -197,15 +263,14 @@ module.exports = Self => {
         const stmts = [];
         let stmt;
         stmt = new ParameterizedSQL(
-            `SELECT
-                    e.id,
+            `SELECT e.id,
                     e.supplierFk,
                     e.dated,
                     e.reference,
                     e.invoiceNumber,
                     e.isBooked,
                     e.isExcludedFromAvailable,
-                    e.evaNotes observation,
+                    e.evaNotes,
                     e.isConfirmed,
                     e.isOrdered,
                     t.isRaid,
@@ -227,15 +292,27 @@ module.exports = Self => {
                     cu.code currencyCode,
                     t.shipped,
                     t.landed,
-                    t.ref AS travelRef,
+                    t.ref travelRef,
                     t.warehouseInFk,
-                    w.name warehouseInName
+                    w.name warehouseInName,
+                    t.warehouseOutFk,
+                    w2.name warehouseOutName,
+                    a.code awbCode,
+                    am.id agencyModeId,
+                    am.name agencyModeName,
+                    et.code entryTypeCode,
+                    et.description entryTypeDescription,
+                    t.isReceived
                 FROM vn.entry e
                     JOIN vn.supplier s ON s.id = e.supplierFk
-                    JOIN vn.travel t ON t.id = e.travelFk
-                    JOIN vn.warehouse w ON w.id = t.warehouseInFk
-                    JOIN vn.company co ON co.id = e.companyFk
-                    JOIN vn.currency cu ON cu.id = e.currencyFk`
+                    LEFT JOIN vn.travel t ON t.id = e.travelFk
+                    LEFT JOIN vn.warehouse w ON w.id = t.warehouseInFk
+                    LEFT JOIN vn.warehouse w2 ON w2.id = t.warehouseOutFk
+                    LEFT JOIN vn.company co ON co.id = e.companyFk
+                    LEFT JOIN vn.currency cu ON cu.id = e.currencyFk
+                    LEFT JOIN vn.awb a ON a.id = t.awbFk
+                    LEFT JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+                    LEFT JOIN vn.entryType et ON et.code = e.typeFk`
         );
 
         stmt.merge(conn.makeWhere(filter.where));

modules/entry/back/methods/entry/recalcEntryPrices.js

@@ -0,0 +1,49 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('recalcEntryPrices', {
+        description: 'Clones an entry',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'entryFk',
+            type: 'number',
+            required: true,
+            description: 'The entry id',
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:entryFk/recalcEntryPrices`,
+            verb: 'POST'
+        }
+    });
+
+    Self.recalcEntryPrices = async(ctx, entryFk, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+        let tx;
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+        const entry = await Self.findById(entryFk, myOptions);
+        const entryConfig = await Self.app.models.EntryConfig.findOne({}, myOptions);
+
+        if (entry.supplierFk === entryConfig.inventorySupplierFk) return;
+
+        try {
+            const result = await Self.rawSql('CALL vn.buy_recalcPricesByEntry(?)', [entryFk], myOptions);
+
+            if (tx) await tx.commit();
+            return result[0];
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/methods/stock-bought/getStockBought.js

@@ -45,7 +45,7 @@ module.exports = Self => {
                             {
                                 relation: 'user',
                                 scope: {
-                                    fields: ['id', 'name']
+                                    fields: ['id', 'nickname']
                                 }
                             }
                         ]

modules/entry/back/model-config.json

@@ -31,5 +31,8 @@
     },
     "InventoryConfig": {
         "dataSource": "vn"
+    },
+    "EntryConfig": {
+        "dataSource": "vn"
     }
 }

modules/entry/back/models/entry-config.json

@@ -0,0 +1,30 @@
+{
+    "name": "EntryConfig",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
+    "options": {
+        "mysql": {
+            "table": "entryConfig"
+        }
+    },
+    "properties": {
+        "defaultEntry": {
+            "type": "number",
+            "id": true
+        },
+        "mailToNotify": {
+            "type": "string"
+        },
+        "inventorySupplierFk": {
+            "type": "number"
+        },
+        "maxLockTime": {
+            "type": "number"
+        },
+        "defaultSupplierFk": {
+            "type": "number"
+        }
+    }
+}

modules/entry/back/models/entry.js

@@ -15,8 +15,13 @@ module.exports = Self => {
     require('../methods/entry/transfer')(Self);
     require('../methods/entry/labelSupplier')(Self);
     require('../methods/entry/buyLabelSupplier')(Self);
+    require('../methods/entry-buys/getBuyList')(Self);
+    require('../methods/entry-buys/getBuyUltimate')(Self);
+    require('../methods/entry/cloneEntry')(Self);
+    require('../methods/entry/deleteEntry')(Self);
+    require('../methods/entry/recalcEntryPrices')(Self);
 
-    Self.observe('before save', async function(ctx, options) {
+    Self.observe('before save', async(ctx, options) => {
         if (ctx.isNewInstance) return;
 
         const changes = ctx.data || ctx.instance;

modules/entry/back/models/entry.json

@@ -56,8 +56,7 @@
             "required": true
         },
         "travelFk": {
-            "type": "number",
-            "required": true
+            "type": "number"
         },
         "companyFk": {
             "type": "number",
@@ -74,6 +73,12 @@
         },
         "finalTemperature": {
             "type": "number"
+        },
+        "lockerUserFk":{
+            "type": "number"
+        },
+        "locked":{
+            "type": "date"
         }
     },
     "relations": {
@@ -107,6 +112,16 @@
             "type": "belongsTo",
             "model": "EntryType",
             "foreignKey": "typeFk"
-        }
+        },
+        "invoiceIn": {
+            "type": "belongsTo",
+            "model": "InvoiceIn",
+            "foreignKey": "invoiceInFk"
+        },
+        "user": {
+			"type": "belongsTo",
+			"model": "VnUser",
+			"foreignKey": "lockerUserFk"
+		}
     }
 }

modules/invoiceIn/back/methods/invoice-in/toUnbook.js

@@ -48,12 +48,10 @@ module.exports = Self => {
             }, myOptions);
 
             let asien = bookEntry?.ASIEN;
+            const invoiceIn = await Self.findById(invoiceInId, myOptions);
             if (asien) {
                 accountingEntries = await models.Xdiario.count({ASIEN: asien}, myOptions);
-
                 await models.Xdiario.destroyAll({ASIEN: asien}, myOptions);
-                const invoiceIn = await Self.findById(invoiceInId, myOptions);
-                await invoiceIn.updateAttribute('isBooked', false, myOptions);
             } else {
                 const linkedBookEntry = await models.Xdiario.findOne({
                     fields: ['ASIEN'],
@@ -66,6 +64,8 @@ module.exports = Self => {
                 asien = linkedBookEntry?.ASIEN;
                 isLinked = true;
             }
+            await invoiceIn.updateAttribute('isBooked', false, myOptions);
+
             if (tx) await tx.commit();
 
             return {

modules/item/back/methods/item/getSimilar.js

@@ -0,0 +1,43 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('getSimilar', {
+        description: 'Returns list of items with similar item requested',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'filter',
+                type: 'Object',
+                required: true,
+                description: 'Filter defining where and paginated data',
+                http: {source: 'query'}
+            }
+        ],
+        returns: {
+            type: ['Object'],
+            root: true
+        },
+        http: {
+            path: `/getSimilar`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getSimilar = async(ctx, filter, options) => {
+        const myOptions = {userId: ctx.req.accessToken.userId};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const {where} = filter;
+
+        const query = [
+            filter.itemFk,
+            where.warehouseFk,
+            where.date,
+            where.showType,
+            where.scopeDays
+        ];
+        const [results] = await Self.rawSql('CALL vn.item_getSimilar(?, ?, ?, ?, ?)', query, myOptions);
+
+        return results;
+    };
+};

modules/item/back/methods/item/search.js

@@ -0,0 +1,38 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+    Self.remoteMethodCtx('search', {
+        description: 'Returns an array of search results for a specified item',
+        accepts: [{
+            arg: 'filter',
+            type: 'object',
+            description: 'Filter to define conditions and paginate the data.',
+            required: true
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/search`,
+            verb: 'GET'
+        }
+    });
+
+    Self.search = async(ctx, filter) => {
+        const conn = Self.dataSource.connector;
+
+        const stmt = new ParameterizedSQL(`
+            SELECT *
+                FROM(
+                    SELECT i.id, i.name, i.size, p.name producerName
+                        FROM item i
+                            LEFT JOIN producer p ON p.id = i.producerFk
+                ) sub
+        `);
+
+        stmt.merge(conn.makeSuffix(filter));
+
+        return conn.executeStmt(stmt);
+    };
+};

modules/item/back/methods/item/specs/filter.spec.js

@@ -89,7 +89,7 @@ describe('item filter()', () => {
             const ctx = {args: {filter: filter, workerFk: 16}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(2);
+            expect(result.length).toEqual(3);
             expect(result[0].id).toEqual(16);
             expect(result[1].id).toEqual(71);
 

modules/item/back/methods/item/specs/getSimilar.spec.js

@@ -0,0 +1,49 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Item get similar', () => {
+    let options;
+    let tx;
+    const ctx = beforeAll.getCtx();
+    beforeAll.mockLoopBackContext();
+    beforeEach(async() => {
+        tx = await models.Item.beginTransaction({});
+        options = {transaction: tx};
+    });
+
+    afterEach(async() => {
+        if (tx)
+            await tx.rollback();
+    });
+
+    it('should return similar items', async() => {
+        const filter = {
+            itemFk: 88, sales: 43,
+            where: {
+                'scopeDays': '2',
+                'showType': true,
+                'alertLevelCode': 'FREE',
+                'date': '2001-01-01T11:00:00.000Z',
+                'warehouseFk': 1
+            }
+        };
+        const result = await models.Item.getSimilar(ctx, filter, options);
+
+        expect(result.length).toEqual(2);
+    });
+
+    it('should return empty array is if not exists', async() => {
+        const filter = {
+            itemFk: 88, sales: 43,
+            where: {
+                'scopeDays': '2',
+                'showType': true,
+                'alertLevelCode': 'FREE',
+                'date': '2001-01-01T11:00:00.000Z',
+                'warehouseFk': 60
+            }
+        };
+        const result = await models.Item.getSimilar(ctx, filter, options);
+
+        expect(result.length).toEqual(0);
+    });
+});

modules/item/back/methods/tag/specs/filterValue.spec.js

@@ -26,7 +26,7 @@ describe('tag filterValue()', () => {
             const filter = {where: {value: 'Blue'}, limit: 5};
             const result = await models.Tag.filterValue(colorTagId, filter, options);
 
-            expect(result.length).toEqual(2);
+            expect(result.length).toEqual(3);
             expect(result[0].value).toEqual('Blue');
             expect(result[1].value).toEqual('Blue/Silver');
 

modules/item/back/models/ink.json

@@ -17,6 +17,9 @@
         },
         "showOrder": {
             "type": "number"
+        },
+        "hexJson": {
+            "type": "string"
         }
     },
     "acls": [

modules/item/back/models/item.js

@@ -5,6 +5,7 @@ module.exports = Self => {
     require('../methods/item/clone')(Self);
     require('../methods/item/updateTaxes')(Self);
     require('../methods/item/getBalance')(Self);
+    require('../methods/item/getSimilar')(Self);
     require('../methods/item/lastEntriesFilter')(Self);
     require('../methods/item/getSummary')(Self);
     require('../methods/item/getCard')(Self);
@@ -17,6 +18,7 @@ module.exports = Self => {
     require('../methods/item/buyerWasteEmail')(Self);
     require('../methods/item/setVisibleDiscard')(Self);
     require('../methods/item/get')(Self);
+    require('../methods/item/search')(Self);
 
     Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'});
 

modules/route/back/methods/route/specs/getSuggestedTickets.spec.js

@@ -31,9 +31,9 @@ describe('route getSuggestedTickets()', () => {
             const length = result.length;
             const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toEqual(5);
             expect(anyResult.zoneFk).toEqual(1);
-            expect(anyResult.agencyModeFk).toEqual(8);
+            expect([1, 8]).toContain(anyResult.agencyModeFk);
 
             await tx.rollback();
         } catch (e) {

modules/route/back/methods/route/specs/unlink.spec.js

@@ -14,7 +14,7 @@ describe('route unlink()', () => {
             let tickets = await models.Route.getSuggestedTickets(routeId, options);
 
             expect(zoneAgencyModes.length).toEqual(4);
-            expect(tickets.length).toEqual(3);
+            expect(tickets.length).toEqual(4);
 
             await models.Route.unlink(agencyModeId, zoneId, options);
 

modules/route/back/models/roadmap.json

@@ -33,7 +33,7 @@
         "observations": {
             "type": "string"
         },
-        "userFk": {
+        "editorFk": {
             "type": "number"
         },
         "price": {

modules/route/back/models/roadmapStop.json

@@ -15,16 +15,13 @@
         "roadmapFk": {
             "type": "number"
         },
-        "addressFk": {
-            "type": "number"
-        },
         "eta": {
             "type": "date"
         },
         "description": {
             "type": "string"
         },
-        "userFk": {
+        "editorFk": {
             "type": "number"
         }
     },
@@ -37,7 +34,7 @@
         "address": {
             "type": "belongsTo",
             "model": "RoadmapAddress",
-            "foreignKey": "addressFk"
+            "foreignKey": "roadmapAddressFk"
         }
     }
 }

modules/supplier/back/methods/supplier/specs/getItemsPackaging.spec.js

@@ -7,6 +7,6 @@ describe('Supplier getItemsPackaging()', () => {
         expect(item.id).toEqual(1);
         expect(item.name).toEqual('Ranged weapon longbow 200cm');
         expect(item.quantity).toEqual(5000);
-        expect(item.quantityTotal).toEqual(5100);
+        expect(item.quantityTotal).toEqual(5200);
     });
 });

modules/ticket/back/methods/boxing/getVideo.js

@@ -49,7 +49,7 @@ module.exports = Self => {
                     ps.monitorId,
                     e.created
                 FROM expedition e
-                    JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk
+                    JOIN host h ON h.code = e.hostFk
                     JOIN packingSite ps ON  ps.hostFk = h.id
                 WHERE e.id = ?;`;
         const [expedition] = await models.Expedition.rawSql(query, [id]);

modules/ticket/back/methods/boxing/getVideoList.js

@@ -44,12 +44,14 @@ module.exports = Self => {
                 ps.monitorId,
                 e.created
             FROM expedition e
-                JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk
-                JOIN packingSite ps ON  ps.hostFk = h.id
+                JOIN host h ON h.code = e.hostFk
+                JOIN packingSite ps ON ps.hostFk = h.id
             WHERE e.id = ?;`;
-        const [expedition] = await models.PackingSiteConfig.rawSql(query, [id]);
+
+        const [expedition] = await models.PackingSiteConfig.rawSql(query, [id], myOptions);
 
         if (!from && !expedition) return [];
+
         let start = new Date(expedition.created);
         let end = new Date(start.getTime() + (packingSiteConfig.avgBoxingTime * 1000));
 
@@ -57,9 +59,13 @@ module.exports = Self => {
             start.setHours(from, 0, 0);
             end.setHours(to, 0, 0);
         }
+
         const offset = start.getTimezoneOffset();
         start = new Date(start.getTime() - (offset * 60 * 1000));
         end = new Date(end.getTime() - (offset * 60 * 1000));
+        const minutes = start.getMinutes();
+        const roundedMinutes = minutes - (minutes % 15);
+        start.setMinutes(roundedMinutes, 0, 0);
 
         const videoUrl =
             `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${expedition.monitorId}`;
@@ -73,6 +79,7 @@ module.exports = Self => {
         } catch (e) {
             return [];
         }
+
         return response.data.videos.map(video => video.filename);
     };
 };

modules/ticket/back/methods/boxing/specs/getVideoList.spec.js

@@ -2,35 +2,28 @@ const models = require('vn-loopback/server/server').models;
 const axios = require('axios');
 
 describe('boxing getVideoList()', () => {
-    it('should return video list', async() => {
-        const tx = await models.PackingSiteConfig.beginTransaction({});
+    let tx;
+    let options;
 
-        try {
-            const options = {transaction: tx};
+    beforeEach(async() => {
+        tx = await models.PackingSiteConfig.beginTransaction({});
+        options = {transaction: tx};
+    });
 
-            const id = 1;
-            const from = 1;
-            const to = 2;
+    afterEach(async() => {
+        await tx.rollback();
+    });
 
-            const response = {
-                data: {
-                    videos: [{
-                        id: 1,
-                        filename: 'video1.mp4'
-                    }]
-                }
-            };
+    it('should make the correct API call', async() => {
+        const expedition = await models.Expedition.findById(15, null, options);
+        await expedition.updateAttribute('created', '2000-12-01 07:07:00', options);
 
-            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(response)));
+        const axiosSpy = spyOn(axios, 'get').and.callThrough();
+        await models.Boxing.getVideoList(expedition.id, undefined, undefined, options);
 
-            const result = await models.Boxing.getVideoList(id, from, to, options);
+        const expectedStartTime = '2000-12-01T07:00:00';
+        const calledUrl = axiosSpy.calls.mostRecent().args[0];
 
-            expect(result[0]).toEqual(response.data.videos[0].filename);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
+        expect(calledUrl).toContain(`start=${expectedStartTime}`);
     });
 });

modules/ticket/back/methods/sale/replaceItem.js

@@ -0,0 +1,99 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('replaceItem', {
+        description: 'Replace item from sale',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'saleFk',
+                type: 'number',
+                required: true,
+            },
+            {
+                arg: 'substitutionFk',
+                type: 'number',
+                required: true
+            },
+            {
+                arg: 'quantity',
+                type: 'number',
+                required: true
+            }
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/replaceItem`,
+            verb: 'POST'
+        }
+    });
+
+    Self.replaceItem = async(ctx, saleFk, substitutionFk, quantity, options) => {
+        const myOptions = {userId: ctx.req.accessToken.userId};
+        let tx;
+        const $t = ctx.req.__;
+
+        const models = Self.app.models;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const replaceItemQuery = {
+                sql: 'CALL sale_replaceItem(?,?,?)',
+                query: [saleFk, substitutionFk, quantity]
+            };
+            const resultReplaceItem = await Self.rawSql(replaceItemQuery.sql, replaceItemQuery.query, myOptions);
+            const sale = await models.Sale.findById(saleFk, {
+                fields: ['id', 'ticketFk', 'itemFk', 'quantity', 'price'],
+                include: [
+                    {
+                        relation: 'ticket',
+                        scope: {
+                            fields: ['id']
+                        },
+                    }, {
+                        relation: 'item',
+                        scope: {
+                            fields: ['id', 'name', 'longName']
+                        }
+                    }
+                ]
+            }, myOptions);
+
+            const salesPersonQuery = {
+                sql: 'SELECT vn.client_getSalesPersonByTicket(?)',
+                query: [sale.ticketFk]
+            };
+            const salesPerson = await Self.rawSql(salesPersonQuery.sql, salesPersonQuery.query, myOptions);
+            const url = await models.Url.getUrl();
+            const substitution = await models.Item.findById(substitutionFk, {
+                fields: ['id', 'name', 'longName']
+            }, myOptions);
+
+            const message = $t('negativeReplaced', {
+                oldItemId: sale.itemFk,
+                oldItem: sale.item().longName,
+                oldItemUrl: `${url}item/${sale.itemFk}/summary`,
+                newItemId: substitution.id,
+                newItem: substitution.longName,
+                newItemUrl: `${url}item/${substitution.id}/summary`,
+                ticketId: sale.ticketFk,
+                ticketUrl: `${url}ticket/${sale.ticketFk}/sale`
+            });
+            await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
+
+            return resultReplaceItem;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/ticket/back/methods/sale/specs/replaceItem.spec.js

@@ -0,0 +1,61 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('Sale - replaceItem function', () => {
+    let options;
+    let tx;
+    const ctx = beforeAll.getCtx();
+    beforeAll.mockLoopBackContext();
+    beforeEach(async() => {
+        tx = await models.Sale.beginTransaction({});
+        options = {transaction: tx};
+    });
+
+    afterEach(async() => {
+        if (tx)
+            await tx.rollback();
+    });
+
+    it('should replace full item in sale and send notification', async() => {
+        const saleFk = 43;
+        const substitutionFk = 3;
+        const quantity = 15;
+        const ticketFk = 1000000;
+
+        const salesBefore = await models.Sale.find({where: {ticketFk}}, options);
+        const salesLength = salesBefore.length;
+
+        expect(1).toEqual(salesBefore.length);
+
+        await models.Sale.replaceItem(ctx, saleFk, substitutionFk, quantity, options);
+        const salesAfter = await models.Sale.find({where: {ticketFk}}, options);
+
+        expect(salesLength).toBeLessThan(salesAfter.length);
+        expect(salesAfter[0].id).toEqual(saleFk);
+        expect(salesAfter[salesLength].itemFk).toEqual(substitutionFk);
+        expect(salesAfter[salesLength].quantity).toEqual(quantity);
+        expect(salesAfter[0].quantity).toEqual(0);
+        expect(salesAfter[salesLength].concept).toMatch(/^\+/);
+    });
+
+    it('should replace half item in sale and send notification', async() => {
+        const saleFk = 43;
+        const substitutionFk = 3;
+        const quantity = 10;
+        const ticketFk = 1000000;
+
+        const salesBefore = await models.Sale.find({where: {ticketFk}}, options);
+        const salesLength = salesBefore.length;
+
+        expect(1).toEqual(salesBefore.length);
+
+        await models.Sale.replaceItem(ctx, saleFk, substitutionFk, quantity, options);
+        const salesAfter = await models.Sale.find({where: {ticketFk}}, options);
+
+        expect(salesLength).toBeLessThan(salesAfter.length);
+        expect(salesAfter[0].id).toEqual(saleFk);
+        expect(salesAfter[salesLength].itemFk).toEqual(substitutionFk);
+        expect(salesAfter[salesLength].quantity).toEqual(quantity);
+        expect(salesAfter[0].quantity).toEqual(5);
+        expect(salesAfter[salesLength].concept).toMatch(/^\+/);
+    });
+});

modules/ticket/back/methods/ticket/closeAll.js

@@ -1,4 +1,5 @@
-const closure = require('./closure');
+const smtp = require('vn-print/core/smtp');
+const config = require('vn-print/core/config');
 
 module.exports = Self => {
     Self.remoteMethodCtx('closeAll', {
@@ -25,122 +26,62 @@ module.exports = Self => {
     Self.closeAll = async(ctx, options) => {
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
-
+        let tx;
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        let tx;
-        // IMPORTANT: Due to its high cost in production, wrapping this process in a transaction may cause timeouts.
-
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
         const toDate = Date.vnNew();
         toDate.setHours(0, 0, 0, 0);
         toDate.setDate(toDate.getDate() - 1);
+        const [{dateFrom, dateTo}] = await Self.rawSql(`
+            SELECT ? - INTERVAL closureDaysAgo DAY dateFrom,
+                    util.dayEnd(?) dateTo
+                FROM ticketConfig
+                LIMIT 1`, [toDate, toDate], myOptions);
 
-        const tickets = await Self.rawSql(`
-            SELECT t.id,
+        await Self.rawSql(`
+            DROP TEMPORARY TABLE IF EXISTS tmp.ticket_close;
+            CREATE TEMPORARY TABLE tmp.ticket_close
+                ENGINE = MEMORY
+            WITH wTickets AS(
+                SELECT t.id ticketFk
+                    FROM ticket t
+                        JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                    WHERE t.shipped BETWEEN ? AND ?
+                        AND t.refFk IS NULL
+            ), wTicketsTracking AS(
+            SELECT wt.ticketFk, MAX(tt.id) maxTracking
+                FROM wTickets wt
+                    JOIN ticketTracking tt ON tt.ticketFk = wt.ticketFk
+                GROUP BY tt.ticketFk
+            ), wTicketsLastState AS(
+                SELECT wt.ticketFk, tt.stateFk
+                    FROM wTicketsTracking wt
+                        JOIN ticketTracking tt ON tt.id = wt.maxTracking
+            ) SELECT tls.ticketFk,
                     t.clientFk,
-                    t.companyFk,
-                    c.id clientFk,
                     c.name clientName,
                     c.email recipient,
-                    c.salesPersonFk,
-                    c.isToBeMailed,
-                    c.hasToInvoice,
-                    c.hasDailyInvoice,
                     eu.email salesPersonEmail,
-                    t.addressFk
-                FROM ticket t
+                    t.addressFk,
+                    c.hasDailyInvoice,
+                    c.hasToInvoiceByAddress,
+                    t.totalWithVat,
+                    t.companyFk
+                FROM wTicketsLastState tls
+                    JOIN ticket t ON t.id = tls.ticketFk
+                    JOIN state s ON s.id =tls.stateFk
+                    JOIN alertLevel al ON al.id = s.alertLevel
                     JOIN agencyMode am ON am.id = t.agencyModeFk
-                    JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
-                    JOIN ticketState ts ON ts.ticketFk = t.id
-                    JOIN alertLevel al ON al.id = ts.alertLevel
                     JOIN client c ON c.id = t.clientFk
-                    JOIN province p ON p.id = c.provinceFk
-                    JOIN country co ON co.id = p.countryFk
                     LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-                    JOIN ticketConfig tc ON TRUE
-                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
-                    AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
-                    AND t.refFk IS NULL
-                GROUP BY t.id
-        `, [toDate, toDate], myOptions);
-        const ticketIds = tickets.map(ticket => ticket.id);
-        await Self.rawSql(`
-            INSERT INTO util.debug (variable, value)
-                VALUES ('nightInvoicing', ?)
-        `, [ticketIds.join(',')], myOptions);
-
-        await Self.rawSql(`
-        WITH ticketNotInvoiceable AS(
-            SELECT JSON_OBJECT(
-                'tickets',
-                JSON_ARRAYAGG(
-                    JSON_OBJECT(
-                        'ticketId', ticketFk,
-                        'reason', reason,
-                        'clientId', clientFk
-                    )
-                )
-            )errors
-            FROM (
-                SELECT ticketFk,
-                        CONCAT_WS(', ',
-                            IF(hasErrorToInvoice, 'Facturar', NULL),
-                            IF(hasErrorTaxDataChecked, 'Datos comprobados', NULL),
-                            IF(hasErrorDeleted, 'Eliminado', NULL),
-                            IF(hasErrorItemTaxCountry, 'Impuesto no informado', NULL),
-                            IF(hasErrorAddress, 'Sin dirección', NULL),
-                            IF(hasErrorInfoTaxAreaWorld, 'Datos exportaciones', NULL)) reason,
-                        clientFk
-                    FROM (
-                        SELECT t.id ticketFk,
-                                SUM(NOT c.hasToInvoice) hasErrorToInvoice,
-                                SUM(NOT c.isTaxDataChecked) hasErrorTaxDataChecked,
-                                SUM(t.isDeleted) hasErrorDeleted,
-                                SUM(itc.id IS NULL) hasErrorItemTaxCountry,
-                                SUM(a.id IS NULL) hasErrorAddress,
-                                SUM(ios.code IS NOT NULL
-                                    AND(ad.customsAgentFk IS NULL
-                                        OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld,
-                                t.clientFk clientFk
-                            FROM ticket t
-                                LEFT JOIN address ad ON ad.id = t.addressFk
-                                JOIN sale s ON s.ticketFk = t.id
-                                JOIN item i ON i.id = s.itemFk
-                                JOIN supplier su ON su.id = t.companyFk
-                                JOIN agencyMode am ON am.id = t.agencyModeFk
-                                JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
-                                JOIN ticketState ts ON ts.ticketFk = t.id
-                                JOIN alertLevel al ON al.id = ts.alertLevel
-                                JOIN client c ON c.id = t.clientFk
-                                JOIN province p ON p.id = c.provinceFk
-                                JOIN ticketConfig tc ON TRUE
-                                LEFT JOIN autonomy a ON a.id = p.autonomyFk
-                                JOIN country co ON co.id = p.countryFk
-                                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-                                LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
-                                    AND itc.countryFk = su.countryFk
-                                LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD'
-                                    AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'multiple')
-                            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
-                                AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
-                                AND t.refFk IS NULL
-                                AND c.hasDailyInvoice
-                            GROUP BY ticketFk
-                            HAVING hasErrorToInvoice
-                                OR hasErrorTaxDataChecked
-                                OR hasErrorDeleted
-                                OR hasErrorItemTaxCountry
-                                OR hasErrorAddress
-                                OR hasErrorInfoTaxAreaWorld
-                    )sub
-                )sub2
-            ) SELECT IF(errors = '{"tickets": null}',
-                    'No errors',
-                    util.notification_send('invoice-ticket-closure', errors, NULL))
-                FROM ticketNotInvoiceable`, [toDate, toDate], myOptions);
-
-        await closure(ctx, Self, tickets, myOptions);
+                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'));
+            CALL ticket_close();
+        `, [dateFrom, dateTo], myOptions);
 
         await Self.rawSql(`
             UPDATE ticket t
@@ -151,17 +92,100 @@ module.exports = Self => {
                     JOIN ticketConfig tc ON TRUE
                     LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
                 SET t.routeFk = NULL
-                WHERE t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
+                WHERE t.shipped BETWEEN ? AND ?
                     AND al.code NOT IN ('DELIVERED', 'PACKED')
                     AND NOT t.packages
                     AND tob.id IS NULL
-                    AND t.routeFk`, [toDate, toDate], myOptions);
+                    AND t.routeFk`, [dateFrom, dateTo], myOptions);
+
+        const [clients] = await Self.rawSql(`
+            SELECT clientFk clientId,
+                    clientName,
+                    recipient,
+                    salesPersonEmail,
+                    addressFk addressId,
+                    companyFk,
+                    SUM(totalWithVat) total,
+                    'quick' serialType
+                FROM tmp.ticket_close
+                WHERE hasDailyInvoice
+                GROUP BY IF (hasToInvoiceByAddress, addressFk, clientFk), companyFk
+                HAVING total > 0;
+            DROP TEMPORARY TABLE tmp.ticket_close;
+        `, [], myOptions);
 
         if (tx)
             await tx.commit();
 
+        const failedClients = [];
+        const nestedTransaction = options?.transaction ? myOptions : {};
+        for (const client of clients) {
+            ctx.args = {
+                ...client,
+                invoiceDate: Date.vnNew(),
+                maxShipped: toDate
+            };
+            try {
+                const id = await Self.app.models.InvoiceOut.invoiceClient(ctx, nestedTransaction);
+                if (id)
+                    await Self.app.models.InvoiceOut.makePdfAndNotify(ctx, id, null, nestedTransaction);
+            } catch (error) {
+                await Self.rawSql(`
+                    INSERT INTO util.debug (variable, value)
+                        VALUES ('invoicingTicketError', ?)
+                `, [client.clientId + ' - ' + error]);
+
+                if (error.responseCode == 450) {
+                    await invalidEmail(client);
+                    continue;
+                }
+
+                failedClients.push({
+                    id: client.clientId,
+                    address: client.addressId,
+                    error
+                });
+            }
+        }
+
+        if (failedClients.length > 0) {
+            let body = 'This following tickets have failed:<br/><br/>';
+
+            for (const client of failedClients) {
+                body += `Client: <strong>${client.id}</strong>
+                        Address: <strong>${client.address}</strong>
+                            <br/> <strong>${client.error}</strong><br/><br/>`;
+            }
+
+            smtp.send({
+                to: config.app.reportEmail,
+                subject: '[API] Nightly ticket closure report',
+                html: body,
+            }).catch(err => console.error(err));
+        }
+
         return {
             message: 'Success'
         };
     };
+
+    async function invalidEmail(client) {
+        await Self.rawSql(
+            `UPDATE client SET email = NULL WHERE id = ?`,
+            [client.clientId],
+            myOptions
+        );
+
+        const body = `No se ha podido facturar al cliente <strong>${client.clientId} - ${client.clientName}</strong>
+            porque la dirección de email <strong>"${client.recipient}"</strong> no es correcta
+            o no está disponible.<br/><br/>
+            Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
+            Actualiza la dirección de email con una correcta.`;
+
+        smtp.send({
+            to: client.salesPersonEmail,
+            subject: 'No se ha podido enviar el albarán',
+            html: body,
+        }).catch(err => console.error(err));
+    }
 };

modules/ticket/back/methods/ticket/getSales.js

@@ -98,6 +98,7 @@ module.exports = Self => {
 
         for (let sale of sales) {
             const problems = saleProblems.get(sale.id);
+            sale.claim = claimedSales.get(sale.id);
             if (problems) {
                 for (const problem in problems)
                     sale[problem] = problems[problem];

modules/ticket/back/methods/ticket/itemLack.js

@@ -0,0 +1,111 @@
+module.exports = Self => {
+    Self.remoteMethod('itemLack', {
+        description: 'Get tickets as negative status',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'ctx',
+                type: 'object',
+                http: {source: 'context'}
+            },
+            {
+                arg: 'filter',
+                type: 'object',
+                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'id',
+                type: 'number',
+                description: 'The item id',
+            },
+            {
+                arg: 'longname',
+                type: 'string',
+                description: 'Article name',
+            },
+            {
+                arg: 'supplier',
+                type: 'string',
+                description: 'Supplier id',
+            },
+            {
+                arg: 'colour',
+                type: 'string',
+                description: 'Colour\'s item',
+            },
+            {
+                arg: 'size',
+                type: 'string',
+                description: 'Size\'s item',
+            },
+            {
+                arg: 'origen',
+                type: 'string',
+                description: 'origen id',
+            },
+            {
+                arg: 'warehouseFk',
+                type: 'number',
+                description: 'The warehouse id',
+            },
+            {
+                arg: 'lack',
+                type: 'number',
+                description: 'The item id',
+            },
+            {
+                arg: 'days',
+                type: 'number',
+                description: 'The range days',
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: ['object'],
+                root: true
+            }
+        ],
+        http: {
+            path: `/itemLack`,
+            verb: 'GET'
+        }
+    });
+
+    Self.itemLack = async(ctx, filter, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const filterKeyOrder = [
+            'id', 'force', 'days', 'longname', 'supplier',
+            'colour', 'size', 'originFk',
+            'lack', 'warehouseFk'
+        ];
+
+        delete ctx?.args?.ctx;
+
+        delete ctx?.args?.filter;
+
+        Object.assign(filter, ctx.args ?? {});
+
+        let procedureParams = [];
+        procedureParams.push(...filterKeyOrder.map(clave => filter[clave] ?? null));
+
+        // Default values
+        const forceIndex = filterKeyOrder.indexOf('force');
+        if (!procedureParams[forceIndex])procedureParams[forceIndex] = true;
+        const daysIndex = filterKeyOrder.indexOf('days');
+        if (!procedureParams[daysIndex])procedureParams[daysIndex] = 2;
+        const procedureArgs = Array(procedureParams.length).fill('?').join(', ');
+
+        let query = `CALL vn.item_getLack(${procedureArgs})`;
+
+        const result = await Self.rawSql(query, procedureParams, myOptions);
+
+        const itemsIndex = 0;
+        return result[itemsIndex];
+    };
+};

modules/ticket/back/methods/ticket/itemLackDetail.js

@@ -0,0 +1,167 @@
+const {ParameterizedSQL} = require('loopback-connector');
+
+module.exports = Self => {
+    Self.remoteMethod('itemLackDetail', {
+        description: 'Retrieve detail from ticket as negative',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'itemFk',
+                type: 'number',
+                description: 'The item as negative status',
+            },
+            {
+                arg: 'filter',
+                type: 'object',
+                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+                http: {source: 'query'}
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: ['object'],
+                root: true,
+            },
+        ],
+        http: {
+            path: `/itemLack/:itemFk`,
+            verb: 'GET',
+        },
+    });
+
+    Self.itemLackDetail = async(itemFk, filter, options) => {
+        const conn = Self.dataSource.connector;
+
+        const myOptions = {};
+        if (typeof options == 'object') Object.assign(myOptions, options);
+        const vDated = (Date.vnNew());
+        vDated.setHours(0, 0, 0, 0);
+        const scopeDays = filter.where.scopeDays ?? 0;
+        let alertLevels = filter.where.alertLevelCode;
+
+        if (!alertLevels)
+            alertLevels = (await Self.app.models.AlertLevel.find({fields: ['code']})).map(({code}) => code);
+
+        const stmt = new ParameterizedSQL(`
+            SELECT s.id,
+                st.code,
+                t.id,
+                t.nickname,
+                c.id customerId,
+                t.shipped,
+                s.quantity,
+                ag.name,
+                ag.id agencyFk,
+                tls.alertLevel alertLevel,
+                st.name stateName,
+                s.id saleFk,
+                s.itemFk,
+                s.price price,
+                al.code alertLevelCode,
+                z.name zoneName,
+                z.id zoneFk,
+                z.hour theoreticalhour,
+                cn.isRookie,
+                sc.saleClonedFk turno,
+                tr.saleFk peticionCompra,
+                DATE_FORMAT(IF(HOUR(t.shipped), t.shipped, IF(zc.hour, zc.hour, z.hour)),'%H:%i') minTimed,
+                FALSE isBasket,
+                substitution.hasObservation,
+                (d.code = 'spainTeamVip') hasToIgnore
+            FROM sale s
+                LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+                JOIN ticket t ON t.id = s.ticketFk
+                LEFT JOIN zone z ON z.id = t.zoneFk
+                LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+                    AND t.shipped BETWEEN zc.dated AND util.dayEnd(t.shipped)
+                JOIN client c ON c.id=t.clientFk
+                LEFT JOIN bs.clientNewBorn cn ON cn.clientFk=c.id
+                JOIN agencyMode ag ON ag.id=t.agencyModeFk
+                JOIN ticketState tls ON tls.ticketFk=t.id
+                LEFT JOIN state st ON st.id=tls.state
+                LEFT JOIN alertLevel al ON al.id = st.alertLevel
+                LEFT JOIN saleCloned sc ON sc.saleClonedFk = s.id
+                LEFT JOIN ticketRequest tr ON tr.saleFk = s.id
+                LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
+                LEFT JOIN department d ON d.id = wd.departmentFk
+                LEFT JOIN (
+                    SELECT co.clientFk, COUNT(*) hasObservation
+                        FROM clientObservation co
+                             JOIN observationType ot ON ot.id = co.observationTypeFk
+                        WHERE ot.code = 'substitution'
+                        GROUP BY co.clientFk
+                ) substitution ON substitution.clientFk = c.id
+            WHERE t.warehouseFk = ?
+                AND s.itemFk = ?
+                AND s.quantity <> 0
+
+                AND t.shipped BETWEEN ? AND (? + INTERVAL ? DAY)
+
+                AND sgd.saleFk IS NULL
+                AND (al.code IN (?) OR al.id IS NULL)
+            UNION ALL
+                SELECT r.id,
+                    NULL,
+                    r.orderFk,
+                    c.name customerName,
+                    c.id customerId,
+                    r.shipment,
+                    r.amount,
+                    ag.name,
+                    ag.id,
+                    NULL,
+                    NULL,
+                    NULL,
+                    r.itemFk,
+                    NULL,
+                    NULL,
+                    NULL,
+                    NULL,
+                    NULL,
+                    cn.isRookie,
+                    NULL,
+                    NULL,
+                    NULL,
+                    TRUE,
+                    substitution.hasObservation,
+                    d.code = 'spainTeamVip'
+                FROM hedera.orderRow r
+                    JOIN hedera.order o ON o.id = r.orderFk
+                    JOIN client c ON c.id = o.customer_id
+                    JOIN agencyMode ag ON ag.id=o.agency_id
+                    LEFT JOIN bs.clientNewBorn cn ON cn.clientFk=c.id
+                    LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
+                    LEFT JOIN department d ON d.id = wd.departmentFk
+                    LEFT JOIN (
+                        SELECT co.clientFk, COUNT(*) hasObservation
+                            FROM clientObservation co
+                                JOIN observationType ot ON ot.id = co.observationTypeFk
+                            WHERE ot.code = 'substitution'
+                            GROUP BY co.clientFk
+                    )  substitution ON substitution.clientFk = c.id
+                WHERE r.shipment BETWEEN ? AND ? + INTERVAL ? DAY
+                    AND r.created >= ?
+                    AND r.warehouseFk = ?
+                    AND NOT o.confirmed
+                    AND r.itemFk = ?
+                    AND r.amount
+            ORDER BY hasToIgnore, isBasket
+        `,
+        [
+            filter.where.warehouseFk,
+            itemFk,
+            vDated, vDated,
+            scopeDays,
+            alertLevels,
+            scopeDays,
+            vDated, vDated, vDated,
+            filter.where.warehouseFk,
+            itemFk
+        ]);
+
+        const sql = ParameterizedSQL.join([stmt], ';');
+        const result = await conn.executeStmt(sql, myOptions);
+        return result;
+    };
+};

modules/ticket/back/methods/ticket/specs/itemLack.spec.js

@@ -0,0 +1,80 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('Item Lack', () => {
+    let options;
+    let tx;
+    const ctx = beforeAll.getCtx();
+    beforeAll.mockLoopBackContext();
+
+    beforeEach(async() => {
+        tx = await models.Ticket.beginTransaction({});
+        options = {transaction: tx};
+    });
+
+    afterEach(async() => {
+        if (tx)
+            await tx.rollback();
+    });
+
+    it('should return data with NO filters', async() => {
+        const filter = {};
+        const result = await models.Ticket.itemLack(ctx, filter, options);
+
+        expect(result.length).toEqual(2);
+    });
+
+    it('should return data with filter.id', async() => {
+        const filter = {
+            id: 5
+        };
+        const result = await models.Ticket.itemLack(ctx, filter, options);
+
+        expect(result.length).toEqual(1);
+    });
+
+    it('should return data with filter.longname', async() => {
+        const filter = {
+            longname: 'Ranged weapon pistol 9mm'
+        };
+        const result = await models.Ticket.itemLack(ctx, filter, options);
+
+        expect(result.length).toEqual(1);
+    });
+
+    it('should return data with filter.color', async() => {
+        const filter = {
+            colour: 'WHT'
+        };
+        const result = await models.Ticket.itemLack(ctx, filter, options);
+
+        expect(result.length).toEqual(1);
+    });
+
+    it('should return data with filter.origen', async() => {
+        const filter = {
+            originFk: 1
+        };
+        const result = await models.Ticket.itemLack(ctx, filter, options);
+
+        expect(result.length).toEqual(2);
+    });
+
+    it('should return data with filter.size', async() => {
+        const filter = {
+            size: '15'
+        };
+        const result = await models.Ticket.itemLack(ctx, filter, options);
+
+        expect(result.length).toEqual(1);
+    });
+
+    it('should return data with filter.lack', async() => {
+        const filter = {
+            lack: '-15'
+        };
+
+        const result = await models.Ticket.itemLack(ctx, filter, options);
+
+        expect(result.length).toEqual(1);
+    });
+});

modules/ticket/back/methods/ticket/specs/itemLackDetail.spec.js

@@ -0,0 +1,55 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Item Lack Detail', () => {
+    it('should return false if id is null', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const itemFk = null;
+
+            const filter = {where: {warehouseFk: 60}};
+            const result = await models.Ticket.itemLackDetail(itemFk, filter, options);
+
+            expect(result.length).toEqual(0);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return data if id exists', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const itemFk = 1167;
+            const filter = {where: {warehouseFk: 60}};
+            const result = await models.Ticket.itemLackDetail(itemFk, filter, options);
+
+            expect(result.length).toEqual(0);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return error is if not exists', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const itemFk = 0;
+            const filter = {where: {warehouseFk: 60}};
+            const result = await models.Ticket.itemLackDetail(itemFk, filter, options);
+
+            expect(result.length).toEqual(0);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/ticket/back/methods/ticket/specs/split.spec.js

@@ -0,0 +1,47 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('Split', () => {
+    let options;
+    let tx;
+    const ctx = beforeAll.getCtx();
+    beforeAll.mockLoopBackContext();
+
+    beforeEach(async() => {
+        tx = await models.Ticket.beginTransaction({});
+        options = {transaction: tx};
+    });
+
+    afterEach(async() => {
+        if (tx)
+            await tx.rollback();
+    });
+
+    it('should split tickets with count 1', async() => {
+        const data =
+            {ticketFk: 7, sales: [1]};
+        const result = await models.Ticket.split(ctx, data, options);
+
+        expect(data.ticketFk).toEqual(result.ticket);
+        expect('noSplit').toEqual(result.status);
+    });
+
+    it('should split tickets with count 2 and error', async() => {
+        const data =
+            {ticketFk: 11, sales: [7]}
+        ;
+        const result = await models.Ticket.split(ctx, data, options);
+
+        expect(data.ticketFk).toEqual(result.ticket);
+        expect('error').toEqual(result.status);
+        expect('Can\'t transfer claimed sales').toEqual(result.message);
+    });
+
+    it('should split tickets with count 2 and success', async() => {
+        const data =
+            {ticketFk: 14, sales: [33]};
+        const result = await models.Ticket.split(ctx, data, options);
+
+        expect(data.ticketFk).toEqual(result.ticket);
+        expect('split').toEqual(result.status);
+    });
+});

modules/ticket/back/methods/ticket/split.js

@@ -0,0 +1,73 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('split', {
+        description: 'Split ticket with custom date',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'ticket',
+                type: 'Object',
+                required: true,
+                http: {source: 'body'}
+            },
+            {
+                arg: 'date',
+                type: 'date',
+                required: true,
+            }
+        ],
+        returns: {
+            type: ['Object'],
+            root: true
+        },
+        http: {
+            path: `/split`,
+            verb: 'POST'
+        }
+    });
+
+    Self.split = async(ctx, ticket, options) => {
+        const {ticketFk} = ticket;
+        const models = Self.app.models;
+        const myOptions = {};
+        let tx;
+        let result = [];
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+        try {
+            const count = await models.Sale.count({
+                ticketFk
+            }, myOptions);
+            if (count === 1)
+                return {ticket: ticketFk, status: 'noSplit'};
+
+            const [, [{vNewTicket}]] = await Self.rawSql(`
+                    CALL vn.ticket_clone(?, @vNewTicket);
+                    SELECT @vNewTicket vNewTicket;`,
+            [ticketFk], myOptions);
+
+            if (vNewTicket === 0) return result;
+            const sales = await models.Sale.find({
+                where: {id: {inq: ticket.sales}}
+            }, myOptions);
+
+            const updateIsPicked = sales.map(({sid}) => Self.rawSql(`
+                     UPDATE vn.sale SET isPicked = (id = ?) WHERE ticketFk = ?`,
+            [sid, ticketFk], myOptions));
+
+            await Promise.all(updateIsPicked);
+            await Self.transferSales(ctx, ticketFk, vNewTicket, sales, myOptions);
+
+            await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketFk, 'FIXING'], myOptions);
+            if (tx) await tx.commit();
+            return {ticket: ticketFk, newTicket: vNewTicket, status: 'split'};
+        } catch (e) {
+            if (tx) await tx.rollback();
+            return {ticket: ticketFk, status: 'error', message: e.message};
+        }
+    };
+};

modules/ticket/back/models/sale.js

@@ -13,6 +13,7 @@ module.exports = Self => {
     require('../methods/sale/usesMana')(Self);
     require('../methods/sale/clone')(Self);
     require('../methods/sale/getFromSectorCollection')(Self);
+    require('../methods/sale/replaceItem')(Self);
 
     Self.validatesPresenceOf('concept', {
         message: `Concept cannot be blank`

modules/ticket/back/models/ticket-config.json

@@ -26,6 +26,12 @@
         },
         "defaultAttenderFk": {
             "type": "number"
+        },
+        "lackAlertPrice": {
+            "type": "number"
+        },
+        "lackScopeDays": {
+            "type": "number"
         }
     },
     "relations": {

modules/ticket/back/models/ticket-methods.js

@@ -46,5 +46,8 @@ module.exports = function(Self) {
     require('../methods/ticket/docuwareDownload')(Self);
     require('../methods/ticket/myLastModified')(Self);
     require('../methods/ticket/setWeight')(Self);
+    require('../methods/ticket/itemLack')(Self);
+    require('../methods/ticket/itemLackDetail')(Self);
+    require('../methods/ticket/split')(Self);
     require('../methods/ticket/getTicketProblems')(Self);
 };

modules/ticket/front/dms/create/index.js

@@ -43,7 +43,7 @@ class Controller extends Section {
         }};
         this.$http.get('DmsTypes/findOne', {params}).then(res => {
             const dmsTypeId = res.data && res.data.id;
-            const warehouseId = this.ticket.warehouseFk;
+            const warehouseId = this.vnConfig.warehouseFk;
             const defaultParams = {
                 reference: this.ticket.id,
                 warehouseId: warehouseId,

modules/ticket/front/future/index.html

@@ -92,7 +92,7 @@
                         </td>
                         <td class="icon-field">
                             <vn-icon
-                                ng-show="::ticket.isTaxDataChecked === 0"
+                                ng-show="::ticket.isTaxDataChecked !== 0"
                                 translate-attr="{title: 'No verified data'}"
                                 class="bright"
                                 icon="icon-no036">

modules/ticket/front/index/index.html

@@ -40,7 +40,7 @@
                     </vn-td>
                     <vn-td class="icon-field">
                         <vn-icon
-                            ng-show="::ticket.isTaxDataChecked === 0"
+                            ng-show="::ticket.isTaxDataChecked !== 0"
                             translate-attr="{title: 'No verified data'}"
                             class="bright"
                             icon="icon-no036">

modules/travel/back/methods/travel/extraCommunityFilter.js

@@ -67,6 +67,11 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The freighter supplier id'
             },
+            {
+                arg: 'entrySupplierFk',
+                type: 'number',
+                description: 'The supplier of the entry(not freighter) id'
+            },
         ],
         returns: {
             type: ['Object'],
@@ -94,6 +99,8 @@ module.exports = Self => {
                 return {'t.landed': {lte: value}};
             case 'continent':
                 return {'cnt.code': value};
+            case 'entrySupplierFk':
+                return {'e.supplierFk': value};
             case 'id':
             case 'agencyModeFk':
             case 'warehouseOutFk':