diff --git a/Jenkinsfile b/Jenkinsfile
index 06addc9408..8f836e8b89 100644
--- a/Jenkinsfile
+++ b/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')
+ }
+}
diff --git a/back/Dockerfile b/back/Dockerfile
index b2c3298966..bd48374d6e 100644
--- a/back/Dockerfile
+++ b/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"]
\ No newline at end of file
+CMD ["node", "--tls-min-v1.0", "--openssl-legacy-provider", "./loopback/server/server.js"]
diff --git a/back/models/vn-user.json b/back/models/vn-user.json
index 8c49c8db9e..03a4e5bc1f 100644
--- a/back/models/vn-user.json
+++ b/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"
]
+
}
}
}
diff --git a/db/.pullinfo.json b/db/.pullinfo.json
index b890ffc31b..423d99bb94 100644
--- a/db/.pullinfo.json
+++ b/db/.pullinfo.json
@@ -3,8 +3,8 @@
"shaSums": {
"srt": {
"view": {
- "routePalletized": "765f8933a6a5a86dfe8f22825cc77351bc8620cdf1be9d3f25abb130460f3a61",
- "ticketPalletized": "c327f3243e717cc607f01d3747967ba68158f90ef1038986b0aa6ae6d5ce7309"
+ "routePalletized": "98d228ced59c8ec590bbaf106cebf47689a02b32e895ba76b5b6e5c05d73cf14",
+ "ticketPalletized": "60d527908d473b92b70ba2ceed4e9be1f3be7509782f2c0d66d0cb98ecfeee2f"
}
},
"vn": {
diff --git a/db/dump/db.cnf b/db/dump/db.cnf
index 3dafaf5146..48523062dd 100644
--- a/db/dump/db.cnf
+++ b/db/dump/db.cnf
@@ -1,4 +1,5 @@
[mysqld]
+bind-address = 0.0.0.0
log-bin = bin.log
max_binlog_size = 1GB
binlog_row_image = noblob
diff --git a/db/dump/dump.before.sql b/db/dump/dump.before.sql
index 20a365c83b..4e0628dbb8 100644
--- a/db/dump/dump.before.sql
+++ b/db/dump/dump.before.sql
@@ -6,9 +6,10 @@ GRANT SELECT,
INSERT,
UPDATE,
DELETE,
- DROP,
CREATE TEMPORARY TABLES,
EXECUTE,
EVENT,
- TRIGGER
+ TRIGGER, -- EXECUTE TRIGGER
+ RELOAD, -- FLUSH PRIVILEGES
+ DROP -- TRUNCATE TABLE
ON *.* TO 'vn'@'localhost';
diff --git a/db/dump/fixtures.after.sql b/db/dump/fixtures.after.sql
index 59730d5929..e68a8a7260 100644
--- a/db/dump/fixtures.after.sql
+++ b/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');
diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index 308a2554fc..08c8407fbd 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -14,7 +14,7 @@ SET DEFAULT ROLE 'salix' FOR 'root'@'%';
CREATE SCHEMA IF NOT EXISTS `tmp`;
UPDATE `util`.`config`
- SET `environment`= 'development';
+ SET `environment`= 'development';
-- FOR MOCK vn.time
@@ -29,10 +29,10 @@ BEGIN
SET vDate = '2000-01-01';
WHILE ( YEAR(vDate) <= 2002 ) DO
- INSERT IGNORE INTO vn.`time` (dated, period, `month`, `year`, `day`, week, yearMonth, salesYear)
+ INSERT IGNORE INTO vn.`time` (dated, period, `month`, `year`, `day`, week, yearMonth, salesYear)
VALUES (vDate, CONCAT(YEAR(vDate), (WEEK(vDate)+1)), MONTH(vDate), YEAR(vDate), DAY(vDate), WEEK(vDate)+1, CONCAT(YEAR(vDate), MONTH(vDate)), YEAR(vDate));
- SET vDate = DATE_ADD(vDate, INTERVAL 1 DAY);
+ SET vDate = DATE_ADD(vDate, INTERVAL 1 DAY);
END WHILE;
END$$
@@ -48,47 +48,47 @@ ALTER TABLE `vn`.`zoneGeo` AUTO_INCREMENT = 1;
ALTER TABLE `vn`.`ticket` AUTO_INCREMENT = 1;
INSERT INTO `salix`.`AccessToken` (`id`, `ttl`, `created`, `userId`)
- VALUES
- ('DEFAULT_TOKEN', '1209600', CURDATE(), 66);
+ VALUES
+ ('DEFAULT_TOKEN', '1209600', CURDATE(), 66);
INSERT INTO `salix`.`printConfig` (`id`, `itRecipient`, `incidencesEmail`)
- VALUES
- (1, 'it@gotamcity.com', 'incidences@gotamcity.com');
+ VALUES
+ (1, 'it@gotamcity.com', 'incidences@gotamcity.com');
INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`)
- VALUES
- ('1', '6');
+ VALUES
+ ('1', '6');
INSERT INTO `vn`.`bionicConfig` (`id`, `generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`)
- VALUES
- (1, 1.30, 167.00, 138000, 71);
+ VALUES
+ (1, 1.30, 167.00, 138000, 71);
INSERT INTO `vn`.`chatConfig` (`id`, `host`, `api`)
- VALUES
- (1, 'https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1');
+ VALUES
+ (1, 'https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1');
INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`)
- VALUES
- ('1', '11');
+ VALUES
+ ('1', '11');
UPDATE `account`.`role` SET id = 100 WHERE id = 0;
INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPrefix`, `userHost`, `tplUser`)
- VALUES
- (1, 'mysqlPassword', '$', '!', '%', 'any');
+ VALUES
+ (1, 'mysqlPassword', '$', '!', '%', 'any');
CALL `account`.`role_sync`;
INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `lang`, `image`, `password`)
- SELECT id, LOWER(name), CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
- FROM `account`.`role`
- ORDER BY id;
+ SELECT id, LOWER(name), CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
+ FROM `account`.`role`
+ ORDER BY id;
INSERT INTO `account`.`account`(`id`)
- SELECT `u`.`id`
- FROM `account`.`user` `u`
- JOIN `account`.`role` `r` ON `u`.`role` = `r`.`id`
- WHERE `r`.`name` <> 'customer';
+ SELECT `u`.`id`
+ FROM `account`.`user` `u`
+ JOIN `account`.`role` `r` ON `u`.`role` = `r`.`id`
+ WHERE `r`.`name` <> 'customer';
INSERT INTO `vn`.`educationLevel` (`id`, `name`)
VALUES
@@ -96,14 +96,14 @@ INSERT INTO `vn`.`educationLevel` (`id`, `name`)
(2, 'ENSEÑANZAS DE BACHILLERATO');
INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `bossFk`)
- SELECT id,UPPER(LPAD(role, 3, '0')), name, name, NULL
- FROM `account`.`user`
- WHERE `id` = 9;
+ SELECT id,UPPER(LPAD(role, 3, '0')), name, name, NULL
+ FROM `account`.`user`
+ WHERE `id` = 9;
INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `bossFk`)
- SELECT id,UPPER(LPAD(role, 3, '0')), name, name, 9
- FROM `account`.`user`
- WHERE `id` <> 9;
+ SELECT id,UPPER(LPAD(role, 3, '0')), name, name, 9
+ FROM `account`.`user`
+ WHERE `id` <> 9;
UPDATE `vn`.`worker` SET bossFk = NULL WHERE id = 20;
UPDATE `vn`.`worker` SET bossFk = 20 WHERE id = 1 OR id = 9;
@@ -113,48 +113,48 @@ UPDATE `vn`.`worker` SET bossFk = 50 WHERE id = 49;
DELETE FROM `vn`.`worker` WHERE firstName ='customer';
INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`, `maxAmount`, `employeeFk`, `testUrl`)
- VALUES
- (1, 978, 1, 0, 2000, 9, 0);
+ VALUES
+ (1, 978, 1, 0, 2000, 9, 0);
INSERT INTO hedera.orderConfig (`id`, `employeeFk`, `defaultAgencyFk`, `guestMethod`, `guestAgencyFk`, `reserveTime`, `defaultCompanyFk`)
VALUES (1, 1, 2, 'PICKUP', 1, '00:20:00', 442);
INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
- VALUES
- (1101, 'brucewayne', 'Bruce Wayne', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com', 'es','1101'),
- (1102, 'petterparker', 'Petter Parker', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 131, 1, 'PetterParker@mydomain.com', 'en','1102'),
- (1103, 'clarkkent', 'Clark Kent', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com', 'fr','1103'),
- (1104, 'tonystark', 'Tony Stark', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com', 'es','1104'),
- (1105, 'maxeisenhardt', 'Max Eisenhardt', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com', 'pt','1105'),
- (1106, 'davidcharleshaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
- (1107, 'hankpym', 'Hank Pym', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com', 'en','1107'),
- (1108, 'charlesxavier', 'Charles Xavier', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com', 'en','1108'),
- (1109, 'brucebanner', 'Bruce Banner', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com', 'en','1109'),
- (1110, 'jessicajones', 'Jessica Jones', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com', 'en','1110'),
- (1111, 'missing', 'Missing', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL, 'en','e7723f0b24ff05b32ed09d95196f2f29'),
- (1112, 'trash', 'Trash', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL, 'en','e7723f0b24ff05b32ed09d95196f2f29');
+ VALUES
+ (1101, 'brucewayne', 'Bruce Wayne', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com', 'es','1101'),
+ (1102, 'petterparker', 'Petter Parker', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 131, 1, 'PetterParker@mydomain.com', 'en','1102'),
+ (1103, 'clarkkent', 'Clark Kent', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com', 'fr','1103'),
+ (1104, 'tonystark', 'Tony Stark', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com', 'es','1104'),
+ (1105, 'maxeisenhardt', 'Max Eisenhardt', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com', 'pt','1105'),
+ (1106, 'davidcharleshaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
+ (1107, 'hankpym', 'Hank Pym', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com', 'en','1107'),
+ (1108, 'charlesxavier', 'Charles Xavier', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com', 'en','1108'),
+ (1109, 'brucebanner', 'Bruce Banner', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com', 'en','1109'),
+ (1110, 'jessicajones', 'Jessica Jones', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com', 'en','1110'),
+ (1111, 'missing', 'Missing', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL, 'en','e7723f0b24ff05b32ed09d95196f2f29'),
+ (1112, 'trash', 'Trash', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL, 'en','e7723f0b24ff05b32ed09d95196f2f29');
UPDATE account.`user`
- SET passExpired = DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR)
- WHERE name = 'maintenance';
+ SET passExpired = DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR)
+ WHERE name = 'maintenance';
INSERT INTO `account`.`mailAlias`(`id`, `alias`, `description`, `isPublic`)
- VALUES
- (1, 'general', 'General mailing list', FALSE),
- (2, 'it' , 'IT department' , TRUE),
- (3, 'sales' , 'Sales department' , TRUE);
+ VALUES
+ (1, 'general', 'General mailing list', FALSE),
+ (2, 'it' , 'IT department' , TRUE),
+ (3, 'sales' , 'Sales department' , TRUE);
INSERT INTO `account`.`mailAliasAccount`(`mailAlias`, `account`)
- VALUES
- (1, 1),
- (1, 18),
- (3, 18),
- (1, 9),
- (2, 9);
+ VALUES
+ (1, 1),
+ (1, 18),
+ (3, 18),
+ (1, 9),
+ (2, 9);
INSERT INTO `account`.`mailForward`(`account`, `forwardTo`)
- VALUES
- (1, 'employee@domain.local');
+ VALUES
+ (1, 'employee@domain.local');
@@ -167,122 +167,122 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`, `hasToDownloadRate`)
(5, 'CNY', 'Yuan Chino', 1.2, TRUE);
INSERT INTO `vn`.`country`(`id`, `name`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
- VALUES
- (1, 'España', 1, 'ES', 1, 24, 4, 0, 1),
- (2, 'Italia', 1, 'IT', 1, 27, 4, 0, 1),
- (3, 'Alemania', 1, 'DE', 1, 22, 4, 0, 1),
- (4, 'Rumania', 1, 'RO', 1, 24, 4, 0, 1),
- (5, 'Holanda', 1, 'NL', 1, 18, 4, 0, 1),
- (8, 'Portugal', 1, 'PT', 1, 27, 4, 0, 1),
- (13,'Ecuador', 0, 'EC', 1, 24, 2, 1, 2),
- (19,'Francia', 1, 'FR', 1, 27, 4, 0, 1),
- (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);
+ VALUES
+ (1, 'España', 1, 'ES', 1, 24, 4, 0, 1),
+ (2, 'Italia', 1, 'IT', 1, 27, 4, 0, 1),
+ (3, 'Alemania', 1, 'DE', 1, 22, 4, 0, 1),
+ (4, 'Rumania', 1, 'RO', 1, 24, 4, 0, 1),
+ (5, 'Holanda', 1, 'NL', 1, 18, 4, 0, 1),
+ (8, 'Portugal', 1, 'PT', 1, 27, 4, 0, 1),
+ (13,'Ecuador', 0, 'EC', 1, 24, 2, 1, 2),
+ (19,'Francia', 1, 'FR', 1, 27, 4, 0, 1),
+ (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);
INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `countryFk`, `hasProduction`, `isOrigin`, `isDestiny`)
- VALUES
- (1, 'Warehouse One', 'ALG', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
- (2, 'Warehouse Two', NULL, 1, 1, 1, 1, 0, 1, 13, 1, 1, 0),
- (3, 'Warehouse Three', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0),
- (4, 'Warehouse Four', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1),
- (5, 'Warehouse Five', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0),
- (6, 'Warehouse six', 'vnh', 1, 1, 1, 1, 0, 0, 1, 1, 0, 0),
- (13, 'Inventory', 'inv', 1, 1, 1, 0, 0, 0, 1, 0, 0, 0),
- (60, 'Algemesi', NULL, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0);
+ VALUES
+ (1, 'Warehouse One', 'ALG', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
+ (2, 'Warehouse Two', NULL, 1, 1, 1, 1, 0, 1, 13, 1, 1, 0),
+ (3, 'Warehouse Three', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0),
+ (4, 'Warehouse Four', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1),
+ (5, 'Warehouse Five', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0),
+ (6, 'Warehouse six', 'vnh', 1, 1, 1, 1, 0, 0, 1, 1, 0, 0),
+ (13, 'Inventory', 'inv', 1, 1, 1, 0, 0, 0, 1, 0, 0, 0),
+ (60, 'Algemesi', NULL, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0);
INSERT INTO `vn`.`sectorType` (`id`, `code`)
VALUES (1,'normal');
INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `code`, `typeFk`)
- VALUES
- (1, 'First sector', 1, 'FIRST', 1),
- (2, 'Second sector', 2, 'SECOND',1);
+ VALUES
+ (1, 'First sector', 1, 'FIRST', 1),
+ (2, 'Second sector', 6, 'SECOND',1);
INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAddress`)
- VALUES
- (1, 'printer1', 'path1', 0, 1 , NULL),
- (2, 'printer2', 'path2', 1, 1 , NULL),
- (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
+ VALUES
+ (1, 'printer1', 'path1', 0, 1 , NULL),
+ (2, 'printer2', 'path2', 1, 1 , NULL),
+ (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
UPDATE `vn`.`sector` SET `backupPrinterFk` = 1 WHERE id = 1;
INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
- VALUES
- (1106, 'LGN', 'David Charles', 'Haller', 19, 432978106),
- (1107, 'ANT', 'Hank' , 'Pym' , 19, 432978107),
- (1108, 'DCX', 'Charles' , 'Xavier', 19, 432978108),
- (1109, 'HLK', 'Bruce' , 'Banner', 19, 432978109),
- (1110, 'JJJ', 'Jessica' , 'Jones' , 19, 432978110);
+ VALUES
+ (1106, 'LGN', 'David Charles', 'Haller', 19, 432978106),
+ (1107, 'ANT', 'Hank' , 'Pym' , 19, 432978107),
+ (1108, 'DCX', 'Charles' , 'Xavier', 19, 432978108),
+ (1109, 'HLK', 'Bruce' , 'Banner', 19, 432978109),
+ (1110, 'JJJ', 'Jessica' , 'Jones' , 19, 432978110);
-INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`)
- VALUES
- ('1', 700, '01', 1, '700-01', 70001),
- ('2', 700, '02', 2, '700-02', 70002),
- ('3', 100, '01', 1, '100-01', 1),
- (32397, 100, '02', 1, 'A-47-1', 1165),
- (34831, 200, '01', 1, 'K-26-2', 20220),
- (34965, 200, '02', 2, 'L-08-4', 21800),
- (39096, 200, '03', 2, 'LR-02-3', 99999);
+INSERT INTO `vn`.`parking` (`id`, `sectorFk`, `code`, `pickingOrder`)
+ VALUES
+ ('1', 1, '700-01', 70001),
+ ('2', 2, '700-02', 70002),
+ ('3', 1, '100-01', 1),
+ (32397, 1, 'A-47-1', 1165),
+ (34831, 1, 'K-26-2', 20220),
+ (34965, 2, 'L-08-4', 21800),
+ (39096, 2, 'LR-02-3', 99999);
INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `userFk`, `isRecyclable`)
- VALUES
- ('AA6', 34965, 1, 0, NULL, 0),
- ('AA7', 34965, 1, 0, NULL, 0),
- ('AA8', 34965, 1, 0, NULL, 0),
- ('AA9', NULL, 1, 0, NULL, 0),
- ('AAA', NULL, 0, 0, 1109, 1),
- ('AAB', NULL, 0, 0, 1109, 1),
- ('AAC', NULL, 1, 99, 1109, 1),
- ('AAD', NULL, 0, 0, 1109, 1),
- ('AAE', 39096, 1, 0, 1109, 1),
- ('AAF', 34831, 1, 0, 1109, 1),
- ('GVC', 1, 0, 1, 1106, 1),
- ('HEJ', 2, 0, 1, 1106, 1),
- ('UXN', 1, 0, 1, 1106, 1);
+ VALUES
+ ('AA6', 34965, 1, 0, NULL, 0),
+ ('AA7', 34965, 1, 0, NULL, 0),
+ ('AA8', 34965, 1, 0, NULL, 0),
+ ('AA9', NULL, 1, 0, NULL, 0),
+ ('AAA', NULL, 0, 0, 1109, 1),
+ ('AAB', NULL, 0, 0, 1109, 1),
+ ('AAC', NULL, 1, 99, 1109, 1),
+ ('AAD', NULL, 0, 0, 1109, 1),
+ ('AAE', 39096, 1, 0, 1109, 1),
+ ('AAF', 34831, 1, 0, 1109, 1),
+ ('GVC', 1, 0, 1, 1106, 1),
+ ('HEJ', 2, 0, 1, 1106, 1),
+ ('UXN', 1, 0, 1, 1106, 1);
INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`,`code`, `maxAmount`, `daysInFuture`)
- VALUES
- (1, 'CC and credit policies', 'Transfers', 'wireTransfer', NULL, 1),
- (2, 'Cash', 'Cash', 'cash', 1000, 0),
- (3, 'Credit card', 'Credit Card', 'creditCard', NULL, 0),
- (4, 'Finalcial lines', NULL, NULL, NULL, 0),
- (5, 'Other products', NULL, NULL, NULL, 0),
- (6, 'Loans', NULL, NULL, NULL, 0),
- (7, 'Leasing', NULL, NULL, NULL, 0),
- (8, 'Compensations', 'Compensations', 'compensation', NULL, 0);
+ VALUES
+ (1, 'CC and credit policies', 'Transfers', 'wireTransfer', NULL, 1),
+ (2, 'Cash', 'Cash', 'cash', 1000, 0),
+ (3, 'Credit card', 'Credit Card', 'creditCard', NULL, 0),
+ (4, 'Finalcial lines', NULL, NULL, NULL, 0),
+ (5, 'Other products', NULL, NULL, NULL, 0),
+ (6, 'Loans', NULL, NULL, NULL, 0),
+ (7, 'Leasing', NULL, NULL, NULL, 0),
+ (8, 'Compensations', 'Compensations', 'compensation', NULL, 0);
INSERT INTO `vn`.`bankEntity`(`id`, `countryFk`, `name`, `bic`)
- VALUES
- (128, 1, 'The Best Bank', 'BBKKESMMMMMM'),
- (2100, 1, 'Caixa Bank', 'CAIXESBB');
+ VALUES
+ (128, 1, 'The Best Bank', 'BBKKESMMMMMM'),
+ (2100, 1, 'Caixa Bank', 'CAIXESBB');
INSERT INTO `vn`.`accounting`(`id`, `bank`, `account`, `accountingTypeFk`, `entityFk`, `isActive`, `currencyFk`, `code`)
- VALUES
- (1, 'Pay on receipt', '5720000001', 3, 128, 1, 1, 'payOnReceipt'),
- (2, 'Cash', '5700000001', 2, 128, 1, 1, 'cash'),
- (3, 'Compensation', '4000000000', 8, 128, 1, 1, 'compensation'),
- (4, 'Transfers', '4000000001', 1, 128, 1, 1, 'transfers'),
- (3117, 'Caixa Rural d''Algemesi', '5720000000', 8, 2100, 1, 1, 'cra');
+ VALUES
+ (1, 'Pay on receipt', '5720000001', 3, 128, 1, 1, 'payOnReceipt'),
+ (2, 'Cash', '5700000001', 2, 128, 1, 1, 'cash'),
+ (3, 'Compensation', '4000000000', 8, 128, 1, 1, 'compensation'),
+ (4, 'Transfers', '4000000001', 1, 128, 1, 1, 'transfers'),
+ (3117, 'Caixa Rural d''Algemesi', '5720000000', 8, 2100, 1, 1, 'cra');
INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
- VALUES
- (1, 'AGENCY', 'Agencia'),
- (2, 'DELIVERY', 'Reparto'),
- (3, 'PICKUP', 'Recogida'),
- (4, 'OTHER', 'Otros');
+ VALUES
+ (1, 'AGENCY', 'Agencia'),
+ (2, 'DELIVERY', 'Reparto'),
+ (3, 'PICKUP', 'Recogida'),
+ (4, 'OTHER', 'Otros');
INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`)
- VALUES
- (1, 'inhouse pickup' , 1),
- (2, 'Super-Man delivery' , 1),
- (3, 'Teleportation device' , 1),
- (4, 'Entanglement' , 1),
- (5, 'Quantum break device' , 1),
- (6, 'Walking' , 1),
- (7, 'Gotham247' , 1),
- (8, 'Gotham247Expensive' , 1),
- (9, 'Refund' , 1),
- (10, 'Other agency' , 1);
+ VALUES
+ (1, 'inhouse pickup' , 1),
+ (2, 'Super-Man delivery' , 1),
+ (3, 'Teleportation device' , 1),
+ (4, 'Entanglement' , 1),
+ (5, 'Quantum break device' , 1),
+ (6, 'Walking' , 1),
+ (7, 'Gotham247' , 1),
+ (8, 'Gotham247Expensive' , 1),
+ (9, 'Refund' , 1),
+ (10, 'Other agency' , 1);
UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup';
UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery';
@@ -327,108 +327,108 @@ INSERT INTO `vn`.`agencyIncoming`(`agencyModeFk`)
(2);
INSERT INTO `vn`.`payMethod`(`id`,`code`, `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`, `hasVerified`)
- VALUES
- (1, NULL, 'PayMethod one', 0, 001, 0, 0, 0),
- (2, NULL, 'PayMethod two', 10, 001, 0, 0, 1),
- (3, 'compensation', 'PayMethod three', 0, 001, 0, 0, 0),
- (4, NULL, 'PayMethod with IBAN', 0, 001, 1, 0, 0),
- (5, NULL, 'PayMethod five', 10, 001, 0, 0, 0),
- (8,'wireTransfer', 'WireTransfer', 5, 001, 1, 1, 0);
+ VALUES
+ (1, NULL, 'PayMethod one', 0, 001, 0, 0, 0),
+ (2, NULL, 'PayMethod two', 10, 001, 0, 0, 1),
+ (3, 'compensation', 'PayMethod three', 0, 001, 0, 0, 0),
+ (4, NULL, 'PayMethod with IBAN', 0, 001, 1, 0, 0),
+ (5, NULL, 'PayMethod five', 10, 001, 0, 0, 0),
+ (8,'wireTransfer', 'WireTransfer', 5, 001, 1, 1, 0);
INSERT INTO `vn`.`payDem`(`id`, `payDem`)
- VALUES
- (1, 10),
- (2, 20),
- (7, 0);
+ VALUES
+ (1, 10),
+ (2, 20),
+ (7, 0);
INSERT INTO `vn`.`autonomy`(`id`, `name`, `countryFk`, `hasDailyInvoice`)
- VALUES
- (1, 'Autonomy one', 1, 1),
- (2, 'Autonomy two', 1, 0),
- (3, 'Autonomy three', 2, 0),
- (4, 'Autonomy four', 13, 0);
+ VALUES
+ (1, 'Autonomy one', 1, 1),
+ (2, 'Autonomy two', 1, 0),
+ (3, 'Autonomy three', 2, 0),
+ (4, 'Autonomy four', 13, 0);
INSERT INTO `vn`.`province`(`id`, `name`, `countryFk`, `autonomyFk`, `warehouseFk`)
- VALUES
- (1, 'Province one', 1, 1, NULL),
- (2, 'Province two', 1, 1, NULL),
- (3, 'Province three', 30, 2, NULL),
- (4, 'Province four', 2, 3, NULL),
- (5, 'Province five', 13, 4, NULL);
+ VALUES
+ (1, 'Province one', 1, 1, NULL),
+ (2, 'Province two', 1, 1, NULL),
+ (3, 'Province three', 30, 2, NULL),
+ (4, 'Province four', 2, 3, NULL),
+ (5, 'Province five', 13, 4, NULL);
INSERT INTO `vn`.`town`(`id`, `name`, `provinceFk`)
- VALUES
- (1, 'Valencia', 1),
- (2, 'Gotham', 1),
- (3, 'Algemesi', 1),
- (4, 'Alzira', 1),
- (5, 'Quito', 5);
+ VALUES
+ (1, 'Valencia', 1),
+ (2, 'Gotham', 1),
+ (3, 'Algemesi', 1),
+ (4, 'Alzira', 1),
+ (5, 'Quito', 5);
INSERT INTO `vn`.`postCode`(`code`, `townFk`, `geoFk`)
- VALUES
- ('46000', 1, 6),
- ('46460', 2, 6),
- ('46680', 3, 6),
- ('46600', 4, 7),
- ('46600',1, 6),
- ('EC170150', 5, 8);
+ VALUES
+ ('46000', 1, 6),
+ ('46460', 2, 6),
+ ('46680', 3, 6),
+ ('46600', 4, 7),
+ ('46600',1, 6),
+ ('EC170150', 5, 8);
INSERT INTO `vn`.`clientType`(`code`, `type`)
- VALUES
- ('normal', 'Normal'),
- ('internalUse', 'Autoconsumo'),
- ('handMaking', 'Confección'),
- ('loses', 'Mermas');
+ VALUES
+ ('normal', 'Normal'),
+ ('internalUse', 'Autoconsumo'),
+ ('handMaking', 'Confección'),
+ ('loses', 'Mermas');
INSERT INTO `vn`.`cplusTerIdNif`(`id`, `description`)
- VALUES
- (1, 'NIF');
+ VALUES
+ (1, 'NIF');
INSERT INTO `vn`.`contactChannel`(`id`, `name`)
- VALUES
- (1, 'Rumors on the streets'),
- (2, 'Metropolis newspaper'),
- (3, 'Daily Bugle'),
- (4, 'GCN Channel'),
- (5, 'The Newspaper');
+ VALUES
+ (1, 'Rumors on the streets'),
+ (2, 'Metropolis newspaper'),
+ (3, 'Daily Bugle'),
+ (4, 'GCN Channel'),
+ (5, 'The Newspaper');
INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
- VALUES
- (1101, 'Bruce Wayne', '84612325V', 'BATMAN', 'Alfred', '1007 MOUNTAIN DRIVE, GOTHAM', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1102, 'Petter Parker', '87945234L', 'SPIDER MAN', 'Aunt May', '20 INGRAM STREET, QUEENS, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1103, 'Clark Kent', '06815934E', 'SUPER MAN', 'lois lane', '344 CLINTON STREET, APARTAMENT 3-D', 'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 0, 19, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1104, 'Tony Stark', '06089160W', 'IRON MAN', 'Pepper Potts', '10880 MALIBU POINT, 90265', 'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1105, 'Max Eisenhardt', '251628698', 'MAGNETO', 'Rogue', 'UNKNOWN WHEREABOUTS', 'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 300, 8, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1106, 'DavidCharlesHaller', '53136686Q', 'LEGION', 'Charles Xavier', 'CITY OF NEW YORK, NEW YORK, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 0, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19, 0, 'florist','normal'),
- (1107, 'Hank Pym', '09854837G', 'ANT MAN', 'Hawk', 'ANTHILL, SAN FRANCISCO, CALIFORNIA', 'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19, 0, 'florist','normal'),
- (1108, 'Charles Xavier', '22641921P', 'PROFESSOR X', 'Beast', '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com', NULL, 0, 1234567890, 0, 5, 1, 300, 13, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19, 0, 'florist','normal'),
- (1109, 'Bruce Banner', '16104829E', 'HULK', 'Black widow', 'SOMEWHERE IN NEW YORK', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9, 0, 'florist','normal'),
- (1110, 'Jessica Jones', '58282869H', 'JESSICA JONES', 'Luke Cage', 'NYCC 2015 POSTER', 'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
- (1111, 'Missing', NULL, 'MISSING MAN', 'Anton', 'THE SPACE, UNIVERSE FAR AWAY', 'Gotham', 46460, 1111111111, 222222222, 0, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
- (1112, 'Trash', NULL, 'GARBAGE MAN', 'Unknown name', 'NEW YORK CITY, UNDERGROUND', 'Gotham', 46460, 1111111111, 222222222, 0, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
+ VALUES
+ (1101, 'Bruce Wayne', '84612325V', 'BATMAN', 'Alfred', '1007 MOUNTAIN DRIVE, GOTHAM', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1102, 'Petter Parker', '87945234L', 'SPIDER MAN', 'Aunt May', '20 INGRAM STREET, QUEENS, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1103, 'Clark Kent', '06815934E', 'SUPER MAN', 'lois lane', '344 CLINTON STREET, APARTAMENT 3-D', 'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 0, 19, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1104, 'Tony Stark', '06089160W', 'IRON MAN', 'Pepper Potts', '10880 MALIBU POINT, 90265', 'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1105, 'Max Eisenhardt', '251628698', 'MAGNETO', 'Rogue', 'UNKNOWN WHEREABOUTS', 'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 300, 8, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1106, 'DavidCharlesHaller', '53136686Q', 'LEGION', 'Charles Xavier', 'CITY OF NEW YORK, NEW YORK, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 0, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19, 0, 'florist','normal'),
+ (1107, 'Hank Pym', '09854837G', 'ANT MAN', 'Hawk', 'ANTHILL, SAN FRANCISCO, CALIFORNIA', 'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19, 0, 'florist','normal'),
+ (1108, 'Charles Xavier', '22641921P', 'PROFESSOR X', 'Beast', '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com', NULL, 0, 1234567890, 0, 5, 1, 300, 13, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19, 0, 'florist','normal'),
+ (1109, 'Bruce Banner', '16104829E', 'HULK', 'Black widow', 'SOMEWHERE IN NEW YORK', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9, 0, 'florist','normal'),
+ (1110, 'Jessica Jones', '58282869H', 'JESSICA JONES', 'Luke Cage', 'NYCC 2015 POSTER', 'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
+ (1111, 'Missing', NULL, 'MISSING MAN', 'Anton', 'THE SPACE, UNIVERSE FAR AWAY', 'Gotham', 46460, 1111111111, 222222222, 0, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+ (1112, 'Trash', NULL, 'GARBAGE MAN', 'Unknown name', 'NEW YORK CITY, UNDERGROUND', 'Gotham', 46460, 1111111111, 222222222, 0, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
- SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 0, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
- FROM `account`.`role` `r`
- WHERE `r`.`hasLogin` = 1;
+ SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 0, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
+ FROM `account`.`role` `r`
+ WHERE `r`.`hasLogin` = 1;
INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`)
- VALUES
- (1101, 50, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
- (1102, 100, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
- (1103, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
- (1104, -30, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH));
+ VALUES
+ (1101, 50, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+ (1102, 100, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+ (1103, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+ (1104, -30, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH));
INSERT INTO `vn`.`mandateType`(`id`, `code`)
- VALUES
- (1, 'B2B'),
- (2, 'CORE'),
- (3, 'LCR');
+ VALUES
+ (1, 'B2B'),
+ (2, 'CORE'),
+ (3, 'LCR');
INSERT INTO `vn`.`clientConfig`(`id`, `riskTolerance`, `maxCreditRows`, `maxPriceIncreasingRatio`, `riskScope`, `defaultPayMethodFk`, `defaultDueDay`, `defaultCredit`, `defaultIsTaxDataChecked`, `defaultHasCoreVnl`, `defaultMandateTypeFk`)
- VALUES
- (1, 200, 10, 0.25, 2, 4, 5, 300.00, 1, 1, 2);
+ VALUES
+ (1, 200, 10, 0.25, 2, 4, 5, 300.00, 1, 1, 2);
INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`, `isDefaultAddress`, `customsAgentFk`)
@@ -477,9 +477,9 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr
(130, 'Non valid address', 'address 30', 'Gotham', 46460, 1, 1111111111, 222222222, 0, 1101, 2, NULL, NULL, 0, 0, NULL);
INSERT INTO `vn`.`address`( `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `isActive`, `clientFk`, `agencyModeFk`, `isDefaultAddress`)
- SELECT name, CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, 1, id, 2, 1
- FROM `account`.`role` `r`
- WHERE `r`.`hasLogin` = 1;
+ SELECT name, CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, 1, id, 2, 1
+ FROM `account`.`role` `r`
+ WHERE `r`.`hasLogin` = 1;
UPDATE `vn`.`client` SET defaultAddressFk = 1 WHERE id = 1101;
UPDATE `vn`.`client` SET defaultAddressFk = 2 WHERE id = 1102;
@@ -497,161 +497,161 @@ UPDATE `vn`.`client` SET defaultAddressFk = 12 WHERE id = 400;
DROP TEMPORARY TABLE IF EXISTS tmp.address;
CREATE TEMPORARY TABLE tmp.address
- SELECT * FROM `vn`.`address`;
+ SELECT * FROM `vn`.`address`;
- UPDATE `vn`.`client` `c`
- JOIN `tmp`.`address` `a` ON `a`.`clientFk` = `c`.`id`
+UPDATE `vn`.`client` `c`
+ JOIN `tmp`.`address` `a` ON `a`.`clientFk` = `c`.`id`
SET `c`.`defaultAddressFk` = `a`.`id`
- WHERE `defaultAddressFk` IS NULL;
+ WHERE `defaultAddressFk` IS NULL;
DROP TEMPORARY TABLE tmp.address;
INSERT INTO `vn`.`clientCredit`(`clientFk`, `workerFk`, `amount`, `created`)
- VALUES
- (1101, 5, 300, DATE_ADD(util.VN_CURDATE(), INTERVAL -11 MONTH)),
- (1101, 5, 900, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 MONTH)),
- (1101, 5, 800, DATE_ADD(util.VN_CURDATE(), INTERVAL -9 MONTH)),
- (1101, 5, 700, DATE_ADD(util.VN_CURDATE(), INTERVAL -8 MONTH)),
- (1101, 5, 600, DATE_ADD(util.VN_CURDATE(), INTERVAL -7 MONTH)),
- (1101, 5, 500, DATE_ADD(util.VN_CURDATE(), INTERVAL -6 MONTH)),
- (1101, 5, 400, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 MONTH)),
- (1101, 9, 300, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
- (1101, 9, 200, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
- (1101, 9, 100, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
- (1101, 9, 50 , DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
- (1102, 9, 800, util.VN_CURDATE()),
- (1104, 9, 90 , util.VN_CURDATE()),
- (1105, 9, 90 , util.VN_CURDATE());
+ VALUES
+ (1101, 5, 300, DATE_ADD(util.VN_CURDATE(), INTERVAL -11 MONTH)),
+ (1101, 5, 900, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 MONTH)),
+ (1101, 5, 800, DATE_ADD(util.VN_CURDATE(), INTERVAL -9 MONTH)),
+ (1101, 5, 700, DATE_ADD(util.VN_CURDATE(), INTERVAL -8 MONTH)),
+ (1101, 5, 600, DATE_ADD(util.VN_CURDATE(), INTERVAL -7 MONTH)),
+ (1101, 5, 500, DATE_ADD(util.VN_CURDATE(), INTERVAL -6 MONTH)),
+ (1101, 5, 400, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 MONTH)),
+ (1101, 9, 300, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
+ (1101, 9, 200, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
+ (1101, 9, 100, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
+ (1101, 9, 50 , DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+ (1102, 9, 800, util.VN_CURDATE()),
+ (1104, 9, 90 , util.VN_CURDATE()),
+ (1105, 9, 90 , util.VN_CURDATE());
INSERT INTO `vn`.`roleCreditLimit`(`id`, `maxAmount`, `roleFk`)
- VALUES
- (1, 9999999, 20),
- (2, 10000, 21),
- (3, 600, 13);
+ VALUES
+ (1, 9999999, 20),
+ (2, 10000, 21),
+ (3, 600, 13);
INSERT INTO `vn`.`clientObservation`(`id`, `clientFk`, `workerFk`, `text`, `created`)
- VALUES
- (1, 1101, 1, 'Madness, as you know, is like gravity, all it takes is a little push', util.VN_CURDATE()),
- (2, 1102, 1, 'With great power, comes great responsibility', util.VN_CURDATE()),
- (3, 1103, 3, 'this is a job for Super-Man!', util.VN_CURDATE()),
- (4, 1104, 3, 'yes... I am Iron-Man', util.VN_CURDATE()),
- (5, 1105, 5, 'They do understand. Our mutant powers make us superior', util.VN_CURDATE()),
- (6, 1106, 5, 'My name is Legion, for we are many!', util.VN_CURDATE()),
- (7, 1107, 9, 'I think our first move should be calling the Avengers..', util.VN_CURDATE()),
- (8, 1108, 9, 'Just because someone stumbles and loses their path, does not mean they are lost forever.', util.VN_CURDATE()),
- (9, 1109, 18, 'HULK SMASH! ...', util.VN_CURDATE()),
- (10, 1110, 18, 'They say everyone is born a hero. But if you let it, life will push you over the line until you are the villain.', util.VN_CURDATE());
+ VALUES
+ (1, 1101, 1, 'Madness, as you know, is like gravity, all it takes is a little push', util.VN_CURDATE()),
+ (2, 1102, 1, 'With great power, comes great responsibility', util.VN_CURDATE()),
+ (3, 1103, 3, 'this is a job for Super-Man!', util.VN_CURDATE()),
+ (4, 1104, 3, 'yes... I am Iron-Man', util.VN_CURDATE()),
+ (5, 1105, 5, 'They do understand. Our mutant powers make us superior', util.VN_CURDATE()),
+ (6, 1106, 5, 'My name is Legion, for we are many!', util.VN_CURDATE()),
+ (7, 1107, 9, 'I think our first move should be calling the Avengers..', util.VN_CURDATE()),
+ (8, 1108, 9, 'Just because someone stumbles and loses their path, does not mean they are lost forever.', util.VN_CURDATE()),
+ (9, 1109, 18, 'HULK SMASH! ...', util.VN_CURDATE()),
+ (10, 1110, 18, 'They say everyone is born a hero. But if you let it, life will push you over the line until you are the villain.', util.VN_CURDATE());
INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
- VALUES
- (1, 'ItemPicker', 'itemPicker'),
- (2, 'Packager', 'packager'),
- (3, 'Delivery', 'delivery'),
- (4, 'SalesPerson', 'salesPerson'),
- (5, 'Administrative', 'administrative'),
- (6, 'Weight', 'weight'),
- (7, 'InvoiceOut', 'invoiceOut'),
- (8, 'DropOff', 'dropOff'),
+ VALUES
+ (1, 'ItemPicker', 'itemPicker'),
+ (2, 'Packager', 'packager'),
+ (3, 'Delivery', 'delivery'),
+ (4, 'SalesPerson', 'salesPerson'),
+ (5, 'Administrative', 'administrative'),
+ (6, 'Weight', 'weight'),
+ (7, 'InvoiceOut', 'invoiceOut'),
+ (8, 'DropOff', 'dropOff'),
(9, 'Sustitución', 'substitution'),
(10, 'Finance', 'finance');
INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
- VALUES
- (1, 121, 1, 'under the floor'),
- (2, 121, 2, 'wears leather and goes out at night'),
- (3, 121, 3, 'care with the dog'),
- (5, 122, 5, 'Delivery after 10am');
+ VALUES
+ (1, 121, 1, 'under the floor'),
+ (2, 121, 2, 'wears leather and goes out at night'),
+ (3, 121, 3, 'care with the dog'),
+ (5, 122, 5, 'Delivery after 10am');
INSERT INTO `vn`.`creditClassification`(`id`, `client`, `dateStart`, `dateEnd`)
- VALUES
- (1, 1101, util.VN_CURDATE(), util.VN_CURDATE()),
- (2, 1102, util.VN_CURDATE(), util.VN_CURDATE()),
- (3, 1103, util.VN_CURDATE(), util.VN_CURDATE()),
- (4, 1104, util.VN_CURDATE(), util.VN_CURDATE()),
- (5, 1105, util.VN_CURDATE(), util.VN_CURDATE());
+ VALUES
+ (1, 1101, util.VN_CURDATE(), util.VN_CURDATE()),
+ (2, 1102, util.VN_CURDATE(), util.VN_CURDATE()),
+ (3, 1103, util.VN_CURDATE(), util.VN_CURDATE()),
+ (4, 1104, util.VN_CURDATE(), util.VN_CURDATE()),
+ (5, 1105, util.VN_CURDATE(), util.VN_CURDATE());
INSERT INTO `vn`.`creditInsurance`(`id`, `creditClassificationFk`, `credit`, `creationDate`, `grade`)
- VALUES
- (1, 1, 3000, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL),
- (2, 2, 6000, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), NULL),
- (3, 3, 10000, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), NULL);
+ VALUES
+ (1, 1, 3000, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL),
+ (2, 2, 6000, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), NULL),
+ (3, 3, 10000, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), NULL);
INSERT INTO `vn`.`companyGroup`(`id`, `code`)
- VALUES
- (1, 'wayneIndustries'),
- (2, 'verdnatura');
+ VALUES
+ (1, 'wayneIndustries'),
+ (2, 'verdnatura');
INSERT INTO `vn`.`supplierActivity`(`code`, `name`)
- VALUES
- ('animals', 'Food and complements for pets'),
- ('complements', 'Other complements'),
- ('flowerPlants', 'Wholesale of flowers and plants'),
- ('vegetablesFruits', 'Fruit and vegetable trade');
+ VALUES
+ ('animals', 'Food and complements for pets'),
+ ('complements', 'Other complements'),
+ ('flowerPlants', 'Wholesale of flowers and plants'),
+ ('vegetablesFruits', 'Fruit and vegetable trade');
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
- VALUES
- (1, 'PLANTS SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'GOTHAM', 1, 46000, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
- (2, 'FARMER KING', 'The farmer', 4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM', 2, 46000, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
- (4, 'INVENTARIO', 'INVENTARIO', 4000000004, NULL, NULL, 0, util.VN_CURDATE(), 1, NULL, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL, NULL),
- (69, 'PACKAGING', 'Packaging nick', 4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD', 3, 46600, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
- (442, 'VERDNATURA LEVANTE SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM', 1, 46000, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
- (567, 'HOLLAND', 'Holland nick', 4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD', 3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
- (791, 'BROS SL', 'Bros nick', 5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD', 3, 46600, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
- (1381, 'ORNAMENTALES', 'Ornamentales', 7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM', 1, 46000, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V');
+ VALUES
+ (1, 'PLANTS SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'GOTHAM', 1, 46000, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
+ (2, 'FARMER KING', 'The farmer', 4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM', 2, 46000, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
+ (4, 'INVENTARIO', 'INVENTARIO', 4000000004, NULL, NULL, 0, util.VN_CURDATE(), 1, NULL, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL, NULL),
+ (69, 'PACKAGING', 'Packaging nick', 4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD', 3, 46600, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
+ (442, 'VERDNATURA LEVANTE SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM', 1, 46000, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
+ (567, 'HOLLAND', 'Holland nick', 4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD', 3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
+ (791, 'BROS SL', 'Bros nick', 5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD', 3, 46600, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'),
+ (1381, 'ORNAMENTALES', 'Ornamentales', 7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM', 1, 46000, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V');
INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
- VALUES
- (1, 1, 'Ace Chemicals', 'The Midtown', 1, '46000', 'Gotham', '111111111', '222222222'),
- (2, 1, 'Arkham Asylum', 'Grand Avenue', 1, '46000', 'Gotham', '111111111', '222222222'),
- (3, 2, 'Wayne Tower', 'Grand Avenue', 1, '46000', 'Gotham', '111111111', '222222222'),
- (4, 2, 'Bank of Gotham', 'Founders Island', 1, '46000', 'Gotham', '111111111', '222222222'),
- (5, 442, 'GCR building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
- (6, 442, 'The Gotham Tonight building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
+ VALUES
+ (1, 1, 'Ace Chemicals', 'The Midtown', 1, '46000', 'Gotham', '111111111', '222222222'),
+ (2, 1, 'Arkham Asylum', 'Grand Avenue', 1, '46000', 'Gotham', '111111111', '222222222'),
+ (3, 2, 'Wayne Tower', 'Grand Avenue', 1, '46000', 'Gotham', '111111111', '222222222'),
+ (4, 2, 'Bank of Gotham', 'Founders Island', 1, '46000', 'Gotham', '111111111', '222222222'),
+ (5, 442, 'GCR building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
+ (6, 442, 'The Gotham Tonight building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
- VALUES
- (1, 1, 123121212, 654789123, 'supplier1@email.es', 'observation1', 'the boss'),
- (2, 1, 987456132, NULL, NULL, NULL, 'the salesperson'),
- (3, 2, 321654987, NULL, 'supplier2@email.es', NULL, NULL),
- (4, 442, 321654987, NULL, NULL, 'observation442', NULL);
+ VALUES
+ (1, 1, 123121212, 654789123, 'supplier1@email.es', 'observation1', 'the boss'),
+ (2, 1, 987456132, NULL, NULL, NULL, 'the salesperson'),
+ (3, 2, 321654987, NULL, 'supplier2@email.es', NULL, NULL),
+ (4, 442, 321654987, NULL, NULL, 'observation442', NULL);
INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`)
- VALUES
- (241, 442, 'ES111122333344111122221111', 128);
+ VALUES
+ (241, 442, 'ES111122333344111122221111', 128);
INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `expired`, `companyGroupFk`, `phytosanitary` , `clientFk`)
- VALUES
- (69 , 'CCs', NULL, 30, 0, NULL, 1, NULL , NULL),
- (442 , 'VNL', 241, 30, 1, NULL, 2, 'VNL Company - Plant passport' , 1101),
- (567 , 'VNH', NULL, 30, 4, NULL, 1, 'VNH Company - Plant passport' , NULL),
- (791 , 'FTH', NULL, 30, 3, '2015-11-30', 1, NULL , NULL),
- (1381, 'ORN', NULL, 30, 7, NULL, 1, 'ORN Company - Plant passport' , NULL);
+ VALUES
+ (69 , 'CCs', NULL, 30, 0, NULL, 1, NULL , NULL),
+ (442 , 'VNL', 241, 30, 1, NULL, 2, 'VNL Company - Plant passport' , 1101),
+ (567 , 'VNH', NULL, 30, 4, NULL, 1, 'VNH Company - Plant passport' , NULL),
+ (791 , 'FTH', NULL, 30, 3, '2015-11-30', 1, NULL , NULL),
+ (1381, 'ORN', NULL, 30, 7, NULL, 1, 'ORN Company - Plant passport' , NULL);
INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`)
- VALUES
- ('CEE', 1, 10),
- ('EQU', 0, 1),
- ('NATIONAL', 0, 1),
- ('WORLD', 2, 15);
+ VALUES
+ ('CEE', 1, 10),
+ ('EQU', 0, 1),
+ ('NATIONAL', 0, 1),
+ ('WORLD', 2, 15);
INSERT INTO vn.invoiceOutConfig
- SET id = 1,
- parallelism = 8;
+ SET id = 1,
+ parallelism = 8;
INSERT INTO `vn`.`invoiceOutSerial`
- (`code`,`description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
- VALUES
- ('A', 'Global nacional', 1, 'NATIONAL', 0, 'global'),
- ('T', 'Española rapida', 1, 'NATIONAL', 0, 'quick'),
- ('V', 'Intracomunitaria global', 0, 'CEE', 1, 'global'),
- ('M', 'Múltiple nacional', 1, 'NATIONAL', 0, 'multiple'),
- ('R', 'Rectificativa', 1, 'NATIONAL', 0, NULL),
- ('E', 'Exportación rápida', 0, 'WORLD', 0, 'quick'),
- ('H', 'Intracomunitaria rápida', 0, 'CEE', 1, 'quick'),
- ('P', 'Factura simplificada', 1, 'NATIONAL', 0, NULL),
- ('PE', 'COOPERATIE FLORAHOLLAND UA', 0, 'CEE', 1, NULL),
- ('S', 'Simplificada', 1, 'NATIONAL', 0, NULL),
- ('X', 'Exportación global', 0, 'WORLD', 0, 'global'),
- ('N', 'Múltiple Intracomunitaria', 0, 'CEE', 1, 'multiple');
+ (`code`,`description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
+ VALUES
+ ('A', 'Global nacional', 1, 'NATIONAL', 0, 'global'),
+ ('T', 'Española rapida', 1, 'NATIONAL', 0, 'quick'),
+ ('V', 'Intracomunitaria global', 0, 'CEE', 1, 'global'),
+ ('M', 'Múltiple nacional', 1, 'NATIONAL', 0, 'multiple'),
+ ('R', 'Rectificativa', 1, 'NATIONAL', 0, NULL),
+ ('E', 'Exportación rápida', 0, 'WORLD', 0, 'quick'),
+ ('H', 'Intracomunitaria rápida', 0, 'CEE', 1, 'quick'),
+ ('P', 'Factura simplificada', 1, 'NATIONAL', 0, NULL),
+ ('PE', 'COOPERATIE FLORAHOLLAND UA', 0, 'CEE', 1, NULL),
+ ('S', 'Simplificada', 1, 'NATIONAL', 0, NULL),
+ ('X', 'Exportación global', 0, 'WORLD', 0, 'global'),
+ ('N', 'Múltiple Intracomunitaria', 0, 'CEE', 1, 'multiple');
INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`, `customsAgentFk`, `incotermsFk`)
VALUES
@@ -668,36 +668,36 @@ UPDATE `vn`.`invoiceOut` SET ref = 'T4444444' WHERE id = 4;
UPDATE `vn`.`invoiceOut` SET ref = 'A1111111' WHERE id = 5;
INSERT INTO `vn`.`invoiceOutTax` (`invoiceOutFk`, `taxableBase`, `vat`, `pgcFk`)
- VALUES
- (1, 895.76, 89.58, 4722000010),
- (1, 33.80, 7.10, 4722000021),
- (2, 110.33, 11.03, 4770000010),
- (3, 8.07, 0.81, 4770000010),
- (4, 8.07, 0.81, 4770000010),
- (5, 8.07, 0.81, 4770000010);
+ VALUES
+ (1, 895.76, 89.58, 4722000010),
+ (1, 33.80, 7.10, 4722000021),
+ (2, 110.33, 11.03, 4770000010),
+ (3, 8.07, 0.81, 4770000010),
+ (4, 8.07, 0.81, 4770000010),
+ (5, 8.07, 0.81, 4770000010);
INSERT INTO `vn`.`expense`(`id`, `name`, `isWithheld`)
- VALUES
- (2000000000, 'Inmovilizado pendiente', 0),
- (2000000001, 'Compra de bienes de inmovilizado', 0),
- (4751000000, 'Retenciones', 1),
- (4751000001, 'Retencion', 0),
- (6210000567, 'Alquiler VNH', 0),
- (6240000000, 'Transportes de ventas rutas', 0),
- (7001000000, 'Mercaderia', 0),
- (7050000000, 'Prestacion de servicios', 1);
+ VALUES
+ (2000000000, 'Inmovilizado pendiente', 0),
+ (2000000001, 'Compra de bienes de inmovilizado', 0),
+ (4751000000, 'Retenciones', 1),
+ (4751000001, 'Retencion', 0),
+ (6210000567, 'Alquiler VNH', 0),
+ (6240000000, 'Transportes de ventas rutas', 0),
+ (7001000000, 'Mercaderia', 0),
+ (7050000000, 'Prestacion de servicios', 1);
INSERT INTO `vn`.`agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
INSERT INTO `vn`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`, `created`)
- VALUES
- (1, 1, 813.06, 2000000000, util.VN_CURDATE()),
- (2, 1, 33.80, 4751000000, util.VN_CURDATE()),
- (3, 1, 70.70, 6210000567, util.VN_CURDATE()),
- (4, 2, 110.33, 2000000000, util.VN_CURDATE()),
- (5, 3, 8.07, 2000000000, util.VN_CURDATE()),
- (6, 4, 8.07, 2000000000, util.VN_CURDATE()),
- (7, 5, 8.07, 2000000000, util.VN_CURDATE());
+ VALUES
+ (1, 1, 813.06, 2000000000, util.VN_CURDATE()),
+ (2, 1, 33.80, 4751000000, util.VN_CURDATE()),
+ (3, 1, 70.70, 6210000567, util.VN_CURDATE()),
+ (4, 2, 110.33, 2000000000, util.VN_CURDATE()),
+ (5, 3, 8.07, 2000000000, util.VN_CURDATE()),
+ (6, 4, 8.07, 2000000000, util.VN_CURDATE()),
+ (7, 5, 8.07, 2000000000, util.VN_CURDATE());
INSERT INTO `vn`.`zone`
(`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`, `priceOptimum`)
@@ -717,36 +717,37 @@ VALUES
(13, 'Zone quantum break', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5, 0, 1, 0, 100, 0.5);
INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`)
- VALUES
- (1, 1, 1),
- (2, 2, 2),
- (3, 3, 1),
- (4, 4, 2),
- (5, 5, 1),
- (6, 6, 2),
- (7, 7, 1),
- (8, 8, 1),
- (9, 9, 1),
- (10, 10, 3),
- (11, 11, 5),
- (12, 12, 4),
- (13, 13, 5);
+ VALUES
+ (1, 1, 1),
+ (2, 2, 2),
+ (3, 3, 1),
+ (4, 4, 2),
+ (5, 5, 1),
+ (6, 6, 2),
+ (7, 7, 1),
+ (8, 8, 1),
+ (9, 9, 1),
+ (10, 10, 3),
+ (11, 11, 5),
+ (12, 12, 4),
+ (13, 13, 5),
+ (14, 7, 4);
INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`)
- VALUES
- (1, util.VN_CURDATE(), '23:59'),
- (2, util.VN_CURDATE(), '23:59'),
- (3, util.VN_CURDATE(), '23:59'),
- (4, util.VN_CURDATE(), '23:59'),
- (5, util.VN_CURDATE(), '23:59'),
- (6, util.VN_CURDATE(), '23:59'),
- (7, util.VN_CURDATE(), '23:59'),
- (8, util.VN_CURDATE(), '23:59'),
- (9, util.VN_CURDATE(), '23:59'),
- (10, util.VN_CURDATE(), '23:59'),
- (11, util.VN_CURDATE(), '23:59'),
- (12, util.VN_CURDATE(), '23:59'),
- (13, util.VN_CURDATE(), '23:59');
+ VALUES
+ (1, util.VN_CURDATE(), '23:59'),
+ (2, util.VN_CURDATE(), '23:59'),
+ (3, util.VN_CURDATE(), '23:59'),
+ (4, util.VN_CURDATE(), '23:59'),
+ (5, util.VN_CURDATE(), '23:59'),
+ (6, util.VN_CURDATE(), '23:59'),
+ (7, util.VN_CURDATE(), '23:59'),
+ (8, util.VN_CURDATE(), '23:59'),
+ (9, util.VN_CURDATE(), '23:59'),
+ (10, util.VN_CURDATE(), '23:59'),
+ (11, util.VN_CURDATE(), '23:59'),
+ (12, util.VN_CURDATE(), '23:59'),
+ (13, util.VN_CURDATE(), '23:59');
INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1');
@@ -798,288 +799,293 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
(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);
+ (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
- (1, 11, 1, 'ready'),
- (2, 2, 2, 'do it fast please'),
- (3, 3, 5, 'Faster faster fasteeeeeer!!!'),
- (4, 4, 5, 'Deliver before 8am'),
- (5, 13, 5, 'You can run from the disappointments you are trying to forget. But its only when you embrace your past that you truly move forward. Maybe I never get to go home again, but I found my way there. And I am glad I did.'),
- (6, 14, 5, 'Careful, armed warhead'),
- (7, 23, 1, 'under the floor'),
- (8, 23, 2, 'wears leather and goes out at night'),
- (9, 23, 5, 'care with the dog'),
- (10, 23, 4, 'Reclama ticket: 8'),
- (11, 24, 4, 'Reclama ticket: 7'),
- (12, 11, 3, 'Delivery after 10am'),
- (13, 1, 7, 'observation of ticket one'),
- (14, 2, 7, 'observation of ticket two');
+ VALUES
+ (1, 11, 1, 'ready'),
+ (2, 2, 2, 'do it fast please'),
+ (3, 3, 5, 'Faster faster fasteeeeeer!!!'),
+ (4, 4, 5, 'Deliver before 8am'),
+ (5, 13, 5, 'You can run from the disappointments you are trying to forget. But its only when you embrace your past that you truly move forward. Maybe I never get to go home again, but I found my way there. And I am glad I did.'),
+ (6, 14, 5, 'Careful, armed warhead'),
+ (7, 23, 1, 'under the floor'),
+ (8, 23, 2, 'wears leather and goes out at night'),
+ (9, 23, 5, 'care with the dog'),
+ (10, 23, 4, 'Reclama ticket: 8'),
+ (11, 24, 4, 'Reclama ticket: 7'),
+ (12, 11, 3, 'Delivery after 10am'),
+ (13, 1, 7, 'observation of ticket one'),
+ (14, 2, 7, 'observation of ticket two');
-- FIX for state hours on local, inter_afterInsert
-- UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND);
INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `userFk`, `created`)
- VALUES
- (1, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)),
- (2, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)),
- (3, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -2 MONTH)),
- (4, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -3 MONTH)),
- (5, 16, 18, DATE_ADD(util.VN_NOW(), INTERVAL -4 MONTH)),
- (6, 16, 18, DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)),
- (7, 10, 18, util.VN_NOW()),
- (8, 5, 19, util.VN_NOW()),
- (9, 5, 19, util.VN_NOW()),
- (10, 5, 19, util.VN_NOW()),
- (11, 3, 19, util.VN_NOW()),
- (12, 3, 19, util.VN_NOW()),
- (13, 3, 19, util.VN_NOW()),
- (14, 3, 19, util.VN_NOW()),
- (15, 10, 19, util.VN_NOW()),
- (16, 3, 19, util.VN_NOW()),
- (17, 2, 19, util.VN_NOW()),
- (37, 10, 19, util.VN_NOW()),
- (19, 2, 19, util.VN_NOW()),
- (20, 1, 19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
- (21, 1, 19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
- (22, 1, 19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
- (23, 16, 21, util.VN_NOW()),
- (24, 16, 21, util.VN_NOW()),
- (34, 14, 49, util.VN_NOW()),
- (35, 14, 18, util.VN_NOW()),
- (36, 14, 18, util.VN_NOW());
+ VALUES
+ (1, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)),
+ (2, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)),
+ (3, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -2 MONTH)),
+ (4, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -3 MONTH)),
+ (5, 16, 18, DATE_ADD(util.VN_NOW(), INTERVAL -4 MONTH)),
+ (6, 16, 18, DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)),
+ (7, 10, 18, util.VN_NOW()),
+ (8, 5, 19, util.VN_NOW()),
+ (9, 5, 19, util.VN_NOW()),
+ (10, 5, 19, util.VN_NOW()),
+ (11, 3, 19, util.VN_NOW()),
+ (12, 3, 19, util.VN_NOW()),
+ (13, 3, 19, util.VN_NOW()),
+ (14, 3, 19, util.VN_NOW()),
+ (15, 10, 19, util.VN_NOW()),
+ (16, 3, 19, util.VN_NOW()),
+ (17, 2, 19, util.VN_NOW()),
+ (37, 10, 19, util.VN_NOW()),
+ (19, 2, 19, util.VN_NOW()),
+ (20, 1, 19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
+ (21, 1, 19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
+ (22, 1, 19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
+ (23, 16, 21, util.VN_NOW()),
+ (24, 16, 21, util.VN_NOW()),
+ (34, 14, 49, util.VN_NOW()),
+ (35, 14, 18, util.VN_NOW()),
+ (36, 14, 18, util.VN_NOW());
INSERT INTO `vn`.`deliveryPoint` (`id`, `name`, `ubication`)
- VALUES
- (1, 'Gotham','1007 Mountain Drive, Gotham');
+ VALUES
+ (1, 'Gotham','1007 Mountain Drive, Gotham');
-INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`, `deliveryPointFk`)
+INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`, `deliveryPointFk`, `chassis`, `leasing`, `supplierFk`, `fuelTypeFk`, `bankPolicyFk`)
VALUES
- (1, '3333-BAT', 'WAYNE INDUSTRIES', 'BATMOBILE', 442, 1, 'The ultimate war machine', 50, 1, 1),
- (2, '1111-IMK', 'STARK INDUSTRIES', 'MARK-III', 442, 1, 'Iron-Man Heavy Armor MARK-III', 18, 1, 1),
- (3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI', 442, 1, 'Iron-Man Heavy Armor MARK-VI', 16, 1, 1),
- (4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII', 442, 1, 'Iron-Man Heavy Armor MARK-VII', 14, 1, 1),
- (5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1, 1),
- (6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV', 442, 1, 'Iron-Man Heavy Armor MARK-XLV', 12, 0, 1);
+ (1, '3333-BAT', 'WAYNE INDUSTRIES', 'BATMOBILE', 442, 1, 'The ultimate war machine', 50, 1, 1, 'XCSC133C60', 'Wayne leasing', 1, 1, 1),
+ (2, '1111-IMK', 'STARK INDUSTRIES', 'MARK-III', 442, 1, 'Iron-Man Heavy Armor MARK-III', 18, 1, 1, '', '', 2, 2, 2),
+ (3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI', 442, 1, 'Iron-Man Heavy Armor MARK-VI', 16, 1, 1, '', '', 442, 2, null),
+ (4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII', 442, 1, 'Iron-Man Heavy Armor MARK-VII', 14, 1, 1, '', '', 442, 3, null),
+ (5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1, 1, '', '', 442, 4, null),
+ (6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV', 442, 1, 'Iron-Man Heavy Armor MARK-XLV', 12, 0, 1, '', '', 442, 5, null),
+ (7, '5555-SHI', 'SHIELD', 'Quinjet', 442, 1, 'High-speed jet used by the Avengers', 30, 1, 1, 'QJ12345', 'SHIELD leasing', 1, 1, 1);
INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`, `inventoried`)
- VALUES
- (1, 'beta-server', 'nightmare@mydomain.com', '200', DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH));
+ VALUES
+ (1, 'beta-server', 'nightmare@mydomain.com', '200', DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH));
INSERT INTO `vn`.`greugeType`(`id`, `name`, `code`)
- VALUES
- (1, 'Diff', 'diff'),
- (2, 'Recovery', 'recovery'),
- (3, 'Mana', 'mana'),
- (4, 'Claim', 'claim'),
- (5, 'Heritage', 'heritage'),
- (6, 'Miscellaneous', 'miscellaneous'),
- (7, 'Freight Pickup', 'freightPickUp');
+ VALUES
+ (1, 'Diff', 'diff'),
+ (2, 'Recovery', 'recovery'),
+ (3, 'Mana', 'mana'),
+ (4, 'Claim', 'claim'),
+ (5, 'Heritage', 'heritage'),
+ (6, 'Miscellaneous', 'miscellaneous'),
+ (7, 'Freight Pickup', 'freightPickUp');
INSERT INTO `vn`.`greuge`(`id`, `clientFk`, `description`, `amount`, `shipped`, `created`, `greugeTypeFk`, `ticketFk`)
- VALUES
- (1, 1101, 'some diff charges', -19.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 1, 1),
- (2, 1101, 'more diff charges', 60, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 2, 1),
- (3, 1101, 'even more! diff charges', -9.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 3, 1),
- (4, 1101, 'insane diff charges', 60, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 4, 1),
- (5, 1101, 'gargantuous diff charges', -9.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 5, 1),
- (6, 1101, 'diff charges', 88.30, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 6, 1),
- (7, 1101, 'unaffordable diff charges', -39.12, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 1, 1),
- (8, 1101, 'some recovery charges', 29.35, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 2, 1),
- (9, 1101, 'some manna charges', -9.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 3, 1),
- (10, 1101, 'some claim charges', 13.13, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 4, 1),
- (11, 1101, 'some heritage charges', -15.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 5, 1),
- (12, 1101, 'some miscellaneous charges', 58.00, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 6, 1);
+ VALUES
+ (1, 1101, 'some diff charges', -19.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 1, 1),
+ (2, 1101, 'more diff charges', 60, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 2, 1),
+ (3, 1101, 'even more! diff charges', -9.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 3, 1),
+ (4, 1101, 'insane diff charges', 60, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 4, 1),
+ (5, 1101, 'gargantuous diff charges', -9.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 5, 1),
+ (6, 1101, 'diff charges', 88.30, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 6, 1),
+ (7, 1101, 'unaffordable diff charges', -39.12, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 1, 1),
+ (8, 1101, 'some recovery charges', 29.35, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 2, 1),
+ (9, 1101, 'some manna charges', -9.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 3, 1),
+ (10, 1101, 'some claim charges', 13.13, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 4, 1),
+ (11, 1101, 'some heritage charges', -15.99, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 5, 1),
+ (12, 1101, 'some miscellaneous charges', 58.00, DATE_ADD(util.VN_CURDATE(), INTERVAL 1 MONTH), util.VN_CURDATE(), 6, 1);
INSERT INTO `vn`.`mandate`(`id`, `clientFk`, `companyFk`, `code`, `created`, `mandateTypeFk`)
- VALUES
- (1, 1102, 442, '1-1', util.VN_CURDATE(), 2);
+ VALUES
+ (1, 1102, 442, '1-1', util.VN_CURDATE(), 2);
INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`, `icon`, `code`)
- VALUES
- (1, 'Plant', 1, 'B92A26', 'icon-plant', 'plant'),
- (2, 'Flower', 2, 'dcf711', 'icon-flower', 'flower'),
- (3, 'Logistic', 0, 'b9f711', NULL, 'logistical'),
- (4, 'Handmade', 1, NULL, 'icon-handmade', 'handmade'),
- (5, 'Artificial', 1, NULL, 'icon-artificial', 'artificial'),
- (6, 'Green', 1, NULL, 'icon-greenery', 'greenery'),
- (7, 'Accessories', 1, NULL, 'icon-accessory', 'accessory'),
- (8, 'Fruit', 1, NULL, 'icon-fruit', 'fruit');
+ VALUES
+ (1, 'Plant', 1, 'B92A26', 'icon-plant', 'plant'),
+ (2, 'Flower', 2, 'dcf711', 'icon-flower', 'flower'),
+ (3, 'Logistic', 0, 'b9f711', NULL, 'logistical'),
+ (4, 'Handmade', 1, NULL, 'icon-handmade', 'handmade'),
+ (5, 'Artificial', 1, NULL, 'icon-artificial', 'artificial'),
+ (6, 'Green', 1, NULL, 'icon-greenery', 'greenery'),
+ (7, 'Accessories', 1, NULL, 'icon-accessory', 'accessory'),
+ (8, 'Fruit', 1, NULL, 'icon-fruit', 'fruit');
INSERT INTO `vn`.`temperature`(`code`, `name`, `description`)
- VALUES
- ('warm', 'Warm', 'Warm'),
- ('cool', 'Cool', 'Cool');
+ VALUES
+ ('warm', 'Warm', 'Warm'),
+ ('cool', 'Cool', 'Cool');
INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`, `workerFk`, `isPackaging`, `temperatureFk`, `isFragile`)
- VALUES
- (1, 'CRI', 'Crisantemo', 2, 31, 35, 0, 'cool', 0),
- (2, 'ITG', 'Anthurium', 1, 31, 35, 0, 'cool', 1),
- (3, 'WPN', 'Paniculata', 2, 31, 35, 0, 'cool', 0),
- (4, 'PRT', 'Delivery ports', 3, NULL, 35, 1, 'warm', 0),
- (5, 'CON', 'Container', 3, NULL, 35, 1, 'warm', 0),
- (6, 'ALS', 'Alstroemeria', 1, 31, 16, 0, 'warm', 1);
+ VALUES
+ (1, 'CRI', 'Crisantemo', 2, 31, 35, 0, 'cool', 0),
+ (2, 'ITG', 'Anthurium', 1, 31, 35, 0, 'cool', 1),
+ (3, 'WPN', 'Paniculata', 2, 31, 35, 0, 'cool', 0),
+ (4, 'PRT', 'Delivery ports', 3, NULL, 35, 1, 'warm', 0),
+ (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`)
- 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');
+INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`, `hexJson`)
+ VALUES
+ ('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
- (1, 'SPA', 'Spain'),
- (2, 'HOL', 'Holand'),
- (3, 'VLC', 'Valencia');
+ VALUES
+ (1, 'SPA', 'Spain'),
+ (2, 'HOL', 'Holand'),
+ (3, 'VLC', 'Valencia');
INSERT INTO `vn`.`producer`(`id`, `name`)
- VALUES
- (1, 'Marvel Studios'),
- (2, 'Nordic Mythology');
+ VALUES
+ (1, 'Marvel Studios'),
+ (2, 'Nordic Mythology');
INSERT INTO `vn`.`taxType`(`id`, `nickname`, `isAccrued`, `serial`, `TIPOOPE`, `description`, `countryFk`)
- VALUES
- (1, 'National', 1, 'R', 'I', 'national VAT', 1),
- (2, 'European', 0, 'E', 'I', 'europe VAT', 1);
+ VALUES
+ (1, 'National', 1, 'R', 'I', 'national VAT', 1),
+ (2, 'European', 0, 'E', 'I', 'europe VAT', 1);
INSERT INTO `vn`.`taxCode`(`id`, `dated`, `code`, `taxTypeFk`, `rate`, `equalizationTax`, `type`, `link`, `isActive`, `updated`, `transactionCode`)
- VALUES
- (1 , util.VN_CURDATE(), '1111111111', 1, 7.0 , 0.0, 'R', 1, 1, util.VN_CURDATE(), 1),
- (2 , util.VN_CURDATE(), '2222222222', 2, 16.0, 0.0, 'G', 2, 1, util.VN_CURDATE(), 1),
- (21 , util.VN_CURDATE(), '3333333333', 1, 7.0, 0.0, 'R', 3, 1, util.VN_CURDATE(), 1),
- (108, util.VN_CURDATE(), '4444444444', 2, 8.0 , 0.0, 'R', 4, 1, util.VN_CURDATE(), 1);
+ VALUES
+ (1 , util.VN_CURDATE(), '1111111111', 1, 7.0 , 0.0, 'R', 1, 1, util.VN_CURDATE(), 1),
+ (2 , util.VN_CURDATE(), '2222222222', 2, 16.0, 0.0, 'G', 2, 1, util.VN_CURDATE(), 1),
+ (21 , util.VN_CURDATE(), '3333333333', 1, 7.0, 0.0, 'R', 3, 1, util.VN_CURDATE(), 1),
+ (108, util.VN_CURDATE(), '4444444444', 2, 8.0 , 0.0, 'R', 4, 1, util.VN_CURDATE(), 1);
INSERT INTO `vn`.`taxClass`(`id`, `description`, `code`)
- VALUES
- (1, 'Reduced VAT', 'R'),
- (2, 'General VAT', 'G');
+ VALUES
+ (1, 'Reduced VAT', 'R'),
+ (2, 'General VAT', 'G');
INSERT INTO `vn`.`taxClassCode`(`taxClassFk`, `effectived`, `taxCodeFk`)
- VALUES
- (1, util.VN_CURDATE(), 1),
- (1, util.VN_CURDATE(), 21),
- (2, util.VN_CURDATE(), 2);
+ VALUES
+ (1, util.VN_CURDATE(), 1),
+ (1, util.VN_CURDATE(), 21),
+ (2, util.VN_CURDATE(), 2);
INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`)
- VALUES
- (05080000, 'Coral y materiales similares', 2, 2),
- (06021010, 'Plantas vivas: Esqueje/injerto, Vid', 1, 1);
+ VALUES
+ (05080000, 'Coral y materiales similares', 2, 2),
+ (06021010, 'Plantas vivas: Esqueje/injerto, Vid', 1, 1);
INSERT INTO `vn`.`itemFamily`(`code`, `description`)
- VALUES
- ('EMB', 'Packagings'),
- ('SER', 'Services'),
- ('VT', 'Sales');
+ VALUES
+ ('EMB', 'Packagings'),
+ ('SER', 'Services'),
+ ('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
UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2
- WHERE `itemFk` IN(4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 71);
+ WHERE `itemFk` IN(4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 71);
INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`, `started`, `ended`, `bonus`, `warehouseFk`, `created`)
- VALUES
- (1, 1, 0, 0, 2.5, 2, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 0, 1, util.VN_CURDATE()),
- (2, 3, 10, 10, 10, 10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 0, 1, util.VN_CURDATE()),
- (3, 13, 8.5, 10, 7.5, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 1, 2, util.VN_CURDATE());
+ VALUES
+ (1, 1, 0, 0, 2.5, 2, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 0, 1, util.VN_CURDATE()),
+ (2, 3, 10, 10, 10, 10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 0, 1, util.VN_CURDATE()),
+ (3, 13, 8.5, 10, 7.5, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 1, 2, util.VN_CURDATE());
INSERT INTO `vn`.`itemMinimumQuantity`(`itemFk`, `quantity`, `started`, `ended`, `warehouseFk`)
- VALUES
- (1, 5, util.VN_CURDATE() - INTERVAL 2 MONTH, util.VN_CURDATE() + INTERVAL 1 MONTH, 1),
- (2, 10, util.VN_CURDATE() - INTERVAL 2 DAY, util.VN_CURDATE() - INTERVAL 1 DAY, 2),
- (3, 15, util.VN_CURDATE() + INTERVAL 3 DAY, util.VN_CURDATE() + INTERVAL 2 WEEK, 3),
- (2, 10, util.VN_CURDATE() + INTERVAL 2 MONTH, NULL, 5),
- (4, 8, util.VN_CURDATE() - INTERVAL 3 MONTH, NULL, NULL);
+ VALUES
+ (1, 5, util.VN_CURDATE() - INTERVAL 2 MONTH, util.VN_CURDATE() + INTERVAL 1 MONTH, 1),
+ (2, 10, util.VN_CURDATE() - INTERVAL 2 DAY, util.VN_CURDATE() - INTERVAL 1 DAY, 2),
+ (3, 15, util.VN_CURDATE() + INTERVAL 3 DAY, util.VN_CURDATE() + INTERVAL 2 WEEK, 3),
+ (2, 10, util.VN_CURDATE() + INTERVAL 2 MONTH, NULL, 5),
+ (4, 8, util.VN_CURDATE() - INTERVAL 3 MONTH, NULL, NULL);
INSERT INTO `vn`.`expeditionBoxVol`(`boxFk`, `m3`, `ratio`)
- VALUES
- (71,0.141,1);
+ VALUES
+ (71,0.141,1);
INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPackageReturnable`, `created`, `itemFk`, `price`)
- VALUES
- (1, 0.00, 10, 10, 0, 1, util.VN_CURDATE(), 6, 1.50),
- (2, 100.00, 20, 20, 0, 1, util.VN_CURDATE(), 7, 1.00),
- (3, 14000.00, 0, 0, 0, 1, util.VN_CURDATE(), NULL, 0),
- (4, 218000.00, 0, 0, 0, 0, util.VN_CURDATE(), NULL, 0),
- (5, 292000.00, 0, 0, 0, 0, util.VN_CURDATE(), NULL, 0),
- (94, 140875.00, 49.00, 115.00, 25.00, 0, util.VN_CURDATE(), 71, 0.00),
- ('cc', 1640038.00, 56.00, 220.00, 128.00, 1, util.VN_CURDATE(), 15, 90.00),
- ('pallet 100', 2745600.00, 100.00, 220.00, 120.00, 1, util.VN_CURDATE(), 16, 0.00);
+ VALUES
+ (1, 0.00, 10, 10, 0, 1, util.VN_CURDATE(), 6, 1.50),
+ (2, 100.00, 20, 20, 0, 1, util.VN_CURDATE(), 7, 1.00),
+ (3, 14000.00, 0, 0, 0, 1, util.VN_CURDATE(), NULL, 0),
+ (4, 218000.00, 0, 0, 0, 0, util.VN_CURDATE(), NULL, 0),
+ (5, 292000.00, 0, 0, 0, 0, util.VN_CURDATE(), NULL, 0),
+ (94, 140875.00, 49.00, 115.00, 25.00, 0, util.VN_CURDATE(), 71, 0.00),
+ ('cc', 1640038.00, 56.00, 220.00, 128.00, 1, util.VN_CURDATE(), 15, 90.00),
+ ('pallet 100', 2745600.00, 100.00, 220.00, 120.00, 1, util.VN_CURDATE(), 16, 0.00);
INSERT INTO `vn`.`packagingConfig`(`id`, `upperGap`, `defaultSmallPackageFk`, `defaultBigPackageFk`)
- VALUES
- (1, '10', 1, 'pallet 100');
+ VALUES
+ (1, '10', 1, 'pallet 100');
INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
- VALUES
- (1, 'En reparto', 'ON DELIVERY'),
- (2, 'Entregada', 'DELIVERED'),
- (3, 'Perdida', 'LOST');
+ VALUES
+ (1, 'En reparto', 'ON DELIVERY'),
+ (2, 'Entregada', 'DELIVERED'),
+ (3, 'Perdida', 'LOST');
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
- VALUES
- (1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 18, 'UR9000006041', 94, 1, 'pc1'),
- (2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 18, 'UR9000006041', 94, 1, NULL),
- (3, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 18, 'UR9000006041', 94, 2, NULL),
- (4, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 18, 'UR9000006041', 94, 2, NULL),
- (5, 1, 2, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 18, NULL, 94, 3, NULL),
- (6, 7, 3, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 18, NULL, 94, 3, NULL),
- (7, 2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), 1, 18, NULL, 94, NULL,NULL),
- (8, 3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), 1, 18, NULL, 94, 1, NULL),
- (9, 3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 18, NULL, 94, 2, NULL),
- (10, 7, 7, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
- (11, 7, 8, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
- (12, 7, 9, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
- (13, 1, 10, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
+ VALUES
+ (1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 18, 'UR9000006041', 94, 1, 'pc1'),
+ (2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 18, 'UR9000006041', 94, 1, NULL),
+ (3, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 18, 'UR9000006041', 94, 2, NULL),
+ (4, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 18, 'UR9000006041', 94, 2, NULL),
+ (5, 1, 2, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 18, NULL, 94, 3, NULL),
+ (6, 7, 3, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 18, NULL, 94, 3, NULL),
+ (7, 2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), 1, 18, NULL, 94, NULL,NULL),
+ (8, 3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), 1, 18, NULL, 94, 1, NULL),
+ (9, 3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 18, NULL, 94, 2, NULL),
+ (10, 7, 7, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
+ (11, 7, 8, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
+ (12, 7, 9, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
+ (13, 1, 10, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL),
(14, 1, 37, 71, util.VN_NOW(), 1, 18, NULL, 94, 3, NULL);
INSERT INTO `vn`.`expeditionState`(`id`, `created`, `expeditionFk`, `typeFk`, `userFk`)
- VALUES
- (1, util.VN_CURDATE(), 1, 1, 1),
- (2, util.VN_CURDATE(), 2, 1, 1),
- (3, util.VN_CURDATE(), 3, 1, 1),
- (4, util.VN_CURDATE(), 3, 2, 1106),
- (5, util.VN_CURDATE(), 5, 1, 1106),
- (6, util.VN_CURDATE(), 5, 3, 1106);
+ VALUES
+ (1, util.VN_CURDATE(), 1, 1, 1),
+ (2, util.VN_CURDATE(), 2, 1, 1),
+ (3, util.VN_CURDATE(), 3, 1, 1),
+ (4, util.VN_CURDATE(), 3, 2, 1106),
+ (5, util.VN_CURDATE(), 5, 1, 1106),
+ (6, util.VN_CURDATE(), 5, 3, 1106);
INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`, `created`, `pvp`)
- VALUES
- (1, 1, 2, 2, util.VN_CURDATE(), NULL),
- (2, 2, 2, 1, util.VN_CURDATE(), NULL),
- (3, 3, 2, 4, util.VN_CURDATE(), NULL);
+ VALUES
+ (1, 1, 2, 2, util.VN_CURDATE(), NULL),
+ (2, 2, 2, 1, util.VN_CURDATE(), NULL),
+ (3, 3, 2, 4, util.VN_CURDATE(), NULL);
INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `price`, `discount`, `reserved`, `isPicked`, `created`, `problem`)
VALUES
@@ -1090,12 +1096,12 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
(5, 1, 2, 'Ranged weapon longbow 200cm', 1, 110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 'hasComponentLack'),
(6, 1, 3, 'Ranged weapon longbow 200cm', 1, 110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 'hasComponentLack'),
(7, 2, 11, 'Melee weapon combat fist 15cm', 15, 7.74, 0, 0, 0, util.VN_CURDATE(), NULL),
- (8, 4, 11, 'Melee weapon heavy shield 100cm', 10, 1.79, 0, 0, 0, util.VN_CURDATE(), NULL),
+ (8, 4, 11, 'Melee weapon heavy shield 100cm', 10, 1.79, 0, 0, 0, util.VN_CURDATE(), 'hasItemLost,hasRounding'),
(9, 1, 16, 'Ranged weapon longbow 200cm', 1, 103.49, 0, 0, 0, util.VN_CURDATE(), NULL),
(10, 2, 16, 'Melee weapon combat fist 15cm', 10, 7.09, 0, 0, 0, util.VN_CURDATE(), NULL),
(11, 1, 16, 'Ranged weapon longbow 200cm', 1, 103.49, 0, 0, 0, util.VN_CURDATE(), NULL),
- (12, 4, 16, 'Melee weapon heavy shield 100cm', 20, 1.71, 0, 0, 0, util.VN_CURDATE(), NULL),
- (13, 2, 8, 'Melee weapon combat fist 15cm', 10, 7.08, 0, 0, 0, util.VN_CURDATE(), NULL),
+ (12, 4, 16, 'Melee weapon heavy shield 100cm', 20, 1.71, 0, 0, 0, util.VN_CURDATE(), NULL),
+ (13, 2, 8, 'Melee weapon combat fist 15cm', 10, 7.08, 0, 0, 0, util.VN_CURDATE(), 'hasItemLost'),
(14, 1, 8, 'Ranged weapon longbow 200cm', 2, 103.49, 0, 0, 0, util.VN_CURDATE(), NULL),
(15, 1, 19, 'Ranged weapon longbow 200cm', 1, 103.49, 0, 0, 0, util.VN_CURDATE(), NULL),
(16, 2, 20, 'Melee weapon combat fist 15cm', 20, 7.07, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
@@ -1106,253 +1112,255 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
(21, 1, 6, 'Ranged weapon longbow 200cm', 1, 8.07, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 'hasComponentLack'),
(22, 1, 7, 'Ranged weapon longbow 200cm', 1, 8.07, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
(23, 1, 9, 'Ranged weapon longbow 200cm', 1, 8.07, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (24, 1, 10, 'Ranged weapon longbow 200cm', 1, 8.07, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (25, 4, 12, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (26, 4, 13, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (27, 4, 14, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (28, 4, 15, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (29, 4, 17, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (30, 4, 18, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (31, 2, 23, 'Melee weapon combat fist 15cm', -5, 7.08, 0, 0, 0, util.VN_CURDATE(), NULL),
+ (24, 1, 10, 'Ranged weapon longbow 200cm', 1, 8.07, 0, 0, 0, util.VN_CURDATE(), 'hasItemShortage,hasComponentLack'),
+ (25, 4, 12, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack,hasItemLost'),
+ (26, 4, 13, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack,hasItemLost'),
+ (27, 4, 14, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasItemShortage,hasComponentLack,hasItemLost'),
+ (28, 4, 15, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack,hasItemLost'),
+ (29, 4, 17, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasItemShortage,hasComponentLack'),
+ (30, 4, 18, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasItemShortage,hasComponentLack'),
+ (31, 2, 23, 'Melee weapon combat fist 15cm', -5, 7.08, 0, 0, 0, util.VN_CURDATE(), 'hasRounding'),
(32, 1, 24, 'Ranged weapon longbow 200cm', -1, 8.07, 0, 0, 0, util.VN_CURDATE(), NULL),
(33, 5, 14, 'Ranged weapon pistol 9mm', 50, 1.79, 0, 0, 0, util.VN_CURDATE(), NULL),
- (34, 4, 28, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (35, 4, 29, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
+ (34, 4, 28, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack,hasItemLost'),
+ (35, 4, 29, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack,hasItemLost'),
(37, 4, 31, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), NULL),
- (36, 4, 30, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
+ (36, 4, 30, 'Melee weapon heavy shield 100cm', 20, 1.72, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack,hasItemLost'),
(38, 2, 32, 'Melee weapon combat fist 15cm', 30, 7.07, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 'hasComponentLack'),
(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'),
- (41, 2, 35, 'Melee weapon combat fist 15cm', 8.00, 3.01, 0, 0, 0, util.VN_CURDATE(), 'hasComponentLack'),
- (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 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'),
+ (43, 88, 1000000, 'Chest medical box 2', 15.00, 10.00, 0, 0, 0, CURDATE(), '');
INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
- VALUES
- (1, 28, 50),
- (1, 29, 49.4),
- (1, 39, 0.994),
- (2, 28, 5),
- (2, 29, 2),
- (2, 39, 0.07),
- (3, 28, 50),
- (3, 29, 49.4),
- (3, 39, 0.994),
- (4, 28, 1.25),
- (4, 29, 0.42),
- (4, 39, 0.017),
- (5, 17, 9.94),
- (5, 28, 50),
- (5, 29, 49.4),
- (5, 39, 0.994),
- (6, 17, 9.94),
- (6, 28, 50),
- (6, 29, 49.4),
- (6, 39, 0.994),
- (7, 15, 0.0199),
- (7, 17, 0.35),
- (7, 28, 5),
- (7, 29, 2),
- (7, 39, 0.07),
- (8, 15, 0.0199),
- (8, 17, 0.084),
- (8, 28, 1.25),
- (8, 29, 0.42),
- (8, 39, 0.017),
- (9, 15, 3.0949),
- (9, 21, 0.001),
- (9, 28, 53),
- (9, 29, 46.4),
- (9, 39, 0.994),
- (10, 15, 0.0199),
- (10, 28, 7),
- (10, 29, 0),
- (10, 39, 0.07),
- (11, 15, 3.0949),
- (11, 21, 0.001),
- (11, 28, 53),
- (11, 29, 46.4),
- (11, 39, 0.994),
- (12, 15, 0.0199),
- (12, 21, 0.003),
- (12, 28, 2.25),
- (12, 29, -0.58),
- (12, 39, 0.017),
- (13, 15, 0.114),
- (13, 28, 5),
- (13, 29, 2),
- (13, 39, 0.07),
- (14, 15, 3.0949),
- (14, 28, 50),
- (14, 29, 49.4),
- (14, 39, 0.994),
- (15, 15, 3.0949),
- (15, 28, 50),
- (15, 29, 49.4),
- (15, 39, 0.994),
- (16, 28, 5),
- (16, 29, 2),
- (16, 39, 0.07),
- (17, 28, 5),
- (17, 29, 2),
- (17, 39, 0.07),
- (18, 28, 1.25),
- (18, 29, 0.42),
- (18, 39, 0.017),
- (19, 17, 0.7),
- (19, 22, 0.3),
- (19, 28, 5),
- (19, 29, 2),
- (19, 39, 0.02),
- (20, 17, 0.7),
- (20, 22, 0.3),
- (20, 28, 5),
- (20, 29, 2),
- (20, 39, 0.02),
- (21, 17, 0.7),
- (21, 22, 0.3),
- (21, 28, 5),
- (21, 29, 2),
- (21, 39, 0.02),
- (22, 17, 0.7),
- (22, 22, 0.3),
- (22, 28, 5),
- (22, 29, 2),
- (22, 39, 0.02),
- (23, 17, 0.7),
- (23, 22, 0.3),
- (23, 28, 5),
- (23, 29, 2),
- (23, 39, 0.02),
- (24, 17, 0.7),
- (24, 22, 0.3),
- (24, 28, 5),
- (24, 29, 2),
- (24, 39, 0.02),
- (25, 17, 0.033),
- (25, 28, 1.25),
- (25, 29, 0.42),
- (25, 39, 0.017),
- (26, 17, 0.033),
- (26, 28, 1.25),
- (26, 29, 0.42),
- (26, 39, 0.017),
- (27, 17, 0.033),
- (27, 28, 1.25),
- (27, 29, 0.42),
- (27, 39, 0.017),
- (28, 17, 0.033),
- (28, 28, 1.25),
- (28, 29, 0.42),
- (28, 39, 0.017),
- (29, 17, 0.033),
- (29, 28, 1.25),
- (29, 29, 0.42),
- (29, 39, 0.017),
- (30, 17, 0.033),
- (30, 28, 1.25),
- (30, 29, 0.42),
- (30, 39, 0.017),
- (31, 28, 5),
- (31, 29, 2),
- (31, 36, 0.01),
- (31, 39, 0.07),
- (32, 28, 50),
- (32, 29, 49.4),
- (32, 36, -92.324),
- (32, 39, 0.994);
+ VALUES
+ (1, 28, 50),
+ (1, 29, 49.4),
+ (1, 39, 0.994),
+ (2, 28, 5),
+ (2, 29, 2),
+ (2, 39, 0.07),
+ (3, 28, 50),
+ (3, 29, 49.4),
+ (3, 39, 0.994),
+ (4, 28, 1.25),
+ (4, 29, 0.42),
+ (4, 39, 0.017),
+ (5, 17, 9.94),
+ (5, 28, 50),
+ (5, 29, 49.4),
+ (5, 39, 0.994),
+ (6, 17, 9.94),
+ (6, 28, 50),
+ (6, 29, 49.4),
+ (6, 39, 0.994),
+ (7, 15, 0.0199),
+ (7, 17, 0.35),
+ (7, 28, 5),
+ (7, 29, 2),
+ (7, 39, 0.07),
+ (8, 15, 0.0199),
+ (8, 17, 0.084),
+ (8, 28, 1.25),
+ (8, 29, 0.42),
+ (8, 39, 0.017),
+ (9, 15, 3.0949),
+ (9, 21, 0.001),
+ (9, 28, 53),
+ (9, 29, 46.4),
+ (9, 39, 0.994),
+ (10, 15, 0.0199),
+ (10, 28, 7),
+ (10, 29, 0),
+ (10, 39, 0.07),
+ (11, 15, 3.0949),
+ (11, 21, 0.001),
+ (11, 28, 53),
+ (11, 29, 46.4),
+ (11, 39, 0.994),
+ (12, 15, 0.0199),
+ (12, 21, 0.003),
+ (12, 28, 2.25),
+ (12, 29, -0.58),
+ (12, 39, 0.017),
+ (13, 15, 0.114),
+ (13, 28, 5),
+ (13, 29, 2),
+ (13, 39, 0.07),
+ (14, 15, 3.0949),
+ (14, 28, 50),
+ (14, 29, 49.4),
+ (14, 39, 0.994),
+ (15, 15, 3.0949),
+ (15, 28, 50),
+ (15, 29, 49.4),
+ (15, 39, 0.994),
+ (16, 28, 5),
+ (16, 29, 2),
+ (16, 39, 0.07),
+ (17, 28, 5),
+ (17, 29, 2),
+ (17, 39, 0.07),
+ (18, 28, 1.25),
+ (18, 29, 0.42),
+ (18, 39, 0.017),
+ (19, 17, 0.7),
+ (19, 22, 0.3),
+ (19, 28, 5),
+ (19, 29, 2),
+ (19, 39, 0.02),
+ (20, 17, 0.7),
+ (20, 22, 0.3),
+ (20, 28, 5),
+ (20, 29, 2),
+ (20, 39, 0.02),
+ (21, 17, 0.7),
+ (21, 22, 0.3),
+ (21, 28, 5),
+ (21, 29, 2),
+ (21, 39, 0.02),
+ (22, 17, 0.7),
+ (22, 22, 0.3),
+ (22, 28, 5),
+ (22, 29, 2),
+ (22, 39, 0.02),
+ (23, 17, 0.7),
+ (23, 22, 0.3),
+ (23, 28, 5),
+ (23, 29, 2),
+ (23, 39, 0.02),
+ (24, 17, 0.7),
+ (24, 22, 0.3),
+ (24, 28, 5),
+ (24, 29, 2),
+ (24, 39, 0.02),
+ (25, 17, 0.033),
+ (25, 28, 1.25),
+ (25, 29, 0.42),
+ (25, 39, 0.017),
+ (26, 17, 0.033),
+ (26, 28, 1.25),
+ (26, 29, 0.42),
+ (26, 39, 0.017),
+ (27, 17, 0.033),
+ (27, 28, 1.25),
+ (27, 29, 0.42),
+ (27, 39, 0.017),
+ (28, 17, 0.033),
+ (28, 28, 1.25),
+ (28, 29, 0.42),
+ (28, 39, 0.017),
+ (29, 17, 0.033),
+ (29, 28, 1.25),
+ (29, 29, 0.42),
+ (29, 39, 0.017),
+ (30, 17, 0.033),
+ (30, 28, 1.25),
+ (30, 29, 0.42),
+ (30, 39, 0.017),
+ (31, 28, 5),
+ (31, 29, 2),
+ (31, 36, 0.01),
+ (31, 39, 0.07),
+ (32, 28, 50),
+ (32, 29, 49.4),
+ (32, 36, -92.324),
+ (32, 39, 0.994);
INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`, `packing`,`buyFk`, `userFk`)
- VALUES
- (2, 11, 1, 1, 1, 2,1106),
- (4, 12, 1, 1, 1, NULL,1106),
- (1, 13, 2, 12, 12, NULL,1106);
+ VALUES
+ (2, 11, 1, 1, 1, 2,1106),
+ (4, 12, 1, 1, 1, NULL,1106),
+ (1, 13, 2, 12, 12, NULL,1106);
INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
- VALUES
- ('1', '1', '1', util.VN_CURDATE(), '1106'),
- ('2', '2', '5', util.VN_CURDATE(), '1106'),
- ('1', '7', '1', util.VN_CURDATE(), '1106'),
- ('2', '8', '5', util.VN_CURDATE(), '1106');
+ VALUES
+ ('1', '1', '1', util.VN_CURDATE(), '1106'),
+ ('2', '2', '5', util.VN_CURDATE(), '1106'),
+ ('1', '7', '1', util.VN_CURDATE(), '1106'),
+ ('2', '8', '5', util.VN_CURDATE(), '1106');
INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `id`, `stateFk`)
- VALUES
- (1, 0, util.VN_CURDATE(), 5, 55, 1, 14),
- (1, 1, util.VN_CURDATE(), 5, 54, 2, 8),
- (2, 1, util.VN_CURDATE(), 10, 40, 3, 8),
- (3, 1, util.VN_CURDATE(), 2, 40, 4, 8),
- (31, 1, util.VN_CURDATE(), -5, 40, 5, 8);
+ VALUES
+ (1, 0, util.VN_CURDATE(), 5, 55, 1, 14),
+ (1, 1, util.VN_CURDATE(), 5, 54, 2, 8),
+ (2, 1, util.VN_CURDATE(), 10, 40, 3, 8),
+ (3, 1, util.VN_CURDATE(), 2, 40, 4, 8),
+ (31, 1, util.VN_CURDATE(), -5, 40, 5, 8);
INSERT INTO `vn`.`itemBarcode`(`id`, `itemFk`, `code`)
- VALUES
- (1, 1, 1111111111),
- (2, 1, 2222222222),
- (3, 1, 3333333333),
- (4, 2, 4444444444);
+ VALUES
+ (1, 1, 1111111111),
+ (2, 1, 2222222222),
+ (3, 1, 3333333333),
+ (4, 2, 4444444444);
INSERT INTO `vn`.`train`(`id`, `name`)
- VALUES
- (1, 'Train1'),
- (2, 'Train2');
+ VALUES
+ (1, 'Train1'),
+ (2, 'Train2');
INSERT INTO `vn`.`operator` (`workerFk`, `numberOfWagons`, `trainFk`, `itemPackingTypeFk`, `warehouseFk`, `sectorFk`, `labelerFk`)
- VALUES
- ('1106', '1', '1', 'H', '1', '1', '1'),
- ('9', '2', '1', 'H', '1', '1', '1'),
- ('1107', '1', '1', 'V', '1', '1', '1');
+ VALUES
+ (1106, '1', '1', 'H', '1', '1', '1'),
+ (9, '2', '1', 'H', '1', '1', '1'),
+ (1107, '1', '1', 'V', '1', '1', '1'),
+ (72, '1', '1', 'V', '1', '1', '1');
INSERT INTO `vn`.`collection`(`id`, `workerFk`, `stateFk`, `created`, `trainFk`)
- VALUES
- (1, 1106, 5, DATE_ADD(util.VN_CURDATE(),INTERVAL +1 DAY), 1),
- (2, 1106, 14, util.VN_CURDATE(), 1),
- (4, 49, 5, util.VN_CURDATE(), 1),
- (5, 18, 5, util.VN_CURDATE(), 1),
- (6, 18, 5, util.VN_CURDATE(), 1);
+ VALUES
+ (1, 1106, 5, DATE_ADD(util.VN_CURDATE(),INTERVAL +1 DAY), 1),
+ (2, 1106, 14, util.VN_CURDATE(), 1),
+ (4, 49, 5, util.VN_CURDATE(), 1),
+ (5, 18, 5, util.VN_CURDATE(), 1),
+ (6, 18, 5, util.VN_CURDATE(), 1);
INSERT INTO `vn`.`ticketCollection`(`ticketFk`, `collectionFk`, `level`)
- VALUES
- (1, 1, 1),
- (2, 1, NULL),
- (3, 2, NULL),
- (23, 1, NULL),
- (34, 4, 1),
- (35, 5, 1),
- (8, 6, 1);
+ VALUES
+ (1, 1, 1),
+ (2, 1, NULL),
+ (3, 2, NULL),
+ (23, 1, NULL),
+ (34, 4, 1),
+ (35, 5, 1),
+ (8, 6, 1);
INSERT INTO `vn`.`genus`(`id`, `name`)
- VALUES
- (1, 'Abelia'),
- (2, 'Abies'),
- (3, 'Abutilon');
+ VALUES
+ (1, 'Abelia'),
+ (2, 'Abies'),
+ (3, 'Abutilon');
INSERT INTO `vn`.`specie`(`id`, `name`)
- VALUES
- (1, 'grandiflora'),
- (2, 'procera'),
- (3, 'decurrens'),
- (4, 'dealbata');
+ VALUES
+ (1, 'grandiflora'),
+ (2, 'procera'),
+ (3, 'decurrens'),
+ (4, 'dealbata');
INSERT INTO `vn`.`itemBotanical`(`itemFk`, `genusFk`, `specieFk`)
- VALUES
- (1, 1, 1),
- (2, 2, 2),
- (3, 2, NULL),
- (4, 2, 1);
+ VALUES
+ (1, 1, 1),
+ (2, 2, 2),
+ (3, 2, NULL),
+ (4, 2, 1);
INSERT INTO `vn`.`tag`(`id`, `code`, `name`, `isFree`, `isQuantitatif`, `sourceTable`, `unit`, `ediTypeFk`, `overwrite`)
- VALUES
- (1, 'color', 'Color', 0, 0, 'ink', NULL, NULL, 'inkFk'),
- (2, NULL, 'Forma', 1, 0, NULL, NULL,NULL, NULL),
- (3, NULL, 'Material', 1, 0, NULL, NULL,NULL, NULL),
- (4, NULL, 'Longitud', 1, 1, NULL, 'mm', NULL, 'size'),
- (5, NULL, 'Diámetro', 1, 1, NULL, 'mm',NULL, 'diameter'),
- (7, NULL, 'Ancho de la base', 1, 1, NULL, 'mm',NULL, NULL),
- (23, 'stems', 'Tallos', 1, 1, NULL, NULL, NULL, 'stems'),
- (27, NULL, 'Longitud(cm)', 1, 1, NULL, 'cm', NULL, 'size'),
- (36, 'producer', 'Proveedor', 1, 0, NULL, NULL, NULL, 'producer'),
- (56, NULL, 'Genero', 1, 0, NULL, NULL, NULL, NULL),
- (58, NULL, 'Variedad', 1, 0, NULL, NULL, NULL, NULL),
- (67, 'category', 'Categoria', 1, 0, NULL, NULL, NULL, NULL),
- (92, NULL, 'Nombre temporal', 1, 0, NULL, NULL, NULL, NULL);
+ VALUES
+ (1, 'color', 'Color', 0, 0, 'ink', NULL, NULL, 'inkFk'),
+ (2, NULL, 'Forma', 1, 0, NULL, NULL,NULL, NULL),
+ (3, NULL, 'Material', 1, 0, NULL, NULL,NULL, NULL),
+ (4, NULL, 'Longitud', 1, 1, NULL, 'mm', NULL, 'size'),
+ (5, NULL, 'Diámetro', 1, 1, NULL, 'mm',NULL, 'diameter'),
+ (7, NULL, 'Ancho de la base', 1, 1, NULL, 'mm',NULL, NULL),
+ (23, 'stems', 'Tallos', 1, 1, NULL, NULL, NULL, 'stems'),
+ (27, NULL, 'Longitud(cm)', 1, 1, NULL, 'cm', NULL, 'size'),
+ (36, 'producer', 'Proveedor', 1, 0, NULL, NULL, NULL, 'producer'),
+ (56, NULL, 'Genero', 1, 0, NULL, NULL, NULL, NULL),
+ (58, NULL, 'Variedad', 1, 0, NULL, NULL, NULL, NULL),
+ (67, 'category', 'Categoria', 1, 0, NULL, NULL, NULL, NULL),
+ (92, NULL, 'Nombre temporal', 1, 0, NULL, NULL, NULL, NULL);
INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES
@@ -1451,68 +1459,82 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
(93, 14, 58, 'medical box', 2),
(94, 14, 27, '100cm', 3),
(95, 14, 36, 'Stark Industries', 4),
- (96, 14, 1, 'White', 5),
+ (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);
+ (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
- (1, 1, 1, 0),
- (2, 2, 2, 0),
- (3, 3, 3, 0),
- (4, 1, 4, 4),
- (5, 1, 5, 5);
+ VALUES
+ (1, 1, 1, 0),
+ (2, 2, 2, 0),
+ (3, 3, 3, 0),
+ (4, 1, 4, 4),
+ (5, 1, 5, 5);
CALL `vn`.`itemRefreshTags`(NULL);
INSERT INTO `vn`.`itemLog` (`id`, `originFk`, `userFk`, `action`, `description`, `changedModel`, `oldInstance`, `newInstance`, `changedModelId`, `changedModelValue`)
- VALUES
- ('1', '1', '1', 'insert', 'We made a change!', 'Item', '{}', '{}', 1, '1');
+ VALUES
+ ('1', '1', '1', 'insert', 'We made a change!', 'Item', '{}', '{}', 1, '1');
INSERT INTO `vn`.`recovery`(`id`, `clientFk`, `started`, `finished`, `amount`, `period`)
- VALUES
- (1, 1101, DATE_ADD(util.VN_CURDATE(),INTERVAL -7 MONTH), DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), 50, 7),
- (2, 1102, DATE_ADD(util.VN_CURDATE(),INTERVAL -5 MONTH), util.VN_CURDATE(), 100, 1),
- (3, 1102, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(),INTERVAL 1 MONTH), 50, 7),
- (4, 1103, util.VN_CURDATE(), NULL, 50, 7);
+ VALUES
+ (1, 1101, DATE_ADD(util.VN_CURDATE(),INTERVAL -7 MONTH), DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), 50, 7),
+ (2, 1102, DATE_ADD(util.VN_CURDATE(),INTERVAL -5 MONTH), util.VN_CURDATE(), 100, 1),
+ (3, 1102, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(),INTERVAL 1 MONTH), 50, 7),
+ (4, 1103, util.VN_CURDATE(), NULL, 50, 7);
INSERT INTO `bs`.`clientAnnualConsumption`(`clientFk`, `invoiced`)
- VALUES
- (1101, 1500),
- (1102, 100),
- (1103, 1000),
- (1104, 500),
- (1105, 5000);
+ VALUES
+ (1101, 1500),
+ (1102, 100),
+ (1103, 1000),
+ (1104, 500),
+ (1105, 5000);
INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_refresh`, `expires`, `created`, `connection_id`)
- VALUES
- (1, 2, 'available', CONCAT_WS('/',1,util.VN_CURDATE()), util.VN_NOW(), DATE_ADD(util.VN_NOW(),INTERVAL 15 MINUTE), util.VN_CURDATE(), NULL),
- (2, 4, 'last_buy', CONCAT_WS('/',1,util.VN_CURDATE()), util.VN_NOW(), DATE_ADD(util.VN_NOW(),INTERVAL 15 MINUTE), util.VN_CURDATE(), NULL),
- (3, 8, 'visible', CONCAT_WS('/',1,util.VN_CURDATE()), util.VN_NOW(), DATE_ADD(util.VN_NOW(),INTERVAL 15 MINUTE), util.VN_CURDATE(), NULL);
+ VALUES
+ (1, 2, 'available', CONCAT_WS('/',1,util.VN_CURDATE()), util.VN_NOW(), DATE_ADD(util.VN_NOW(),INTERVAL 15 MINUTE), util.VN_CURDATE(), NULL),
+ (2, 4, 'last_buy', CONCAT_WS('/',1,util.VN_CURDATE()), util.VN_NOW(), DATE_ADD(util.VN_NOW(),INTERVAL 15 MINUTE), util.VN_CURDATE(), NULL),
+ (3, 8, 'visible', CONCAT_WS('/',1,util.VN_CURDATE()), util.VN_NOW(), DATE_ADD(util.VN_NOW(),INTERVAL 15 MINUTE), util.VN_CURDATE(), NULL);
INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`)
- VALUES
- (2, 1),
- (3, 2),
- (5, 6),
- (15, 6),
- (17, 6);
+ VALUES
+ (2, 1),
+ (3, 2),
+ (5, 6),
+ (15, 6),
+ (17, 6);
INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk)
- VALUES
- (1, '07546501420', 67, 671, util.VN_CURDATE(), 1761, 1, 1),
- (2, '07546491421', 252, 2769, util.VN_CURDATE(), 5231, 1, 1),
- (3, '07546500823', 102, 1495, util.VN_CURDATE(), 3221, 1, 1),
- (4, '99610288821', 252, 2777, util.VN_CURDATE(), 3641, 1, 1),
- (5, '07546500834', 229, 3292, util.VN_CURDATE(), 6601, 2, 1),
- (6, '22101929561', 37, 458, util.VN_CURDATE(), 441, 2, 1),
- (7, '07546491432', 258, 3034, util.VN_CURDATE(), 6441, 2, 1),
- (8, '99610288644', 476, 4461, util.VN_CURDATE(), 5751, 442, 1),
- (9, '99610289193', 302, 2972, util.VN_CURDATE(), 3871, 442, 1),
- (10, '07546500856', 185, 2364, util.VN_CURDATE(), 5321, 442, 1);
+ VALUES
+ (1, '07546501420', 67, 671, util.VN_CURDATE(), 1761, 1, 1),
+ (2, '07546491421', 252, 2769, util.VN_CURDATE(), 5231, 1, 1),
+ (3, '07546500823', 102, 1495, util.VN_CURDATE(), 3221, 1, 1),
+ (4, '99610288821', 252, 2777, util.VN_CURDATE(), 3641, 1, 1),
+ (5, '07546500834', 229, 3292, util.VN_CURDATE(), 6601, 2, 1),
+ (6, '22101929561', 37, 458, util.VN_CURDATE(), 441, 2, 1),
+ (7, '07546491432', 258, 3034, util.VN_CURDATE(), 6441, 2, 1),
+ (8, '99610288644', 476, 4461, util.VN_CURDATE(), 5751, 442, 1),
+ (9, '99610289193', 302, 2972, util.VN_CURDATE(), 3871, 442, 1),
+ (10, '07546500856', 185, 2364, util.VN_CURDATE(), 5321, 442, 1);
INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`, `isRaid`, `daysInForward`)
VALUES (1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel', 1, 1, 1, FALSE, NULL),
@@ -1526,7 +1548,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
@@ -1542,548 +1565,559 @@ 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
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 1, 1, '1062', '51', '56.20', '56.20', '56.20', '56.20', '56.20'),
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 2, 1, '35074', '687', '53.12', '89.69', '56.20', '56.20', '56.20'),
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 3, 1, '1777', '13', '12.02', '53.12', '56.20', '56.20', '56.20'),
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 4, 1, '3182', '59', '51', '56.20', '56.20', '56.20', '56.20'),
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 5, 1, '1747', '13', '53.12', '53.12', '56.20', '56.20', '56.20'),
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 6, 1, '7182', '59', '51', '53.12', '56.20', '56.20', '56.20'),
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 7, 1, '1777', '13', '89.69', '89.69', '56.20', '56.20', '56.20'),
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 8, 1, '4181', '59', '53.12', '53.12', '56.20', '56.20', '56.20'),
- ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 9, 1, '7268', '59', '12.02', '56.20', '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), 2, 1, '-74', '0', '51', '89.69', '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), 3, 1, '-7', '0', '12.02', '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), 4, 1, '1100', '0', '51', '56.20', '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), 5, 1, '848', '-187', '12.02', '89.69', '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), 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');
+ VALUES
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 1, 1, '1062', '51', '56.20', '56.20', '56.20', '56.20', '56.20'),
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 2, 1, '35074', '687', '53.12', '89.69', '56.20', '56.20', '56.20'),
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 3, 1, '1777', '13', '12.02', '53.12', '56.20', '56.20', '56.20'),
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 4, 1, '3182', '59', '51', '56.20', '56.20', '56.20', '56.20'),
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 5, 1, '1747', '13', '53.12', '53.12', '56.20', '56.20', '56.20'),
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 6, 1, '7182', '59', '51', '53.12', '56.20', '56.20', '56.20'),
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 7, 1, '1777', '13', '89.69', '89.69', '56.20', '56.20', '56.20'),
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 8, 1, '4181', '59', '53.12', '53.12', '56.20', '56.20', '56.20'),
+ ('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 9, 1, '7268', '59', '12.02', '56.20', '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), 2, 1, '-74', '0', '51', '89.69', '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), 3, 1, '-7', '0', '12.02', '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), 4, 1, '1100', '0', '51', '56.20', '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), 5, 1, '848', '-187', '12.02', '89.69', '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), 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()),
+ (22, 100, 4, 55, 0, 5, 0, 0, 0, 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
- (1, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 3, 1, 121, 442, NULL, 'TPV', 1,'155.89', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
- (2, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 3, 1, 124, 442, NULL, 'WEB', 1,'100.10', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
- (3, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 1, 2, 124, 442, NULL, 'ANDROID', 1,'107.25', DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
- (4, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 1, 2, 124, 442, NULL, 'SALIX', 1,'10.01', DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
- (5, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 1, 3, 124, 442, NULL, 'SALIX', 1,'10.01', DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
- (6, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 1, 3, 1, 442, NULL, 'SALIX', 1,'10.01', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
- (7, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 2, 7, 1, 442, NULL, 'SALIX', 0,'10.01', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (8, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 2, 7, 121, 442, NULL, 'SALIX', 0,'123.53', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (9, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1104, 2, 7, 124, 442, NULL, 'SALIX', 0,'10.01', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (10, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 3, 1, 2, 442, NULL, 'SALIX', 0,'10.01', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (11, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 2, 7, 122, 442, NULL, 'SALIX', 0,'60.90', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (12, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 3, 1, 3, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (13, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 1, 2, 123, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (14, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1104, 1, 2, 4, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (15, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1105, 1, 3, 125, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (16, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1106, 2, 7, 126, 442, NULL, 'SALIX', 0,'155.89', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (17, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1107, 1, 4, 127, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (18, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1108, 1, 4, 128, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (19, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1109, 1, 5, 129, 442, NULL, 'SALIX', 0,'16.50', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
- (20, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 1, 5, 101, 442, NULL, 'SALIX', 0,'21.45', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
- (21, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 1, 5, 102, 442, NULL, 'SALIX', 0,'0.00', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
- (22, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 1, 5, 103, 442, NULL, 'SALIX', 0,'148.50', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH));
+ VALUES
+ (1, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 3, 1, 121, 442, NULL, 'TPV', 1,'155.89', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+ (2, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 3, 1, 124, 442, NULL, 'WEB', 1,'100.10', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+ (3, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 1, 2, 124, 442, NULL, 'ANDROID', 1,'107.25', DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
+ (4, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 1, 2, 124, 442, NULL, 'SALIX', 1,'10.01', DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
+ (5, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 1, 3, 124, 442, NULL, 'SALIX', 1,'10.01', DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
+ (6, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 1, 3, 1, 442, NULL, 'SALIX', 1,'10.01', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+ (7, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 2, 7, 1, 442, NULL, 'SALIX', 0,'10.01', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (8, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 2, 7, 121, 442, NULL, 'SALIX', 0,'123.53', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (9, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1104, 2, 7, 124, 442, NULL, 'SALIX', 0,'10.01', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (10, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 3, 1, 2, 442, NULL, 'SALIX', 0,'10.01', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (11, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 2, 7, 122, 442, NULL, 'SALIX', 0,'60.90', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (12, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 3, 1, 3, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (13, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 1, 2, 123, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (14, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1104, 1, 2, 4, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (15, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1105, 1, 3, 125, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (16, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1106, 2, 7, 126, 442, NULL, 'SALIX', 0,'155.89', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (17, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1107, 1, 4, 127, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (18, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1108, 1, 4, 128, 442, NULL, 'SALIX', 0,'72.60', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (19, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1109, 1, 5, 129, 442, NULL, 'SALIX', 0,'16.50', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE()),
+ (20, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 1, 5, 101, 442, NULL, 'SALIX', 0,'21.45', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
+ (21, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 1, 5, 102, 442, NULL, 'SALIX', 0,'0.00', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
+ (22, DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 1, 5, 103, 442, NULL, 'SALIX', 0,'148.50', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH));
INSERT INTO `hedera`.`orderRow`(`id`, `orderFk`, `itemFk`, `warehouseFk`, `shipment`, `amount`, `price`, `rate`, `created`, `saleFk`)
- VALUES
- (1, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1),
- (2, 1, 2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 10, 1.07, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2),
- (3, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3),
- (4, 1, 4, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 20, 3.06, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4),
- (5, 2, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 10, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5),
- (6, 3, 1, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 15, 6.50, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 6),
- (7, 11, 2, 1, util.VN_CURDATE(), 15, 1.30, 0, util.VN_CURDATE(), 7),
- (8, 11, 4, 1, util.VN_CURDATE(), 10, 3.26, 0, util.VN_CURDATE(), 8),
- (9, 16, 1, 1, util.VN_CURDATE(), 5, 9.10, 0, util.VN_CURDATE(), 9),
- (10, 16, 2, 1, util.VN_CURDATE(), 10, 1.07, 0, util.VN_CURDATE(), 10),
- (11, 16, 1, 1, util.VN_CURDATE(), 2, 9.10, 0, util.VN_CURDATE(), 11),
- (12, 16, 4, 1, util.VN_CURDATE(), 20, 3.06, 0, util.VN_CURDATE(), 12),
- (13, 8, 2, 1, util.VN_CURDATE(), 15, 1.30, 0, util.VN_CURDATE(), 13),
- (14, 8, 1, 1, util.VN_CURDATE(), 10, 9.28, 0, util.VN_CURDATE(), 14),
- (15, 19, 1, 1, util.VN_CURDATE(), 10, 1.50, 0, util.VN_CURDATE(), 15),
- (16, 20, 2, 1, util.VN_CURDATE(), 15, 1.30, 0, util.VN_CURDATE(), 16),
- (17, 22, 2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 30, 2.30, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 17),
- (18, 22, 4, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 20, 3.00, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 18),
- (19, 4, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), 1, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), 19),
- (20, 5, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), 1, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), 20),
- (21, 6, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 21),
- (22, 7, 1, 1, util.VN_CURDATE(), 1, 9.10, 0, util.VN_CURDATE(), 22),
- (23, 9, 1, 1, util.VN_CURDATE(), 1, 9.10, 0, util.VN_CURDATE(), 23),
- (24, 10, 1, 1, util.VN_CURDATE(), 1, 9.10, 0, util.VN_CURDATE(), 24),
- (25, 12, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 25),
- (26, 13, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 26),
- (27, 14, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 27),
- (28, 15, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 28),
- (29, 17, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 29),
- (30, 18, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 30);
+ VALUES
+ (1, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1),
+ (2, 1, 2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 10, 1.07, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2),
+ (3, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3),
+ (4, 1, 4, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 20, 3.06, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4),
+ (5, 2, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 10, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5),
+ (6, 3, 1, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 15, 6.50, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 6),
+ (7, 11, 2, 1, util.VN_CURDATE(), 15, 1.30, 0, util.VN_CURDATE(), 7),
+ (8, 11, 4, 1, util.VN_CURDATE(), 10, 3.26, 0, util.VN_CURDATE(), 8),
+ (9, 16, 1, 1, util.VN_CURDATE(), 5, 9.10, 0, util.VN_CURDATE(), 9),
+ (10, 16, 2, 1, util.VN_CURDATE(), 10, 1.07, 0, util.VN_CURDATE(), 10),
+ (11, 16, 1, 1, util.VN_CURDATE(), 2, 9.10, 0, util.VN_CURDATE(), 11),
+ (12, 16, 4, 1, util.VN_CURDATE(), 20, 3.06, 0, util.VN_CURDATE(), 12),
+ (13, 8, 2, 1, util.VN_CURDATE(), 15, 1.30, 0, util.VN_CURDATE(), 13),
+ (14, 8, 1, 1, util.VN_CURDATE(), 10, 9.28, 0, util.VN_CURDATE(), 14),
+ (15, 19, 1, 1, util.VN_CURDATE(), 10, 1.50, 0, util.VN_CURDATE(), 15),
+ (16, 20, 2, 1, util.VN_CURDATE(), 15, 1.30, 0, util.VN_CURDATE(), 16),
+ (17, 22, 2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 30, 2.30, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 17),
+ (18, 22, 4, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 20, 3.00, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 18),
+ (19, 4, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), 1, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), 19),
+ (20, 5, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), 1, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), 20),
+ (21, 6, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 9.10, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 21),
+ (22, 7, 1, 1, util.VN_CURDATE(), 1, 9.10, 0, util.VN_CURDATE(), 22),
+ (23, 9, 1, 1, util.VN_CURDATE(), 1, 9.10, 0, util.VN_CURDATE(), 23),
+ (24, 10, 1, 1, util.VN_CURDATE(), 1, 9.10, 0, util.VN_CURDATE(), 24),
+ (25, 12, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 25),
+ (26, 13, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 26),
+ (27, 14, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 27),
+ (28, 15, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 28),
+ (29, 17, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 29),
+ (30, 18, 4, 1, util.VN_CURDATE(), 20, 3.00, 0, util.VN_CURDATE(), 30);
INSERT INTO `hedera`.`orderRowComponent`(`rowFk`, `componentFk`, `price`)
- VALUES
- (1, 15, 0.58),
- (1, 23, 6.5),
- (1, 28, 20.72),
- (1, 29, -18.72),
- (1, 39, 0.02),
- (2, 15, 0.058),
- (2, 21, 0.002),
- (2, 28, 5.6),
- (2, 29, -4.6),
- (2, 39, 0.01),
- (3, 15, 0.58),
- (3, 23, 6.5),
- (3, 28, 20.72),
- (3, 29, -18.72),
- (3, 39, 0.02),
- (4, 15, 0.051),
- (4, 21, -0.001),
- (4, 28, 20.72),
- (4, 29, -19.72),
- (4, 37, 2),
- (4, 39, 0.01),
- (5, 15, 0.58),
- (5, 23, 6.5),
- (5, 28, 20.72),
- (5, 29, -18.72),
- (5, 39, 0.02),
- (6, 23, 6.5),
- (7, 15, 0.0114),
- (7, 28, 5.6),
- (7, 29, -4.6),
- (7, 39, 0.01),
- (8, 15, 0.0016),
- (8, 28, 20.72),
- (8, 29, -19.72),
- (8, 37, 2),
- (8, 39, 0.01),
- (9, 15, 0.58),
- (9, 23, 6.5),
- (9, 28, 20.72),
- (9, 29, -18.72),
- (9, 39, 0.02),
- (10, 15, 0.058),
- (10, 21, 0.002),
- (10, 28, 5.6),
- (10, 29, -4.6),
- (10, 39, 0.01),
- (11, 15, 0.58),
- (11, 23, 6.5),
- (11, 28, 20.72),
- (11, 29, -18.72),
- (11, 39, 0.02),
- (12, 15, 0.051),
- (12, 22, -0.001),
- (12, 28, 20.72),
- (12, 29, -19.72),
- (12, 37, 2),
- (12, 39, 0.01),
- (13, 15, 0.2899),
- (13, 28, 5.6),
- (13, 29, -4.6),
- (13, 39, 0.01),
- (14, 15, 0.58),
- (14, 23, 6.5),
- (14, 28, 20.72),
- (14, 29, -18.72),
- (14, 39, 0.02),
- (15, 15, 0.58),
- (15, 23, 6.5),
- (15, 28, 20.72),
- (15, 29, -18.72),
- (15, 39, 0.02),
- (16, 15, 0.058),
- (16, 21, 0.002),
- (16, 28, 5.6),
- (16, 29, -4.6),
- (16, 39, 0.01),
- (17, 15, 0.058),
- (17, 21, 0.002),
- (17, 28, 5.6),
- (17, 29, -4.6),
- (17, 39, 0.01),
- (18, 15, 0.051),
- (18, 22, -0.001),
- (18, 28, 20.72),
- (18, 29, -19.72),
- (18, 37, 2),
- (18, 39, 0.01),
- (19, 15, 0.58),
- (19, 23, 6.5),
- (19, 28, 20.72),
- (19, 29, -18.72),
- (19, 39, 0.02),
- (20, 15, 0.58),
- (20, 23, 6.5),
- (20, 28, 20.72),
- (20, 29, -18.72),
- (20, 39, 0.02),
- (21, 15, 0.58),
- (21, 23, 6.5),
- (21, 28, 20.72),
- (21, 29, -18.72),
- (21, 39, 0.02),
- (22, 15, 0.58),
- (22, 23, 6.5),
- (22, 28, 20.72),
- (22, 29, -18.72),
- (22, 39, 0.02),
- (23, 15, 0.58),
- (23, 23, 6.5),
- (23, 28, 20.72),
- (23, 29, -18.72),
- (23, 39, 0.02),
- (24, 15, 0.58),
- (24, 23, 6.5),
- (24, 28, 20.72),
- (24, 29, -18.72),
- (24, 39, 0.02),
- (25, 15, 0.051),
- (25, 22, -0.001),
- (25, 28, 20.72),
- (25, 29, -19.72),
- (25, 37, 2),
- (25, 39, 0.01),
- (26, 15, 0.051),
- (26, 22, -0.001),
- (26, 28, 20.72),
- (26, 29, -19.72),
- (26, 37, 2),
- (26, 39, 0.01),
- (27, 15, 0.051),
- (27, 22, -0.001),
- (27, 28, 20.72),
- (27, 29, -19.72),
- (27, 37, 2),
- (27, 39, 0.01),
- (28, 15, 0.051),
- (28, 22, -0.001),
- (28, 28, 20.72),
- (28, 29, -19.72),
- (28, 37, 2),
- (28, 39, 0.01),
- (29, 15, 0.051),
- (29, 22, -0.001),
- (29, 28, 20.72),
- (29, 29, -19.72),
- (29, 37, 2),
- (29, 39, 0.01),
- (30, 15, 0.051),
- (30, 22, -0.001),
- (30, 28, 20.72),
- (30, 29, -19.72),
- (30, 37, 2),
- (30, 39, 0.01);
+ VALUES
+ (1, 15, 0.58),
+ (1, 23, 6.5),
+ (1, 28, 20.72),
+ (1, 29, -18.72),
+ (1, 39, 0.02),
+ (2, 15, 0.058),
+ (2, 21, 0.002),
+ (2, 28, 5.6),
+ (2, 29, -4.6),
+ (2, 39, 0.01),
+ (3, 15, 0.58),
+ (3, 23, 6.5),
+ (3, 28, 20.72),
+ (3, 29, -18.72),
+ (3, 39, 0.02),
+ (4, 15, 0.051),
+ (4, 21, -0.001),
+ (4, 28, 20.72),
+ (4, 29, -19.72),
+ (4, 37, 2),
+ (4, 39, 0.01),
+ (5, 15, 0.58),
+ (5, 23, 6.5),
+ (5, 28, 20.72),
+ (5, 29, -18.72),
+ (5, 39, 0.02),
+ (6, 23, 6.5),
+ (7, 15, 0.0114),
+ (7, 28, 5.6),
+ (7, 29, -4.6),
+ (7, 39, 0.01),
+ (8, 15, 0.0016),
+ (8, 28, 20.72),
+ (8, 29, -19.72),
+ (8, 37, 2),
+ (8, 39, 0.01),
+ (9, 15, 0.58),
+ (9, 23, 6.5),
+ (9, 28, 20.72),
+ (9, 29, -18.72),
+ (9, 39, 0.02),
+ (10, 15, 0.058),
+ (10, 21, 0.002),
+ (10, 28, 5.6),
+ (10, 29, -4.6),
+ (10, 39, 0.01),
+ (11, 15, 0.58),
+ (11, 23, 6.5),
+ (11, 28, 20.72),
+ (11, 29, -18.72),
+ (11, 39, 0.02),
+ (12, 15, 0.051),
+ (12, 22, -0.001),
+ (12, 28, 20.72),
+ (12, 29, -19.72),
+ (12, 37, 2),
+ (12, 39, 0.01),
+ (13, 15, 0.2899),
+ (13, 28, 5.6),
+ (13, 29, -4.6),
+ (13, 39, 0.01),
+ (14, 15, 0.58),
+ (14, 23, 6.5),
+ (14, 28, 20.72),
+ (14, 29, -18.72),
+ (14, 39, 0.02),
+ (15, 15, 0.58),
+ (15, 23, 6.5),
+ (15, 28, 20.72),
+ (15, 29, -18.72),
+ (15, 39, 0.02),
+ (16, 15, 0.058),
+ (16, 21, 0.002),
+ (16, 28, 5.6),
+ (16, 29, -4.6),
+ (16, 39, 0.01),
+ (17, 15, 0.058),
+ (17, 21, 0.002),
+ (17, 28, 5.6),
+ (17, 29, -4.6),
+ (17, 39, 0.01),
+ (18, 15, 0.051),
+ (18, 22, -0.001),
+ (18, 28, 20.72),
+ (18, 29, -19.72),
+ (18, 37, 2),
+ (18, 39, 0.01),
+ (19, 15, 0.58),
+ (19, 23, 6.5),
+ (19, 28, 20.72),
+ (19, 29, -18.72),
+ (19, 39, 0.02),
+ (20, 15, 0.58),
+ (20, 23, 6.5),
+ (20, 28, 20.72),
+ (20, 29, -18.72),
+ (20, 39, 0.02),
+ (21, 15, 0.58),
+ (21, 23, 6.5),
+ (21, 28, 20.72),
+ (21, 29, -18.72),
+ (21, 39, 0.02),
+ (22, 15, 0.58),
+ (22, 23, 6.5),
+ (22, 28, 20.72),
+ (22, 29, -18.72),
+ (22, 39, 0.02),
+ (23, 15, 0.58),
+ (23, 23, 6.5),
+ (23, 28, 20.72),
+ (23, 29, -18.72),
+ (23, 39, 0.02),
+ (24, 15, 0.58),
+ (24, 23, 6.5),
+ (24, 28, 20.72),
+ (24, 29, -18.72),
+ (24, 39, 0.02),
+ (25, 15, 0.051),
+ (25, 22, -0.001),
+ (25, 28, 20.72),
+ (25, 29, -19.72),
+ (25, 37, 2),
+ (25, 39, 0.01),
+ (26, 15, 0.051),
+ (26, 22, -0.001),
+ (26, 28, 20.72),
+ (26, 29, -19.72),
+ (26, 37, 2),
+ (26, 39, 0.01),
+ (27, 15, 0.051),
+ (27, 22, -0.001),
+ (27, 28, 20.72),
+ (27, 29, -19.72),
+ (27, 37, 2),
+ (27, 39, 0.01),
+ (28, 15, 0.051),
+ (28, 22, -0.001),
+ (28, 28, 20.72),
+ (28, 29, -19.72),
+ (28, 37, 2),
+ (28, 39, 0.01),
+ (29, 15, 0.051),
+ (29, 22, -0.001),
+ (29, 28, 20.72),
+ (29, 29, -19.72),
+ (29, 37, 2),
+ (29, 39, 0.01),
+ (30, 15, 0.051),
+ (30, 22, -0.001),
+ (30, 28, 20.72),
+ (30, 29, -19.72),
+ (30, 37, 2),
+ (30, 39, 0.01);
INSERT INTO `hedera`.`visit`(`id`, `firstAgentFk`)
- VALUES
- (1, NULL),
- (2, NULL),
- (3, NULL),
- (4, NULL),
- (5, NULL),
- (6, NULL),
- (7, NULL),
- (8, NULL),
- (9, NULL),
- (10, NULL),
- (11, NULL);
+ VALUES
+ (1, NULL),
+ (2, NULL),
+ (3, NULL),
+ (4, NULL),
+ (5, NULL),
+ (6, NULL),
+ (7, NULL),
+ (8, NULL),
+ (9, NULL),
+ (10, NULL),
+ (11, NULL);
INSERT INTO `hedera`.`visitAgent`(`id`, `visitFk`)
- VALUES
- (1, 1),
- (2, 2),
- (3, 3),
- (4, 4),
- (5, 5),
- (6, 6),
- (7, 7),
- (8, 8),
- (9, 9),
- (10, 10),
- (11, 11);
+ VALUES
+ (1, 1),
+ (2, 2),
+ (3, 3),
+ (4, 4),
+ (5, 5),
+ (6, 6),
+ (7, 7),
+ (8, 8),
+ (9, 9),
+ (10, 10),
+ (11, 11);
INSERT INTO `hedera`.`visitAccess`(`id`, `agentFk`, `stamp`)
- VALUES
- (1, 1, util.VN_CURDATE()),
- (2, 2, util.VN_CURDATE()),
- (3, 3, util.VN_CURDATE()),
- (4, 4, util.VN_CURDATE()),
- (5, 5, util.VN_CURDATE()),
- (6, 6, util.VN_CURDATE()),
- (7, 7, util.VN_CURDATE()),
- (8, 8, util.VN_CURDATE()),
- (9, 9, util.VN_CURDATE()),
- (10, 10, util.VN_CURDATE()),
- (11, 11, util.VN_CURDATE());
+ VALUES
+ (1, 1, util.VN_CURDATE()),
+ (2, 2, util.VN_CURDATE()),
+ (3, 3, util.VN_CURDATE()),
+ (4, 4, util.VN_CURDATE()),
+ (5, 5, util.VN_CURDATE()),
+ (6, 6, util.VN_CURDATE()),
+ (7, 7, util.VN_CURDATE()),
+ (8, 8, util.VN_CURDATE()),
+ (9, 9, util.VN_CURDATE()),
+ (10, 10, util.VN_CURDATE()),
+ (11, 11, util.VN_CURDATE());
INSERT INTO `hedera`.`visitUser`(`id`, `accessFk`, `userFk`, `stamp`)
- VALUES
- (1, 1, 1101, util.VN_CURDATE()),
- (2, 2, 1101, util.VN_CURDATE()),
- (3, 3, 1101, util.VN_CURDATE()),
- (4, 4, 1102, util.VN_CURDATE()),
- (5, 5, 1102, util.VN_CURDATE()),
- (6, 6, 1102, util.VN_CURDATE()),
- (7, 7, 1103, util.VN_CURDATE()),
- (8, 8, 1103, util.VN_CURDATE()),
- (9, 9, 1103, util.VN_CURDATE()),
- (10, 10, 1102, DATE_SUB(util.VN_CURDATE(), INTERVAL 1 DAY)),
- (11, 11, 1103, DATE_SUB(util.VN_CURDATE(), INTERVAL 1 DAY));
+ VALUES
+ (1, 1, 1101, util.VN_CURDATE()),
+ (2, 2, 1101, util.VN_CURDATE()),
+ (3, 3, 1101, util.VN_CURDATE()),
+ (4, 4, 1102, util.VN_CURDATE()),
+ (5, 5, 1102, util.VN_CURDATE()),
+ (6, 6, 1102, util.VN_CURDATE()),
+ (7, 7, 1103, util.VN_CURDATE()),
+ (8, 8, 1103, util.VN_CURDATE()),
+ (9, 9, 1103, util.VN_CURDATE()),
+ (10, 10, 1102, DATE_SUB(util.VN_CURDATE(), INTERVAL 1 DAY)),
+ (11, 11, 1103, DATE_SUB(util.VN_CURDATE(), INTERVAL 1 DAY));
INSERT INTO `hedera`.`userSession`(`created`, `lastUpdate`, `ssid`, `data`, `userVisitFk`)
- VALUES
- (util.VN_CURDATE(), util.VN_CURDATE(), '121', 'data', 1),
- (util.VN_CURDATE(), util.VN_CURDATE(), '122', 'data', 2),
- (util.VN_CURDATE(), util.VN_CURDATE(), '123', 'data', 3),
- (util.VN_CURDATE(), util.VN_CURDATE(), '124', 'data', 4),
- (util.VN_CURDATE(), util.VN_CURDATE(), '125', 'data', 5),
- (util.VN_CURDATE(), util.VN_CURDATE(), '126', 'data', 6),
- (util.VN_CURDATE(), util.VN_CURDATE(), '127', 'data', 7),
- (util.VN_CURDATE(), util.VN_CURDATE(), '128', 'data', 8),
- (util.VN_CURDATE(), util.VN_CURDATE(), '129', 'data', 9);
+ VALUES
+ (util.VN_CURDATE(), util.VN_CURDATE(), '121', 'data', 1),
+ (util.VN_CURDATE(), util.VN_CURDATE(), '122', 'data', 2),
+ (util.VN_CURDATE(), util.VN_CURDATE(), '123', 'data', 3),
+ (util.VN_CURDATE(), util.VN_CURDATE(), '124', 'data', 4),
+ (util.VN_CURDATE(), util.VN_CURDATE(), '125', 'data', 5),
+ (util.VN_CURDATE(), util.VN_CURDATE(), '126', 'data', 6),
+ (util.VN_CURDATE(), util.VN_CURDATE(), '127', 'data', 7),
+ (util.VN_CURDATE(), util.VN_CURDATE(), '128', 'data', 8),
+ (util.VN_CURDATE(), util.VN_CURDATE(), '129', 'data', 9);
INSERT INTO `vn`.`clientContact`(`id`, `clientFk`, `name`, `phone`)
- VALUES
- (1, 1101, 'contact 1', 666777888),
- (2, 1101, 'contact 2', 111222333),
- (3, 1101, 'contact 3', 222333444),
- (4, 1102, 'contact 1', 876543219);
+ VALUES
+ (1, 1101, 'contact 1', 666777888),
+ (2, 1101, 'contact 2', 111222333),
+ (3, 1101, 'contact 3', 222333444),
+ (4, 1102, 'contact 1', 876543219);
INSERT INTO `vn`.`workerManaExcluded`(`workerFk`)
- VALUES
- (9);
+ VALUES
+ (9);
/*
- el mana de los trabajadores lo podemos poner a mano en la tabla si lo calculamos antes,
- pero si hazemos alguna modificacion en alguna tabla que utiliza para calcularlo ya no seria correcto
+el mana de los trabajadores lo podemos poner a mano en la tabla si lo calculamos antes,
+pero si hazemos alguna modificacion en alguna tabla que utiliza para calcularlo ya no seria correcto
- La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets
+La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets
*/
call vn.manaSpellersRequery(19);
call vn.manaSpellersRequery(18);
INSERT INTO `vn`.`clientSample`(`id`, `clientFk`, `typeFk`, `created`, `workerFk`, `userFk`, `companyFk`)
- VALUES
- (1, 1101, 1, util.VN_CURDATE(), 18, 18, 442),
- (2, 1101, 1, util.VN_CURDATE(), 18, 18, 442),
- (3, 1101, 2, util.VN_CURDATE(), 18, 18, 442),
- (4, 1102, 2, util.VN_CURDATE(), 18, 18, 567),
- (5, 1102, 3, util.VN_CURDATE(), 19, 19, 567);
+ VALUES
+ (1, 1101, 1, util.VN_CURDATE(), 18, 18, 442),
+ (2, 1101, 1, util.VN_CURDATE(), 18, 18, 442),
+ (3, 1101, 2, util.VN_CURDATE(), 18, 18, 442),
+ (4, 1102, 2, util.VN_CURDATE(), 18, 18, 567),
+ (5, 1102, 3, util.VN_CURDATE(), 19, 19, 567);
INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`, `hasToNotify`)
- VALUES
- ( 1, 'pending', 'Pendiente', 1, 1, 0),
- ( 3, 'resolved', 'Resuelto', 72, 7, 0),
- ( 4, 'canceled', 'Anulado', 72, 6, 1),
- ( 5, 'incomplete', 'Incompleta', 1, 3, 1);
+ VALUES
+ ( 1, 'pending', 'Pendiente', 1, 1, 0),
+ ( 3, 'resolved', 'Resuelto', 72, 7, 0),
+ ( 4, 'canceled', 'Anulado', 72, 6, 1),
+ ( 5, 'incomplete', 'Incompleta', 1, 3, 1);
INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `ticketFk`)
- VALUES
- (1, util.VN_CURDATE(), 1, 1101, 19, 3, 0, util.VN_CURDATE(), 0, 11),
- (2, util.VN_CURDATE(), 4, 1101, 18, 3, 0, util.VN_CURDATE(), 1, 16),
- (3, util.VN_CURDATE(), 3, 1101, 19, 1, 1, util.VN_CURDATE(), 5, 7),
- (4, util.VN_CURDATE(), 3, 1104, 18, 5, 0, util.VN_CURDATE(), 10, 8);
+ VALUES
+ (1, util.VN_CURDATE(), 1, 1101, 19, 3, 0, util.VN_CURDATE(), 0, 11),
+ (2, util.VN_CURDATE(), 4, 1101, 18, 3, 0, util.VN_CURDATE(), 1, 16),
+ (3, util.VN_CURDATE(), 3, 1101, 19, 1, 1, util.VN_CURDATE(), 5, 7),
+ (4, util.VN_CURDATE(), 3, 1104, 18, 5, 0, util.VN_CURDATE(), 10, 8);
INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
- VALUES
- (1, 18, 'Cu nam labores lobortis definiebas, ei aliquyam salutatus persequeris quo, cum eu nemore fierent dissentiunt. Per vero dolor id, vide democritum scribentur eu vim, pri erroribus temporibus ex.', util.VN_CURDATE()),
- (2, 18, 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.', util.VN_CURDATE()),
- (3, 18, 'An vim commodo dolorem volutpat, cu expetendis voluptatum usu, et mutat consul adversarium his. His natum numquam legimus an, diam fabulas mei ut. Melius fabellas sadipscing vel id. Partem diceret mandamus mea ne, has te tempor nostrud. Aeque nostro eum no.', util.VN_CURDATE()),
- (4, 18, 'Wisi forensibus mnesarchum in cum. Per id impetus abhorreant, his no magna definiebas, inani rationibus in quo. Ut vidisse dolores est, ut quis nominavi mel. Ad pri quod apeirian concludaturque.', util.VN_CURDATE());
+ VALUES
+ (1, 18, 'Cu nam labores lobortis definiebas, ei aliquyam salutatus persequeris quo, cum eu nemore fierent dissentiunt. Per vero dolor id, vide democritum scribentur eu vim, pri erroribus temporibus ex.', util.VN_CURDATE()),
+ (2, 18, 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.', util.VN_CURDATE()),
+ (3, 18, 'An vim commodo dolorem volutpat, cu expetendis voluptatum usu, et mutat consul adversarium his. His natum numquam legimus an, diam fabulas mei ut. Melius fabellas sadipscing vel id. Partem diceret mandamus mea ne, has te tempor nostrud. Aeque nostro eum no.', util.VN_CURDATE()),
+ (4, 18, 'Wisi forensibus mnesarchum in cum. Per id impetus abhorreant, his no magna definiebas, inani rationibus in quo. Ut vidisse dolores est, ut quis nominavi mel. Ad pri quod apeirian concludaturque.', util.VN_CURDATE());
INSERT INTO `vn`.`claimBeginning`(`id`, `claimFk`, `saleFk`, `quantity`)
- VALUES
- (1, 1, 7, 5),
- (2, 2, 10, 10),
- (3, 3, 22, 1),
- (4, 4, 13, 5);
+ VALUES
+ (1, 1, 7, 5),
+ (2, 2, 10, 10),
+ (3, 3, 22, 1),
+ (4, 4, 13, 5);
INSERT INTO `vn`.`claimDestination`(`id`, `description`, `addressFk`)
- VALUES
- (1, 'Bueno', NULL),
- (2, 'Basura/Perd.', 12),
- (3, 'Confeccion', NULL),
- (4, 'Reclam.PRAG', 12),
- (5, 'Corregido', 11);
+ VALUES
+ (1, 'Bueno', 11),
+ (2, 'Basura/Perd.', NULL),
+ (3, 'Confeccion', NULL),
+ (4, 'Reclam.PRAG', NULL),
+ (5, 'Corregido', NULL);
INSERT INTO `vn`.`claimDevelopment`(`id`, `claimFk`, `claimResponsibleFk`, `workerFk`, `claimReasonFk`, `claimResultFk`, `claimRedeliveryFk`, `claimDestinationFk`)
- VALUES
- (1, 1, 1, 21, 7, 1, 2, 5),
- (2, 1, 2, 21, 7, 2, 2, 5),
- (3, 2, 7, 21, 9, 3, 2, 5),
- (4, 3, 7, 21, 15, 8, 2, 5),
- (5, 4, 7, 21, 7, 8, 2, 5);
+ VALUES
+ (1, 1, 1, 21, 7, 1, 2, 5),
+ (2, 1, 2, 21, 7, 2, 2, 5),
+ (3, 2, 7, 21, 9, 3, 2, 5),
+ (4, 3, 7, 21, 15, 8, 2, 5),
+ (5, 4, 7, 21, 7, 8, 2, 5);
INSERT INTO `vn`.`claimEnd`(`id`, `saleFk`, `claimFk`, `workerFk`, `claimDestinationFk`)
- VALUES
- (1, 31, 4, 21, 2),
- (2, 32, 3, 21, 3);
+ VALUES
+ (1, 31, 4, 21, 2),
+ (2, 32, 3, 21, 3);
-INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`, `monthsToRefund`, `minShipped`)
+INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`, `monthsToRefund`, `minShipped`,`daysToClaim`, `pickupDeliveryFk`, `warehouseFk`)
VALUES
- (1, 5, 4, '2016-10-01');
+ (1, 5, 4, '2016-10-01', 7, 8, 4);
INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`)
- VALUES
- (1101, 500, NULL, 0.00, 0.00, 1.00),
- (1102, 1000, 2.00, 0.01, 0.05, 1.00),
- (1103, 2000, 0.00, 0.00, 0.02, 1.00),
- (1104, 2500, 150.00, 0.02, 0.10, 1.00);
+ VALUES
+ (1101, 500, NULL, 0.00, 0.00, 1.00),
+ (1102, 1000, 2.00, 0.01, 0.05, 1.00),
+ (1103, 2000, 0.00, 0.00, 0.02, 1.00),
+ (1104, 2500, 150.00, 0.02, 0.10, 1.00);
INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
- VALUES
- (1, 18, 'update', 'Claim', '{"pickup":null}', '{"pickup":"agency"}', 1, NULL),
- (1, 18, 'update', 'ClaimObservation', '{}', '{"claimFk":1,"text":"Waiting for customer"}', 1, NULL),
- (1, 18, 'insert', 'ClaimBeginning', '{}', '{"claimFk":1,"saleFk":1,"quantity":10}', 1, NULL),
- (1, 18, 'insert', 'ClaimDms', '{}', '{"claimFk":1,"dmsFk":1}', 1, NULL);
+ VALUES
+ (1, 18, 'update', 'Claim', '{"pickup":null}', '{"pickup":"agency"}', 1, NULL),
+ (1, 18, 'update', 'ClaimObservation', '{}', '{"claimFk":1,"text":"Waiting for customer"}', 1, NULL),
+ (1, 18, 'insert', 'ClaimBeginning', '{}', '{"claimFk":1,"saleFk":1,"quantity":10}', 1, NULL),
+ (1, 18, 'insert', 'ClaimDms', '{}', '{"claimFk":1,"dmsFk":1}', 1, NULL);
INSERT INTO `hedera`.`tpvMerchant`(`id`, `description`, `companyFk`, `bankFk`, `secretKey`)
- VALUES
- (1, 'Arkham Bank', 442, 1, 'h12387193H10238'),
- (2, 'NewYork Bank', 442, 1, '7981ugsgd1hsdad');
+ VALUES
+ (1, 'Arkham Bank', 442, 1, 'h12387193H10238'),
+ (2, 'NewYork Bank', 442, 1, '7981ugsgd1hsdad');
INSERT INTO `hedera`.`tpvTransaction`(`id`,`merchantFk`, `clientFk`,`receiptFk`, `amount`, `response`, `errorCode`, `status`, `created`)
- VALUES
- (1, 1, 1101, NULL, 2000, NULL, 'SIS0042', 'ok', util.VN_CURDATE()),
- (2, 1, 1101, NULL, 1000, NULL, 'SIS0051', 'started', util.VN_CURDATE()),
- (3, 2, 1101, NULL, 7268, NULL, NULL, 'ok', util.VN_CURDATE()),
- (4, 2, 1101, NULL, 4698, NULL, NULL, 'started', util.VN_CURDATE()),
- (5, 1, 1104, NULL, 2000, NULL, 'SIS0043', 'ok', util.VN_CURDATE()),
- (6, 2, 1104, NULL, 4000, NULL, 'SIS0044', 'started', util.VN_CURDATE());
+ VALUES
+ (1, 1, 1101, NULL, 2000, NULL, 'SIS0042', 'ok', util.VN_CURDATE()),
+ (2, 1, 1101, NULL, 1000, NULL, 'SIS0051', 'started', util.VN_CURDATE()),
+ (3, 2, 1101, NULL, 7268, NULL, NULL, 'ok', util.VN_CURDATE()),
+ (4, 2, 1101, NULL, 4698, NULL, NULL, 'started', util.VN_CURDATE()),
+ (5, 1, 1104, NULL, 2000, NULL, 'SIS0043', 'ok', util.VN_CURDATE()),
+ (6, 2, 1104, NULL, 4000, NULL, 'SIS0044', 'started', util.VN_CURDATE());
INSERT INTO `vn`.`orderTicket`(`orderFk`, `ticketFk`)
- VALUES
- (1, 1),
- (2, 2),
- (3, 3),
- (4, 4),
- (5, 5),
- (6, 6),
- (7, 7),
- (8, 8),
- (9, 9),
- (10, 10),
- (11, 11),
- (12, 12),
- (13, 13),
- (14, 14),
- (15, 15),
- (16, 16),
- (17, 17),
- (18, 18),
- (19, 19),
- (20, 20),
- (21, 21),
- (22, 22);
+ VALUES
+ (1, 1),
+ (2, 2),
+ (3, 3),
+ (4, 4),
+ (5, 5),
+ (6, 6),
+ (7, 7),
+ (8, 8),
+ (9, 9),
+ (10, 10),
+ (11, 11),
+ (12, 12),
+ (13, 13),
+ (14, 14),
+ (15, 15),
+ (16, 16),
+ (17, 17),
+ (18, 18),
+ (19, 19),
+ (20, 20),
+ (21, 21),
+ (22, 22);
INSERT INTO `vn`.`userMultiConfig` (`userFk`, `warehouseFk`, `companyFk`)
- VALUES
- (1, 1, 69),
- (5, 1, 442),
- (9, 1, 442),
- (18, 3, 567);
+ VALUES
+ (1, 1, 69),
+ (5, 1, 442),
+ (9, 1, 442),
+ (18, 3, 567);
INSERT INTO `vn`.`receipt`(`id`, `invoiceFk`, `amountPaid`, `payed`, `workerFk`, `bankFk`, `clientFk`, `created`, `companyFk`, `isConciliate`)
- VALUES
- (1, 'Cobro web', 100.50, util.VN_CURDATE(), 9, 1, 1101, util.VN_CURDATE(), 442, 1),
- (2, 'Cobro web', 200.50, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), 9, 1, 1101, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), 442, 1),
- (3, 'Cobro en efectivo', 300.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), 9, 1, 1102, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), 442, 0),
- (4, 'Cobro en efectivo', 400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 1, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0),
- (5, 'Compensación', 400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 3, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0);
+ VALUES
+ (1, 'Cobro web', 100.50, util.VN_CURDATE(), 9, 1, 1101, util.VN_CURDATE(), 442, 1),
+ (2, 'Cobro web', 200.50, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), 9, 1, 1101, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), 442, 1),
+ (3, 'Cobro en efectivo', 300.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), 9, 1, 1102, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), 442, 0),
+ (4, 'Cobro en efectivo', 400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 1, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0),
+ (5, 'Compensación', 400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 3, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0);
INSERT INTO `vn`.`workerTeam`(`id`, `team`, `workerFk`)
- VALUES
- (1, 1, 9),
- (2, 2, 18),
- (3, 2, 19),
- (4, 3, 1101),
- (5, 3, 1102),
- (6, 4, 1103),
- (7, 4, 1104);
+ VALUES
+ (1, 1, 9),
+ (2, 2, 18),
+ (3, 2, 19),
+ (4, 3, 1101),
+ (5, 3, 1102),
+ (6, 4, 1103),
+ (7, 4, 1104);
INSERT INTO `vn`.`ticketRequest`(`id`, `description`, `requesterFk`, `attenderFk`, `quantity`, `itemFk`, `price`, `isOk`, `saleFk`, `ticketFk`, `created`)
- VALUES
- (1, 'Ranged weapon longbow 200cm', 18, 35, 5, 1, 9.10, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
- (2, 'Melee weapon combat first 15cm', 18, 35, 10, 2, 1.07, 0, NULL, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
- (3, 'Melee weapon heavy shield 100cm', 18, 35, 20, NULL, 3.06, NULL, NULL, 23, util.VN_CURDATE()),
- (4, 'Melee weapon combat first 15cm', 18, 35, 15, NULL, 1.30, NULL, NULL, 11, util.VN_CURDATE()),
- (5, 'Melee weapon combat first 15cm', 18, 35, 15, 4, 1.30, 0, NULL, 18, util.VN_CURDATE());
+ VALUES
+ (1, 'Ranged weapon longbow 200cm', 18, 35, 5, 1, 9.10, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
+ (2, 'Melee weapon combat first 15cm', 18, 35, 10, 2, 1.07, 0, NULL, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
+ (3, 'Melee weapon heavy shield 100cm', 18, 35, 20, NULL, 3.06, NULL, NULL, 23, util.VN_CURDATE()),
+ (4, 'Melee weapon combat first 15cm', 18, 35, 15, NULL, 1.30, NULL, NULL, 11, util.VN_CURDATE()),
+ (5, 'Melee weapon combat first 15cm', 18, 35, 15, 4, 1.30, 0, NULL, 18, util.VN_CURDATE());
INSERT INTO `vn`.`ticketServiceType`(`id`, `name`, `expenseFk`)
- VALUES
- (1, 'Porte Agencia', 7001000000),
- (2, 'Portes Retorno', 7001000000),
- (3, 'Porte Carry', 7001000000),
- (4, 'Cargo FITOSANITARIO', 4751000000),
- (5, 'Documentos', 2000000000);
+ VALUES
+ (1, 'Porte Agencia', 7001000000),
+ (2, 'Portes Retorno', 7001000000),
+ (3, 'Porte Carry', 7001000000),
+ (4, 'Cargo FITOSANITARIO', 4751000000),
+ (5, 'Documentos', 2000000000);
INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxClassFk`, `ticketFk`, `ticketServiceTypeFk`)
- VALUES
- (1, 'Documentos', 1, 2.00, 1, 1, 1),
- (2, 'Porte Agencia', 1, 10.00, 1, 2, 1),
- (3, 'Documentos', 1, 5.50, 1, 11, 1),
- (4, 'Documentos', 1, 2.00, 1, 9, 1),
- (5, 'Documentos', 1, 2.00, 1, 8, 1);
+ VALUES
+ (1, 'Documentos', 1, 2.00, 1, 1, 1),
+ (2, 'Porte Agencia', 1, 10.00, 1, 2, 1),
+ (3, 'Documentos', 1, 5.50, 1, 11, 1),
+ (4, 'Documentos', 1, 2.00, 1, 9, 1),
+ (5, 'Documentos', 1, 2.00, 1, 8, 1);
INSERT INTO `pbx`.`config` (id,defaultPrefix)
- VALUES (1,'0034');
+ VALUES (1,'0034');
INSERT IGNORE INTO `pbx`.`prefix` (country, prefix)
- VALUES
- ('es', '0034'),
- ('fr', '0033'),
- ('pt', '00351');
+ VALUES
+ ('es', '0034'),
+ ('fr', '0033'),
+ ('pt', '00351');
INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
- VALUES
- (1, 1010),
- (3, 1101),
- (5, 1102),
- (9, 1201);
+ VALUES
+ (1, 1010),
+ (3, 1101),
+ (5, 1102),
+ (9, 1201);
INSERT INTO `vn`.`professionalCategory` (`id`, `description`)
- VALUES
- (1, 'employee'),
- (2, 'florist');
+ VALUES
+ (1, 'employee'),
+ (2, 'florist');
INSERT INTO `vn`.`calendarType` (`id`, `description`, `hoursWeek`, `isPartial`)
- VALUES
- (1, 'General schedule', 40, 0);
+ VALUES
+ (1, 'General schedule', 40, 0);
INSERT INTO `vn`.`workerBusinessAgreement` (`id`, `name`, `monthHolidays`, `yearHours`, `started`, `ended`)
- VALUES(1, 'flowers', 2.5, 1830, '2001-01-01', NULL);
+ VALUES(1, 'flowers', 2.5, 1830, '2001-01-01', NULL);
DROP TEMPORARY TABLE IF EXISTS tmp.worker;
CREATE TEMPORARY TABLE tmp.worker
- (PRIMARY KEY (id))
- ENGINE = MEMORY
- SELECT w.id, w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)), '-12-25') as ended, CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+ (PRIMARY KEY (id))
+ ENGINE = MEMORY
+ SELECT w.id, w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)), '-12-25') as ended, CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
FROM `vn`.`worker` `w`;
INSERT INTO `vn`.`business`(`id`, `workerFk`, `companyCodeFk`, `started`, `ended`, `workerBusiness`, `reasonEndFk`, `notes`, `departmentFk`, `workerBusinessProfessionalCategoryFk`, `calendarTypeFk`, `isHourlyLabor`, `workerBusinessAgreementFk`, `workcenterFk`)
@@ -2091,610 +2125,610 @@ INSERT INTO `vn`.`business`(`id`, `workerFk`, `companyCodeFk`, `started`, `ended
DROP TEMPORARY TABLE IF EXISTS tmp.worker;
CREATE TEMPORARY TABLE tmp.worker
- (PRIMARY KEY (id))
- ENGINE = MEMORY
- SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-24') as ended, CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+ (PRIMARY KEY (id))
+ ENGINE = MEMORY
+ SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-24') as ended, CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
FROM `vn`.`worker` `w`
WHERE `w`.`id` = 1109;
INSERT INTO `vn`.`business` (`id`, `workerFk`, `companyCodeFk`, `started`, `ended`, `workerBusiness`, `reasonEndFk`, `notes`, `departmentFk`, `workerBusinessProfessionalCategoryFk`, `calendarTypeFk`, `isHourlyLabor`, `workerBusinessAgreementFk`, `workcenterFk`)
- SELECT * FROM tmp.worker;
+ SELECT * FROM tmp.worker;
DROP TEMPORARY TABLE IF EXISTS tmp.worker;
UPDATE `vn`.`business`
- SET `payedHolidays`= 8
- WHERE `id`= 1106;
+ SET `payedHolidays`= 8
+ WHERE `id`= 1106;
UPDATE `vn`.`business` b
- SET b.`workerBusinessProfessionalCategoryFk` = 2
- WHERE b.`workerFk` = 1110;
+ SET b.`workerBusinessProfessionalCategoryFk` = 2
+ WHERE b.`workerFk` = 1110;
UPDATE `vn`.`business` b
- SET b.`departmentFk` = 43
- WHERE b.id IN(18, 19);
+ SET b.`departmentFk` = 43
+ WHERE b.id IN(18, 19);
UPDATE `vn`.`business` b
- SET b.`started` = b.`started` - INTERVAL 100 DAY
- WHERE b.id = 1107;
+ SET b.`started` = b.`started` - INTERVAL 100 DAY
+ WHERE b.id = 1107;
INSERT INTO `vn`.`workCenterHoliday` (`workCenterFk`, `days`, `year`)
- VALUES
- ('1', '27.5', YEAR(util.VN_CURDATE())),
- ('5', '22', YEAR(util.VN_CURDATE())),
- ('1', '24.5', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))),
- ('5', '23', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)));
+ VALUES
+ ('1', '27.5', YEAR(util.VN_CURDATE())),
+ ('5', '22', YEAR(util.VN_CURDATE())),
+ ('1', '24.5', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))),
+ ('5', '23', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)));
INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`, `hasHolidayEntitlement`)
- VALUES
- (1, 'CONTRATO HOLANDA', 1, 0, 1),
- (100, 'INDEFINIDO A TIEMPO COMPLETO', 1, 1, 1),
- (109, 'CONVERSION DE TEMPORAL EN INDEFINIDO T.COMPLETO', 1, 1, 1);
+ VALUES
+ (1, 'CONTRATO HOLANDA', 1, 0, 1),
+ (100, 'INDEFINIDO A TIEMPO COMPLETO', 1, 1, 1),
+ (109, 'CONVERSION DE TEMPORAL EN INDEFINIDO T.COMPLETO', 1, 1, 1);
UPDATE `vn`.`business` b
- SET `rate` = 7,
- `workerBusinessTypeFk` = 100,
- `amount` = 900.50
- WHERE b.id = 1;
+ SET `rate` = 7,
+ `workerBusinessTypeFk` = 100,
+ `amount` = 900.50
+ WHERE b.id = 1;
UPDATE `vn`.`business` b
- SET `rate` = 7,
- `workerBusinessTypeFk` = 100,
- `amount` = 1263.03
- WHERE b.id = 1106;
+ SET `rate` = 7,
+ `workerBusinessTypeFk` = 100,
+ `amount` = 1263.03
+ WHERE b.id = 1106;
UPDATE `vn`.`business` b
- SET `rate` = 7,
- `workerBusinessTypeFk` = 100,
- `amount` = 2000
- WHERE b.id = 1107;
+ SET `rate` = 7,
+ `workerBusinessTypeFk` = 100,
+ `amount` = 2000
+ WHERE b.id = 1107;
UPDATE `vn`.`business` b
- SET `rate` = 7,
- `workerBusinessTypeFk` = 100,
- `amount` = 1500
- WHERE b.id = 1108;
+ SET `rate` = 7,
+ `workerBusinessTypeFk` = 100,
+ `amount` = 1500
+ WHERE b.id = 1108;
INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`)
- VALUES
- (1, 'Holidays', '#FF4444', 'holiday', 0, 0),
- (2, 'Leave of absence', '#C71585', 'absence', 0, 1),
- (6, 'Half holiday', '#E65F00', 'halfHoliday', 0, 0.5),
- (15, 'Half Paid Leave', '#5151c0', 'halfPaidLeave', 0, 1),
- (20, 'Furlough', '#97B92F', 'furlough', 1, 1),
- (21, 'Furlough half day', '#778899', 'halfFurlough', 0.5, 1);
+ VALUES
+ (1, 'Holidays', '#FF4444', 'holiday', 0, 0),
+ (2, 'Leave of absence', '#C71585', 'absence', 0, 1),
+ (6, 'Half holiday', '#E65F00', 'halfHoliday', 0, 0.5),
+ (15, 'Half Paid Leave', '#5151c0', 'halfPaidLeave', 0, 1),
+ (20, 'Furlough', '#97B92F', 'furlough', 1, 1),
+ (21, 'Furlough half day', '#778899', 'halfFurlough', 0.5, 1);
INSERT INTO `vn`.`calendar` (`businessFk`, `dayOffTypeFk`, `dated`)
- VALUES
- (1, 6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)),
- (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)),
- (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 11 DAY, util.VN_CURDATE() + INTERVAL 11 DAY)),
- (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 12 DAY, util.VN_CURDATE() + INTERVAL 12 DAY)),
- (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 20 DAY, util.VN_CURDATE() + INTERVAL 20 DAY)),
- (1106, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 13 DAY, util.VN_CURDATE() + INTERVAL 8 DAY)),
- (1106, 1, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 14 DAY, util.VN_CURDATE() + INTERVAL 9 DAY)),
- (1106, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 15 DAY, util.VN_CURDATE() + INTERVAL 7 DAY)),
- (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)),
- (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 11 DAY, util.VN_CURDATE() + INTERVAL 11 DAY)),
- (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 12 DAY, util.VN_CURDATE() + INTERVAL 12 DAY)),
- (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 20 DAY, util.VN_CURDATE() + INTERVAL 20 DAY)),
- (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 13 DAY, util.VN_CURDATE() + INTERVAL 8 DAY)),
- (1107, 1, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 14 DAY, util.VN_CURDATE() + INTERVAL 9 DAY)),
- (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 15 DAY, util.VN_CURDATE() + INTERVAL 7 DAY)),
- (1107, 2, util.VN_CURDATE() - INTERVAL 16 DAY);
+ VALUES
+ (1, 6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)),
+ (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)),
+ (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 11 DAY, util.VN_CURDATE() + INTERVAL 11 DAY)),
+ (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 12 DAY, util.VN_CURDATE() + INTERVAL 12 DAY)),
+ (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 20 DAY, util.VN_CURDATE() + INTERVAL 20 DAY)),
+ (1106, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 13 DAY, util.VN_CURDATE() + INTERVAL 8 DAY)),
+ (1106, 1, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 14 DAY, util.VN_CURDATE() + INTERVAL 9 DAY)),
+ (1106, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 15 DAY, util.VN_CURDATE() + INTERVAL 7 DAY)),
+ (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)),
+ (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 11 DAY, util.VN_CURDATE() + INTERVAL 11 DAY)),
+ (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 12 DAY, util.VN_CURDATE() + INTERVAL 12 DAY)),
+ (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 20 DAY, util.VN_CURDATE() + INTERVAL 20 DAY)),
+ (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 13 DAY, util.VN_CURDATE() + INTERVAL 8 DAY)),
+ (1107, 1, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 14 DAY, util.VN_CURDATE() + INTERVAL 9 DAY)),
+ (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 15 DAY, util.VN_CURDATE() + INTERVAL 7 DAY)),
+ (1107, 2, util.VN_CURDATE() - INTERVAL 16 DAY);
INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`, `apiKey`)
- VALUES
- ('1', 'https://api.gateway360.com/api/3.0/sms/send', 'Verdnatura', '5715476da95b46d686a5a255e6459523');
+ VALUES
+ ('1', 'https://api.gateway360.com/api/3.0/sms/send', 'Verdnatura', '5715476da95b46d686a5a255e6459523');
INSERT INTO `vn`.`sharingClient`(`id`, `workerFk`, `started`, `ended`, `clientFk`)
- VALUES
- (1, 19, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 1101),
- (2, 18, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 1106);
+ VALUES
+ (1, 19, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 1101),
+ (2, 18, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 1106);
INSERT INTO `vn`.`sharingCart`(`id`, `workerFk`, `started`, `ended`, `workerSubstitute`, `created`)
- VALUES
- (1, 18, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 19, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY));
+ VALUES
+ (1, 18, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 19, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY));
CALL `vn`.zoneGeo_calcTree(); -- this is an auto calculate for table vn.zoneGeo, columns: path,lft,rgt,depth,sons
INSERT INTO `vn`.`zoneIncluded` (`zoneFk`, `geoFk`, `isIncluded`)
- VALUES
- (1, 3, 0),
- (1, 4, 0),
- (1, 5, 0),
- (1, 1, 1),
- (2, 3, 0),
- (2, 4, 0),
- (2, 5, 0),
- (2, 1, 1),
- (3, 3, 0),
- (3, 4, 0),
- (3, 5, 0),
- (3, 1, 1),
- (4, 3, 0),
- (4, 4, 0),
- (4, 5, 0),
- (4, 1, 1),
- (5, 3, 1),
- (5, 4, 0),
- (5, 5, 1),
- (5, 1, 1),
- (6, 3, 1),
- (6, 4, 0),
- (6, 5, 1),
- (6, 1, 1),
- (7, 3, 0),
- (7, 4, 0),
- (7, 5, 0),
- (7, 1, 1),
- (8, 3, 0),
- (8, 4, 0),
- (8, 5, 0),
- (8, 1, 1),
- (9, 7, 1),
- (10, 14, 1);
+ VALUES
+ (1, 3, 0),
+ (1, 4, 0),
+ (1, 5, 0),
+ (1, 1, 1),
+ (2, 3, 0),
+ (2, 4, 0),
+ (2, 5, 0),
+ (2, 1, 1),
+ (3, 3, 0),
+ (3, 4, 0),
+ (3, 5, 0),
+ (3, 1, 1),
+ (4, 3, 0),
+ (4, 4, 0),
+ (4, 5, 0),
+ (4, 1, 1),
+ (5, 3, 1),
+ (5, 4, 0),
+ (5, 5, 1),
+ (5, 1, 1),
+ (6, 3, 1),
+ (6, 4, 0),
+ (6, 5, 1),
+ (6, 1, 1),
+ (7, 3, 0),
+ (7, 4, 0),
+ (7, 5, 0),
+ (7, 1, 1),
+ (8, 3, 0),
+ (8, 4, 0),
+ (8, 5, 0),
+ (8, 1, 1),
+ (9, 7, 1),
+ (10, 14, 1);
INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `dated`)
- VALUES
- (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=2, 2, 9) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=3, 3, 10) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=4, 4, 11) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=5, 5, 12) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=6, 6, 13) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=2, 2, 9) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=3, 3, 10) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=4, 4, 11) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=5, 5, 12) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=6, 6, 13) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
- (3, 'day', util.VN_CURDATE()),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +7 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +8 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +9 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +10 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +11 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +12 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +13 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +14 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +16 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +17 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +18 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +19 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +20 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +21 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +22 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +23 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +24 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +25 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +26 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +27 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +28 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +29 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +30 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +31 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +32 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +33 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +34 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +35 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +36 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +37 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +38 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +39 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +40 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +41 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +42 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +43 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +44 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +45 DAY)),
- (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +46 DAY)),
- (4, 'day', util.VN_CURDATE()),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +7 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +8 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +9 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +10 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +11 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +12 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +13 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +14 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +16 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +17 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +18 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +19 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +20 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +21 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +22 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +23 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +24 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +25 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +26 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +27 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +28 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +29 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +30 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +31 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +32 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +33 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +34 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +35 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +36 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +37 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +38 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +39 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +40 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +41 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +42 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +43 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +44 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +45 DAY)),
- (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +46 DAY)),
- (5, 'day', util.VN_CURDATE()),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +7 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +8 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +9 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +10 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +11 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +12 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +13 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +14 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +16 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +17 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +18 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +19 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +20 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +21 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +22 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +23 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +24 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +25 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +26 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +27 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +28 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +29 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +30 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +31 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +32 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +33 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +34 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +35 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +36 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +37 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +38 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +39 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +40 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +41 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +42 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +43 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +44 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +45 DAY)),
- (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +46 DAY)),
- (6, 'day', util.VN_CURDATE()),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +7 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +8 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +9 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +10 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +11 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +12 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +13 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +14 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +16 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +17 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +18 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +19 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +20 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +21 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +22 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +23 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +24 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +25 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +26 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +27 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +28 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +29 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +30 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +31 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +32 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +33 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +34 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +35 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +36 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +37 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +38 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +39 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +40 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +41 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +42 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +43 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +44 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +45 DAY)),
- (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +46 DAY)),
- (7, 'day', util.VN_CURDATE()),
- (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
- (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
- (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
- (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
- (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
- (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY));
+ VALUES
+ (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=2, 2, 9) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=3, 3, 10) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=4, 4, 11) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=5, 5, 12) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (1, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=6, 6, 13) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=2, 2, 9) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=3, 3, 10) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=4, 4, 11) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=5, 5, 12) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (2, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=6, 6, 13) - DAYOFWEEK(util.VN_CURDATE())) DAY)),
+ (3, 'day', util.VN_CURDATE()),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +7 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +8 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +9 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +10 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +11 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +12 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +13 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +14 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +16 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +17 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +18 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +19 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +20 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +21 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +22 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +23 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +24 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +25 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +26 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +27 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +28 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +29 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +30 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +31 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +32 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +33 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +34 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +35 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +36 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +37 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +38 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +39 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +40 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +41 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +42 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +43 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +44 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +45 DAY)),
+ (3, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +46 DAY)),
+ (4, 'day', util.VN_CURDATE()),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +7 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +8 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +9 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +10 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +11 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +12 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +13 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +14 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +16 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +17 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +18 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +19 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +20 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +21 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +22 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +23 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +24 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +25 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +26 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +27 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +28 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +29 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +30 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +31 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +32 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +33 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +34 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +35 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +36 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +37 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +38 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +39 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +40 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +41 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +42 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +43 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +44 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +45 DAY)),
+ (4, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +46 DAY)),
+ (5, 'day', util.VN_CURDATE()),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +7 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +8 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +9 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +10 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +11 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +12 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +13 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +14 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +16 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +17 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +18 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +19 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +20 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +21 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +22 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +23 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +24 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +25 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +26 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +27 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +28 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +29 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +30 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +31 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +32 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +33 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +34 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +35 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +36 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +37 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +38 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +39 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +40 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +41 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +42 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +43 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +44 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +45 DAY)),
+ (5, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +46 DAY)),
+ (6, 'day', util.VN_CURDATE()),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +7 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +8 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +9 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +10 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +11 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +12 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +13 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +14 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +16 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +17 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +18 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +19 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +20 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +21 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +22 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +23 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +24 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +25 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +26 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +27 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +28 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +29 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +30 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +31 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +32 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +33 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +34 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +35 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +36 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +37 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +38 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +39 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +40 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +41 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +42 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +43 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +44 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +45 DAY)),
+ (6, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +46 DAY)),
+ (7, 'day', util.VN_CURDATE()),
+ (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
+ (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY)),
+ (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +3 DAY)),
+ (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +4 DAY)),
+ (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY)),
+ (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY));
INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `weekDays`)
- VALUES
- (8, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'),
- (10, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun');
+ VALUES
+ (8, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'),
+ (10, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun');
INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`, `weekDays`)
- VALUES
- (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR), 'mon'),
- (9, 'range', util.VN_CURDATE(), NULL, 'tue'),
- (9, 'range', NULL, util.VN_CURDATE(), 'wed');
+ VALUES
+ (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR), 'mon'),
+ (9, 'range', util.VN_CURDATE(), NULL, 'tue'),
+ (9, 'range', NULL, util.VN_CURDATE(), 'wed');
INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `isSendMail`)
- VALUES
- (1106, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in', 0),
- (1106, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle', 0),
- (1106, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 0),
- (1106, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out', 0),
- (1107, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in', 1),
- (1107, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle', 1),
- (1107, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 1),
- (1107, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out', 1);
+ VALUES
+ (1106, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in', 0),
+ (1106, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle', 0),
+ (1106, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 0),
+ (1106, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out', 0),
+ (1107, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in', 1),
+ (1107, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle', 1),
+ (1107, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 1),
+ (1107, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out', 1);
INSERT INTO `vn`.`dmsType`
(`id`, `name`, `readRoleFk`, `writeRoleFk`, `code`)
- VALUES
- (1, 'Facturas Recibidas', 1, 1, 'invoiceIn'),
- (2, 'Doc oficial', NULL, NULL, 'officialDoc'),
- (3, 'Laboral', 37, 37, 'hhrrData'),
- (4, 'Albaranes recibidos', NULL, NULL, 'deliveryNote'),
- (5, 'Otros', 1, 1, 'miscellaneous'),
- (6, 'Pruebas', NULL, NULL, 'tests'),
- (7, 'IAE Clientes', 1, 1, 'economicActivitiesTax'),
- (8, 'Fiscal', NULL, NULL, 'fiscal'),
- (9, 'Vehiculos', NULL, NULL, 'vehicles'),
- (10, 'Plantillas', NULL, NULL, 'templates'),
- (11, 'Contratos', NULL, NULL, 'contracts'),
- (12, 'ley de pagos', 1, 1, 'paymentsLaw'),
- (13, 'Basura', 1, 1, 'trash'),
- (14, 'Ticket', 1, 1, 'ticket'),
- (15, 'Presupuestos', NULL, NULL, 'budgets'),
- (16, 'Logistica', NULL, NULL, 'logistics'),
- (17, 'cmr', 1, 1, 'cmr'),
- (18, 'dua', NULL, NULL, 'dua'),
- (19, 'inmovilizado', NULL, NULL, 'fixedAssets'),
- (20, 'Reclamación', 1, 1, 'claim'),
- (21, 'Entrada', 1, 1, 'entry'),
+ VALUES
+ (1, 'Facturas Recibidas', 1, 1, 'invoiceIn'),
+ (2, 'Doc oficial', NULL, NULL, 'officialDoc'),
+ (3, 'Laboral', 37, 37, 'hhrrData'),
+ (4, 'Albaranes recibidos', NULL, NULL, 'deliveryNote'),
+ (5, 'Otros', 1, 1, 'miscellaneous'),
+ (6, 'Pruebas', NULL, NULL, 'tests'),
+ (7, 'IAE Clientes', 1, 1, 'economicActivitiesTax'),
+ (8, 'Fiscal', NULL, NULL, 'fiscal'),
+ (9, 'Vehiculos', NULL, NULL, 'vehicles'),
+ (10, 'Plantillas', NULL, NULL, 'templates'),
+ (11, 'Contratos', NULL, NULL, 'contracts'),
+ (12, 'ley de pagos', 1, 1, 'paymentsLaw'),
+ (13, 'Basura', 1, 1, 'trash'),
+ (14, 'Ticket', 1, 1, 'ticket'),
+ (15, 'Presupuestos', NULL, NULL, 'budgets'),
+ (16, 'Logistica', NULL, NULL, 'logistics'),
+ (17, 'cmr', 1, 1, 'cmr'),
+ (18, 'dua', NULL, NULL, 'dua'),
+ (19, 'inmovilizado', NULL, NULL, 'fixedAssets'),
+ (20, 'Reclamación', 1, 1, 'claim'),
+ (21, 'Entrada', 1, 1, 'entry'),
(22, 'Proveedor', 1, 1, 'supplier'),
(23, 'Termografos', 35, 35, 'thermograph'),
(24, 'Sello de calidad', 1, 1, 'qualitySeal');
INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
- VALUES
- (1, 14, '1.txt', 'text/plain', 5, 1, 442, NULL, FALSE, 'Ticket:11', 'Ticket:11 dms for the ticket', util.VN_CURDATE()),
- (2, 5, '2.txt', 'text/plain', 5, 1, 442, 1, TRUE, 'Client:104', 'Client:104 dms for the client', util.VN_CURDATE()),
- (3, 5, '3.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'Client: 104', 'Client:104 readme', util.VN_CURDATE()),
- (4, 3, '4.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'Worker: 106', 'Worker:106 readme', util.VN_CURDATE()),
- (5, 23, '5.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'travel: 1', 'dmsForThermograph', util.VN_CURDATE()),
- (6, 5, '6.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'NotExists', 'DoesNotExists', util.VN_CURDATE()),
- (7, 20, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1', 'TICKET ID DEL CLIENTE BRUCE WAYNE ID 1101', util.VN_CURDATE()),
- (8, 20, '8.mp4', 'video/mp4', 9, 1, 442, NULL, FALSE, '1', 'TICKET ID DEL CLIENTE BRUCE WAYNE ID 1101', util.VN_CURDATE()),
- (9, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1', 'ENTRADA ID 1', util.VN_CURDATE()),
+ VALUES
+ (1, 14, '1.txt', 'text/plain', 5, 1, 442, NULL, FALSE, 'Ticket:11', 'Ticket:11 dms for the ticket', util.VN_CURDATE()),
+ (2, 5, '2.txt', 'text/plain', 5, 1, 442, 1, TRUE, 'Client:104', 'Client:104 dms for the client', util.VN_CURDATE()),
+ (3, 5, '3.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'Client: 104', 'Client:104 readme', util.VN_CURDATE()),
+ (4, 3, '4.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'Worker: 106', 'Worker:106 readme', util.VN_CURDATE()),
+ (5, 23, '5.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'travel: 1', 'dmsForThermograph', util.VN_CURDATE()),
+ (6, 5, '6.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'NotExists', 'DoesNotExists', util.VN_CURDATE()),
+ (7, 20, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1', 'TICKET ID DEL CLIENTE BRUCE WAYNE ID 1101', util.VN_CURDATE()),
+ (8, 20, '8.mp4', 'video/mp4', 9, 1, 442, NULL, FALSE, '1', 'TICKET ID DEL CLIENTE BRUCE WAYNE ID 1101', util.VN_CURDATE()),
+ (9, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1', 'ENTRADA ID 1', util.VN_CURDATE()),
(10, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1', 'ENTRADA DE PRUEBA', util.VN_CURDATE());
INSERT INTO `vn`.`claimDms`(`claimFk`, `dmsFk`)
- VALUES
- (1, 7),
- (1, 8);
+ VALUES
+ (1, 7),
+ (1, 8);
INSERT INTO `vn`.`ticketDms`(`ticketFk`, `dmsFk`)
- VALUES
- (11, 1);
+ VALUES
+ (11, 1);
INSERT INTO `vn`.`clientDms`(`clientFk`, `dmsFk`)
- VALUES
- (1104, 2),
- (1104, 3);
+ VALUES
+ (1104, 2),
+ (1104, 3);
INSERT INTO `vn`.`workerDms`(`id`, `workerFk`, `dmsFk`,`isReadableByWorker`)
- VALUES
- (1, 1106, 4, TRUE),
- (2, 1107, 3, FALSE);
+ VALUES
+ (1, 1106, 4, TRUE),
+ (2, 1107, 3, FALSE);
INSERT INTO `vn`.`device` (`sn`, `model`, `userFk`)
- VALUES
- ('aaa', 'android', '9');
+ VALUES
+ ('aaa', 'android', '9');
INSERT INTO `vn`.`queuePriority`(`id`, `priority`, `code`)
- VALUES
- (1, 'Alta', 'high'),
- (2, 'Normal', 'normal'),
- (3, 'Baja', 'low');
+ VALUES
+ (1, 'Alta', 'high'),
+ (2, 'Normal', 'normal'),
+ (3, 'Baja', 'low');
INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');
INSERT INTO `vn`.`thermograph`(`id`, `model`)
- VALUES
- ('TMM190901395', 'TEMPMATE'),
- ('TL.BBA85422', 'TL30'),
- ('TZ1905012010', 'DISPOSABLE'),
- ('138350-0', 'DISPOSABLE');
+ VALUES
+ ('TMM190901395', 'TEMPMATE'),
+ ('TL.BBA85422', 'TL30'),
+ ('TZ1905012010', 'DISPOSABLE'),
+ ('138350-0', 'DISPOSABLE');
INSERT INTO `vn`.`travelThermograph`
(`thermographFk`, `created`, `warehouseFk`, `travelFk`, `temperatureFk`, `minTemperature`, `maxTemperature`, `result`, `dmsFk`)
- VALUES
- ('TMM190901395', util.VN_CURDATE(), 1, 1, 'WARM', NULL, NULL, 'Ok', NULL),
- ('TL.BBA85422', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 2, 'COOL', NULL, NULL, 'Ok', NULL),
- ('TL.BBA85422', util.VN_CURDATE(), 2, 1, 'COOL', NULL, NULL, 'can not read the temperature', NULL),
- ('TZ1905012010', util.VN_CURDATE(), 1, 1, 'WARM', NULL, NULL, 'Temperature in range', 5),
- ('138350-0', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 'WARM', 2, 12, NULL, 5),
- ('138350-0', util.VN_CURDATE(), 1, NULL, 'COOL', NULL, NULL, NULL, NULL);
+ VALUES
+ ('TMM190901395', util.VN_CURDATE(), 1, 1, 'WARM', NULL, NULL, 'Ok', NULL),
+ ('TL.BBA85422', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 2, 'COOL', NULL, NULL, 'Ok', NULL),
+ ('TL.BBA85422', util.VN_CURDATE(), 2, 1, 'COOL', NULL, NULL, 'can not read the temperature', NULL),
+ ('TZ1905012010', util.VN_CURDATE(), 1, 1, 'WARM', NULL, NULL, 'Temperature in range', 5),
+ ('138350-0', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 'WARM', 2, 12, NULL, 5),
+ ('138350-0', util.VN_CURDATE(), 1, NULL, 'COOL', NULL, NULL, NULL, NULL);
REPLACE INTO `vn`.`incoterms`(`code`, `name`)
- VALUES
- ('FAS', 'Free Alongside Ship');
+ VALUES
+ ('FAS', 'Free Alongside Ship');
REPLACE INTO `vn`.`customsAgent`(`id`, `fiscalName`, `street`, `nif`, `phone`, `email`)
- VALUES
- (1, 'Agent one', '1007 Mountain Drive, Gotham', 'N1111111111', '111111111', 'agentone@gotham.com'),
- (2, 'Agent two', '1007 Mountain Drive, Gotham', 'N2222222222', '222222222', 'agenttwo@gotham.com');
+ VALUES
+ (1, 'Agent one', '1007 Mountain Drive, Gotham', 'N1111111111', '111111111', 'agentone@gotham.com'),
+ (2, 'Agent two', '1007 Mountain Drive, Gotham', 'N2222222222', '222222222', 'agenttwo@gotham.com');
INSERT INTO `vn`.`tablet`(`uuid`, `name`, `place`, `macwifi`)
- VALUES
- ('1', 'TEST', 'ON THE FIXTURES', '0'),
- ('2', 'DEV', 'OTHER TABLET', '0');
+ VALUES
+ ('1', 'TEST', 'ON THE FIXTURES', '0'),
+ ('2', 'DEV', 'OTHER TABLET', '0');
INSERT INTO `vn`.`tabletDepartment`(`tabletFk`, `departmentFk`)
- VALUES
- (1, 23),
- (2, 1);
+ VALUES
+ (1, 23),
+ (2, 1);
INSERT INTO `vn`.`campaign`(`code`, `dated`)
- VALUES
- ('valentinesDay', CONCAT(YEAR(util.VN_CURDATE()), '-02-14')),
- ('valentinesDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-02-14')),
- ('valentinesDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-02-14')),
- ('valentinesDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -3 YEAR)), '-02-14')),
- ('mothersDay', CONCAT(YEAR(util.VN_CURDATE()), '-05-05')),
- ('mothersDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-05-05')),
- ('mothersDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-05-05')),
- ('mothersDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -3 YEAR)), '-05-05')),
- ('allSaints', CONCAT(YEAR(util.VN_CURDATE()), '-11-01')),
- ('allSaints', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-11-01')),
- ('allSaints', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-11-01')),
- ('allSaints', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -3 YEAR)), '-11-01'));
+ VALUES
+ ('valentinesDay', CONCAT(YEAR(util.VN_CURDATE()), '-02-14')),
+ ('valentinesDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-02-14')),
+ ('valentinesDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-02-14')),
+ ('valentinesDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -3 YEAR)), '-02-14')),
+ ('mothersDay', CONCAT(YEAR(util.VN_CURDATE()), '-05-05')),
+ ('mothersDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-05-05')),
+ ('mothersDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-05-05')),
+ ('mothersDay', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -3 YEAR)), '-05-05')),
+ ('allSaints', CONCAT(YEAR(util.VN_CURDATE()), '-11-01')),
+ ('allSaints', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-11-01')),
+ ('allSaints', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-11-01')),
+ ('allSaints', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -3 YEAR)), '-11-01'));
INSERT INTO `hedera`.`imageCollectionSize`(`id`, `collectionFk`,`width`, `height`)
- VALUES
- (1, 4, 160, 160);
+ VALUES
+ (1, 4, 160, 160);
INSERT INTO `vn`.`rateConfig`(`id`, `rate0`, `rate1`, `rate2`, `rate3`)
- VALUES
- (1, 36, 31, 25, 21);
+ VALUES
+ (1, 36, 31, 25, 21);
INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate3`)
- VALUES
- (DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), 1, 10, 15, 20, 25),
- (util.VN_CURDATE(), 1, 12, 17, 22, 27);
+ VALUES
+ (DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), 1, 10, 15, 20, 25),
+ (util.VN_CURDATE(), 1, 12, 17, 22, 27);
INSERT INTO `vn`.`dua` (id, code, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk)
- VALUES
- (1, '19ES0028013A481523', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95, 442),
- (2, '21ES00280136115760', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20, 442),
- (3, '19ES00280131956004', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 3, 14268.50, 442),
- (4, '19ES00280131955995', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 8242.50, 442),
- (5, '19ES00280132022070', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 10012.49, 442),
- (6, '19ES00280132032308', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 19914.25, 442),
- (7, '19ES00280132025489', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1934.06, 442),
- (8, '19ES00280132025490', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 3618.52, 442),
- (9, '19ES00280132025491', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 7126.23, 442),
- (10, '19ES00280132025492', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 4631.45, 442);
+ VALUES
+ (1, '19ES0028013A481523', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95, 442),
+ (2, '21ES00280136115760', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20, 442),
+ (3, '19ES00280131956004', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 3, 14268.50, 442),
+ (4, '19ES00280131955995', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 8242.50, 442),
+ (5, '19ES00280132022070', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 10012.49, 442),
+ (6, '19ES00280132032308', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 19914.25, 442),
+ (7, '19ES00280132025489', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1934.06, 442),
+ (8, '19ES00280132025490', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 3618.52, 442),
+ (9, '19ES00280132025491', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 7126.23, 442),
+ (10, '19ES00280132025492', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 4631.45, 442);
INSERT INTO `vn`.`duaEntry` (`duaFk`, `entryFk`, `value`, `customsValue`, `euroValue`)
- VALUES
- (1, 1, 1.00, 1.00, 1.00),
- (2, 2, 1.00, 1.00, 1.00),
- (3, 3, 1.00, 1.00, 1.00),
- (4, 4, 1.00, 1.00, 1.00),
- (5, 5, 1.00, 1.00, 1.00),
- (6, 6, 1.00, 1.00, 1.00),
- (7, 7, 1.00, 1.00, 1.00),
- (8, 8, 1.00, 1.00, 1.00);
+ VALUES
+ (1, 1, 1.00, 1.00, 1.00),
+ (2, 2, 1.00, 1.00, 1.00),
+ (3, 3, 1.00, 1.00, 1.00),
+ (4, 4, 1.00, 1.00, 1.00),
+ (5, 5, 1.00, 1.00, 1.00),
+ (6, 6, 1.00, 1.00, 1.00),
+ (7, 7, 1.00, 1.00, 1.00),
+ (8, 8, 1.00, 1.00, 1.00);
REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`, `bookEntried`)
- VALUES
- (1, 1001, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1234, 0, 442, 1,util.VN_CURDATE()),
- (2, 1002, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 0, 442, 1,util.VN_CURDATE()),
- (3, 1003, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1236, 0, 442, 1,util.VN_CURDATE()),
- (4, 1004, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1237, 0, 442, 1,util.VN_CURDATE()),
- (5, 1005, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 0, 442, 1,util.VN_CURDATE()),
- (6, 1006, 'R', 2, util.VN_CURDATE(), util.VN_CURDATE(), 1239, 0, 442, 1,util.VN_CURDATE()),
- (7, 1007, 'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 0, 442, 1,util.VN_CURDATE()),
- (8, 1008, 'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 0, 442, 1,util.VN_CURDATE()),
- (9, 1009, 'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1,util.VN_CURDATE()),
- (10, 1010, 'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1,util.VN_CURDATE());
+ VALUES
+ (1, 1001, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1234, 0, 442, 1,util.VN_CURDATE()),
+ (2, 1002, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 0, 442, 1,util.VN_CURDATE()),
+ (3, 1003, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1236, 0, 442, 1,util.VN_CURDATE()),
+ (4, 1004, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1237, 0, 442, 1,util.VN_CURDATE()),
+ (5, 1005, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 0, 442, 1,util.VN_CURDATE()),
+ (6, 1006, 'R', 2, util.VN_CURDATE(), util.VN_CURDATE(), 1239, 0, 442, 1,util.VN_CURDATE()),
+ (7, 1007, 'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 0, 442, 1,util.VN_CURDATE()),
+ (8, 1008, 'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 0, 442, 1,util.VN_CURDATE()),
+ (9, 1009, 'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1,util.VN_CURDATE()),
+ (10, 1010, 'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1,util.VN_CURDATE());
INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`, `balanceStartingDate`)
VALUES
(1, -2, '2% retention', 2, 45, '2000-01-01');
INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`)
- VALUES
- (1, util.VN_CURDATE(), 1, 336.99),
- (1, util.VN_CURDATE(), 1, 15.25),
- (2, util.VN_CURDATE(), 1, 168),
- (2, util.VN_CURDATE(), 1, 55.17),
- (3, util.VN_CURDATE(), 1, 87.95),
- (3, util.VN_CURDATE(), 1, 7.65),
- (4, util.VN_CURDATE(), 1, 373.27),
- (4, util.VN_CURDATE(), 1, 73.36),
- (5, util.VN_CURDATE(), 1, 64.23),
- (6, util.VN_CURDATE(), 1, 32.95),
- (7, util.VN_CURDATE(), 1, 58.64);
+ VALUES
+ (1, util.VN_CURDATE(), 1, 336.99),
+ (1, util.VN_CURDATE(), 1, 15.25),
+ (2, util.VN_CURDATE(), 1, 168),
+ (2, util.VN_CURDATE(), 1, 55.17),
+ (3, util.VN_CURDATE(), 1, 87.95),
+ (3, util.VN_CURDATE(), 1, 7.65),
+ (4, util.VN_CURDATE(), 1, 373.27),
+ (4, util.VN_CURDATE(), 1, 73.36),
+ (5, util.VN_CURDATE(), 1, 64.23),
+ (6, util.VN_CURDATE(), 1, 32.95),
+ (7, util.VN_CURDATE(), 1, 58.64);
INSERT INTO `vn`.`duaInvoiceIn`(`id`, `duaFk`, `invoiceInFk`)
- VALUES
- (1, 1, 1),
- (2, 2, 2),
- (3, 3, 3),
- (4, 4, 4),
- (5, 5, 5),
- (6, 6, 6),
- (7, 7, 7),
- (8, 8, 8),
- (9, 9, 9),
- (10, 10, 10);
+ VALUES
+ (1, 1, 1),
+ (2, 2, 2),
+ (3, 3, 3),
+ (4, 4, 4),
+ (5, 5, 5),
+ (6, 6, 6),
+ (7, 7, 7),
+ (8, 8, 8),
+ (9, 9, 9),
+ (10, 10, 10);
INSERT INTO `vn`.`invoiceInTax` (`invoiceInFk`, `taxableBase`, `expenseFk`, `foreignValue`, `taxTypeSageFk`, `transactionTypeSageFk`)
- VALUES
- (1, 99.99, '2000000000', NULL, NULL, NULL),
- (2, 999.99, '2000000000', NULL, NULL, NULL),
- (3, 1000.50, '2000000000', NULL, NULL, NULL),
- (4, 0.50, '2000000000', NULL, NULL, NULL),
- (5, 150.50, '2000000000', NULL, NULL, NULL),
- (1, 252.25, '4751000000', NULL, 7, 61),
- (2, 223.17, '6210000567', NULL, 8, 20),
- (3, 95.60, '7001000000', NULL, 8, 35),
- (4, 446.63, '7001000000', NULL, 6, 61),
- (5, 64.23, '6210000567', NULL, 8, 20),
- (6, 29.95, '7001000000', NULL, 7, 20),
- (7, 58.64, '6210000567', NULL, 8, 20);
+ VALUES
+ (1, 99.99, '2000000000', NULL, NULL, NULL),
+ (2, 999.99, '2000000000', NULL, NULL, NULL),
+ (3, 1000.50, '2000000000', NULL, NULL, NULL),
+ (4, 0.50, '2000000000', NULL, NULL, NULL),
+ (5, 150.50, '2000000000', NULL, NULL, NULL),
+ (1, 252.25, '4751000000', NULL, 7, 61),
+ (2, 223.17, '6210000567', NULL, 8, 20),
+ (3, 95.60, '7001000000', NULL, 8, 35),
+ (4, 446.63, '7001000000', NULL, 6, 61),
+ (5, 64.23, '6210000567', NULL, 8, 20),
+ (6, 29.95, '7001000000', NULL, 7, 20),
+ (7, 58.64, '6210000567', NULL, 8, 20);
INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amount`, `stems`, `countryFk`)
- VALUES
- (1, 30.50, 5080000, 10.00, 162, 5),
- (1, 10, 6021010, 20.00, 205, 5),
- (2, 13.20, 5080000, 15.00, 580, 5),
- (2, 16.10, 6021010, 25.00, 80, 5);
+ VALUES
+ (1, 30.50, 5080000, 10.00, 162, 5),
+ (1, 10, 6021010, 20.00, 205, 5),
+ (2, 13.20, 5080000, 15.00, 580, 5),
+ (2, 16.10, 6021010, 25.00, 80, 5);
UPDATE `vn`.`invoiceIn`
- SET isBooked = TRUE
- WHERE id IN (5, 7, 8, 9, 10);
+ SET isBooked = TRUE
+ WHERE id IN (5, 7, 8, 9, 10);
DELIMITER $$
CREATE PROCEDURE `tmp`.`ticket_recalc`()
@@ -2721,38 +2755,38 @@ CALL tmp.ticket_recalc;
DROP PROCEDURE tmp.ticket_recalc;
UPDATE `vn`.`ticket`
- SET refFk = 'T1111111'
- WHERE id IN (1,2);
+ SET refFk = 'T1111111'
+ WHERE id IN (1,2);
UPDATE `vn`.`ticket`
- SET refFk = 'T2222222'
- WHERE id = 3;
+ SET refFk = 'T2222222'
+ WHERE id = 3;
UPDATE `vn`.`ticket`
- SET refFk = 'T3333333'
- WHERE id = 4;
+ SET refFk = 'T3333333'
+ WHERE id = 4;
UPDATE `vn`.`ticket`
- SET refFk = 'T4444444'
- WHERE id = 5;
+ SET refFk = 'T4444444'
+ WHERE id = 5;
UPDATE `vn`.`ticket`
- SET refFk = 'A1111111'
- WHERE id = 6;
+ SET refFk = 'A1111111'
+ WHERE id = 6;
INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`)
- VALUES
- (1, 1, 1),
- (2, 1, 2),
- (3, 6, 5),
- (4, 7, 1);
+ VALUES
+ (1, 1, 1),
+ (2, 1, 2),
+ (3, 6, 5),
+ (4, 7, 1);
INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
- VALUES
- (1),
- (2),
- (3),
- (4);
+ VALUES
+ (1),
+ (2),
+ (3),
+ (4);
INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `editorFk`, `price`, `driverName`)
VALUES
@@ -2768,150 +2802,150 @@ INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `roadmapAddressFk`, `eta`, `d
(4, 2, 1, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), 'Truck red', 1);
INSERT INTO `vn`.`expeditionPallet` (`id`, `truckFk`, `built`, `position`, `isPrint`)
- VALUES
- (1, 1, util.VN_CURDATE(), 1, 1);
+ VALUES
+ (1, 1, util.VN_CURDATE(), 1, 1);
INSERT INTO `vn`.`expeditionScan` (`id`, `expeditionFk`, `scanned`, `palletFk`)
- VALUES
- (1, 1, util.VN_CURDATE(), 1),
- (2, 2, util.VN_CURDATE(), 1),
- (3, 3, util.VN_CURDATE(), 1),
- (4, 4, util.VN_CURDATE(), 1),
- (5, 5, util.VN_CURDATE(), 1),
- (6, 6, util.VN_CURDATE(), 1),
- (7, 7, util.VN_CURDATE(), 1),
- (8, 8, util.VN_CURDATE(), 1),
- (9, 9, util.VN_CURDATE(), 1),
- (10, 10, util.VN_CURDATE(), 1);
+ VALUES
+ (1, 1, util.VN_CURDATE(), 1),
+ (2, 2, util.VN_CURDATE(), 1),
+ (3, 3, util.VN_CURDATE(), 1),
+ (4, 4, util.VN_CURDATE(), 1),
+ (5, 5, util.VN_CURDATE(), 1),
+ (6, 6, util.VN_CURDATE(), 1),
+ (7, 7, util.VN_CURDATE(), 1),
+ (8, 8, util.VN_CURDATE(), 1),
+ (9, 9, util.VN_CURDATE(), 1),
+ (10, 10, util.VN_CURDATE(), 1);
CALL `cache`.`last_buy_refresh`(FALSE);
UPDATE `vn`.`item` SET `genericFk` = 9
- WHERE `id` = 2;
+ WHERE `id` = 2;
INSERT INTO `bs`.`defaulter` (`clientFk`, `amount`, `created`, `defaulterSinced`)
- VALUES
- (1101, 500, util.VN_CURDATE(), util.VN_CURDATE()),
- (1102, 500, util.VN_CURDATE(), util.VN_CURDATE()),
- (1103, 500, util.VN_CURDATE(), util.VN_CURDATE()),
- (1107, 500, util.VN_CURDATE(), util.VN_CURDATE()),
- (1109, 500, util.VN_CURDATE(), util.VN_CURDATE());
+ VALUES
+ (1101, 500, util.VN_CURDATE(), util.VN_CURDATE()),
+ (1102, 500, util.VN_CURDATE(), util.VN_CURDATE()),
+ (1103, 500, util.VN_CURDATE(), util.VN_CURDATE()),
+ (1107, 500, util.VN_CURDATE(), util.VN_CURDATE()),
+ (1109, 500, util.VN_CURDATE(), util.VN_CURDATE());
UPDATE `vn`.`route`
- SET `invoiceInFk`=1
- WHERE `id`=1;
+ SET `invoiceInFk`=1
+ WHERE `id`=1;
UPDATE `vn`.`route`
- SET `invoiceInFk`=2
- WHERE `id`=2;
+ SET `invoiceInFk`=2
+ WHERE `id`=2;
INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`)
- VALUES
- (1, 501.95, util.VN_CURDATE(), 2, 1101),
- (2, 70.7, util.VN_CURDATE(), 2, 1101),
- (3, 200.78, util.VN_CURDATE(), 2, 1101),
- (4, 33.8, util.VN_CURDATE(), 1, 1101),
- (30, 34.4, util.VN_CURDATE(), 1, 1108);
+ VALUES
+ (1, 501.95, util.VN_CURDATE(), 2, 1101),
+ (2, 70.7, util.VN_CURDATE(), 2, 1101),
+ (3, 200.78, util.VN_CURDATE(), 2, 1101),
+ (4, 33.8, util.VN_CURDATE(), 1, 1101),
+ (30, 34.4, util.VN_CURDATE(), 1, 1108);
INSERT INTO `vn`.`docuwareConfig` (`id`, `url`)
- VALUES
- (1, 'http://docuware.url/');
+ VALUES
+ (1, 'http://docuware.url/');
INSERT INTO `vn`.`calendarHolidaysName` (`id`, `name`)
- VALUES
- (1, 'dayOfIT');
+ VALUES
+ (1, 'dayOfIT');
INSERT INTO `vn`.`calendarHolidaysType` (`id`, `name`, `hexColour`)
- VALUES
- (1, 'National', '#4169E1');
+ VALUES
+ (1, 'National', '#4169E1');
INSERT INTO `vn`.`calendarHolidays` (`id`, `calendarHolidaysTypeFk`, `dated`, `calendarHolidaysNameFk`, `workCenterFk`)
- VALUES
- (1, 1, CONCAT(YEAR(util.VN_CURDATE()), '-12-09'), 1, 1);
+ VALUES
+ (1, 1, CONCAT(YEAR(util.VN_CURDATE()), '-12-09'), 1, 1);
INSERT INTO `vn`.`supplierAgencyTerm` (`agencyFk`, `supplierFk`, `minimumPackages`, `kmPrice`, `packagePrice`, `routePrice`, `minimumKm`, `minimumM3`, `m3Price`)
- VALUES
- (1, 1, 0, 0.00, 0.00, NULL, 0, 0.00, 23),
- (2, 1, 60, 0.00, 0.00, NULL, 0, 5.00, 33),
- (3, 2, 0, 15.00, 0.00, NULL, 0, 0.00, 0),
- (4, 2, 0, 20.00, 0.00, NULL, 0, 0.00, 0),
- (5, 442, 0, 0.00, 3.05, NULL, 0, 0.00, 0);
+ VALUES
+ (1, 1, 0, 0.00, 0.00, NULL, 0, 0.00, 23),
+ (2, 1, 60, 0.00, 0.00, NULL, 0, 5.00, 33),
+ (3, 2, 0, 15.00, 0.00, NULL, 0, 0.00, 0),
+ (4, 2, 0, 20.00, 0.00, NULL, 0, 0.00, 0),
+ (5, 442, 0, 0.00, 3.05, NULL, 0, 0.00, 0);
INSERT INTO `vn`.`chat` (`senderFk`, `recipient`, `dated`, `checkUserStatus`, `message`, `status`, `attempts`)
- VALUES
- (1101, '@PetterParker', util.VN_CURDATE(), 1, 'First test message', 0, 'sent'),
- (1101, '@PetterParker', util.VN_CURDATE(), 0, 'Second test message', 0, 'pending');
+ VALUES
+ (1101, '@PetterParker', util.VN_CURDATE(), 1, 'First test message', 0, 'sent'),
+ (1101, '@PetterParker', util.VN_CURDATE(), 0, 'Second test message', 0, 'pending');
INSERT INTO `vn`.`mobileAppVersionControl` (`appName`, `version`, `isVersionCritical`,`versionBeta`)
- VALUES
- ('delivery', '9.2', 0,'9.7'),
- ('warehouse', '8.1', 0,'8.3');
+ VALUES
+ ('delivery', '9.2', 0,'9.7'),
+ ('warehouse', '8.1', 0,'8.3');
INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmentFk`, `type`, `use`, `productionYear`, `workerFk`, `companyFk`)
- VALUES
- ('RE-001', 'STILL', 'LTX-20', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442),
- ('RE-002', 'STILL', 'LTX-20', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442);
+ VALUES
+ ('RE-001', 'STILL', 'LTX-20', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442),
+ ('RE-002', 'STILL', 'LTX-20', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442);
INSERT INTO `vn`.`zoneExclusion` (`id`, `zoneFk`, `dated`, `created`, `userFk`)
VALUES
- (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=7, 7, 14) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100),
- (2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=8, 8, 15) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100);
+ (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=7, 7, 14) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100),
+ (2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=8, 8, 15) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100);
INSERT INTO `vn`.`zoneExclusionGeo` (`zoneExclusionFk`, `geoFk`)
- VALUES
- (2, 1);
+ VALUES
+ (2, 1);
INSERT INTO `vn`.`mdbBranch` (`name`)
- VALUES
- ('test'),
- ('master');
+ VALUES
+ ('test'),
+ ('master');
INSERT INTO `vn`.`mdbVersion` (`app`, `branchFk`, `version`)
- VALUES
- ('tpv', 'test', '1'),
- ('lab', 'master', '1');
+ VALUES
+ ('tpv', 'test', '1'),
+ ('lab', 'master', '1');
INSERT INTO `vn`.`accountingConfig` (`id`, `minDate`, `maxDate`)
- VALUES
- (1, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-01-01'), CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)), '-01-01'));
+ VALUES
+ (1, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-01-01'), CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)), '-01-01'));
INSERT INTO `vn`.`saleGroup` (`userFk`, `parkingFk`, `sectorFk`)
- VALUES
- (1, 1, 1);
+ VALUES
+ (1, 1, 1);
INSERT INTO `vn`.`saleGroupDetail` (`saleFk`, `saleGroupFk`)
- VALUES
- (31, 1);
+ VALUES
+ (31, 1);
INSERT INTO `vn`.`sectorCollection` (`userFk`, `sectorFk`)
- VALUES
- (1, 1);
+ VALUES
+ (1, 1);
INSERT INTO `vn`.`sectorCollectionSaleGroup` (`sectorCollectionFk`, `saleGroupFk`)
- VALUES
- (1, 1);
+ VALUES
+ (1, 1);
INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`, `teleworkingStart`, `teleworkingStartBreakTime`, `maxTimeToBreak`, `maxWorkShortCycle`, `maxWorkLongCycle`)
- VALUES
- (1, 43200, 32400, 129600, 259200, 1080000, '', 'imap.verdnatura.es', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.00, 0.33, 40, '22:00:00', '06:00:00', 72000, 1200, 18000, 72000, 6, 13, 28800, 32400, 3600, 561600, 950400);
+ VALUES
+ (1, 43200, 32400, 129600, 259200, 1080000, '', 'imap.verdnatura.es', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.00, 0.33, 40, '22:00:00', '06:00:00', 72000, 1200, 18000, 72000, 6, 13, 28800, 32400, 3600, 561600, 950400);
INSERT INTO `vn`.`host` (`id`, `code`, `description`, `warehouseFk`, `bankFk`)
- VALUES
- (1, 'pc1', 'pc host', 1, 1);
+ VALUES
+ (1, 'pc1', 'pc host', 1, 1);
INSERT INTO `vn`.`packingSite` (`id`, `code`, `hostFk`, `monitorId`)
- VALUES
- (1, 'h1', 1, '');
+ VALUES
+ (1, 'h1', 1, '');
INSERT INTO `vn`.`packingSiteConfig` (`id`, `shinobiUrl`, `shinobiToken`, `shinobiGroupKey`, `avgBoxingTime`)
- VALUES
- (1, '', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000);
+ VALUES
+ (1, '', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000);
INSERT INTO `util`.`notificationConfig`
SET `id` = 1,
- `cleanDays` = 90;
+ `cleanDays` = 90;
TRUNCATE `util`.`notification`;
INSERT INTO `util`.`notification` (`id`, `name`, `description`)
VALUES
@@ -2944,209 +2978,210 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
TRUNCATE `util`.`notificationQueue`;
INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
- VALUES
- (1, 'print-email', '{"id": "1"}', 9, 'pending', util.VN_CURDATE()),
- (2, 'print-email', '{"id": "2"}', null, 'pending', util.VN_CURDATE()),
- (3, 'print-email', null, null, 'pending', util.VN_CURDATE());
+ VALUES
+ (1, 'print-email', '{"id": "1"}', 9, 'pending', util.VN_CURDATE()),
+ (2, 'print-email', '{"id": "2"}', null, 'pending', util.VN_CURDATE()),
+ (3, 'print-email', null, null, 'pending', util.VN_CURDATE());
TRUNCATE `util`.`notificationSubscription`;
INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
- VALUES
- (1, 1109),
- (1, 1110),
- (2, 1110),
- (4, 1110),
- (2, 1109),
- (1, 9),
- (1, 3),
- (6, 9),
- (7, 9),
- (8, 66);
+ VALUES
+ (1, 1109),
+ (1, 1110),
+ (2, 1110),
+ (4, 1110),
+ (2, 1109),
+ (1, 9),
+ (1, 3),
+ (6, 9),
+ (7, 9),
+ (8, 66);
INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
- VALUES
- (1, 9);
+ VALUES
+ (1, 9);
INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`, `clientSelfConsumptionFk`, `addressSelfConsumptionFk`)
- VALUES
- (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600, 1112, 12);
+ VALUES
+ (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600, 1112, 12);
INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
- VALUES
- (3, util.VN_NOW(), 1107, 5, NULL, 0, 0, 1, NULL, NULL);
+ VALUES
+ (3, util.VN_NOW(), 1107, 5, NULL, 0, 0, 1, NULL, NULL);
INSERT INTO `vn`.`itemConfig` (`id`, `isItemTagTriggerDisabled`, `monthToDeactivate`, `wasteRecipients`, `validPriorities`, `defaultPriority`, `defaultTag`, `warehouseFk`)
- VALUES
- (1, 0, 24, '', '[1,2,3]', 2, 56, 60);
+ VALUES
+ (1, 0, 24, '', '[1,2,3]', 2, 56, 60);
INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
- VALUES
- (9, 3, util.VN_NOW(), NULL, 0, NULL, NULL, NULL, NULL);
+ VALUES
+ (9, 3, util.VN_NOW(), NULL, 0, NULL, NULL, NULL, NULL);
INSERT INTO `vn`.`saleCloned` (`saleClonedFk`, `saleOriginalFk`)
- VALUES
- (29, 25);
+ VALUES
+ (29, 25);
UPDATE `account`.`user`
- SET `hasGrant` = 1
- WHERE `id` = 66;
+ SET `hasGrant` = 1
+ WHERE `id` = 66;
INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
- VALUES
- (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 22, NULL),
- (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 22, NULL),
- (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 22, NULL),
- (7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 100cm de '5' a '10'"),
- (16, 9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 12, 'Shield');
+ VALUES
+ (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 22, NULL),
+ (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 22, NULL),
+ (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 22, NULL),
+ (7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 100cm de '5' a '10'"),
+ (16, 9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 12, 'Shield');
INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedModel, changedModelId, changedModelValue, oldInstance, newInstance, description)
- VALUES
- (1, NULL, 'delete', '2001-06-09 11:00:04', 'Ticket', 45, 'Spider Man' , NULL, NULL, NULL),
- (1, 18, 'select', '2001-06-09 11:00:03', 'Ticket', 45, 'Spider Man' , NULL, NULL, NULL),
- (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale', 5, 'Armor' , '{"isPicked": false}','{"isPicked": true}', NULL),
- (1, 18, 'update', '2001-01-01 10:05:01', 'Sale', 5, 'Armor' , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
- (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale', 4, 'Shield' , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
- (1, 18, 'insert', '2000-12-31 15:00:05', 'Sale', 1, 'Armor' , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
- (1, 18, 'update', '2000-12-28 08:40:45', 'Ticket', 45, 'Spider Man' , '{"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"isBlocked":false,"hasPriority":false,"companyFk":442,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"warehouseFk":61,"shipped":"2023-05-17T22:00:00.000Z","nickname":"Spider Man","isSigned":false,"isLabeled":false,"isPrinted":false,"packages":1,"hour":0,"isBlocked":true,"hasPriority":true,"companyFk":443,"landed":"2023-05-18T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":13,"zoneBonus":1}', NULL),
- (1, 18, 'select', '2000-12-27 03:40:30', 'Ticket', 45, NULL , NULL, NULL, NULL),
- (1, 18, 'insert', '2000-04-10 09:40:15', 'Sale', 4, 'Shield' , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
- (1, 18, 'insert', '1999-05-09 10:00:00', 'Ticket', 45, 'Super Man' , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
+ VALUES
+ (1, NULL, 'delete', '2001-06-09 11:00:04', 'Ticket', 45, 'Spider Man' , NULL, NULL, NULL),
+ (1, 18, 'select', '2001-06-09 11:00:03', 'Ticket', 45, 'Spider Man' , NULL, NULL, NULL),
+ (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale', 5, 'Armor' , '{"isPicked": false}','{"isPicked": true}', NULL),
+ (1, 18, 'update', '2001-01-01 10:05:01', 'Sale', 5, 'Armor' , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
+ (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale', 4, 'Shield' , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
+ (1, 18, 'insert', '2000-12-31 15:00:05', 'Sale', 1, 'Armor' , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
+ (1, 18, 'update', '2000-12-28 08:40:45', 'Ticket', 45, 'Spider Man' , '{"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"isBlocked":false,"hasPriority":false,"companyFk":442,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"warehouseFk":61,"shipped":"2023-05-17T22:00:00.000Z","nickname":"Spider Man","isSigned":false,"isLabeled":false,"isPrinted":false,"packages":1,"hour":0,"isBlocked":true,"hasPriority":true,"companyFk":443,"landed":"2023-05-18T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":13,"zoneBonus":1}', NULL),
+ (1, 18, 'select', '2000-12-27 03:40:30', 'Ticket', 45, NULL , NULL, NULL, NULL),
+ (1, 18, 'insert', '2000-04-10 09:40:15', 'Sale', 4, 'Shield' , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
+ (1, 18, 'insert', '1999-05-09 10:00:00', 'Ticket', 45, 'Super Man' , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
- VALUES
- (1, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
+ VALUES
+ (1, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
- VALUES
- ('foo', 'master', NULL, NULL),
- ('bar', 'test', 9, util.VN_NOW());
+ VALUES
+ ('foo', 'master', NULL, NULL),
+ ('bar', 'test', 9, util.VN_NOW());
INSERT INTO `vn`.`profileType` (`id`, `name`)
- VALUES
- (1, 'working');
+ VALUES
+ (1, 'working');
INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
- VALUES
- ('lilium', 'development', 'http://localhost:9000/#/'),
- ('hedera', 'development', 'http://localhost:9090/'),
- ('salix', 'development', 'http://localhost:5000/#!/'),
- ('docuware', 'development', 'http://docuware');
+ VALUES
+ ('lilium', 'development', 'http://localhost:9000/#/'),
+ ('hedera', 'development', 'http://localhost:9090/'),
+ ('salix', 'development', 'http://localhost:5000/#!/'),
+ ('docuware', 'development', 'http://docuware');
-INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
- VALUES
- (3, 'invoice', NULL, 'InvoiceOuts/{refFk}/invoice-out-pdf');
+INSERT INTO `vn`.`report` (`name`, `method`)
+ VALUES
+ ('invoice', 'InvoiceOuts/{refFk}/invoice-out-pdf'),
+ ('LabelBuy', 'Entries/{id}/{labelType}/buy-label');
INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
- VALUES
- (1, 1),
- (2, 20),
- (7, 1);
+ VALUES
+ (1, 1),
+ (2, 20),
+ (7, 1);
INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `payMethodFk`, `businessTypeFk`)
- VALUES
- (1, NULL, 1, 4, 'worker');
+ VALUES
+ (1, NULL, 1, 4, 'worker');
INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`)
- VALUES
- (24, 8);
+ VALUES
+ (24, 8);
INSERT INTO `vn`.`deviceProductionModels` (`code`)
- VALUES
- ('BLACKVIEW'),
- ('DODGEE'),
- ('ZEBRA');
+ VALUES
+ ('BLACKVIEW'),
+ ('DODGEE'),
+ ('ZEBRA');
INSERT INTO `vn`.`deviceProductionState` (`code`, `description`)
- VALUES
- ('active', 'activo'),
- ('idle', 'inactivo'),
- ('lost', 'perdida'),
- ('repair', 'reparación'),
- ('retired', 'retirada');
+ VALUES
+ ('active', 'activo'),
+ ('idle', 'inactivo'),
+ ('lost', 'perdida'),
+ ('repair', 'reparación'),
+ ('retired', 'retirada');
INSERT INTO `vn`.`deviceProduction` (`imei`, `modelFk`, `macWifi`, `serialNumber`, `android_id`, `purchased`, `stateFk`, `isInScalefusion`, `description`)
VALUES
- ('ime1', 'BLACKVIEW', 'macWifi1', 'serialNumber1', 'androidid11234567890', util.VN_NOW(), 'active', 0, NULL),
- ('ime2', 'DODGEE', 'macWifi2', 'serialNumber2', 'androidid21234567890', util.VN_NOW(), 'idle', 0, NULL),
- ('ime3', 'ZEBRA', 'macWifi3', 'serialNumber3', 'androidid31234567890', util.VN_NOW(), 'active', 0, NULL),
- ('ime4', 'BLACKVIEW', 'macWifi4', 'serialNumber4', 'androidid41234567890', util.VN_NOW(), 'idle', 0, NULL);
+ ('ime1', 'BLACKVIEW', 'macWifi1', 'serialNumber1', 'androidid11234567890', util.VN_NOW(), 'active', 0, NULL),
+ ('ime2', 'DODGEE', 'macWifi2', 'serialNumber2', 'androidid21234567890', util.VN_NOW(), 'idle', 0, NULL),
+ ('ime3', 'ZEBRA', 'macWifi3', 'serialNumber3', 'androidid31234567890', util.VN_NOW(), 'active', 0, NULL),
+ ('ime4', 'BLACKVIEW', 'macWifi4', 'serialNumber4', 'androidid41234567890', util.VN_NOW(), 'idle', 0, NULL);
INSERT INTO `vn`.`deviceProductionUser` (`deviceProductionFk`, `userFk`, `created`)
- VALUES
- (1, 1, util.VN_NOW()),
- (3, 3, util.VN_NOW());
+ VALUES
+ (1, 1, util.VN_NOW()),
+ (3, 3, util.VN_NOW());
INSERT INTO `vn`.`workerTimeControlMail` (`id`, `workerFk`, `year`, `week`, `state`, `updated`, `sendedCounter`, `reason`)
- VALUES
- (1, 9, 2000, 49, 'REVISE', util.VN_NOW(), 1, 'test2'),
- (2, 9, 2000, 50, 'SENDED', util.VN_NOW(), 1, NULL),
- (3, 9, 2000, 51, 'CONFIRMED', util.VN_NOW(), 1, NULL),
- (4, 9, 2001, 1, 'SENDED', util.VN_NOW(), 1, NULL);
+ VALUES
+ (1, 9, 2000, 49, 'REVISE', util.VN_NOW(), 1, 'test2'),
+ (2, 9, 2000, 50, 'SENDED', util.VN_NOW(), 1, NULL),
+ (3, 9, 2000, 51, 'CONFIRMED', util.VN_NOW(), 1, NULL),
+ (4, 9, 2001, 1, 'SENDED', util.VN_NOW(), 1, NULL);
INSERT INTO `vn`.`wagonTypeColor` (`id`, `name`, `rgb`)
- VALUES
- (1, 'white', '#ffffff'),
- (2, 'red', '#ff0000'),
- (3, 'green', '#00ff00'),
- (4, 'blue', '#0000ff');
+ VALUES
+ (1, 'white', '#ffffff'),
+ (2, 'red', '#ff0000'),
+ (3, 'green', '#00ff00'),
+ (4, 'blue', '#0000ff');
INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `maxWagonHeight`, `minHeightBetweenTrays`, `maxTrays`, `defaultTrayColorFk`)
- VALUES
- (1, 1350, 1900, 200, 50, 6, 1);
+ VALUES
+ (1, 1350, 1900, 200, 50, 6, 1);
INSERT INTO `vn`.`wagonType` (`id`, `name`, `divisible`)
- VALUES
- (1, 'Wagon Type #1', 1);
+ VALUES
+ (1, 'Wagon Type #1', 1);
INSERT INTO `vn`.`wagonTypeTray` (`id`, `wagonTypeFk`, `height`, `wagonTypeColorFk`)
- VALUES
- (1, 1, 0, 1),
- (2, 1, 50, 2),
- (3, 1, 100, 3);
+ VALUES
+ (1, 1, 0, 1),
+ (2, 1, 50, 2),
+ (3, 1, 100, 3);
INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `courtesyTime`, `renewInterval`)
- VALUES
- (1, 21600, 60, 300);
+ VALUES
+ (1, 21600, 60, 300);
INSERT INTO `vn`.`travelConfig` (`id`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `companyFk`)
- VALUES
- (1, 1, 1, 1, 442);
+ VALUES
+ (1, 1, 1, 1, 442);
INSERT INTO `vn`.`buyConfig` (`id`, `monthsAgo`)
- VALUES
- (1, 6);
+ VALUES
+ (1, 6);
INSERT INTO `vn`.`invoiceInSerial` (`code`, `description`, `cplusTerIdNifFk`, `taxAreaFk`)
- VALUES
- ('C', 'Asgard', 1, 'WORLD'),
- ('E', 'Midgard', 1, 'CEE'),
- ('R', 'Jotunheim', 1, 'NATIONAL'),
- ('W', 'Vanaheim', 1, 'WORLD');
+ VALUES
+ ('C', 'Asgard', 1, 'WORLD'),
+ ('E', 'Midgard', 1, 'CEE'),
+ ('R', 'Jotunheim', 1, 'NATIONAL'),
+ ('W', 'Vanaheim', 1, 'WORLD');
INSERT INTO `hedera`.`imageConfig` (`id`, `maxSize`, `useXsendfile`, `url`)
- VALUES
- (1, 0, 0, 'marvel.com');
+ VALUES
+ (1, 0, 0, 'marvel.com');
INSERT INTO vn.XDiario (id, ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, BASEEURO, SERIE, FACTURA, IVA, RECEQUIV, CLAVE, CAMBIO, DEBEME, HABERME, AUXILIAR, MONEDAUSO, TIPOOPE, NFACTICK, TERIDNIF, TERNIF, TERNOM, OPBIENES, L340, enlazado, FECHA_EX, LRECT349, empresa_id, LDIFADUAN, METAL, METALIMP, CLIENTE, METALEJE, FECHA_OP, FACTURAEX, TIPOCLAVE, TIPOEXENCI, TIPONOSUJE, TIPOFACT, TIPORECTIF, SERIE_RT, FACTU_RT, BASEIMP_RT, BASEIMP_RF, RECTIFICA, FECHA_RT, FECREGCON, enlazadoSage)
- VALUES
- (1, 1.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T3333333', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
- (2, 1.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T3333333 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
- (3, 1.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T3333333 Tony Stark', NULL, 0.81, 8.07, 'T', '3333333', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
- (4, 2.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T4444444', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
- (5, 2.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T4444444 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
- (6, 2.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T4444444 Tony Stark', NULL, 0.81, 8.07, 'T', '4444444', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0);
+ VALUES
+ (1, 1.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T3333333', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
+ (2, 1.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T3333333 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
+ (3, 1.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T3333333 Tony Stark', NULL, 0.81, 8.07, 'T', '3333333', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
+ (4, 2.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T4444444', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
+ (5, 2.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T4444444 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
+ (6, 2.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T4444444 Tony Stark', NULL, 0.81, 8.07, 'T', '4444444', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0);
INSERT INTO `vn`.`mistakeType` (`id`, `description`)
- VALUES
- (1, 'Incorrect quantity');
+ VALUES
+ (1, 'Incorrect quantity');
INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`)
- VALUES
- (1, 'Error in VAT calculation'),
- (2, 'Error in sales details'),
- (3, 'Error in customer data');
+ VALUES
+ (1, 'Error in VAT calculation'),
+ (2, 'Error in sales details'),
+ (3, 'Error in customer data');
UPDATE `vn`.`client`
SET fi='65004204V'
@@ -3158,53 +3193,53 @@ UPDATE `vn`.`worker`
INSERT INTO `account`.`mailAliasAcl` (`mailAliasFk`, `roleFk`)
- VALUES
- (1, 1),
- (2, 9),
- (3, 15);
+ VALUES
+ (1, 1),
+ (2, 9),
+ (3, 15);
INSERT INTO `vn`.`docuwareTablet` (`tablet`,`description`)
VALUES
- ('Tablet1','Jarvis tablet'),
- ('Tablet2','Avengers tablet');
+ ('Tablet1','Jarvis tablet'),
+ ('Tablet2','Avengers tablet');
INSERT INTO `vn`.`sms` (`id`, `senderFk`, `sender`, `destination`, `message`, `statusCode`, `status`, `created`)
- VALUES (1, 66, '111111111', '0001111111111', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE()),
- (2, 66, '222222222', '0002222222222', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'PENDING', util.VN_CURDATE()),
- (3, 66, '333333333', '0003333333333', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'ERROR', util.VN_CURDATE()),
- (4, 66, '444444444', '0004444444444', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE());
+ VALUES (1, 66, '111111111', '0001111111111', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE()),
+ (2, 66, '222222222', '0002222222222', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'PENDING', util.VN_CURDATE()),
+ (3, 66, '333333333', '0003333333333', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'ERROR', util.VN_CURDATE()),
+ (4, 66, '444444444', '0004444444444', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE());
INSERT INTO `vn`.`clientSms` (`id`, `clientFk`, `smsFk`, `ticketFk`)
- VALUES(1, 1103, 1, NULL),
- (2, 1103, 2, NULL),
- (3, 1103, 3, 32),
- (4, 1103, 4, 32),
- (13, 1101, 1, NULL),
- (14, 1101, 4, 27);
+ VALUES(1, 1103, 1, NULL),
+ (2, 1103, 2, NULL),
+ (3, 1103, 3, 32),
+ (4, 1103, 4, 32),
+ (13, 1101, 1, NULL),
+ (14, 1101, 4, 27);
INSERT INTO `vn`.`entryDms`(`entryFk`, `dmsFk`, `editorFk`)
- VALUES
- (1, 9, 9);
+ VALUES
+ (1, 9, 9);
INSERT INTO vn.entryType (code,description,isInformal)
VALUES ('devaluation','Devaluation',0),
- ('internal','Internal',1),
- ('inventory','Inventory',1),
- ('life','Life',1),
- ('packaging','Packaging',0),
- ('payment','Refund',0),
- ('product','Product',0),
- ('regularization','Regularization',1),
- ('return','Return',0),
- ('transport','Delivery',0);
+ ('internal','Internal',1),
+ ('inventory','Inventory',1),
+ ('life','Life',1),
+ ('packaging','Packaging',0),
+ ('payment','Refund',0),
+ ('product','Product',0),
+ ('regularization','Regularization',1),
+ ('return','Return',0),
+ ('transport','Delivery',0);
INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentInstruccions,specialAgreements,companyFk,addressToFk,addressFromFk,supplierFk,packagesList,merchandiseDetail,state)
VALUES (1,'123456A','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',442,1,2,1,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
- (2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
- (3,'123456B','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',567,5,6,69,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet');
+ (2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
+ (3,'123456B','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',567,5,6,69,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet');
UPDATE vn.department
- SET workerFk = null;
+ SET workerFk = null;
INSERT INTO vn.packaging
VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0,0,1,0);
@@ -3257,30 +3292,30 @@ INSERT IGNORE INTO vn.sector
INSERT INTO vn.parking (id,sectorFk, code, pickingOrder)
- VALUES (4,9991, 'A-01-1', 1),
- (5,9991, 'A-02-2', 2),
- (6,9991, 'A-03-3', 3),
- (7,9991, 'A-04-4', 4),
- (8,9991, 'A-05-5', 5),
- (9,9992, 'P-01-1', 6),
- (10,9992, 'P-02-2', 7),
- (11,9992, 'P-03-3', 8),
- (12,9993, 'M-01-1', 9),
- (13,9993, 'M-02-2', 10),
- (14,9993, 'M-03-3', 11);
+ VALUES (4,9991, 'A-01-1', 1),
+ (5,9991, 'A-02-2', 2),
+ (6,9991, 'A-03-3', 3),
+ (7,9991, 'A-04-4', 4),
+ (8,9991, 'A-05-5', 5),
+ (9,9992, 'P-01-1', 6),
+ (10,9992, 'P-02-2', 7),
+ (11,9992, 'P-03-3', 8),
+ (12,9993, 'M-01-1', 9),
+ (13,9993, 'M-02-2', 10),
+ (14,9993, 'M-03-3', 11);
INSERT INTO vn.shelving (code, parkingFk, priority)
- VALUES ('NAA', 4, 1),
- ('NBB', 5, 1),
- ('NCC', 6, 1),
- ('NDD', 7, 1),
- ('NEE', 8, 1),
- ('PAA', 9, 1),
- ('PBB', 10, 1),
- ('PCC', 11, 1),
- ('MAA', 12, 1),
- ('MBB', 13, 1),
- ('MCC', 14, 1);
+ VALUES ('NAA', 4, 1),
+ ('NBB', 5, 1),
+ ('NCC', 6, 1),
+ ('NDD', 7, 1),
+ ('NEE', 8, 1),
+ ('PAA', 9, 1),
+ ('PBB', 10, 1),
+ ('PCC', 11, 1),
+ ('MAA', 12, 1),
+ ('MBB', 13, 1),
+ ('MCC', 14, 1);
INSERT IGNORE INTO vn.itemType
SET id = 999,
@@ -3789,7 +3824,7 @@ VALUES
(1000000, 18, 25, '2023-09-21', 25, 500, NULL, 103, NULL),
(999996, 19, 5, '2023-09-27', 1, 5, NULL, 103, NULL),
(999997, 21, 10, '2023-09-27', 5, 100, NULL, 103, NULL),
- (1000000, 16, 25, '2023-08-21',25, 500, NULL, NULL, NULL);
+ (1000000, 16, 25, '2023-08-21',25, 500, NULL, NULL, NULL);
-- Previous for Bolas de madera
INSERT IGNORE INTO vn.sectorCollection
@@ -3802,7 +3837,7 @@ INSERT IGNORE INTO vn.saleGroup
userFk = 1,
parkingFk = 9,
sectorFk = 9992,
- ticketFk = 36;
+ ticketFk = 36;
INSERT IGNORE INTO vn.sectorCollectionSaleGroup
SET id = 9999,
@@ -3816,7 +3851,7 @@ INSERT vn.saleGroupDetail
INSERT INTO vn.saleTracking
SET id = 7,
- saleFk = 99996,
+ saleFk = 99996,
isChecked = TRUE,
workerFk = 103,
stateFk = 28;
@@ -3843,8 +3878,8 @@ UPDATE vn.sale
INSERT INTO vn.workerAppTester(workerFk) VALUES(66);
INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmentFk`, `type`, `use`, `productionYear`, `workerFk`, `companyFk`)
- VALUES
- ('RE-003', 'IRON', 'JPH-24', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442);
+ VALUES
+ ('RE-003', 'IRON', 'JPH-24', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442);
UPDATE vn.buy SET itemOriginalFk = 1 WHERE id = 1;
@@ -3859,7 +3894,7 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man');
INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
- VALUES (1, 10, 9);
+ VALUES (1, 10, 9);
INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created)
VALUES
@@ -3877,11 +3912,11 @@ INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
INSERT INTO vn.workerTeam(id, team, workerFk)
- VALUES
- (8, 1, 19);
+ VALUES
+ (8, 1, 19);
INSERT INTO vn.workCenter (id, name, payrollCenterFk, counter, warehouseFk, street, geoFk, deliveryManAdjustment)
- VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
+ VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
INSERT INTO `vn`.`locker` (code, gender, workerFk) VALUES
('1M', 'M', 1),
@@ -3894,11 +3929,11 @@ INSERT INTO `vn`.`locker` (code, gender, workerFk) VALUES
('4F', 'F', NULL);
INSERT INTO `vn`.`ledgerCompany` SET
- fiscalYear = YEAR(util.VN_CURDATE()),
- bookEntry = 2;
+ fiscalYear = YEAR(util.VN_CURDATE()),
+ bookEntry = 2;
INSERT INTO `vn`.`ledgerConfig` SET
- maxTolerance = 0.01;
+ maxTolerance = 0.01;
INSERT INTO vn.trainingCourse (workerFk,trainingCourseTypeFk,centerFk,started,ended,hasDiscount,hasDiploma)
@@ -3918,8 +3953,8 @@ INSERT INTO vn.sectorCollectionSaleGroup
saleGroupFk = 4;
INSERT INTO vn.saleGroup (userFk, parkingFk, sectorFk, ticketFk)
- VALUES
- (1, 1, 1, 37);
+ VALUES
+ (1, 1, 1, 37);
INSERT INTO vn.sectorCollection
SET id = 3,
@@ -3955,7 +3990,7 @@ INSERT INTO vn.medicalReview
VALUES(3, 9, 2, '2000-01-01', '8:00', 1, 150.0, NULL, NULL);
INSERT INTO vn.stockBought (workerFk, bought, reserve, dated)
- VALUES(35, 1.00, 1.00, '2001-01-01');
+ VALUES(35, 1.00, 1.00, '2001-01-01');
INSERT INTO vn.auctionConfig (id,conversionCoefficient,warehouseFk)
VALUES (1,0.6,6);
@@ -3998,8 +4033,8 @@ VALUES
(6, 'ABA', 'aba');
INSERT IGNORE INTO ormConfig
- SET id =1,
- selectLimit = 1000;
+ SET id =1,
+ selectLimit = 1000;
INSERT INTO pbx.queueMultiConfig
SET id = 'ring',
@@ -4011,12 +4046,12 @@ INSERT INTO pbx.queueMultiConfig
ringInUse = 0;
INSERT INTO pbx.queue (description, name, config)
- VALUES ('X-men', '1000', 1),
- ('Avengers', '2000', 1);
+ VALUES ('X-men', '1000', 1),
+ ('Avengers', '2000', 1);
INSERT IGNORE INTO pbx.queueMember
- SET queue = '1000',
- extension = '1010';
+ SET queue = '1000',
+ extension = '1010';
UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
@@ -4029,22 +4064,22 @@ INSERT INTO vn.routeComplement (id, dated, workerFk, price, routeActionFk) VALUE
INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, code, stratus, hasWorkerWaiting, reserve, routeFk, dayMinute, lastUnloaded, hasStrapper, typeDefaultFk, motors, editorFk)
- VALUES (0, 0, 0, 0, NULL, 3, 1, 0, 'ENT', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
- (1, 0, 9900, 0, NULL, 1, 0, 0, 'NOK', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
- (2, 0, 0, 450, 13000, 1, 0, 1, '01A', 1, 1, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
- (3, 1400, 0, 450, 13000, 1, 0, 1, '01B', 1, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
- (4, 0, 500, 500, 13000, 1, 4, 1, '02A', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
- (5, 1400, 500, 500, 13000, 1, 4, 1, '02B', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
- (6, 0, 1000, 500, 13000, 1, 1, 1, '03A', 3, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
- (7, 1400, 1000, 500, 13000, 1, 1, 1, '03B', 3, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
- (8, 0, 1500, 500, 13000, 1, 0, 1, '04A', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
- (9, 1400, 1500, 500, 13000, 1, 1, 1, '04B', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
- (10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
+ VALUES (0, 0, 0, 0, NULL, 3, 1, 0, 'ENT', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
+ (1, 0, 9900, 0, NULL, 1, 0, 0, 'NOK', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
+ (2, 0, 0, 450, 13000, 1, 0, 1, '01A', 1, 1, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
+ (3, 1400, 0, 450, 13000, 1, 0, 1, '01B', 1, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
+ (4, 0, 500, 500, 13000, 1, 4, 1, '02A', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
+ (5, 1400, 500, 500, 13000, 1, 4, 1, '02B', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
+ (6, 0, 1000, 500, 13000, 1, 1, 1, '03A', 3, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
+ (7, 1400, 1000, 500, 13000, 1, 1, 1, '03B', 3, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
+ (8, 0, 1500, 500, 13000, 1, 0, 1, '04A', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
+ (9, 1400, 1500, 500, 13000, 1, 1, 1, '04B', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
+ (10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
VALUES (19, '1169'),
(8, '1183'),
- (1, '1320');
+ (1, '1320');
INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
VALUES ('saysimle-url-mock', '1819');
@@ -4061,13 +4096,56 @@ INSERT INTO vn.referenceRate (currencyFk, dated, value)
(2, '2001-02-01', 7.6347);
INSERT IGNORE INTO vn.osrmConfig (id,url,tolerance)
- VALUES (1,'https://router.project-osrm.org', 0.002);
+ VALUES (1,'https://router.project-osrm.org', 0.002);
INSERT IGNORE INTO vn.inventoryConfig
- SET id = 1,
- supplierFk = 4;
+ SET id = 1,
+ supplierFk = 4;
UPDATE vn.worker
SET isFreelance=1
WHERE firstName='deliveryFreelancer';
+INSERT INTO vn.vehicleState (state, hasToNotify)
+ VALUES
+ ('Operativo', NULL),
+ ('Prestado', NULL),
+ ('Robado', NULL),
+ ('Taller', NULL),
+ ('Targeta SOLRED', NULL),
+ ('Via T SOLRED', NULL),
+ ('ITV', NULL);
+
+INSERT INTO vn.vehicleEvent (started, finished, vehicleStateFk, description, vehicleFk, userFk, notified)
+ VALUES
+ ('2000-12-01', '2000-12-02', 4, 'cambio de aceite', 5, 103, NULL),
+ ('2000-12-15', '2000-12-18', 2, 'viaje fin de curso', 5, 103, NULL),
+ ('2000-12-20', '2001-01-01', 3, 'llaves puestas', 2, 103, NULL);
+
+INSERT INTO vn.fuelType (id, name, code)
+ VALUES
+ (1, 'gasoil', 'gasoil'),
+ (2, 'gas', 'gas'),
+ (3, 'adblue', 'adblue'),
+ (4, 'gasolina', 'gasolina'),
+ (5, 'gasoil-frigo', 'gasoil-frigo'),
+ (6, 'electrico', 'electric');
+
+INSERT INTO vn.bankPolicy (id, `ref`, amount, committedFee, nonCommittedFee, annualFee, started, ended, accountingFk, companyFk, supplierFk, description, hasGuarantee, dmsFk, notaryFk, currencyFk, amortizationTypeFk, periodicityTypeFk, insuranceExpired)
+ VALUES
+ (1, '11112222', 500000.0, 0.028, 0.0, 0.001, '2001-01-01', '2001-02-01', 1, 442, NULL, NULL, 0, NULL, NULL, 1, NULL, NULL, NULL),
+ (2, '33334444', 100000.0, 0.017, 0.0, 0.0, '2001-01-01', '2001-02-01', 1, 2, NULL, NULL, 0, NULL, NULL, 2, NULL, NULL, NULL);
+
+INSERT INTO vn.ppe (id, amortization, firstAmortizated, lastAmortizated, finished, value, planFk, groupFk, account, endowment, elementAccount, nature, location, discharged, cause, isInvestmentAsset, workerFk, companyFk, description, isDone)
+ VALUES
+ (1, 0.00, '2001-01-01', NULL, NULL, 700.95, 16, 4, '3456000000', '4320000000', '12345', 'INMOVILIZADO', 'V02', NULL, NULL, 0, NULL, 442, 'UTILLAJE LASER ROTATIVO AUTONIVELANTE 500M', NULL),
+ (2, 0.00, '2001-01-01', NULL, NULL, 400.00, 16, 4, '5678000000', '1230000000', '67891', 'INMOVILIZADO', 'V02', NULL, NULL, 0, NULL, 442, 'UTILLAJE BALANZA Z100 150KILOS', NULL);
+
+INSERT IGNORE INTO vn.vehicleType (id, name)
+ VALUES (1,'vehículo empresa'),
+ (2, 'furgoneta'),
+ (3, 'cabeza tractora'),
+ (4, 'remolque');
+
+INSERT INTO vn.addressWaste (addressFk, type)
+ VALUES (11, 'fault');
diff --git a/db/dump/mockDate.sql b/db/dump/mockDate.sql
index 1ed5d76bef..b74bc9bb6f 100644
--- a/db/dump/mockDate.sql
+++ b/db/dump/mockDate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION util.mockTime()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION util.mockTime()
RETURNS DATETIME
DETERMINISTIC
BEGIN
@@ -8,7 +8,7 @@ END$$
DELIMITER ;
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION util.mockUtcTime()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION util.mockUtcTime()
RETURNS DATETIME
DETERMINISTIC
BEGIN
diff --git a/db/routines/account/functions/myUser_checkLogin.sql b/db/routines/account/functions/myUser_checkLogin.sql
index ed55f0d13f..76cf6da04a 100644
--- a/db/routines/account/functions/myUser_checkLogin.sql
+++ b/db/routines/account/functions/myUser_checkLogin.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_checkLogin`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_checkLogin`()
RETURNS tinyint(1)
DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/account/functions/myUser_getId.sql b/db/routines/account/functions/myUser_getId.sql
index bc86c87dc8..864e798a99 100644
--- a/db/routines/account/functions/myUser_getId.sql
+++ b/db/routines/account/functions/myUser_getId.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_getId`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_getId`()
RETURNS int(11)
DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/account/functions/myUser_getName.sql b/db/routines/account/functions/myUser_getName.sql
index 541f7c0866..e91681329e 100644
--- a/db/routines/account/functions/myUser_getName.sql
+++ b/db/routines/account/functions/myUser_getName.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_getName`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_getName`()
RETURNS varchar(30) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
DETERMINISTIC
NO SQL
diff --git a/db/routines/account/functions/myUser_hasPriv.sql b/db/routines/account/functions/myUser_hasPriv.sql
index b53580d740..8105e9baa4 100644
--- a/db/routines/account/functions/myUser_hasPriv.sql
+++ b/db/routines/account/functions/myUser_hasPriv.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasPriv`(vChain VARCHAR(100),
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_hasPriv`(vChain VARCHAR(100),
vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE')
)
RETURNS tinyint(1)
diff --git a/db/routines/account/functions/myUser_hasRole.sql b/db/routines/account/functions/myUser_hasRole.sql
index 8cc8aafb59..53fd143fd5 100644
--- a/db/routines/account/functions/myUser_hasRole.sql
+++ b/db/routines/account/functions/myUser_hasRole.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRole`(vRoleName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_hasRole`(vRoleName VARCHAR(255))
RETURNS tinyint(1)
DETERMINISTIC
BEGIN
diff --git a/db/routines/account/functions/myUser_hasRoleId.sql b/db/routines/account/functions/myUser_hasRoleId.sql
index d059b095d0..fd8b3fb198 100644
--- a/db/routines/account/functions/myUser_hasRoleId.sql
+++ b/db/routines/account/functions/myUser_hasRoleId.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRoleId`(vRoleId INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_hasRoleId`(vRoleId INT)
RETURNS tinyint(1)
DETERMINISTIC
BEGIN
diff --git a/db/routines/account/functions/myUser_hasRoutinePriv.sql b/db/routines/account/functions/myUser_hasRoutinePriv.sql
index 9e9563a5f6..517e36f5cd 100644
--- a/db/routines/account/functions/myUser_hasRoutinePriv.sql
+++ b/db/routines/account/functions/myUser_hasRoutinePriv.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
vChain VARCHAR(100)
)
RETURNS tinyint(1)
diff --git a/db/routines/account/functions/passwordGenerate.sql b/db/routines/account/functions/passwordGenerate.sql
index 952a8912cc..a4cff0ab9c 100644
--- a/db/routines/account/functions/passwordGenerate.sql
+++ b/db/routines/account/functions/passwordGenerate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`passwordGenerate`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`passwordGenerate`()
RETURNS text CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/account/functions/toUnixDays.sql b/db/routines/account/functions/toUnixDays.sql
index db908060b1..931c29cb01 100644
--- a/db/routines/account/functions/toUnixDays.sql
+++ b/db/routines/account/functions/toUnixDays.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`toUnixDays`(vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`toUnixDays`(vDate DATE)
RETURNS int(11)
DETERMINISTIC
BEGIN
diff --git a/db/routines/account/functions/user_getMysqlRole.sql b/db/routines/account/functions/user_getMysqlRole.sql
index 91540bc6ba..e507264800 100644
--- a/db/routines/account/functions/user_getMysqlRole.sql
+++ b/db/routines/account/functions/user_getMysqlRole.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_getMysqlRole`(vUserName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_getMysqlRole`(vUserName VARCHAR(255))
RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
diff --git a/db/routines/account/functions/user_getNameFromId.sql b/db/routines/account/functions/user_getNameFromId.sql
index b06facd7a3..27ea434e8c 100644
--- a/db/routines/account/functions/user_getNameFromId.sql
+++ b/db/routines/account/functions/user_getNameFromId.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_getNameFromId`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_getNameFromId`(vSelf INT)
RETURNS varchar(30) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
diff --git a/db/routines/account/functions/user_hasPriv.sql b/db/routines/account/functions/user_hasPriv.sql
index 83bdfaa194..fc74b197a1 100644
--- a/db/routines/account/functions/user_hasPriv.sql
+++ b/db/routines/account/functions/user_hasPriv.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasPriv`(vChain VARCHAR(100),
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_hasPriv`(vChain VARCHAR(100),
vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE'),
vUserFk INT
)
diff --git a/db/routines/account/functions/user_hasRole.sql b/db/routines/account/functions/user_hasRole.sql
index fb88efeecd..71bd7bcaee 100644
--- a/db/routines/account/functions/user_hasRole.sql
+++ b/db/routines/account/functions/user_hasRole.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_hasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255))
RETURNS tinyint(1)
DETERMINISTIC
BEGIN
diff --git a/db/routines/account/functions/user_hasRoleId.sql b/db/routines/account/functions/user_hasRoleId.sql
index a35624d3d6..1ba5fae75c 100644
--- a/db/routines/account/functions/user_hasRoleId.sql
+++ b/db/routines/account/functions/user_hasRoleId.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRoleId`(vUser VARCHAR(255), vRoleId INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_hasRoleId`(vUser VARCHAR(255), vRoleId INT)
RETURNS tinyint(1)
DETERMINISTIC
BEGIN
diff --git a/db/routines/account/functions/user_hasRoutinePriv.sql b/db/routines/account/functions/user_hasRoutinePriv.sql
index 6f87f160c4..b19ed6c2a7 100644
--- a/db/routines/account/functions/user_hasRoutinePriv.sql
+++ b/db/routines/account/functions/user_hasRoutinePriv.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
vChain VARCHAR(100),
vUserFk INT
)
diff --git a/db/routines/account/procedures/account_enable.sql b/db/routines/account/procedures/account_enable.sql
index 9f43c97a38..9441e46c8f 100644
--- a/db/routines/account/procedures/account_enable.sql
+++ b/db/routines/account/procedures/account_enable.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`account_enable`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`account_enable`(vSelf INT)
BEGIN
/**
* Enables an account and sets up email configuration.
diff --git a/db/routines/account/procedures/myUser_login.sql b/db/routines/account/procedures/myUser_login.sql
index be547292e5..013dc55d7d 100644
--- a/db/routines/account/procedures/myUser_login.sql
+++ b/db/routines/account/procedures/myUser_login.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_login`(vUserName VARCHAR(255), vPassword VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`myUser_login`(vUserName VARCHAR(255), vPassword VARCHAR(255))
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/account/procedures/myUser_loginWithKey.sql b/db/routines/account/procedures/myUser_loginWithKey.sql
index 67d8c99232..dab21e433c 100644
--- a/db/routines/account/procedures/myUser_loginWithKey.sql
+++ b/db/routines/account/procedures/myUser_loginWithKey.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_loginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`myUser_loginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255))
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/account/procedures/myUser_loginWithName.sql b/db/routines/account/procedures/myUser_loginWithName.sql
index 522da77dd8..c71b7ae7b2 100644
--- a/db/routines/account/procedures/myUser_loginWithName.sql
+++ b/db/routines/account/procedures/myUser_loginWithName.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_loginWithName`(vUserName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`myUser_loginWithName`(vUserName VARCHAR(255))
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/account/procedures/myUser_logout.sql b/db/routines/account/procedures/myUser_logout.sql
index a1d7db361a..8740a1b254 100644
--- a/db/routines/account/procedures/myUser_logout.sql
+++ b/db/routines/account/procedures/myUser_logout.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_logout`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`myUser_logout`()
BEGIN
/**
* Logouts the user.
diff --git a/db/routines/account/procedures/role_checkName.sql b/db/routines/account/procedures/role_checkName.sql
index 55d9d80a9c..5f5a8b8457 100644
--- a/db/routines/account/procedures/role_checkName.sql
+++ b/db/routines/account/procedures/role_checkName.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_checkName`(vRoleName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`role_checkName`(vRoleName VARCHAR(255))
BEGIN
/**
* Checks that role name meets the necessary syntax requirements, otherwise it
diff --git a/db/routines/account/procedures/role_getDescendents.sql b/db/routines/account/procedures/role_getDescendents.sql
index ecd4a8790b..fcc9536fdd 100644
--- a/db/routines/account/procedures/role_getDescendents.sql
+++ b/db/routines/account/procedures/role_getDescendents.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_getDescendents`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`role_getDescendents`(vSelf INT)
BEGIN
/**
* Gets the identifiers of all the subroles implemented by a role (Including
diff --git a/db/routines/account/procedures/role_sync.sql b/db/routines/account/procedures/role_sync.sql
index 139193a31a..645f1f6149 100644
--- a/db/routines/account/procedures/role_sync.sql
+++ b/db/routines/account/procedures/role_sync.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_sync`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`role_sync`()
BEGIN
/**
* Synchronize the @roleRole table with the current role hierarchy. This
diff --git a/db/routines/account/procedures/role_syncPrivileges.sql b/db/routines/account/procedures/role_syncPrivileges.sql
index cf265b4bdf..cfdb815936 100644
--- a/db/routines/account/procedures/role_syncPrivileges.sql
+++ b/db/routines/account/procedures/role_syncPrivileges.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_syncPrivileges`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`role_syncPrivileges`()
BEGIN
/**
* Synchronizes permissions of MySQL role users based on role hierarchy.
diff --git a/db/routines/account/procedures/user_checkName.sql b/db/routines/account/procedures/user_checkName.sql
index 6fab173615..ca12a67a2f 100644
--- a/db/routines/account/procedures/user_checkName.sql
+++ b/db/routines/account/procedures/user_checkName.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`user_checkName`(vUserName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`user_checkName`(vUserName VARCHAR(255))
BEGIN
/**
* Checks that username meets the necessary syntax requirements, otherwise it
diff --git a/db/routines/account/procedures/user_checkPassword.sql b/db/routines/account/procedures/user_checkPassword.sql
index eb09905334..d696c51cd5 100644
--- a/db/routines/account/procedures/user_checkPassword.sql
+++ b/db/routines/account/procedures/user_checkPassword.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`user_checkPassword`(vPassword VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`user_checkPassword`(vPassword VARCHAR(255))
BEGIN
/**
* Comprueba si la contraseña cumple los requisitos de seguridad
diff --git a/db/routines/account/triggers/account_afterDelete.sql b/db/routines/account/triggers/account_afterDelete.sql
index be0e5901fb..5249b358d4 100644
--- a/db/routines/account/triggers/account_afterDelete.sql
+++ b/db/routines/account/triggers/account_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`account_afterDelete`
AFTER DELETE ON `account`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/account_afterInsert.sql b/db/routines/account/triggers/account_afterInsert.sql
index be2959ab67..0fe35867ed 100644
--- a/db/routines/account/triggers/account_afterInsert.sql
+++ b/db/routines/account/triggers/account_afterInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`account_afterInsert`
AFTER INSERT ON `account`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/account_beforeInsert.sql b/db/routines/account/triggers/account_beforeInsert.sql
index 43b611990a..b4e9f06f71 100644
--- a/db/routines/account/triggers/account_beforeInsert.sql
+++ b/db/routines/account/triggers/account_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`account_beforeInsert`
BEFORE INSERT ON `account`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/account_beforeUpdate.sql b/db/routines/account/triggers/account_beforeUpdate.sql
index bbcea028d7..05d3ec3aeb 100644
--- a/db/routines/account/triggers/account_beforeUpdate.sql
+++ b/db/routines/account/triggers/account_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`account_beforeUpdate`
BEFORE UPDATE ON `account`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailAliasAccount_afterDelete.sql b/db/routines/account/triggers/mailAliasAccount_afterDelete.sql
index 83af7169c2..32b5b620eb 100644
--- a/db/routines/account/triggers/mailAliasAccount_afterDelete.sql
+++ b/db/routines/account/triggers/mailAliasAccount_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAliasAccount_afterDelete`
AFTER DELETE ON `mailAliasAccount`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailAliasAccount_beforeInsert.sql b/db/routines/account/triggers/mailAliasAccount_beforeInsert.sql
index a435832f20..171c7bc7af 100644
--- a/db/routines/account/triggers/mailAliasAccount_beforeInsert.sql
+++ b/db/routines/account/triggers/mailAliasAccount_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeInsert`
BEFORE INSERT ON `mailAliasAccount`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailAliasAccount_beforeUpdate.sql b/db/routines/account/triggers/mailAliasAccount_beforeUpdate.sql
index 471a349006..4d05fc32ab 100644
--- a/db/routines/account/triggers/mailAliasAccount_beforeUpdate.sql
+++ b/db/routines/account/triggers/mailAliasAccount_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeUpdate`
BEFORE UPDATE ON `mailAliasAccount`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailAlias_afterDelete.sql b/db/routines/account/triggers/mailAlias_afterDelete.sql
index fe944246d2..ec01b1a4b6 100644
--- a/db/routines/account/triggers/mailAlias_afterDelete.sql
+++ b/db/routines/account/triggers/mailAlias_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAlias_afterDelete`
AFTER DELETE ON `mailAlias`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailAlias_beforeInsert.sql b/db/routines/account/triggers/mailAlias_beforeInsert.sql
index 37a9546ca7..02f900f563 100644
--- a/db/routines/account/triggers/mailAlias_beforeInsert.sql
+++ b/db/routines/account/triggers/mailAlias_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAlias_beforeInsert`
BEFORE INSERT ON `mailAlias`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailAlias_beforeUpdate.sql b/db/routines/account/triggers/mailAlias_beforeUpdate.sql
index e3940cfda6..0f14dcf3f0 100644
--- a/db/routines/account/triggers/mailAlias_beforeUpdate.sql
+++ b/db/routines/account/triggers/mailAlias_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAlias_beforeUpdate`
BEFORE UPDATE ON `mailAlias`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailForward_afterDelete.sql b/db/routines/account/triggers/mailForward_afterDelete.sql
index cb02b746d8..c1eef93deb 100644
--- a/db/routines/account/triggers/mailForward_afterDelete.sql
+++ b/db/routines/account/triggers/mailForward_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailForward_afterDelete`
AFTER DELETE ON `mailForward`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailForward_beforeInsert.sql b/db/routines/account/triggers/mailForward_beforeInsert.sql
index bc4e5ef172..bf5bd1369a 100644
--- a/db/routines/account/triggers/mailForward_beforeInsert.sql
+++ b/db/routines/account/triggers/mailForward_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailForward_beforeInsert`
BEFORE INSERT ON `mailForward`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/mailForward_beforeUpdate.sql b/db/routines/account/triggers/mailForward_beforeUpdate.sql
index 88594979a2..590b203474 100644
--- a/db/routines/account/triggers/mailForward_beforeUpdate.sql
+++ b/db/routines/account/triggers/mailForward_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailForward_beforeUpdate`
BEFORE UPDATE ON `mailForward`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/roleInherit_afterDelete.sql b/db/routines/account/triggers/roleInherit_afterDelete.sql
index c7c82eedb0..84e2cbc67d 100644
--- a/db/routines/account/triggers/roleInherit_afterDelete.sql
+++ b/db/routines/account/triggers/roleInherit_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`roleInherit_afterDelete`
AFTER DELETE ON `roleInherit`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/roleInherit_beforeInsert.sql b/db/routines/account/triggers/roleInherit_beforeInsert.sql
index 77932c12d1..a964abecbb 100644
--- a/db/routines/account/triggers/roleInherit_beforeInsert.sql
+++ b/db/routines/account/triggers/roleInherit_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`roleInherit_beforeInsert`
BEFORE INSERT ON `roleInherit`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/roleInherit_beforeUpdate.sql b/db/routines/account/triggers/roleInherit_beforeUpdate.sql
index 05aef0b95a..05b2ae8b5e 100644
--- a/db/routines/account/triggers/roleInherit_beforeUpdate.sql
+++ b/db/routines/account/triggers/roleInherit_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`roleInherit_beforeUpdate`
BEFORE UPDATE ON `roleInherit`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/role_afterDelete.sql b/db/routines/account/triggers/role_afterDelete.sql
index be382cba63..731f1c978e 100644
--- a/db/routines/account/triggers/role_afterDelete.sql
+++ b/db/routines/account/triggers/role_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`role_afterDelete`
AFTER DELETE ON `role`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/role_beforeInsert.sql b/db/routines/account/triggers/role_beforeInsert.sql
index f68a211a76..35e493bf7e 100644
--- a/db/routines/account/triggers/role_beforeInsert.sql
+++ b/db/routines/account/triggers/role_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`role_beforeInsert`
BEFORE INSERT ON `role`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/role_beforeUpdate.sql b/db/routines/account/triggers/role_beforeUpdate.sql
index a2f471b646..588d2271d1 100644
--- a/db/routines/account/triggers/role_beforeUpdate.sql
+++ b/db/routines/account/triggers/role_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`role_beforeUpdate`
BEFORE UPDATE ON `role`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/user_afterDelete.sql b/db/routines/account/triggers/user_afterDelete.sql
index eabe60d8cf..710549cc66 100644
--- a/db/routines/account/triggers/user_afterDelete.sql
+++ b/db/routines/account/triggers/user_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_afterDelete`
AFTER DELETE ON `user`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/user_afterInsert.sql b/db/routines/account/triggers/user_afterInsert.sql
index 31f992c16b..2cc4da49b0 100644
--- a/db/routines/account/triggers/user_afterInsert.sql
+++ b/db/routines/account/triggers/user_afterInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_afterInsert`
AFTER INSERT ON `user`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/user_afterUpdate.sql b/db/routines/account/triggers/user_afterUpdate.sql
index 7fb4e644f5..7e5415ee7f 100644
--- a/db/routines/account/triggers/user_afterUpdate.sql
+++ b/db/routines/account/triggers/user_afterUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_afterUpdate`
AFTER UPDATE ON `user`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/user_beforeInsert.sql b/db/routines/account/triggers/user_beforeInsert.sql
index 6cafa8b3ff..e15f8faa51 100644
--- a/db/routines/account/triggers/user_beforeInsert.sql
+++ b/db/routines/account/triggers/user_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_beforeInsert`
BEFORE INSERT ON `user`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/triggers/user_beforeUpdate.sql b/db/routines/account/triggers/user_beforeUpdate.sql
index 849dfbd91b..ae8d648e29 100644
--- a/db/routines/account/triggers/user_beforeUpdate.sql
+++ b/db/routines/account/triggers/user_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_beforeUpdate`
BEFORE UPDATE ON `user`
FOR EACH ROW
BEGIN
diff --git a/db/routines/account/views/accountDovecot.sql b/db/routines/account/views/accountDovecot.sql
index 1e30946f3f..d3d03ca641 100644
--- a/db/routines/account/views/accountDovecot.sql
+++ b/db/routines/account/views/accountDovecot.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `account`.`accountDovecot`
AS SELECT `u`.`name` AS `name`,
diff --git a/db/routines/account/views/emailUser.sql b/db/routines/account/views/emailUser.sql
index dcb4354540..d6a66719c6 100644
--- a/db/routines/account/views/emailUser.sql
+++ b/db/routines/account/views/emailUser.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `account`.`emailUser`
AS SELECT `u`.`id` AS `userFk`,
diff --git a/db/routines/account/views/myRole.sql b/db/routines/account/views/myRole.sql
index 68364f0bc1..036300db58 100644
--- a/db/routines/account/views/myRole.sql
+++ b/db/routines/account/views/myRole.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `account`.`myRole`
AS SELECT `r`.`inheritsFrom` AS `id`
diff --git a/db/routines/account/views/myUser.sql b/db/routines/account/views/myUser.sql
index 8d927dc0f3..faf7f76aec 100644
--- a/db/routines/account/views/myUser.sql
+++ b/db/routines/account/views/myUser.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `account`.`myUser`
AS SELECT `u`.`id` AS `id`,
diff --git a/db/routines/bi/procedures/Greuge_Evolution_Add.sql b/db/routines/bi/procedures/Greuge_Evolution_Add.sql
index 6480155cb1..bf5693ad28 100644
--- a/db/routines/bi/procedures/Greuge_Evolution_Add.sql
+++ b/db/routines/bi/procedures/Greuge_Evolution_Add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`Greuge_Evolution_Add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`Greuge_Evolution_Add`()
BEGIN
/*
Inserta en la tabla Greuge_Evolution el saldo acumulado de cada cliente,
diff --git a/db/routines/bi/procedures/analisis_ventas_evolution_add.sql b/db/routines/bi/procedures/analisis_ventas_evolution_add.sql
index 7c2cc5678d..bbee190ea6 100644
--- a/db/routines/bi/procedures/analisis_ventas_evolution_add.sql
+++ b/db/routines/bi/procedures/analisis_ventas_evolution_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_evolution_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`analisis_ventas_evolution_add`()
BEGIN
DECLARE vPreviousPeriod INT;
DECLARE vCurrentPeriod INT;
diff --git a/db/routines/bi/procedures/analisis_ventas_simple.sql b/db/routines/bi/procedures/analisis_ventas_simple.sql
index 5c67584eed..597d9bcd48 100644
--- a/db/routines/bi/procedures/analisis_ventas_simple.sql
+++ b/db/routines/bi/procedures/analisis_ventas_simple.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_simple`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`analisis_ventas_simple`()
BEGIN
/**
* Vacia y rellena la tabla 'analisis_grafico_simple' desde 'analisis_grafico_ventas'
diff --git a/db/routines/bi/procedures/analisis_ventas_update.sql b/db/routines/bi/procedures/analisis_ventas_update.sql
index ef3e165a03..a7bb463876 100644
--- a/db/routines/bi/procedures/analisis_ventas_update.sql
+++ b/db/routines/bi/procedures/analisis_ventas_update.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
BEGIN
DECLARE vLastMonth DATE;
diff --git a/db/routines/bi/procedures/clean.sql b/db/routines/bi/procedures/clean.sql
index a1eb991660..4c3994dd52 100644
--- a/db/routines/bi/procedures/clean.sql
+++ b/db/routines/bi/procedures/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`clean`()
BEGIN
DECLARE vDateShort DATETIME;
DECLARE vDateLong DATETIME;
diff --git a/db/routines/bi/procedures/defaultersFromDate.sql b/db/routines/bi/procedures/defaultersFromDate.sql
index bfe1337506..88828a6e1d 100644
--- a/db/routines/bi/procedures/defaultersFromDate.sql
+++ b/db/routines/bi/procedures/defaultersFromDate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(IN vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(IN vDate DATE)
BEGIN
SELECT t1.*, c.name Cliente, w.code workerCode, c.payMethodFk pay_met_id, c.dueDay Vencimiento
diff --git a/db/routines/bi/procedures/defaulting.sql b/db/routines/bi/procedures/defaulting.sql
index d20232b8b0..db030fa0f3 100644
--- a/db/routines/bi/procedures/defaulting.sql
+++ b/db/routines/bi/procedures/defaulting.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting`(IN `vDate` DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`defaulting`(IN `vDate` DATE)
BEGIN
DECLARE vDone BOOLEAN;
DECLARE vClient INT;
diff --git a/db/routines/bi/procedures/defaulting_launcher.sql b/db/routines/bi/procedures/defaulting_launcher.sql
index 585abdc09b..a0df72adf9 100644
--- a/db/routines/bi/procedures/defaulting_launcher.sql
+++ b/db/routines/bi/procedures/defaulting_launcher.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting_launcher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`defaulting_launcher`()
BEGIN
/**
* Calcula la morosidad de los clientes.
diff --git a/db/routines/bi/procedures/facturacion_media_anual_update.sql b/db/routines/bi/procedures/facturacion_media_anual_update.sql
index e8810cc219..62f5d623d5 100644
--- a/db/routines/bi/procedures/facturacion_media_anual_update.sql
+++ b/db/routines/bi/procedures/facturacion_media_anual_update.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`facturacion_media_anual_update`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`facturacion_media_anual_update`()
BEGIN
TRUNCATE TABLE bs.clientAnnualConsumption;
diff --git a/db/routines/bi/procedures/greuge_dif_porte_add.sql b/db/routines/bi/procedures/greuge_dif_porte_add.sql
index 330ff92b81..b86524f59c 100644
--- a/db/routines/bi/procedures/greuge_dif_porte_add.sql
+++ b/db/routines/bi/procedures/greuge_dif_porte_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
BEGIN
/**
diff --git a/db/routines/bi/procedures/nigthlyAnalisisVentas.sql b/db/routines/bi/procedures/nigthlyAnalisisVentas.sql
index c21a3bae5d..2568600ae6 100644
--- a/db/routines/bi/procedures/nigthlyAnalisisVentas.sql
+++ b/db/routines/bi/procedures/nigthlyAnalisisVentas.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`nigthlyAnalisisVentas`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`nigthlyAnalisisVentas`()
BEGIN
CALL analisis_ventas_update;
CALL analisis_ventas_simple;
diff --git a/db/routines/bi/procedures/rutasAnalyze.sql b/db/routines/bi/procedures/rutasAnalyze.sql
index 1f103bde0e..a5f051dfac 100644
--- a/db/routines/bi/procedures/rutasAnalyze.sql
+++ b/db/routines/bi/procedures/rutasAnalyze.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`rutasAnalyze`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`rutasAnalyze`(
vDatedFrom DATE,
vDatedTo DATE
)
diff --git a/db/routines/bi/procedures/rutasAnalyze_launcher.sql b/db/routines/bi/procedures/rutasAnalyze_launcher.sql
index 02f5e1b9c7..9cc6f0eeb5 100644
--- a/db/routines/bi/procedures/rutasAnalyze_launcher.sql
+++ b/db/routines/bi/procedures/rutasAnalyze_launcher.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`rutasAnalyze_launcher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`rutasAnalyze_launcher`()
BEGIN
/**
* Call rutasAnalyze
diff --git a/db/routines/bi/views/analisis_grafico_ventas.sql b/db/routines/bi/views/analisis_grafico_ventas.sql
index f5956f27a1..566f24c2ee 100644
--- a/db/routines/bi/views/analisis_grafico_ventas.sql
+++ b/db/routines/bi/views/analisis_grafico_ventas.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bi`.`analisis_grafico_ventas`
AS SELECT `bi`.`analisis_ventas`.`Año` AS `Año`,
diff --git a/db/routines/bi/views/analisis_ventas_simple.sql b/db/routines/bi/views/analisis_ventas_simple.sql
index 109378c8a6..8651f3d05e 100644
--- a/db/routines/bi/views/analisis_ventas_simple.sql
+++ b/db/routines/bi/views/analisis_ventas_simple.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bi`.`analisis_ventas_simple`
AS SELECT `bi`.`analisis_ventas`.`Año` AS `Año`,
diff --git a/db/routines/bi/views/claims_ratio.sql b/db/routines/bi/views/claims_ratio.sql
index cfd9b62316..39ceae56d2 100644
--- a/db/routines/bi/views/claims_ratio.sql
+++ b/db/routines/bi/views/claims_ratio.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bi`.`claims_ratio`
AS SELECT `cr`.`clientFk` AS `Id_Cliente`,
diff --git a/db/routines/bi/views/customerRiskOverdue.sql b/db/routines/bi/views/customerRiskOverdue.sql
index 27ef7ca471..8b8deb3ca6 100644
--- a/db/routines/bi/views/customerRiskOverdue.sql
+++ b/db/routines/bi/views/customerRiskOverdue.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bi`.`customerRiskOverdue`
AS SELECT `cr`.`clientFk` AS `customer_id`,
diff --git a/db/routines/bi/views/defaulters.sql b/db/routines/bi/views/defaulters.sql
index 9275032451..e5922a7461 100644
--- a/db/routines/bi/views/defaulters.sql
+++ b/db/routines/bi/views/defaulters.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bi`.`defaulters`
AS SELECT `d`.`clientFk` AS `client`,
diff --git a/db/routines/bi/views/facturacion_media_anual.sql b/db/routines/bi/views/facturacion_media_anual.sql
index 2e0c2ca6e8..8b1cde492b 100644
--- a/db/routines/bi/views/facturacion_media_anual.sql
+++ b/db/routines/bi/views/facturacion_media_anual.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bi`.`facturacion_media_anual`
AS SELECT `cac`.`clientFk` AS `Id_Cliente`,
diff --git a/db/routines/bi/views/tarifa_componentes.sql b/db/routines/bi/views/tarifa_componentes.sql
index 42ea9fa81d..614e84eb98 100644
--- a/db/routines/bi/views/tarifa_componentes.sql
+++ b/db/routines/bi/views/tarifa_componentes.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bi`.`tarifa_componentes`
AS SELECT `c`.`id` AS `Id_Componente`,
diff --git a/db/routines/bi/views/tarifa_componentes_series.sql b/db/routines/bi/views/tarifa_componentes_series.sql
index ed2f8e29a4..508a78fb30 100644
--- a/db/routines/bi/views/tarifa_componentes_series.sql
+++ b/db/routines/bi/views/tarifa_componentes_series.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bi`.`tarifa_componentes_series`
AS SELECT `ct`.`id` AS `tarifa_componentes_series_id`,
diff --git a/db/routines/bs/events/clientDied_recalc.sql b/db/routines/bs/events/clientDied_recalc.sql
index db912658af..9a9a5ebb31 100644
--- a/db/routines/bs/events/clientDied_recalc.sql
+++ b/db/routines/bs/events/clientDied_recalc.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `bs`.`clientDied_recalc`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `bs`.`clientDied_recalc`
ON SCHEDULE EVERY 1 DAY
STARTS '2023-06-01 03:00:00.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/bs/events/inventoryDiscrepancy_launch.sql b/db/routines/bs/events/inventoryDiscrepancy_launch.sql
index 3ee165846f..015425dfdd 100644
--- a/db/routines/bs/events/inventoryDiscrepancy_launch.sql
+++ b/db/routines/bs/events/inventoryDiscrepancy_launch.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `bs`.`inventoryDiscrepancy_launch`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `bs`.`inventoryDiscrepancy_launch`
ON SCHEDULE EVERY 15 MINUTE
STARTS '2023-07-18 00:00:00.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/bs/events/nightTask_launchAll.sql b/db/routines/bs/events/nightTask_launchAll.sql
index 1a55ca1a31..f1f20f1cc6 100644
--- a/db/routines/bs/events/nightTask_launchAll.sql
+++ b/db/routines/bs/events/nightTask_launchAll.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `bs`.`nightTask_launchAll`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `bs`.`nightTask_launchAll`
ON SCHEDULE EVERY 1 DAY
STARTS '2022-02-08 04:14:00.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/bs/functions/tramo.sql b/db/routines/bs/functions/tramo.sql
index 0415cfc92d..a45860409a 100644
--- a/db/routines/bs/functions/tramo.sql
+++ b/db/routines/bs/functions/tramo.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `bs`.`tramo`(vDateTime DATETIME)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `bs`.`tramo`(vDateTime DATETIME)
RETURNS varchar(20) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
NOT DETERMINISTIC
NO SQL
diff --git a/db/routines/bs/procedures/campaignComparative.sql b/db/routines/bs/procedures/campaignComparative.sql
index 6b4b983b5e..27957976ab 100644
--- a/db/routines/bs/procedures/campaignComparative.sql
+++ b/db/routines/bs/procedures/campaignComparative.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`campaignComparative`(vDateFrom DATE, vDateTo DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`campaignComparative`(vDateFrom DATE, vDateTo DATE)
BEGIN
SELECT
workerName,
diff --git a/db/routines/bs/procedures/carteras_add.sql b/db/routines/bs/procedures/carteras_add.sql
index 5143b4bb56..8c806e1d95 100644
--- a/db/routines/bs/procedures/carteras_add.sql
+++ b/db/routines/bs/procedures/carteras_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`carteras_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`carteras_add`()
BEGIN
/**
* Inserta en la tabla @bs.carteras las ventas desde el año pasado
diff --git a/db/routines/bs/procedures/clean.sql b/db/routines/bs/procedures/clean.sql
index eff2faadbb..a1d393122b 100644
--- a/db/routines/bs/procedures/clean.sql
+++ b/db/routines/bs/procedures/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`clean`()
BEGIN
DECLARE vOneYearAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 1 YEAR;
diff --git a/db/routines/bs/procedures/clientDied_recalc.sql b/db/routines/bs/procedures/clientDied_recalc.sql
index 1b5cb5ac82..d76c61968b 100644
--- a/db/routines/bs/procedures/clientDied_recalc.sql
+++ b/db/routines/bs/procedures/clientDied_recalc.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`clientDied_recalc`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`clientDied_recalc`(
vDays INT,
vCountryCode VARCHAR(2)
)
diff --git a/db/routines/bs/procedures/clientNewBorn_recalc.sql b/db/routines/bs/procedures/clientNewBorn_recalc.sql
index bb6b02aa7b..02a3387cff 100644
--- a/db/routines/bs/procedures/clientNewBorn_recalc.sql
+++ b/db/routines/bs/procedures/clientNewBorn_recalc.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`clientNewBorn_recalc`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`clientNewBorn_recalc`()
BLOCK1: BEGIN
DECLARE vClientFk INT;
diff --git a/db/routines/bs/procedures/compradores_evolution_add.sql b/db/routines/bs/procedures/compradores_evolution_add.sql
index e9b073e28d..1049122a0e 100644
--- a/db/routines/bs/procedures/compradores_evolution_add.sql
+++ b/db/routines/bs/procedures/compradores_evolution_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`compradores_evolution_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`compradores_evolution_add`()
BEGIN
/**
* Inserta en la tabla compradores_evolution las ventas acumuladas en los ultimos 365 dias
diff --git a/db/routines/bs/procedures/fondo_evolution_add.sql b/db/routines/bs/procedures/fondo_evolution_add.sql
index 3ca91e6473..22f73ff8dc 100644
--- a/db/routines/bs/procedures/fondo_evolution_add.sql
+++ b/db/routines/bs/procedures/fondo_evolution_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`fondo_evolution_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`fondo_evolution_add`()
BEGIN
/**
* Inserta en la tabla fondo_maniobra los saldos acumulados en los ultimos 365 dias
diff --git a/db/routines/bs/procedures/fruitsEvolution.sql b/db/routines/bs/procedures/fruitsEvolution.sql
index c689f4b760..15ce35ebe3 100644
--- a/db/routines/bs/procedures/fruitsEvolution.sql
+++ b/db/routines/bs/procedures/fruitsEvolution.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`fruitsEvolution`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`fruitsEvolution`()
BEGIN
select Id_Cliente,
Cliente, count(semana) as semanas, (w.code IS NOT NULL) isWorker
diff --git a/db/routines/bs/procedures/indicatorsUpdate.sql b/db/routines/bs/procedures/indicatorsUpdate.sql
index d66e52a614..958aae0176 100644
--- a/db/routines/bs/procedures/indicatorsUpdate.sql
+++ b/db/routines/bs/procedures/indicatorsUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`indicatorsUpdate`(vDated DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`indicatorsUpdate`(vDated DATE)
BEGIN
DECLARE oneYearBefore DATE DEFAULT TIMESTAMPADD(YEAR,-1, vDated);
diff --git a/db/routines/bs/procedures/indicatorsUpdateLauncher.sql b/db/routines/bs/procedures/indicatorsUpdateLauncher.sql
index 8ede28ec84..b4f7685221 100644
--- a/db/routines/bs/procedures/indicatorsUpdateLauncher.sql
+++ b/db/routines/bs/procedures/indicatorsUpdateLauncher.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`indicatorsUpdateLauncher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`indicatorsUpdateLauncher`()
BEGIN
DECLARE vDated DATE;
diff --git a/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql b/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql
index 6894b29289..045f06f299 100644
--- a/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql
+++ b/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`inventoryDiscrepancyDetail_replace`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`inventoryDiscrepancyDetail_replace`()
BEGIN
/**
* Replace all records in table inventoryDiscrepancyDetail and insert new
diff --git a/db/routines/bs/procedures/m3Add.sql b/db/routines/bs/procedures/m3Add.sql
index 0ec2c8ce29..63159815b2 100644
--- a/db/routines/bs/procedures/m3Add.sql
+++ b/db/routines/bs/procedures/m3Add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`m3Add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`m3Add`()
BEGIN
DECLARE datSTART DATE;
diff --git a/db/routines/bs/procedures/manaCustomerUpdate.sql b/db/routines/bs/procedures/manaCustomerUpdate.sql
index e9ba704234..f2bcc942ec 100644
--- a/db/routines/bs/procedures/manaCustomerUpdate.sql
+++ b/db/routines/bs/procedures/manaCustomerUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`manaCustomerUpdate`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`manaCustomerUpdate`()
BEGIN
DECLARE vToDated DATE;
DECLARE vFromDated DATE;
diff --git a/db/routines/bs/procedures/manaSpellers_actualize.sql b/db/routines/bs/procedures/manaSpellers_actualize.sql
index 20b0f84f8c..818ef40a62 100644
--- a/db/routines/bs/procedures/manaSpellers_actualize.sql
+++ b/db/routines/bs/procedures/manaSpellers_actualize.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`manaSpellers_actualize`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`manaSpellers_actualize`()
BEGIN
/**
* Recalcula el valor del campo con el modificador de precio
diff --git a/db/routines/bs/procedures/nightTask_launchAll.sql b/db/routines/bs/procedures/nightTask_launchAll.sql
index e61e88bb6f..9c3788b509 100644
--- a/db/routines/bs/procedures/nightTask_launchAll.sql
+++ b/db/routines/bs/procedures/nightTask_launchAll.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`nightTask_launchAll`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`nightTask_launchAll`()
BEGIN
/**
* Runs all nightly tasks.
diff --git a/db/routines/bs/procedures/nightTask_launchTask.sql b/db/routines/bs/procedures/nightTask_launchTask.sql
index aa4c540e8e..042df9d5d4 100644
--- a/db/routines/bs/procedures/nightTask_launchTask.sql
+++ b/db/routines/bs/procedures/nightTask_launchTask.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`nightTask_launchTask`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`nightTask_launchTask`(
vSchema VARCHAR(255),
vProcedure VARCHAR(255),
OUT vError VARCHAR(255),
diff --git a/db/routines/bs/procedures/payMethodClientAdd.sql b/db/routines/bs/procedures/payMethodClientAdd.sql
index 0c19f453ac..6ed39538a9 100644
--- a/db/routines/bs/procedures/payMethodClientAdd.sql
+++ b/db/routines/bs/procedures/payMethodClientAdd.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`payMethodClientAdd`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`payMethodClientAdd`()
BEGIN
INSERT IGNORE INTO `bs`.`payMethodClient` (dated, payMethodFk, clientFk)
SELECT util.VN_CURDATE(), c.payMethodFk, c.id
diff --git a/db/routines/bs/procedures/saleGraphic.sql b/db/routines/bs/procedures/saleGraphic.sql
index e1e3879800..cdf04ed194 100644
--- a/db/routines/bs/procedures/saleGraphic.sql
+++ b/db/routines/bs/procedures/saleGraphic.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`saleGraphic`(IN vItemFk INT, IN vTypeFk INT, IN vCategoryFk INT, IN vFromDate DATE,
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`saleGraphic`(IN vItemFk INT, IN vTypeFk INT, IN vCategoryFk INT, IN vFromDate DATE,
IN vToDate DATE, IN vProducerFk INT)
BEGIN
diff --git a/db/routines/bs/procedures/salePersonEvolutionAdd.sql b/db/routines/bs/procedures/salePersonEvolutionAdd.sql
index 33e31b6995..8894e85463 100644
--- a/db/routines/bs/procedures/salePersonEvolutionAdd.sql
+++ b/db/routines/bs/procedures/salePersonEvolutionAdd.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salePersonEvolutionAdd`(IN vDateStart DATETIME)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`salePersonEvolutionAdd`(IN vDateStart DATETIME)
BEGIN
DELETE FROM bs.salePersonEvolution
WHERE dated <= DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR);
diff --git a/db/routines/bs/procedures/sale_add.sql b/db/routines/bs/procedures/sale_add.sql
index c50d27b814..37f4f41c45 100644
--- a/db/routines/bs/procedures/sale_add.sql
+++ b/db/routines/bs/procedures/sale_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`sale_add`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`sale_add`(
IN vStarted DATE,
IN vEnded DATE
)
diff --git a/db/routines/bs/procedures/salesByItemTypeDay_add.sql b/db/routines/bs/procedures/salesByItemTypeDay_add.sql
index 5c12081a0e..fe7d36dc8e 100644
--- a/db/routines/bs/procedures/salesByItemTypeDay_add.sql
+++ b/db/routines/bs/procedures/salesByItemTypeDay_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesByItemTypeDay_add`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`salesByItemTypeDay_add`(
vDateStart DATE,
vDateEnd DATE
)
diff --git a/db/routines/bs/procedures/salesByItemTypeDay_addLauncher.sql b/db/routines/bs/procedures/salesByItemTypeDay_addLauncher.sql
index 63677def67..c2b3f4b489 100644
--- a/db/routines/bs/procedures/salesByItemTypeDay_addLauncher.sql
+++ b/db/routines/bs/procedures/salesByItemTypeDay_addLauncher.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesByItemTypeDay_addLauncher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`salesByItemTypeDay_addLauncher`()
BEGIN
CALL bs.salesByItemTypeDay_add(util.VN_CURDATE() - INTERVAL 30 DAY, util.VN_CURDATE());
END$$
diff --git a/db/routines/bs/procedures/salesByclientSalesPerson_add.sql b/db/routines/bs/procedures/salesByclientSalesPerson_add.sql
index eb441c07bb..4e0af84bf0 100644
--- a/db/routines/bs/procedures/salesByclientSalesPerson_add.sql
+++ b/db/routines/bs/procedures/salesByclientSalesPerson_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesByclientSalesPerson_add`(vDatedFrom DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`salesByclientSalesPerson_add`(vDatedFrom DATE)
BEGIN
/**
* Agrupa las ventas por cliente/comercial/fecha en la tabla bs.salesByclientSalesPerson
diff --git a/db/routines/bs/procedures/salesPersonEvolution_add.sql b/db/routines/bs/procedures/salesPersonEvolution_add.sql
index ea150e182a..3474352c31 100644
--- a/db/routines/bs/procedures/salesPersonEvolution_add.sql
+++ b/db/routines/bs/procedures/salesPersonEvolution_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesPersonEvolution_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`salesPersonEvolution_add`()
BEGIN
/**
* Calcula los datos para los gráficos de evolución agrupado por salesPersonFk y día.
diff --git a/db/routines/bs/procedures/sales_addLauncher.sql b/db/routines/bs/procedures/sales_addLauncher.sql
index 38cb5e2198..403e76bd5e 100644
--- a/db/routines/bs/procedures/sales_addLauncher.sql
+++ b/db/routines/bs/procedures/sales_addLauncher.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`sales_addLauncher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`sales_addLauncher`()
BEGIN
/**
* Añade las ventas a la tabla bs.sale que se realizaron desde hace un mes hasta hoy
diff --git a/db/routines/bs/procedures/vendedores_add_launcher.sql b/db/routines/bs/procedures/vendedores_add_launcher.sql
index c0718a6593..562b02c5cf 100644
--- a/db/routines/bs/procedures/vendedores_add_launcher.sql
+++ b/db/routines/bs/procedures/vendedores_add_launcher.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`vendedores_add_launcher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`vendedores_add_launcher`()
BEGIN
CALL bs.salesByclientSalesPerson_add(util.VN_CURDATE()- INTERVAL 45 DAY);
diff --git a/db/routines/bs/procedures/ventas_contables_add.sql b/db/routines/bs/procedures/ventas_contables_add.sql
index c82cb96d9c..e9d578462c 100644
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_add`(IN vYear INT, IN vMonth INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`ventas_contables_add`(IN vYear INT, IN vMonth INT)
BEGIN
/**
diff --git a/db/routines/bs/procedures/ventas_contables_add_launcher.sql b/db/routines/bs/procedures/ventas_contables_add_launcher.sql
index ac74c47bf5..e4b9c89a0a 100644
--- a/db/routines/bs/procedures/ventas_contables_add_launcher.sql
+++ b/db/routines/bs/procedures/ventas_contables_add_launcher.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_add_launcher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`ventas_contables_add_launcher`()
BEGIN
/**
diff --git a/db/routines/bs/procedures/waste_addSales.sql b/db/routines/bs/procedures/waste_addSales.sql
index 4a34d74b3c..69678b4fc2 100644
--- a/db/routines/bs/procedures/waste_addSales.sql
+++ b/db/routines/bs/procedures/waste_addSales.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSales`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`waste_addSales`(
vDateFrom DATE,
vDateTo DATE
)
diff --git a/db/routines/bs/procedures/waste_addSalesLauncher.sql b/db/routines/bs/procedures/waste_addSalesLauncher.sql
index 5eaea9be4d..a735ba25a3 100644
--- a/db/routines/bs/procedures/waste_addSalesLauncher.sql
+++ b/db/routines/bs/procedures/waste_addSalesLauncher.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSalesLauncher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`waste_addSalesLauncher`()
BEGIN
CALL waste_addSales(NULL, NULL);
END$$
diff --git a/db/routines/bs/procedures/workerLabour_getData.sql b/db/routines/bs/procedures/workerLabour_getData.sql
index 1f5a39fe0c..28e80365a9 100644
--- a/db/routines/bs/procedures/workerLabour_getData.sql
+++ b/db/routines/bs/procedures/workerLabour_getData.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`workerLabour_getData`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`workerLabour_getData`()
BEGIN
/**
* Carga los datos de la plantilla de trabajadores, altas y bajas en la tabla workerLabourDataByMonth para facilitar el cálculo del gráfico en grafana.
diff --git a/db/routines/bs/procedures/workerProductivity_add.sql b/db/routines/bs/procedures/workerProductivity_add.sql
index 3d7dbdca96..00d8ba9e82 100644
--- a/db/routines/bs/procedures/workerProductivity_add.sql
+++ b/db/routines/bs/procedures/workerProductivity_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`workerProductivity_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bs`.`workerProductivity_add`()
BEGIN
DECLARE vDateFrom DATE;
SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 30 DAY) INTO vDateFrom;
diff --git a/db/routines/bs/triggers/clientNewBorn_beforeUpdate.sql b/db/routines/bs/triggers/clientNewBorn_beforeUpdate.sql
index a88567a21b..33e5ad3bdb 100644
--- a/db/routines/bs/triggers/clientNewBorn_beforeUpdate.sql
+++ b/db/routines/bs/triggers/clientNewBorn_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `bs`.`clientNewBorn_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `bs`.`clientNewBorn_beforeUpdate`
BEFORE UPDATE ON `clientNewBorn`
FOR EACH ROW
BEGIN
diff --git a/db/routines/bs/triggers/nightTask_beforeInsert.sql b/db/routines/bs/triggers/nightTask_beforeInsert.sql
index 96f2b52913..6d0313425b 100644
--- a/db/routines/bs/triggers/nightTask_beforeInsert.sql
+++ b/db/routines/bs/triggers/nightTask_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `bs`.`nightTask_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `bs`.`nightTask_beforeInsert`
BEFORE INSERT ON `nightTask`
FOR EACH ROW
BEGIN
diff --git a/db/routines/bs/triggers/nightTask_beforeUpdate.sql b/db/routines/bs/triggers/nightTask_beforeUpdate.sql
index 1da1da8c3c..70186202cf 100644
--- a/db/routines/bs/triggers/nightTask_beforeUpdate.sql
+++ b/db/routines/bs/triggers/nightTask_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `bs`.`nightTask_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `bs`.`nightTask_beforeUpdate`
BEFORE UPDATE ON `nightTask`
FOR EACH ROW
BEGIN
diff --git a/db/routines/bs/views/lastIndicators.sql b/db/routines/bs/views/lastIndicators.sql
index 3fa04abd3e..15de2d97fd 100644
--- a/db/routines/bs/views/lastIndicators.sql
+++ b/db/routines/bs/views/lastIndicators.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bs`.`lastIndicators`
AS SELECT `i`.`updated` AS `updated`,
diff --git a/db/routines/bs/views/packingSpeed.sql b/db/routines/bs/views/packingSpeed.sql
index 517706b158..10b70c9406 100644
--- a/db/routines/bs/views/packingSpeed.sql
+++ b/db/routines/bs/views/packingSpeed.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bs`.`packingSpeed`
AS SELECT HOUR(`e`.`created`) AS `hora`,
diff --git a/db/routines/bs/views/ventas.sql b/db/routines/bs/views/ventas.sql
index 1fab2e91b4..3ebaf67c5f 100644
--- a/db/routines/bs/views/ventas.sql
+++ b/db/routines/bs/views/ventas.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `bs`.`ventas`
AS SELECT `s`.`saleFk` AS `Id_Movimiento`,
diff --git a/db/routines/cache/events/cacheCalc_clean.sql b/db/routines/cache/events/cacheCalc_clean.sql
index e13bae98b4..e201dac3aa 100644
--- a/db/routines/cache/events/cacheCalc_clean.sql
+++ b/db/routines/cache/events/cacheCalc_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `cache`.`cacheCalc_clean`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `cache`.`cacheCalc_clean`
ON SCHEDULE EVERY 30 MINUTE
STARTS '2022-01-28 09:29:18.000'
ON COMPLETION NOT PRESERVE
diff --git a/db/routines/cache/events/cache_clean.sql b/db/routines/cache/events/cache_clean.sql
index c5e247bd4b..6b83f71a0d 100644
--- a/db/routines/cache/events/cache_clean.sql
+++ b/db/routines/cache/events/cache_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `cache`.`cache_clean`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `cache`.`cache_clean`
ON SCHEDULE EVERY 5 MINUTE
STARTS '2022-01-28 09:29:18.000'
ON COMPLETION NOT PRESERVE
diff --git a/db/routines/cache/procedures/addressFriendship_Update.sql b/db/routines/cache/procedures/addressFriendship_Update.sql
index f7fab8b9b4..5e59d957a0 100644
--- a/db/routines/cache/procedures/addressFriendship_Update.sql
+++ b/db/routines/cache/procedures/addressFriendship_Update.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`addressFriendship_Update`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`addressFriendship_Update`()
BEGIN
REPLACE cache.addressFriendship
diff --git a/db/routines/cache/procedures/availableNoRaids_refresh.sql b/db/routines/cache/procedures/availableNoRaids_refresh.sql
index 447300305c..b16a91ebfa 100644
--- a/db/routines/cache/procedures/availableNoRaids_refresh.sql
+++ b/db/routines/cache/procedures/availableNoRaids_refresh.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`availableNoRaids_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDated` DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`availableNoRaids_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDated` DATE)
proc: BEGIN
DECLARE vStartDate DATE;
DECLARE vEndDate DATETIME;
diff --git a/db/routines/cache/procedures/available_clean.sql b/db/routines/cache/procedures/available_clean.sql
index bb1f7302c9..5a6401dc27 100644
--- a/db/routines/cache/procedures/available_clean.sql
+++ b/db/routines/cache/procedures/available_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`available_clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`available_clean`()
BEGIN
DROP TEMPORARY TABLE IF EXISTS tCalc;
CREATE TEMPORARY TABLE tCalc
diff --git a/db/routines/cache/procedures/available_refresh.sql b/db/routines/cache/procedures/available_refresh.sql
index 87c003648c..968484ea26 100644
--- a/db/routines/cache/procedures/available_refresh.sql
+++ b/db/routines/cache/procedures/available_refresh.sql
@@ -1,9 +1,9 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`available_refresh`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`available_refresh`(
OUT `vCalc` INT,
`vRefresh` INT,
`vWarehouse` INT,
- `vDated` DATE
+ `vAvailabled` DATETIME
)
proc: BEGIN
DECLARE vStartDate DATE;
@@ -12,6 +12,7 @@ proc: BEGIN
DECLARE vInventoryDate DATE;
DECLARE vLifeScope DATE;
DECLARE vWarehouseFkInventory INT;
+ DECLARE vDated DATE;
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
@@ -19,13 +20,17 @@ proc: BEGIN
RESIGNAL;
END;
- IF vDated < util.VN_CURDATE() THEN
+ IF vAvailabled < util.VN_CURDATE() THEN
LEAVE proc;
END IF;
+ SET vDated = DATE(vAvailabled);
+
+ SET vAvailabled = vDated + INTERVAL HOUR(vAvailabled) HOUR;
+
CALL vn.item_getStock(vWarehouse, vDated, NULL);
- SET vParams = CONCAT_WS('/', vWarehouse, vDated);
+ SET vParams = CONCAT_WS('/', vWarehouse, vAvailabled);
CALL cache_calc_start (vCalc, vRefresh, 'available', vParams);
IF !vRefresh THEN
@@ -84,14 +89,15 @@ 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
LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk
- WHERE i.landed >= vStartDate
- AND (ir.ended IS NULL OR i.landed <= ir.ended)
+ WHERE IFNULL(i.availabled, i.landed) >= vStartDate
+ AND IFNULL(i.availabled, i.landed) <= vAvailabled
+ AND (ir.ended IS NULL OR IFNULL(i.availabled, i.landed) <= ir.ended)
AND i.warehouseInFk = vWarehouse
- AND ISNULL(wf.entryFk)
+ AND wf.entryFk IS NULL
UNION ALL
SELECT i.itemFk, i.shipped, i.quantity
FROM vn.itemEntryOut i
diff --git a/db/routines/cache/procedures/available_updateItem.sql b/db/routines/cache/procedures/available_updateItem.sql
index 8e94a9d75e..3f5d58d9a7 100644
--- a/db/routines/cache/procedures/available_updateItem.sql
+++ b/db/routines/cache/procedures/available_updateItem.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`available_updateItem`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`available_updateItem`(
`vItem` INT,
`vWarehouse` INT,
`vDated` DATE,
diff --git a/db/routines/cache/procedures/cacheCalc_clean.sql b/db/routines/cache/procedures/cacheCalc_clean.sql
index 5c588687e0..ddaf649105 100644
--- a/db/routines/cache/procedures/cacheCalc_clean.sql
+++ b/db/routines/cache/procedures/cacheCalc_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cacheCalc_clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`cacheCalc_clean`()
BEGIN
DECLARE vCleanTime DATETIME DEFAULT TIMESTAMPADD(MINUTE, -5, NOW());
DELETE FROM cache_calc WHERE expires < vCleanTime;
diff --git a/db/routines/cache/procedures/cache_calc_end.sql b/db/routines/cache/procedures/cache_calc_end.sql
index b74a1b7fde..eb4ea3207f 100644
--- a/db/routines/cache/procedures/cache_calc_end.sql
+++ b/db/routines/cache/procedures/cache_calc_end.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cache_calc_end`(IN `v_calc` INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`cache_calc_end`(IN `v_calc` INT)
BEGIN
DECLARE v_cache_name VARCHAR(255);
DECLARE v_params VARCHAR(255);
diff --git a/db/routines/cache/procedures/cache_calc_start.sql b/db/routines/cache/procedures/cache_calc_start.sql
index 933d926ef7..74526b36b1 100644
--- a/db/routines/cache/procedures/cache_calc_start.sql
+++ b/db/routines/cache/procedures/cache_calc_start.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cache_calc_start`(OUT `v_calc` INT, INOUT `v_refresh` INT, IN `v_cache_name` VARCHAR(50), IN `v_params` VARCHAR(100))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`cache_calc_start`(OUT `v_calc` INT, INOUT `v_refresh` INT, IN `v_cache_name` VARCHAR(50), IN `v_params` VARCHAR(100))
proc: BEGIN
DECLARE v_valid BOOL;
DECLARE v_lock_id VARCHAR(100);
diff --git a/db/routines/cache/procedures/cache_calc_unlock.sql b/db/routines/cache/procedures/cache_calc_unlock.sql
index 5dc46d9259..35733b7726 100644
--- a/db/routines/cache/procedures/cache_calc_unlock.sql
+++ b/db/routines/cache/procedures/cache_calc_unlock.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cache_calc_unlock`(IN `v_calc` INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`cache_calc_unlock`(IN `v_calc` INT)
proc: BEGIN
DECLARE v_cache_name VARCHAR(50);
DECLARE v_params VARCHAR(100);
diff --git a/db/routines/cache/procedures/cache_clean.sql b/db/routines/cache/procedures/cache_clean.sql
index 0fca75e630..afeea93701 100644
--- a/db/routines/cache/procedures/cache_clean.sql
+++ b/db/routines/cache/procedures/cache_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cache_clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`cache_clean`()
NO SQL
BEGIN
CALL available_clean;
diff --git a/db/routines/cache/procedures/clean.sql b/db/routines/cache/procedures/clean.sql
index 5e66286896..3aeafe79a7 100644
--- a/db/routines/cache/procedures/clean.sql
+++ b/db/routines/cache/procedures/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`clean`()
BEGIN
DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
END$$
diff --git a/db/routines/cache/procedures/departure_timing.sql b/db/routines/cache/procedures/departure_timing.sql
index 778c2cd743..d683a75d9a 100644
--- a/db/routines/cache/procedures/departure_timing.sql
+++ b/db/routines/cache/procedures/departure_timing.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`departure_timing`(vWarehouseId INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`departure_timing`(vWarehouseId INT)
BEGIN
DECLARE done BOOL DEFAULT FALSE;
diff --git a/db/routines/cache/procedures/last_buy_refresh.sql b/db/routines/cache/procedures/last_buy_refresh.sql
index 86a5e8d8cc..0b41915e44 100644
--- a/db/routines/cache/procedures/last_buy_refresh.sql
+++ b/db/routines/cache/procedures/last_buy_refresh.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`last_buy_refresh`(vRefresh BOOL)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`last_buy_refresh`(vRefresh BOOL)
proc: BEGIN
/**
* Crea o actualiza la cache con la última compra y fecha de cada
diff --git a/db/routines/cache/procedures/stock_refresh.sql b/db/routines/cache/procedures/stock_refresh.sql
index 5ddc6c20e1..e68688586a 100644
--- a/db/routines/cache/procedures/stock_refresh.sql
+++ b/db/routines/cache/procedures/stock_refresh.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`stock_refresh`(v_refresh BOOL)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`stock_refresh`(v_refresh BOOL)
proc: BEGIN
/**
* Crea o actualiza la cache con el disponible hasta el día de
diff --git a/db/routines/cache/procedures/visible_clean.sql b/db/routines/cache/procedures/visible_clean.sql
index b6f03c5635..5bc0c0fc18 100644
--- a/db/routines/cache/procedures/visible_clean.sql
+++ b/db/routines/cache/procedures/visible_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`visible_clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`visible_clean`()
BEGIN
DROP TEMPORARY TABLE IF EXISTS tCalc;
CREATE TEMPORARY TABLE tCalc
diff --git a/db/routines/cache/procedures/visible_refresh.sql b/db/routines/cache/procedures/visible_refresh.sql
index a673969d2d..fa88de1e2a 100644
--- a/db/routines/cache/procedures/visible_refresh.sql
+++ b/db/routines/cache/procedures/visible_refresh.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`visible_refresh`(OUT v_calc INT, v_refresh BOOL, v_warehouse INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `cache`.`visible_refresh`(OUT v_calc INT, v_refresh BOOL, v_warehouse INT)
proc:BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
diff --git a/db/routines/dipole/procedures/clean.sql b/db/routines/dipole/procedures/clean.sql
index a9af64e15e..9054124b39 100644
--- a/db/routines/dipole/procedures/clean.sql
+++ b/db/routines/dipole/procedures/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `dipole`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `dipole`.`clean`()
BEGIN
DECLARE vFromDated DATE;
diff --git a/db/routines/dipole/procedures/expedition_add.sql b/db/routines/dipole/procedures/expedition_add.sql
index 70bc7930ef..6d6fb2fd8c 100644
--- a/db/routines/dipole/procedures/expedition_add.sql
+++ b/db/routines/dipole/procedures/expedition_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `dipole`.`expedition_add`(vExpeditionFk INT, vPrinterFk INT, vIsPrinted BOOLEAN)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `dipole`.`expedition_add`(vExpeditionFk INT, vPrinterFk INT, vIsPrinted BOOLEAN)
BEGIN
/** Insert records to print agency stickers and to inform sorter with new box
*
diff --git a/db/routines/dipole/views/expeditionControl.sql b/db/routines/dipole/views/expeditionControl.sql
index e26e83440a..9a2c0a731f 100644
--- a/db/routines/dipole/views/expeditionControl.sql
+++ b/db/routines/dipole/views/expeditionControl.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `dipole`.`expeditionControl`
AS SELECT cast(`epo`.`created` AS date) AS `fecha`,
diff --git a/db/routines/edi/functions/imageName.sql b/db/routines/edi/functions/imageName.sql
index f2e52558f5..a5cf33ff88 100644
--- a/db/routines/edi/functions/imageName.sql
+++ b/db/routines/edi/functions/imageName.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `edi`.`imageName`(vPictureReference VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `edi`.`imageName`(vPictureReference VARCHAR(255))
RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
diff --git a/db/routines/edi/procedures/clean.sql b/db/routines/edi/procedures/clean.sql
index 71dd576e93..ce35b3e1d8 100644
--- a/db/routines/edi/procedures/clean.sql
+++ b/db/routines/edi/procedures/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`clean`()
BEGIN
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
BEGIN
diff --git a/db/routines/edi/procedures/deliveryInformation_Delete.sql b/db/routines/edi/procedures/deliveryInformation_Delete.sql
index b4f51515a6..ac5b67e6f0 100644
--- a/db/routines/edi/procedures/deliveryInformation_Delete.sql
+++ b/db/routines/edi/procedures/deliveryInformation_Delete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`deliveryInformation_Delete`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`deliveryInformation_Delete`()
BEGIN
DECLARE vID INT;
diff --git a/db/routines/edi/procedures/ekt_add.sql b/db/routines/edi/procedures/ekt_add.sql
index 1cc67bb935..377c9b411a 100644
--- a/db/routines/edi/procedures/ekt_add.sql
+++ b/db/routines/edi/procedures/ekt_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_add`(vPutOrderFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`ekt_add`(vPutOrderFk INT)
BEGIN
/**
diff --git a/db/routines/edi/procedures/ekt_load.sql b/db/routines/edi/procedures/ekt_load.sql
index 190b09a864..76f530183a 100644
--- a/db/routines/edi/procedures/ekt_load.sql
+++ b/db/routines/edi/procedures/ekt_load.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_load`(IN `vSelf` INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`ekt_load`(IN `vSelf` INT)
proc:BEGIN
/**
* Carga los datos esenciales para el sistema EKT.
diff --git a/db/routines/edi/procedures/ekt_loadNotBuy.sql b/db/routines/edi/procedures/ekt_loadNotBuy.sql
index 52697adc04..867c99ab76 100644
--- a/db/routines/edi/procedures/ekt_loadNotBuy.sql
+++ b/db/routines/edi/procedures/ekt_loadNotBuy.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_loadNotBuy`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`ekt_loadNotBuy`()
BEGIN
/**
* Ejecuta ekt_load para aquellos ekt de hoy que no tienen vn.buy
diff --git a/db/routines/edi/procedures/ekt_refresh.sql b/db/routines/edi/procedures/ekt_refresh.sql
index 8ba438c0ac..2df736b0e6 100644
--- a/db/routines/edi/procedures/ekt_refresh.sql
+++ b/db/routines/edi/procedures/ekt_refresh.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_refresh`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`ekt_refresh`(
`vSelf` INT, vMailFk INT)
BEGIN
/**
diff --git a/db/routines/edi/procedures/ekt_scan.sql b/db/routines/edi/procedures/ekt_scan.sql
index 0cf8bb4669..c42e57ca4d 100644
--- a/db/routines/edi/procedures/ekt_scan.sql
+++ b/db/routines/edi/procedures/ekt_scan.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_scan`(vBarcode VARCHAR(512))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`ekt_scan`(vBarcode VARCHAR(512))
BEGIN
/**
* Busca transaciones a partir de un codigo de barras, las marca como escaneadas
diff --git a/db/routines/edi/procedures/item_freeAdd.sql b/db/routines/edi/procedures/item_freeAdd.sql
index cb572e1b10..93842af6e1 100644
--- a/db/routines/edi/procedures/item_freeAdd.sql
+++ b/db/routines/edi/procedures/item_freeAdd.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`item_freeAdd`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`item_freeAdd`()
BEGIN
/**
* Rellena la tabla item_free con los id ausentes en vn.item
diff --git a/db/routines/edi/procedures/item_getNewByEkt.sql b/db/routines/edi/procedures/item_getNewByEkt.sql
index a80d04817b..e169a0f00c 100644
--- a/db/routines/edi/procedures/item_getNewByEkt.sql
+++ b/db/routines/edi/procedures/item_getNewByEkt.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`item_getNewByEkt`(vEktFk INT, OUT vItemFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`item_getNewByEkt`(vEktFk INT, OUT vItemFk INT)
BEGIN
/**
diff --git a/db/routines/edi/procedures/mail_new.sql b/db/routines/edi/procedures/mail_new.sql
index 7bbf3f5cf3..4ed3d0c377 100644
--- a/db/routines/edi/procedures/mail_new.sql
+++ b/db/routines/edi/procedures/mail_new.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`mail_new`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `edi`.`mail_new`(
vMessageId VARCHAR(100)
,vSender VARCHAR(150)
,OUT vSelf INT
diff --git a/db/routines/edi/triggers/item_feature_beforeInsert.sql b/db/routines/edi/triggers/item_feature_beforeInsert.sql
index 4e3e9cc0e1..f2aabb91fc 100644
--- a/db/routines/edi/triggers/item_feature_beforeInsert.sql
+++ b/db/routines/edi/triggers/item_feature_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`item_feature_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `edi`.`item_feature_beforeInsert`
BEFORE INSERT ON `item_feature`
FOR EACH ROW
BEGIN
diff --git a/db/routines/edi/triggers/putOrder_afterUpdate.sql b/db/routines/edi/triggers/putOrder_afterUpdate.sql
index b56ae4c669..00bb228c5e 100644
--- a/db/routines/edi/triggers/putOrder_afterUpdate.sql
+++ b/db/routines/edi/triggers/putOrder_afterUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`putOrder_afterUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `edi`.`putOrder_afterUpdate`
AFTER UPDATE ON `putOrder`
FOR EACH ROW
BEGIN
diff --git a/db/routines/edi/triggers/putOrder_beforeInsert.sql b/db/routines/edi/triggers/putOrder_beforeInsert.sql
index beddd191cf..13274c33ca 100644
--- a/db/routines/edi/triggers/putOrder_beforeInsert.sql
+++ b/db/routines/edi/triggers/putOrder_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`putOrder_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `edi`.`putOrder_beforeInsert`
BEFORE INSERT ON `putOrder`
FOR EACH ROW
BEGIN
diff --git a/db/routines/edi/triggers/putOrder_beforeUpdate.sql b/db/routines/edi/triggers/putOrder_beforeUpdate.sql
index f18b77a0cd..c532f75d14 100644
--- a/db/routines/edi/triggers/putOrder_beforeUpdate.sql
+++ b/db/routines/edi/triggers/putOrder_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`putOrder_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `edi`.`putOrder_beforeUpdate`
BEFORE UPDATE ON `putOrder`
FOR EACH ROW
BEGIN
diff --git a/db/routines/edi/triggers/supplyResponse_afterUpdate.sql b/db/routines/edi/triggers/supplyResponse_afterUpdate.sql
index f3e5aaefdb..721cab8cd3 100644
--- a/db/routines/edi/triggers/supplyResponse_afterUpdate.sql
+++ b/db/routines/edi/triggers/supplyResponse_afterUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`supplyResponse_afterUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `edi`.`supplyResponse_afterUpdate`
AFTER UPDATE ON `supplyResponse`
FOR EACH ROW
BEGIN
diff --git a/db/routines/edi/views/ektK2.sql b/db/routines/edi/views/ektK2.sql
index 299d26b015..5c06221b13 100644
--- a/db/routines/edi/views/ektK2.sql
+++ b/db/routines/edi/views/ektK2.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `edi`.`ektK2`
AS SELECT `eek`.`id` AS `id`,
diff --git a/db/routines/edi/views/ektRecent.sql b/db/routines/edi/views/ektRecent.sql
index 66ff7875e5..83f839bd9d 100644
--- a/db/routines/edi/views/ektRecent.sql
+++ b/db/routines/edi/views/ektRecent.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `edi`.`ektRecent`
AS SELECT `e`.`id` AS `id`,
diff --git a/db/routines/edi/views/errorList.sql b/db/routines/edi/views/errorList.sql
index 4e7cbc840e..0273f81105 100644
--- a/db/routines/edi/views/errorList.sql
+++ b/db/routines/edi/views/errorList.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `edi`.`errorList`
AS SELECT `po`.`id` AS `id`,
diff --git a/db/routines/edi/views/supplyOffer.sql b/db/routines/edi/views/supplyOffer.sql
index c4a8582a12..e4e84df744 100644
--- a/db/routines/edi/views/supplyOffer.sql
+++ b/db/routines/edi/views/supplyOffer.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `edi`.`supplyOffer`
AS SELECT `sr`.`vmpID` AS `vmpID`,
diff --git a/db/routines/floranet/procedures/catalogue_findById.sql b/db/routines/floranet/procedures/catalogue_findById.sql
index aca6ca4d61..ab97d1adae 100644
--- a/db/routines/floranet/procedures/catalogue_findById.sql
+++ b/db/routines/floranet/procedures/catalogue_findById.sql
@@ -1,6 +1,6 @@
DELIMITER $$
$$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_findById(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE floranet.catalogue_findById(vSelf INT)
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/floranet/procedures/catalogue_get.sql b/db/routines/floranet/procedures/catalogue_get.sql
index 1e224c8103..d4dd0c69fc 100644
--- a/db/routines/floranet/procedures/catalogue_get.sql
+++ b/db/routines/floranet/procedures/catalogue_get.sql
@@ -1,6 +1,6 @@
DELIMITER $$
$$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_get(vLanded DATE, vPostalCode VARCHAR(15))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE floranet.catalogue_get(vLanded DATE, vPostalCode VARCHAR(15))
READS SQL DATA
proc:BEGIN
/**
diff --git a/db/routines/floranet/procedures/contact_request.sql b/db/routines/floranet/procedures/contact_request.sql
index 2132a86fc0..6d05edaf7a 100644
--- a/db/routines/floranet/procedures/contact_request.sql
+++ b/db/routines/floranet/procedures/contact_request.sql
@@ -2,7 +2,7 @@ DROP PROCEDURE IF EXISTS floranet.contact_request;
DELIMITER $$
$$
-CREATE DEFINER=`root`@`localhost`
+CREATE DEFINER=`vn`@`localhost`
PROCEDURE floranet.contact_request(
vName VARCHAR(100),
vPhone VARCHAR(15),
diff --git a/db/routines/floranet/procedures/deliveryDate_get.sql b/db/routines/floranet/procedures/deliveryDate_get.sql
index 70cb488184..84620dfeda 100644
--- a/db/routines/floranet/procedures/deliveryDate_get.sql
+++ b/db/routines/floranet/procedures/deliveryDate_get.sql
@@ -1,6 +1,6 @@
DELIMITER $$
$$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPostalCode VARCHAR(15))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPostalCode VARCHAR(15))
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/floranet/procedures/order_confirm.sql b/db/routines/floranet/procedures/order_confirm.sql
index 98e15bbab4..2e59ed7377 100644
--- a/db/routines/floranet/procedures/order_confirm.sql
+++ b/db/routines/floranet/procedures/order_confirm.sql
@@ -1,7 +1,7 @@
DELIMITER $$
$$
-CREATE OR REPLACE DEFINER=`root`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk INT)
READS SQL DATA
proc:BEGIN
diff --git a/db/routines/floranet/procedures/order_put.sql b/db/routines/floranet/procedures/order_put.sql
index c5eb714728..7ab766a8df 100644
--- a/db/routines/floranet/procedures/order_put.sql
+++ b/db/routines/floranet/procedures/order_put.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE floranet.order_put(vJsonData JSON)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE floranet.order_put(vJsonData JSON)
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/floranet/procedures/sliders_get.sql b/db/routines/floranet/procedures/sliders_get.sql
index bafda47324..096cfbde6a 100644
--- a/db/routines/floranet/procedures/sliders_get.sql
+++ b/db/routines/floranet/procedures/sliders_get.sql
@@ -2,7 +2,7 @@ DROP PROCEDURE IF EXISTS floranet.sliders_get;
DELIMITER $$
$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.sliders_get()
+CREATE DEFINER=`vn`@`localhost` PROCEDURE floranet.sliders_get()
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/hedera/functions/myClient_getDebt.sql b/db/routines/hedera/functions/myClient_getDebt.sql
index 7f981904e0..7a3678c621 100644
--- a/db/routines/hedera/functions/myClient_getDebt.sql
+++ b/db/routines/hedera/functions/myClient_getDebt.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `hedera`.`myClient_getDebt`(vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `hedera`.`myClient_getDebt`(vDate DATE)
RETURNS decimal(10,2)
DETERMINISTIC
BEGIN
diff --git a/db/routines/hedera/functions/myUser_checkRestPriv.sql b/db/routines/hedera/functions/myUser_checkRestPriv.sql
index 874499ce97..c074a20737 100644
--- a/db/routines/hedera/functions/myUser_checkRestPriv.sql
+++ b/db/routines/hedera/functions/myUser_checkRestPriv.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `hedera`.`myUser_checkRestPriv`(vMethodPath VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `hedera`.`myUser_checkRestPriv`(vMethodPath VARCHAR(255))
RETURNS tinyint(1)
DETERMINISTIC
BEGIN
diff --git a/db/routines/hedera/functions/order_getTotal.sql b/db/routines/hedera/functions/order_getTotal.sql
index 2edb6340d9..2a6c901828 100644
--- a/db/routines/hedera/functions/order_getTotal.sql
+++ b/db/routines/hedera/functions/order_getTotal.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `hedera`.`order_getTotal`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `hedera`.`order_getTotal`(vSelf INT)
RETURNS decimal(10,2)
DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/hedera/procedures/catalog_calcFromMyAddress.sql b/db/routines/hedera/procedures/catalog_calcFromMyAddress.sql
index c9fa54f36c..d25346f345 100644
--- a/db/routines/hedera/procedures/catalog_calcFromMyAddress.sql
+++ b/db/routines/hedera/procedures/catalog_calcFromMyAddress.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`catalog_calcFromMyAddress`(vDelivery DATE, vAddress INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`catalog_calcFromMyAddress`(vDelivery DATE, vAddress INT)
BEGIN
/**
* Gets the available items list.
diff --git a/db/routines/hedera/procedures/image_ref.sql b/db/routines/hedera/procedures/image_ref.sql
index 4c6e925fe7..8fb344c1cf 100644
--- a/db/routines/hedera/procedures/image_ref.sql
+++ b/db/routines/hedera/procedures/image_ref.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`image_ref`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`image_ref`(
vCollection VARCHAR(255),
vName VARCHAR(255)
)
diff --git a/db/routines/hedera/procedures/image_unref.sql b/db/routines/hedera/procedures/image_unref.sql
index 146fc486b9..95dda10439 100644
--- a/db/routines/hedera/procedures/image_unref.sql
+++ b/db/routines/hedera/procedures/image_unref.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`image_unref`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`image_unref`(
vCollection VARCHAR(255),
vName VARCHAR(255)
)
diff --git a/db/routines/hedera/procedures/item_calcCatalog.sql b/db/routines/hedera/procedures/item_calcCatalog.sql
index fae89bd5cc..0afe79d5a2 100644
--- a/db/routines/hedera/procedures/item_calcCatalog.sql
+++ b/db/routines/hedera/procedures/item_calcCatalog.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`item_calcCatalog`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`item_calcCatalog`(
vSelf INT,
vLanded DATE,
vAddressFk INT,
diff --git a/db/routines/hedera/procedures/item_getVisible.sql b/db/routines/hedera/procedures/item_getVisible.sql
index d5bbe9d76c..ffb04bf689 100644
--- a/db/routines/hedera/procedures/item_getVisible.sql
+++ b/db/routines/hedera/procedures/item_getVisible.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`item_getVisible`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`item_getVisible`(
vWarehouse TINYINT,
vDate DATE,
vType INT,
diff --git a/db/routines/hedera/procedures/item_listAllocation.sql b/db/routines/hedera/procedures/item_listAllocation.sql
index 4a9c723f52..c7fdf6aa7c 100644
--- a/db/routines/hedera/procedures/item_listAllocation.sql
+++ b/db/routines/hedera/procedures/item_listAllocation.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`item_listAllocation`(IN `vWh` TINYINT, IN `vDate` DATE, IN `vType` INT, IN `vPrefix` VARCHAR(255), IN `vUseIds` BOOLEAN)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`item_listAllocation`(IN `vWh` TINYINT, IN `vDate` DATE, IN `vType` INT, IN `vPrefix` VARCHAR(255), IN `vUseIds` BOOLEAN)
BEGIN
/**
* Lists visible items and it's box sizes of the specified
diff --git a/db/routines/hedera/procedures/myOrder_addItem.sql b/db/routines/hedera/procedures/myOrder_addItem.sql
index b5ea34ea23..90804017c7 100644
--- a/db/routines/hedera/procedures/myOrder_addItem.sql
+++ b/db/routines/hedera/procedures/myOrder_addItem.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_addItem`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_addItem`(
vSelf INT,
vWarehouse INT,
vItem INT,
diff --git a/db/routines/hedera/procedures/myOrder_calcCatalogFromItem.sql b/db/routines/hedera/procedures/myOrder_calcCatalogFromItem.sql
index 05c2a41f2e..dd6e1b476c 100644
--- a/db/routines/hedera/procedures/myOrder_calcCatalogFromItem.sql
+++ b/db/routines/hedera/procedures/myOrder_calcCatalogFromItem.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_calcCatalogFromItem`(vSelf INT, vItem INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_calcCatalogFromItem`(vSelf INT, vItem INT)
BEGIN
/**
* Gets the availability and prices for the given item
diff --git a/db/routines/hedera/procedures/myOrder_calcCatalogFull.sql b/db/routines/hedera/procedures/myOrder_calcCatalogFull.sql
index b83286a2ba..b593b64926 100644
--- a/db/routines/hedera/procedures/myOrder_calcCatalogFull.sql
+++ b/db/routines/hedera/procedures/myOrder_calcCatalogFull.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_calcCatalogFull`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_calcCatalogFull`(vSelf INT)
BEGIN
/**
* Gets the availability and prices for the given items
diff --git a/db/routines/hedera/procedures/myOrder_checkConfig.sql b/db/routines/hedera/procedures/myOrder_checkConfig.sql
index ca810805c9..ca33db032d 100644
--- a/db/routines/hedera/procedures/myOrder_checkConfig.sql
+++ b/db/routines/hedera/procedures/myOrder_checkConfig.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_checkConfig`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_checkConfig`(vSelf INT)
proc: BEGIN
/**
* Comprueba que la cesta esta creada y que su configuración es
diff --git a/db/routines/hedera/procedures/myOrder_checkMine.sql b/db/routines/hedera/procedures/myOrder_checkMine.sql
index 7e00b2f7f1..7ac370cb60 100644
--- a/db/routines/hedera/procedures/myOrder_checkMine.sql
+++ b/db/routines/hedera/procedures/myOrder_checkMine.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_checkMine`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_checkMine`(vSelf INT)
proc: BEGIN
/**
* Check that order is owned by current user, otherwise throws an error.
diff --git a/db/routines/hedera/procedures/myOrder_configure.sql b/db/routines/hedera/procedures/myOrder_configure.sql
index 185384fc07..c16406ee7f 100644
--- a/db/routines/hedera/procedures/myOrder_configure.sql
+++ b/db/routines/hedera/procedures/myOrder_configure.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_configure`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_configure`(
vSelf INT,
vDelivery DATE,
vDeliveryMethod VARCHAR(45),
diff --git a/db/routines/hedera/procedures/myOrder_configureForGuest.sql b/db/routines/hedera/procedures/myOrder_configureForGuest.sql
index 9d4ede5e0d..aa4d0fde7c 100644
--- a/db/routines/hedera/procedures/myOrder_configureForGuest.sql
+++ b/db/routines/hedera/procedures/myOrder_configureForGuest.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_configureForGuest`(OUT vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_configureForGuest`(OUT vSelf INT)
BEGIN
DECLARE vMethod VARCHAR(255);
DECLARE vAgency INT;
diff --git a/db/routines/hedera/procedures/myOrder_confirm.sql b/db/routines/hedera/procedures/myOrder_confirm.sql
index 2117ea4489..4966bbf9f9 100644
--- a/db/routines/hedera/procedures/myOrder_confirm.sql
+++ b/db/routines/hedera/procedures/myOrder_confirm.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_confirm`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_confirm`(vSelf INT)
BEGIN
CALL myOrder_checkMine(vSelf);
CALL order_checkConfig(vSelf);
diff --git a/db/routines/hedera/procedures/myOrder_create.sql b/db/routines/hedera/procedures/myOrder_create.sql
index 251948bc64..f945c5af53 100644
--- a/db/routines/hedera/procedures/myOrder_create.sql
+++ b/db/routines/hedera/procedures/myOrder_create.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_create`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_create`(
OUT vSelf INT,
vDelivery DATE,
vDeliveryMethod VARCHAR(45),
diff --git a/db/routines/hedera/procedures/myOrder_getAvailable.sql b/db/routines/hedera/procedures/myOrder_getAvailable.sql
index 00ac605636..c94a339a6c 100644
--- a/db/routines/hedera/procedures/myOrder_getAvailable.sql
+++ b/db/routines/hedera/procedures/myOrder_getAvailable.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_getAvailable`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_getAvailable`(vSelf INT)
BEGIN
/**
* Gets the available items list.
diff --git a/db/routines/hedera/procedures/myOrder_getTax.sql b/db/routines/hedera/procedures/myOrder_getTax.sql
index 826a37efdd..68b2dd4c82 100644
--- a/db/routines/hedera/procedures/myOrder_getTax.sql
+++ b/db/routines/hedera/procedures/myOrder_getTax.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_getTax`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_getTax`(vSelf INT)
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/hedera/procedures/myOrder_newWithAddress.sql b/db/routines/hedera/procedures/myOrder_newWithAddress.sql
index ec3f07d9f4..b4ec4aed46 100644
--- a/db/routines/hedera/procedures/myOrder_newWithAddress.sql
+++ b/db/routines/hedera/procedures/myOrder_newWithAddress.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_newWithAddress`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_newWithAddress`(
OUT vSelf INT,
vLandingDate DATE,
vAddressFk INT)
diff --git a/db/routines/hedera/procedures/myOrder_newWithDate.sql b/db/routines/hedera/procedures/myOrder_newWithDate.sql
index 4d1837e2b7..a9c4c8f7f6 100644
--- a/db/routines/hedera/procedures/myOrder_newWithDate.sql
+++ b/db/routines/hedera/procedures/myOrder_newWithDate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myOrder_newWithDate`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myOrder_newWithDate`(
OUT vSelf INT,
vLandingDate DATE)
BEGIN
diff --git a/db/routines/hedera/procedures/myTicket_get.sql b/db/routines/hedera/procedures/myTicket_get.sql
index 7d203aca64..1c95aea36b 100644
--- a/db/routines/hedera/procedures/myTicket_get.sql
+++ b/db/routines/hedera/procedures/myTicket_get.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myTicket_get`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myTicket_get`(vSelf INT)
BEGIN
/**
* Returns a current user ticket header.
diff --git a/db/routines/hedera/procedures/myTicket_getPackages.sql b/db/routines/hedera/procedures/myTicket_getPackages.sql
index 8ed486dffc..8a03a6e354 100644
--- a/db/routines/hedera/procedures/myTicket_getPackages.sql
+++ b/db/routines/hedera/procedures/myTicket_getPackages.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myTicket_getPackages`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myTicket_getPackages`(vSelf INT)
BEGIN
/**
* Returns a current user ticket packages.
diff --git a/db/routines/hedera/procedures/myTicket_getRows.sql b/db/routines/hedera/procedures/myTicket_getRows.sql
index 0a99ce892e..53547f2b21 100644
--- a/db/routines/hedera/procedures/myTicket_getRows.sql
+++ b/db/routines/hedera/procedures/myTicket_getRows.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myTicket_getRows`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myTicket_getRows`(vSelf INT)
BEGIN
SELECT r.itemFk, r.quantity, r.concept, r.price, r.discount,
i.category, i.size, i.stems, i.inkFk,
diff --git a/db/routines/hedera/procedures/myTicket_getServices.sql b/db/routines/hedera/procedures/myTicket_getServices.sql
index 56ca52c19c..3d982d25af 100644
--- a/db/routines/hedera/procedures/myTicket_getServices.sql
+++ b/db/routines/hedera/procedures/myTicket_getServices.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myTicket_getServices`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myTicket_getServices`(vSelf INT)
BEGIN
/**
* Returns a current user ticket services.
diff --git a/db/routines/hedera/procedures/myTicket_list.sql b/db/routines/hedera/procedures/myTicket_list.sql
index b063ce25cd..cfbc064e31 100644
--- a/db/routines/hedera/procedures/myTicket_list.sql
+++ b/db/routines/hedera/procedures/myTicket_list.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myTicket_list`(vFrom DATE, vTo DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myTicket_list`(vFrom DATE, vTo DATE)
BEGIN
/**
* Returns the current user list of tickets between two dates reange.
diff --git a/db/routines/hedera/procedures/myTicket_logAccess.sql b/db/routines/hedera/procedures/myTicket_logAccess.sql
index 1dcee8dd68..aa0a1d380e 100644
--- a/db/routines/hedera/procedures/myTicket_logAccess.sql
+++ b/db/routines/hedera/procedures/myTicket_logAccess.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myTicket_logAccess`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myTicket_logAccess`(vSelf INT)
BEGIN
/**
* Logs an access to a ticket.
diff --git a/db/routines/hedera/procedures/myTpvTransaction_end.sql b/db/routines/hedera/procedures/myTpvTransaction_end.sql
index 3884f0e374..1972078337 100644
--- a/db/routines/hedera/procedures/myTpvTransaction_end.sql
+++ b/db/routines/hedera/procedures/myTpvTransaction_end.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myTpvTransaction_end`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myTpvTransaction_end`(
vSelf INT,
vStatus VARCHAR(12))
BEGIN
diff --git a/db/routines/hedera/procedures/myTpvTransaction_start.sql b/db/routines/hedera/procedures/myTpvTransaction_start.sql
index 71bae97fa6..e3d5023b8f 100644
--- a/db/routines/hedera/procedures/myTpvTransaction_start.sql
+++ b/db/routines/hedera/procedures/myTpvTransaction_start.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`myTpvTransaction_start`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`myTpvTransaction_start`(
vAmount INT,
vCompany INT)
BEGIN
diff --git a/db/routines/hedera/procedures/order_addItem.sql b/db/routines/hedera/procedures/order_addItem.sql
index 1470ddf356..d448f1a0df 100644
--- a/db/routines/hedera/procedures/order_addItem.sql
+++ b/db/routines/hedera/procedures/order_addItem.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_addItem`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_addItem`(
vSelf INT,
vWarehouse INT,
vItem INT,
diff --git a/db/routines/hedera/procedures/order_calcCatalog.sql b/db/routines/hedera/procedures/order_calcCatalog.sql
index 239e017886..efdb9d190d 100644
--- a/db/routines/hedera/procedures/order_calcCatalog.sql
+++ b/db/routines/hedera/procedures/order_calcCatalog.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_calcCatalog`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_calcCatalog`(vSelf INT)
BEGIN
/**
* Gets the availability and prices for order items.
diff --git a/db/routines/hedera/procedures/order_calcCatalogFromItem.sql b/db/routines/hedera/procedures/order_calcCatalogFromItem.sql
index 517e9dab91..ae57ad5ba9 100644
--- a/db/routines/hedera/procedures/order_calcCatalogFromItem.sql
+++ b/db/routines/hedera/procedures/order_calcCatalogFromItem.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_calcCatalogFromItem`(vSelf INT, vItem INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_calcCatalogFromItem`(vSelf INT, vItem INT)
BEGIN
/**
* Gets the availability and prices for the given item
diff --git a/db/routines/hedera/procedures/order_calcCatalogFull.sql b/db/routines/hedera/procedures/order_calcCatalogFull.sql
index 41408c5e80..fedb739031 100644
--- a/db/routines/hedera/procedures/order_calcCatalogFull.sql
+++ b/db/routines/hedera/procedures/order_calcCatalogFull.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_calcCatalogFull`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_calcCatalogFull`(vSelf INT)
BEGIN
/**
* Gets the availability and prices for the given items
diff --git a/db/routines/hedera/procedures/order_checkConfig.sql b/db/routines/hedera/procedures/order_checkConfig.sql
index 9dbea1a76a..88799b2deb 100644
--- a/db/routines/hedera/procedures/order_checkConfig.sql
+++ b/db/routines/hedera/procedures/order_checkConfig.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_checkConfig`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_checkConfig`(vSelf INT)
BEGIN
/**
* Comprueba que la configuración del pedido es correcta.
diff --git a/db/routines/hedera/procedures/order_checkEditable.sql b/db/routines/hedera/procedures/order_checkEditable.sql
index 512e6e6f10..8ff7e59962 100644
--- a/db/routines/hedera/procedures/order_checkEditable.sql
+++ b/db/routines/hedera/procedures/order_checkEditable.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_checkEditable`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_checkEditable`(vSelf INT)
BEGIN
/**
* Cheks if order is editable.
diff --git a/db/routines/hedera/procedures/order_configure.sql b/db/routines/hedera/procedures/order_configure.sql
index b03acec086..42b4034443 100644
--- a/db/routines/hedera/procedures/order_configure.sql
+++ b/db/routines/hedera/procedures/order_configure.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_configure`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_configure`(
vSelf INT,
vDelivery DATE,
vDeliveryMethod VARCHAR(45),
diff --git a/db/routines/hedera/procedures/order_confirm.sql b/db/routines/hedera/procedures/order_confirm.sql
index 6fd53b4ea8..bf70b4645a 100644
--- a/db/routines/hedera/procedures/order_confirm.sql
+++ b/db/routines/hedera/procedures/order_confirm.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_confirm`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_confirm`(vSelf INT)
BEGIN
/**
* Confirms an order, creating each of its tickets on
diff --git a/db/routines/hedera/procedures/order_confirmWithUser.sql b/db/routines/hedera/procedures/order_confirmWithUser.sql
index db83cba5c3..dee927e254 100644
--- a/db/routines/hedera/procedures/order_confirmWithUser.sql
+++ b/db/routines/hedera/procedures/order_confirmWithUser.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_confirmWithUser`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_confirmWithUser`(
vSelf INT,
vUserFk INT
)
diff --git a/db/routines/hedera/procedures/order_getAvailable.sql b/db/routines/hedera/procedures/order_getAvailable.sql
index 2b7d60e331..12a5297d63 100644
--- a/db/routines/hedera/procedures/order_getAvailable.sql
+++ b/db/routines/hedera/procedures/order_getAvailable.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_getAvailable`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_getAvailable`(vSelf INT)
BEGIN
/**
* Gets the available items list.
diff --git a/db/routines/hedera/procedures/order_getTax.sql b/db/routines/hedera/procedures/order_getTax.sql
index 371416c297..59674564f3 100644
--- a/db/routines/hedera/procedures/order_getTax.sql
+++ b/db/routines/hedera/procedures/order_getTax.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_getTax`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_getTax`()
READS SQL DATA
BEGIN
/**
diff --git a/db/routines/hedera/procedures/order_getTotal.sql b/db/routines/hedera/procedures/order_getTotal.sql
index c0b8d40ae7..a8c872aece 100644
--- a/db/routines/hedera/procedures/order_getTotal.sql
+++ b/db/routines/hedera/procedures/order_getTotal.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_getTotal`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_getTotal`()
BEGIN
/**
* Calcula el total con IVA para un conjunto de orders.
diff --git a/db/routines/hedera/procedures/order_recalc.sql b/db/routines/hedera/procedures/order_recalc.sql
index 1398b49f65..a76c34f2c1 100644
--- a/db/routines/hedera/procedures/order_recalc.sql
+++ b/db/routines/hedera/procedures/order_recalc.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_recalc`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_recalc`(vSelf INT)
BEGIN
/**
* Recalculates the order total.
diff --git a/db/routines/hedera/procedures/order_update.sql b/db/routines/hedera/procedures/order_update.sql
index 207cad09f8..0a7981072a 100644
--- a/db/routines/hedera/procedures/order_update.sql
+++ b/db/routines/hedera/procedures/order_update.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_update`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`order_update`(vSelf INT)
proc: BEGIN
/**
* Actualiza las líneas de un pedido.
diff --git a/db/routines/hedera/procedures/survey_vote.sql b/db/routines/hedera/procedures/survey_vote.sql
index 46c31393a3..b54ce2736c 100644
--- a/db/routines/hedera/procedures/survey_vote.sql
+++ b/db/routines/hedera/procedures/survey_vote.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`survey_vote`(vAnswer INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`survey_vote`(vAnswer INT)
BEGIN
DECLARE vSurvey INT;
DECLARE vCount TINYINT;
diff --git a/db/routines/hedera/procedures/tpvTransaction_confirm.sql b/db/routines/hedera/procedures/tpvTransaction_confirm.sql
index 60a6d8452a..e14340b6bb 100644
--- a/db/routines/hedera/procedures/tpvTransaction_confirm.sql
+++ b/db/routines/hedera/procedures/tpvTransaction_confirm.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`tpvTransaction_confirm`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`tpvTransaction_confirm`(
vAmount INT
,vOrder INT
,vMerchant INT
diff --git a/db/routines/hedera/procedures/tpvTransaction_confirmAll.sql b/db/routines/hedera/procedures/tpvTransaction_confirmAll.sql
index b6a71af016..d6cfafd6c7 100644
--- a/db/routines/hedera/procedures/tpvTransaction_confirmAll.sql
+++ b/db/routines/hedera/procedures/tpvTransaction_confirmAll.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`tpvTransaction_confirmAll`(vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`tpvTransaction_confirmAll`(vDate DATE)
BEGIN
/**
* Confirma todas las transacciones confirmadas por el cliente pero no
diff --git a/db/routines/hedera/procedures/tpvTransaction_confirmById.sql b/db/routines/hedera/procedures/tpvTransaction_confirmById.sql
index 7cbdb65c66..a6a476e5bc 100644
--- a/db/routines/hedera/procedures/tpvTransaction_confirmById.sql
+++ b/db/routines/hedera/procedures/tpvTransaction_confirmById.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`tpvTransaction_confirmById`(vOrder INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`tpvTransaction_confirmById`(vOrder INT)
BEGIN
/**
* Confirma manualmente una transacción espedificando su identificador.
diff --git a/db/routines/hedera/procedures/tpvTransaction_confirmFromExport.sql b/db/routines/hedera/procedures/tpvTransaction_confirmFromExport.sql
index 7ca0e44e2e..8082f9abca 100644
--- a/db/routines/hedera/procedures/tpvTransaction_confirmFromExport.sql
+++ b/db/routines/hedera/procedures/tpvTransaction_confirmFromExport.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`tpvTransaction_confirmFromExport`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`tpvTransaction_confirmFromExport`()
BEGIN
/**
* Confirms multiple transactions comming from Redsys "canales" exported CSV.
diff --git a/db/routines/hedera/procedures/tpvTransaction_end.sql b/db/routines/hedera/procedures/tpvTransaction_end.sql
index ec0a0224d5..1c03ffe744 100644
--- a/db/routines/hedera/procedures/tpvTransaction_end.sql
+++ b/db/routines/hedera/procedures/tpvTransaction_end.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`tpvTransaction_end`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`tpvTransaction_end`(
vSelf INT,
vStatus VARCHAR(12))
BEGIN
diff --git a/db/routines/hedera/procedures/tpvTransaction_start.sql b/db/routines/hedera/procedures/tpvTransaction_start.sql
index 55fd922daf..7ed63c1245 100644
--- a/db/routines/hedera/procedures/tpvTransaction_start.sql
+++ b/db/routines/hedera/procedures/tpvTransaction_start.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`tpvTransaction_start`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`tpvTransaction_start`(
vAmount INT,
vCompany INT,
vUser INT)
diff --git a/db/routines/hedera/procedures/tpvTransaction_undo.sql b/db/routines/hedera/procedures/tpvTransaction_undo.sql
index f31ba6a80a..8eabba3c16 100644
--- a/db/routines/hedera/procedures/tpvTransaction_undo.sql
+++ b/db/routines/hedera/procedures/tpvTransaction_undo.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`tpvTransaction_undo`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`tpvTransaction_undo`(vSelf INT)
p: BEGIN
DECLARE vCustomer INT;
DECLARE vAmount DOUBLE;
diff --git a/db/routines/hedera/procedures/visitUser_new.sql b/db/routines/hedera/procedures/visitUser_new.sql
index 3c299f209e..1a4e3a08c2 100644
--- a/db/routines/hedera/procedures/visitUser_new.sql
+++ b/db/routines/hedera/procedures/visitUser_new.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`visitUser_new`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`visitUser_new`(
vAccess INT
,vSsid VARCHAR(64)
)
diff --git a/db/routines/hedera/procedures/visit_listByBrowser.sql b/db/routines/hedera/procedures/visit_listByBrowser.sql
index 2fa45b8f21..dcf3fdad94 100644
--- a/db/routines/hedera/procedures/visit_listByBrowser.sql
+++ b/db/routines/hedera/procedures/visit_listByBrowser.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`visit_listByBrowser`(vFrom DATE, vTo DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`visit_listByBrowser`(vFrom DATE, vTo DATE)
BEGIN
/**
* Lists visits grouped by browser.
diff --git a/db/routines/hedera/procedures/visit_register.sql b/db/routines/hedera/procedures/visit_register.sql
index 80b6f16a9d..345527b257 100644
--- a/db/routines/hedera/procedures/visit_register.sql
+++ b/db/routines/hedera/procedures/visit_register.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`visit_register`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`visit_register`(
vVisit INT
,vPlatform VARCHAR(30)
,vBrowser VARCHAR(30)
diff --git a/db/routines/hedera/triggers/link_afterDelete.sql b/db/routines/hedera/triggers/link_afterDelete.sql
index 571540cbac..e9efa7f91f 100644
--- a/db/routines/hedera/triggers/link_afterDelete.sql
+++ b/db/routines/hedera/triggers/link_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`link_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`link_afterDelete`
AFTER DELETE ON `link`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/link_afterInsert.sql b/db/routines/hedera/triggers/link_afterInsert.sql
index e3f163a9e2..af6989e444 100644
--- a/db/routines/hedera/triggers/link_afterInsert.sql
+++ b/db/routines/hedera/triggers/link_afterInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`link_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`link_afterInsert`
AFTER INSERT ON `link`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/link_afterUpdate.sql b/db/routines/hedera/triggers/link_afterUpdate.sql
index 7ffe2a3353..c10f20b252 100644
--- a/db/routines/hedera/triggers/link_afterUpdate.sql
+++ b/db/routines/hedera/triggers/link_afterUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`link_afterUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`link_afterUpdate`
AFTER UPDATE ON `link`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/news_afterDelete.sql b/db/routines/hedera/triggers/news_afterDelete.sql
index 07a0403e07..73a85ba7b7 100644
--- a/db/routines/hedera/triggers/news_afterDelete.sql
+++ b/db/routines/hedera/triggers/news_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`news_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`news_afterDelete`
AFTER DELETE ON `news`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/news_afterInsert.sql b/db/routines/hedera/triggers/news_afterInsert.sql
index 61e6078ef6..7d5c4ded71 100644
--- a/db/routines/hedera/triggers/news_afterInsert.sql
+++ b/db/routines/hedera/triggers/news_afterInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`news_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`news_afterInsert`
AFTER INSERT ON `news`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/news_afterUpdate.sql b/db/routines/hedera/triggers/news_afterUpdate.sql
index 15ea32f1d9..e0a74f1caa 100644
--- a/db/routines/hedera/triggers/news_afterUpdate.sql
+++ b/db/routines/hedera/triggers/news_afterUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`news_afterUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`news_afterUpdate`
AFTER UPDATE ON `news`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/orderRow_afterInsert.sql b/db/routines/hedera/triggers/orderRow_afterInsert.sql
index 7196dce10f..11809e3c5c 100644
--- a/db/routines/hedera/triggers/orderRow_afterInsert.sql
+++ b/db/routines/hedera/triggers/orderRow_afterInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`orderRow_afterInsert`
AFTER INSERT ON `orderRow`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/orderRow_beforeInsert.sql b/db/routines/hedera/triggers/orderRow_beforeInsert.sql
index 0c9f31bab7..b35123f4a9 100644
--- a/db/routines/hedera/triggers/orderRow_beforeInsert.sql
+++ b/db/routines/hedera/triggers/orderRow_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`orderRow_beforeInsert`
BEFORE INSERT ON `orderRow`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/order_afterInsert.sql b/db/routines/hedera/triggers/order_afterInsert.sql
index 2fe83ee8f6..7070ede026 100644
--- a/db/routines/hedera/triggers/order_afterInsert.sql
+++ b/db/routines/hedera/triggers/order_afterInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`order_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`order_afterInsert`
AFTER INSERT ON `order`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/order_afterUpdate.sql b/db/routines/hedera/triggers/order_afterUpdate.sql
index 25f51b3f03..3b1cd9df1d 100644
--- a/db/routines/hedera/triggers/order_afterUpdate.sql
+++ b/db/routines/hedera/triggers/order_afterUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`order_afterUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`order_afterUpdate`
AFTER UPDATE ON `order`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/triggers/order_beforeDelete.sql b/db/routines/hedera/triggers/order_beforeDelete.sql
index eb602be897..da6259248a 100644
--- a/db/routines/hedera/triggers/order_beforeDelete.sql
+++ b/db/routines/hedera/triggers/order_beforeDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`order_beforeDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `hedera`.`order_beforeDelete`
BEFORE DELETE ON `order`
FOR EACH ROW
BEGIN
diff --git a/db/routines/hedera/views/mainAccountBank.sql b/db/routines/hedera/views/mainAccountBank.sql
index 3130a1614a..9fc3b3c3a1 100644
--- a/db/routines/hedera/views/mainAccountBank.sql
+++ b/db/routines/hedera/views/mainAccountBank.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`mainAccountBank`
AS SELECT `e`.`name` AS `name`,
diff --git a/db/routines/hedera/views/messageL10n.sql b/db/routines/hedera/views/messageL10n.sql
index 6488de6a91..80f6638ada 100644
--- a/db/routines/hedera/views/messageL10n.sql
+++ b/db/routines/hedera/views/messageL10n.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`messageL10n`
AS SELECT `m`.`code` AS `code`,
diff --git a/db/routines/hedera/views/myAddress.sql b/db/routines/hedera/views/myAddress.sql
index ee8d87759e..80809c5ea1 100644
--- a/db/routines/hedera/views/myAddress.sql
+++ b/db/routines/hedera/views/myAddress.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myAddress`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myBasketDefaults.sql b/db/routines/hedera/views/myBasketDefaults.sql
index 475212da10..43df186871 100644
--- a/db/routines/hedera/views/myBasketDefaults.sql
+++ b/db/routines/hedera/views/myBasketDefaults.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myBasketDefaults`
AS SELECT coalesce(`dm`.`code`, `cm`.`code`) AS `deliveryMethod`,
diff --git a/db/routines/hedera/views/myClient.sql b/db/routines/hedera/views/myClient.sql
index ef7159549c..032cc5f5ff 100644
--- a/db/routines/hedera/views/myClient.sql
+++ b/db/routines/hedera/views/myClient.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myClient`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myInvoice.sql b/db/routines/hedera/views/myInvoice.sql
index dd1a917ada..40527ac0ce 100644
--- a/db/routines/hedera/views/myInvoice.sql
+++ b/db/routines/hedera/views/myInvoice.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myInvoice`
AS SELECT `i`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myMenu.sql b/db/routines/hedera/views/myMenu.sql
index 94e58835d1..60f464e7ac 100644
--- a/db/routines/hedera/views/myMenu.sql
+++ b/db/routines/hedera/views/myMenu.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myMenu`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myOrder.sql b/db/routines/hedera/views/myOrder.sql
index 78becd8840..ca92832985 100644
--- a/db/routines/hedera/views/myOrder.sql
+++ b/db/routines/hedera/views/myOrder.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myOrder`
AS SELECT `o`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myOrderRow.sql b/db/routines/hedera/views/myOrderRow.sql
index af42b07455..ddf91a24fc 100644
--- a/db/routines/hedera/views/myOrderRow.sql
+++ b/db/routines/hedera/views/myOrderRow.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myOrderRow`
AS SELECT `orw`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myOrderTicket.sql b/db/routines/hedera/views/myOrderTicket.sql
index fa8220b554..5fa5418559 100644
--- a/db/routines/hedera/views/myOrderTicket.sql
+++ b/db/routines/hedera/views/myOrderTicket.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myOrderTicket`
AS SELECT `o`.`id` AS `orderFk`,
diff --git a/db/routines/hedera/views/myTicket.sql b/db/routines/hedera/views/myTicket.sql
index f17cda9a46..4edb742c85 100644
--- a/db/routines/hedera/views/myTicket.sql
+++ b/db/routines/hedera/views/myTicket.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myTicket`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myTicketRow.sql b/db/routines/hedera/views/myTicketRow.sql
index 5afff812b2..69b11625f7 100644
--- a/db/routines/hedera/views/myTicketRow.sql
+++ b/db/routines/hedera/views/myTicketRow.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myTicketRow`
AS SELECT `s`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myTicketService.sql b/db/routines/hedera/views/myTicketService.sql
index feb839873b..7cb23a862e 100644
--- a/db/routines/hedera/views/myTicketService.sql
+++ b/db/routines/hedera/views/myTicketService.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myTicketService`
AS SELECT `s`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myTicketState.sql b/db/routines/hedera/views/myTicketState.sql
index 530441e3b2..8d3d276b81 100644
--- a/db/routines/hedera/views/myTicketState.sql
+++ b/db/routines/hedera/views/myTicketState.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myTicketState`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/hedera/views/myTpvTransaction.sql b/db/routines/hedera/views/myTpvTransaction.sql
index 98694065fa..a860ed29d7 100644
--- a/db/routines/hedera/views/myTpvTransaction.sql
+++ b/db/routines/hedera/views/myTpvTransaction.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`myTpvTransaction`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/hedera/views/orderTicket.sql b/db/routines/hedera/views/orderTicket.sql
index c350779357..b0c55bc7de 100644
--- a/db/routines/hedera/views/orderTicket.sql
+++ b/db/routines/hedera/views/orderTicket.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`orderTicket`
AS SELECT `b`.`orderFk` AS `orderFk`,
diff --git a/db/routines/hedera/views/order_component.sql b/db/routines/hedera/views/order_component.sql
index b3eb7522b7..e83114724c 100644
--- a/db/routines/hedera/views/order_component.sql
+++ b/db/routines/hedera/views/order_component.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`order_component`
AS SELECT `t`.`rowFk` AS `order_row_id`,
diff --git a/db/routines/hedera/views/order_row.sql b/db/routines/hedera/views/order_row.sql
index f69fd98a36..ab25774f6b 100644
--- a/db/routines/hedera/views/order_row.sql
+++ b/db/routines/hedera/views/order_row.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `hedera`.`order_row`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/pbx/functions/clientFromPhone.sql b/db/routines/pbx/functions/clientFromPhone.sql
index dc18810aaa..b8186e0e02 100644
--- a/db/routines/pbx/functions/clientFromPhone.sql
+++ b/db/routines/pbx/functions/clientFromPhone.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `pbx`.`clientFromPhone`(vPhone VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `pbx`.`clientFromPhone`(vPhone VARCHAR(255))
RETURNS int(11)
DETERMINISTIC
BEGIN
diff --git a/db/routines/pbx/functions/phone_format.sql b/db/routines/pbx/functions/phone_format.sql
index dc697386af..b42dfe96b1 100644
--- a/db/routines/pbx/functions/phone_format.sql
+++ b/db/routines/pbx/functions/phone_format.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `pbx`.`phone_format`(vPhone VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `pbx`.`phone_format`(vPhone VARCHAR(255))
RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
DETERMINISTIC
BEGIN
diff --git a/db/routines/pbx/procedures/phone_isValid.sql b/db/routines/pbx/procedures/phone_isValid.sql
index 083a3e54b6..be3d2968a7 100644
--- a/db/routines/pbx/procedures/phone_isValid.sql
+++ b/db/routines/pbx/procedures/phone_isValid.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `pbx`.`phone_isValid`(vPhone VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `pbx`.`phone_isValid`(vPhone VARCHAR(255))
BEGIN
/**
* Check if an phone has the correct format and
diff --git a/db/routines/pbx/procedures/queue_isValid.sql b/db/routines/pbx/procedures/queue_isValid.sql
index 52c752e092..a07bc342b4 100644
--- a/db/routines/pbx/procedures/queue_isValid.sql
+++ b/db/routines/pbx/procedures/queue_isValid.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `pbx`.`queue_isValid`(vQueue VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `pbx`.`queue_isValid`(vQueue VARCHAR(255))
BEGIN
/**
* Check if an queue has the correct format and
diff --git a/db/routines/pbx/procedures/sip_getExtension.sql b/db/routines/pbx/procedures/sip_getExtension.sql
index 25047fa1f5..640da5a3e0 100644
--- a/db/routines/pbx/procedures/sip_getExtension.sql
+++ b/db/routines/pbx/procedures/sip_getExtension.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `pbx`.`sip_getExtension`(vUserId INT(10))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `pbx`.`sip_getExtension`(vUserId INT(10))
BEGIN
/*
diff --git a/db/routines/pbx/procedures/sip_isValid.sql b/db/routines/pbx/procedures/sip_isValid.sql
index 4a0182bcce..d9c45831de 100644
--- a/db/routines/pbx/procedures/sip_isValid.sql
+++ b/db/routines/pbx/procedures/sip_isValid.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `pbx`.`sip_isValid`(vExtension VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `pbx`.`sip_isValid`(vExtension VARCHAR(255))
BEGIN
/**
* Check if an extension has the correct format and
diff --git a/db/routines/pbx/procedures/sip_setPassword.sql b/db/routines/pbx/procedures/sip_setPassword.sql
index 14e0b05c55..146e7a5022 100644
--- a/db/routines/pbx/procedures/sip_setPassword.sql
+++ b/db/routines/pbx/procedures/sip_setPassword.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `pbx`.`sip_setPassword`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `pbx`.`sip_setPassword`(
vUser VARCHAR(255),
vPassword VARCHAR(255)
)
diff --git a/db/routines/pbx/triggers/blacklist_beforeInsert.sql b/db/routines/pbx/triggers/blacklist_beforeInsert.sql
index ff55c2647e..6bc7909d82 100644
--- a/db/routines/pbx/triggers/blacklist_beforeInsert.sql
+++ b/db/routines/pbx/triggers/blacklist_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`blacklist_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`blacklist_beforeInsert`
BEFORE INSERT ON `blacklist`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/blacklist_berforeUpdate.sql b/db/routines/pbx/triggers/blacklist_berforeUpdate.sql
index 84f2c4bbb0..741b34c0ae 100644
--- a/db/routines/pbx/triggers/blacklist_berforeUpdate.sql
+++ b/db/routines/pbx/triggers/blacklist_berforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`blacklist_berforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`blacklist_berforeUpdate`
BEFORE UPDATE ON `blacklist`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/followme_beforeInsert.sql b/db/routines/pbx/triggers/followme_beforeInsert.sql
index 69f11c5e64..38413f53a4 100644
--- a/db/routines/pbx/triggers/followme_beforeInsert.sql
+++ b/db/routines/pbx/triggers/followme_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`followme_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`followme_beforeInsert`
BEFORE INSERT ON `followme`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/followme_beforeUpdate.sql b/db/routines/pbx/triggers/followme_beforeUpdate.sql
index 697c18974b..67c243c7fd 100644
--- a/db/routines/pbx/triggers/followme_beforeUpdate.sql
+++ b/db/routines/pbx/triggers/followme_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`followme_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`followme_beforeUpdate`
BEFORE UPDATE ON `followme`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/queuePhone_beforeInsert.sql b/db/routines/pbx/triggers/queuePhone_beforeInsert.sql
index debe9c2019..015a227ae7 100644
--- a/db/routines/pbx/triggers/queuePhone_beforeInsert.sql
+++ b/db/routines/pbx/triggers/queuePhone_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`queuePhone_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`queuePhone_beforeInsert`
BEFORE INSERT ON `queuePhone`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/queuePhone_beforeUpdate.sql b/db/routines/pbx/triggers/queuePhone_beforeUpdate.sql
index 9734cc2779..892a10acdb 100644
--- a/db/routines/pbx/triggers/queuePhone_beforeUpdate.sql
+++ b/db/routines/pbx/triggers/queuePhone_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`queuePhone_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`queuePhone_beforeUpdate`
BEFORE UPDATE ON `queuePhone`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/queue_beforeInsert.sql b/db/routines/pbx/triggers/queue_beforeInsert.sql
index 4644dea892..f601d8688a 100644
--- a/db/routines/pbx/triggers/queue_beforeInsert.sql
+++ b/db/routines/pbx/triggers/queue_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`queue_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`queue_beforeInsert`
BEFORE INSERT ON `queue`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/queue_beforeUpdate.sql b/db/routines/pbx/triggers/queue_beforeUpdate.sql
index a2923045ea..22e0afc672 100644
--- a/db/routines/pbx/triggers/queue_beforeUpdate.sql
+++ b/db/routines/pbx/triggers/queue_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`queue_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`queue_beforeUpdate`
BEFORE UPDATE ON `queue`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/sip_afterInsert.sql b/db/routines/pbx/triggers/sip_afterInsert.sql
index 7f0643a986..ab1123106e 100644
--- a/db/routines/pbx/triggers/sip_afterInsert.sql
+++ b/db/routines/pbx/triggers/sip_afterInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`sip_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`sip_afterInsert`
AFTER INSERT ON `sip`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/sip_afterUpdate.sql b/db/routines/pbx/triggers/sip_afterUpdate.sql
index d14df040cc..2556d574c1 100644
--- a/db/routines/pbx/triggers/sip_afterUpdate.sql
+++ b/db/routines/pbx/triggers/sip_afterUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`sip_afterUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`sip_afterUpdate`
AFTER UPDATE ON `sip`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/sip_beforeInsert.sql b/db/routines/pbx/triggers/sip_beforeInsert.sql
index 8322321196..500f300775 100644
--- a/db/routines/pbx/triggers/sip_beforeInsert.sql
+++ b/db/routines/pbx/triggers/sip_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`sip_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`sip_beforeInsert`
BEFORE INSERT ON `sip`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/triggers/sip_beforeUpdate.sql b/db/routines/pbx/triggers/sip_beforeUpdate.sql
index e23b8e22e0..95c943100d 100644
--- a/db/routines/pbx/triggers/sip_beforeUpdate.sql
+++ b/db/routines/pbx/triggers/sip_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`sip_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `pbx`.`sip_beforeUpdate`
BEFORE UPDATE ON `sip`
FOR EACH ROW
BEGIN
diff --git a/db/routines/pbx/views/cdrConf.sql b/db/routines/pbx/views/cdrConf.sql
index adf24c87d6..e4b8ad60a4 100644
--- a/db/routines/pbx/views/cdrConf.sql
+++ b/db/routines/pbx/views/cdrConf.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `pbx`.`cdrConf`
AS SELECT `c`.`call_date` AS `calldate`,
diff --git a/db/routines/pbx/views/followmeConf.sql b/db/routines/pbx/views/followmeConf.sql
index 75eb25ff2b..7c92301d1c 100644
--- a/db/routines/pbx/views/followmeConf.sql
+++ b/db/routines/pbx/views/followmeConf.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `pbx`.`followmeConf`
AS SELECT `f`.`extension` AS `name`,
diff --git a/db/routines/pbx/views/followmeNumberConf.sql b/db/routines/pbx/views/followmeNumberConf.sql
index c83b639a8a..f80dd5a9de 100644
--- a/db/routines/pbx/views/followmeNumberConf.sql
+++ b/db/routines/pbx/views/followmeNumberConf.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `pbx`.`followmeNumberConf`
AS SELECT `f`.`extension` AS `name`,
diff --git a/db/routines/pbx/views/queueConf.sql b/db/routines/pbx/views/queueConf.sql
index 107989801f..8416bdb52e 100644
--- a/db/routines/pbx/views/queueConf.sql
+++ b/db/routines/pbx/views/queueConf.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `pbx`.`queueConf`
AS SELECT `q`.`name` AS `name`,
diff --git a/db/routines/pbx/views/queueMemberConf.sql b/db/routines/pbx/views/queueMemberConf.sql
index 7007daa1ee..734313c7bb 100644
--- a/db/routines/pbx/views/queueMemberConf.sql
+++ b/db/routines/pbx/views/queueMemberConf.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `pbx`.`queueMemberConf`
AS SELECT `m`.`id` AS `uniqueid`,
diff --git a/db/routines/pbx/views/sipConf.sql b/db/routines/pbx/views/sipConf.sql
index 0765264bcd..302f967ec1 100644
--- a/db/routines/pbx/views/sipConf.sql
+++ b/db/routines/pbx/views/sipConf.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `pbx`.`sipConf`
AS SELECT `s`.`user_id` AS `id`,
diff --git a/db/routines/psico/procedures/answerSort.sql b/db/routines/psico/procedures/answerSort.sql
index 75a317b370..c7fd7e48db 100644
--- a/db/routines/psico/procedures/answerSort.sql
+++ b/db/routines/psico/procedures/answerSort.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `psico`.`answerSort`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `psico`.`answerSort`()
BEGIN
UPDATE answer
diff --git a/db/routines/psico/procedures/examNew.sql b/db/routines/psico/procedures/examNew.sql
index 4f27212f6f..5b8eada3ac 100644
--- a/db/routines/psico/procedures/examNew.sql
+++ b/db/routines/psico/procedures/examNew.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `psico`.`examNew`(vFellow VARCHAR(50), vType INT, vQuestionsNumber INT, OUT vExamFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `psico`.`examNew`(vFellow VARCHAR(50), vType INT, vQuestionsNumber INT, OUT vExamFk INT)
BEGIN
DECLARE done BOOL DEFAULT FALSE;
diff --git a/db/routines/psico/procedures/getExamQuestions.sql b/db/routines/psico/procedures/getExamQuestions.sql
index 9ab1eb6d0e..7545a3e792 100644
--- a/db/routines/psico/procedures/getExamQuestions.sql
+++ b/db/routines/psico/procedures/getExamQuestions.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `psico`.`getExamQuestions`(vExamFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `psico`.`getExamQuestions`(vExamFk INT)
BEGIN
SELECT p.text,p.examFk,p.questionFk,p.answerFk,p.id ,a.text AS answerText,a.correct, a.id AS answerFk
diff --git a/db/routines/psico/procedures/getExamType.sql b/db/routines/psico/procedures/getExamType.sql
index d829950e65..25bda6682b 100644
--- a/db/routines/psico/procedures/getExamType.sql
+++ b/db/routines/psico/procedures/getExamType.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `psico`.`getExamType`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `psico`.`getExamType`()
BEGIN
SELECT id,name
diff --git a/db/routines/psico/procedures/questionSort.sql b/db/routines/psico/procedures/questionSort.sql
index 56c5ef4a92..6e47c1c463 100644
--- a/db/routines/psico/procedures/questionSort.sql
+++ b/db/routines/psico/procedures/questionSort.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `psico`.`questionSort`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `psico`.`questionSort`()
BEGIN
UPDATE question
diff --git a/db/routines/psico/views/examView.sql b/db/routines/psico/views/examView.sql
index 1aa7689193..c8bc1a8ef3 100644
--- a/db/routines/psico/views/examView.sql
+++ b/db/routines/psico/views/examView.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `psico`.`examView`
AS SELECT `q`.`text` AS `text`,
diff --git a/db/routines/psico/views/results.sql b/db/routines/psico/views/results.sql
index 1d7945d32d..ad61099f37 100644
--- a/db/routines/psico/views/results.sql
+++ b/db/routines/psico/views/results.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `psico`.`results`
AS SELECT `eq`.`examFk` AS `examFk`,
diff --git a/db/routines/sage/functions/company_getCode.sql b/db/routines/sage/functions/company_getCode.sql
index bdb8c17fbf..412552086b 100644
--- a/db/routines/sage/functions/company_getCode.sql
+++ b/db/routines/sage/functions/company_getCode.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `sage`.`company_getCode`(vCompanyFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `sage`.`company_getCode`(vCompanyFk INT)
RETURNS int(2)
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/sage/procedures/accountingMovements_add.sql b/db/routines/sage/procedures/accountingMovements_add.sql
index 060d89a3fb..229a105296 100644
--- a/db/routines/sage/procedures/accountingMovements_add.sql
+++ b/db/routines/sage/procedures/accountingMovements_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`accountingMovements_add`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`accountingMovements_add`(
vYear INT,
vCompanyFk INT
)
diff --git a/db/routines/sage/procedures/clean.sql b/db/routines/sage/procedures/clean.sql
index f1175c4dc6..9e52d787a8 100644
--- a/db/routines/sage/procedures/clean.sql
+++ b/db/routines/sage/procedures/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`clean`()
BEGIN
/**
* Maintains tables over time by removing unnecessary data
diff --git a/db/routines/sage/procedures/clientSupplier_add.sql b/db/routines/sage/procedures/clientSupplier_add.sql
index 2d1a518820..177b0a7cb1 100644
--- a/db/routines/sage/procedures/clientSupplier_add.sql
+++ b/db/routines/sage/procedures/clientSupplier_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`clientSupplier_add`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`clientSupplier_add`(
vCompanyFk INT
)
BEGIN
diff --git a/db/routines/sage/procedures/importErrorNotification.sql b/db/routines/sage/procedures/importErrorNotification.sql
index 75b0cffc87..1eae584e91 100644
--- a/db/routines/sage/procedures/importErrorNotification.sql
+++ b/db/routines/sage/procedures/importErrorNotification.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`importErrorNotification`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`importErrorNotification`()
BEGIN
/**
* Inserta notificaciones con los errores detectados durante la importación
diff --git a/db/routines/sage/procedures/invoiceIn_add.sql b/db/routines/sage/procedures/invoiceIn_add.sql
index 8fdbb9ce32..e91e337c7a 100644
--- a/db/routines/sage/procedures/invoiceIn_add.sql
+++ b/db/routines/sage/procedures/invoiceIn_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
BEGIN
/**
* Traslada la info de contabilidad relacionada con las facturas recibidas
diff --git a/db/routines/sage/procedures/invoiceIn_manager.sql b/db/routines/sage/procedures/invoiceIn_manager.sql
index f9bf0e92fb..ba99ae9f2f 100644
--- a/db/routines/sage/procedures/invoiceIn_manager.sql
+++ b/db/routines/sage/procedures/invoiceIn_manager.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_manager`(vYear INT, vCompanyFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`invoiceIn_manager`(vYear INT, vCompanyFk INT)
BEGIN
/**
* Traslada la info de contabilidad relacionada con las facturas recibidas
diff --git a/db/routines/sage/procedures/invoiceOut_add.sql b/db/routines/sage/procedures/invoiceOut_add.sql
index f9c6f6b87a..3b9643a36d 100644
--- a/db/routines/sage/procedures/invoiceOut_add.sql
+++ b/db/routines/sage/procedures/invoiceOut_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceOut_add`(IN vInvoiceOutFk INT, IN vXDiarioFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`invoiceOut_add`(IN vInvoiceOutFk INT, IN vXDiarioFk INT)
BEGIN
/**
* Traslada la info de contabilidad relacionada con las facturas emitidas
diff --git a/db/routines/sage/procedures/invoiceOut_manager.sql b/db/routines/sage/procedures/invoiceOut_manager.sql
index 58c0f2a213..cfacc330d7 100644
--- a/db/routines/sage/procedures/invoiceOut_manager.sql
+++ b/db/routines/sage/procedures/invoiceOut_manager.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceOut_manager`(vYear INT, vCompanyFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`invoiceOut_manager`(vYear INT, vCompanyFk INT)
BEGIN
/**
* Traslada la info de contabilidad relacionada con las facturas emitidas
diff --git a/db/routines/sage/procedures/pgc_add.sql b/db/routines/sage/procedures/pgc_add.sql
index 78d80a9fe4..67e3f59cd7 100644
--- a/db/routines/sage/procedures/pgc_add.sql
+++ b/db/routines/sage/procedures/pgc_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`pgc_add`(vCompanyFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `sage`.`pgc_add`(vCompanyFk INT)
BEGIN
/**
* Añade cuentas del plan general contable para exportarlos a Sage
diff --git a/db/routines/sage/triggers/movConta_beforeUpdate.sql b/db/routines/sage/triggers/movConta_beforeUpdate.sql
index 316b28b7f8..f152ebe7f2 100644
--- a/db/routines/sage/triggers/movConta_beforeUpdate.sql
+++ b/db/routines/sage/triggers/movConta_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `sage`.`movConta_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `sage`.`movConta_beforeUpdate`
BEFORE UPDATE ON `movConta`
FOR EACH ROW
BEGIN
diff --git a/db/routines/sage/views/clientLastTwoMonths.sql b/db/routines/sage/views/clientLastTwoMonths.sql
index 059cb07800..24e85796b2 100644
--- a/db/routines/sage/views/clientLastTwoMonths.sql
+++ b/db/routines/sage/views/clientLastTwoMonths.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `sage`.`clientLastTwoMonths`
AS SELECT `vn`.`invoiceOut`.`clientFk` AS `clientFk`,
diff --git a/db/routines/sage/views/supplierLastThreeMonths.sql b/db/routines/sage/views/supplierLastThreeMonths.sql
index f841fd98cc..8fff1d42c7 100644
--- a/db/routines/sage/views/supplierLastThreeMonths.sql
+++ b/db/routines/sage/views/supplierLastThreeMonths.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `sage`.`supplierLastThreeMonths`
AS SELECT `vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,
diff --git a/db/routines/salix/events/accessToken_prune.sql b/db/routines/salix/events/accessToken_prune.sql
index 28b04699f6..adcbb23019 100644
--- a/db/routines/salix/events/accessToken_prune.sql
+++ b/db/routines/salix/events/accessToken_prune.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `salix`.`accessToken_prune`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `salix`.`accessToken_prune`
ON SCHEDULE EVERY 1 DAY
STARTS '2023-03-14 05:14:00.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/salix/procedures/accessToken_prune.sql b/db/routines/salix/procedures/accessToken_prune.sql
index f1a8a0fe8e..06ccbe96a1 100644
--- a/db/routines/salix/procedures/accessToken_prune.sql
+++ b/db/routines/salix/procedures/accessToken_prune.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `salix`.`accessToken_prune`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `salix`.`accessToken_prune`()
BEGIN
/**
* Borra de la tabla salix.AccessToken todos aquellos tokens que hayan caducado
diff --git a/db/routines/salix/triggers/ACL_afterDelete.sql b/db/routines/salix/triggers/ACL_afterDelete.sql
index b7e6071fc2..3528a87477 100644
--- a/db/routines/salix/triggers/ACL_afterDelete.sql
+++ b/db/routines/salix/triggers/ACL_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `salix`.`ACL_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `salix`.`ACL_afterDelete`
AFTER DELETE ON `ACL`
FOR EACH ROW
BEGIN
diff --git a/db/routines/salix/triggers/ACL_beforeInsert.sql b/db/routines/salix/triggers/ACL_beforeInsert.sql
index cb0b5761b2..953ddfba1b 100644
--- a/db/routines/salix/triggers/ACL_beforeInsert.sql
+++ b/db/routines/salix/triggers/ACL_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `salix`.`ACL_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `salix`.`ACL_beforeInsert`
BEFORE INSERT ON `ACL`
FOR EACH ROW
BEGIN
diff --git a/db/routines/salix/triggers/ACL_beforeUpdate.sql b/db/routines/salix/triggers/ACL_beforeUpdate.sql
index b214fc9f63..006a91ae93 100644
--- a/db/routines/salix/triggers/ACL_beforeUpdate.sql
+++ b/db/routines/salix/triggers/ACL_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `salix`.`ACL_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `salix`.`ACL_beforeUpdate`
BEFORE UPDATE ON `ACL`
FOR EACH ROW
BEGIN
diff --git a/db/routines/salix/views/Account.sql b/db/routines/salix/views/Account.sql
index 080e3e50b4..0b75ab6204 100644
--- a/db/routines/salix/views/Account.sql
+++ b/db/routines/salix/views/Account.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `salix`.`Account`
AS SELECT `u`.`id` AS `id`,
diff --git a/db/routines/salix/views/Role.sql b/db/routines/salix/views/Role.sql
index b04ad82a6b..8fcd7c6bef 100644
--- a/db/routines/salix/views/Role.sql
+++ b/db/routines/salix/views/Role.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `salix`.`Role`
AS SELECT `r`.`id` AS `id`,
diff --git a/db/routines/salix/views/RoleMapping.sql b/db/routines/salix/views/RoleMapping.sql
index 48500a05ed..834ec07279 100644
--- a/db/routines/salix/views/RoleMapping.sql
+++ b/db/routines/salix/views/RoleMapping.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `salix`.`RoleMapping`
AS SELECT `u`.`id` * 1000 + `r`.`inheritsFrom` AS `id`,
diff --git a/db/routines/salix/views/User.sql b/db/routines/salix/views/User.sql
index e03803870e..b7536d6b17 100644
--- a/db/routines/salix/views/User.sql
+++ b/db/routines/salix/views/User.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `salix`.`User`
AS SELECT `account`.`user`.`id` AS `id`,
diff --git a/db/routines/srt/events/moving_clean.sql b/db/routines/srt/events/moving_clean.sql
index 18644a9f8a..17490609a1 100644
--- a/db/routines/srt/events/moving_clean.sql
+++ b/db/routines/srt/events/moving_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `srt`.`moving_clean`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `srt`.`moving_clean`
ON SCHEDULE EVERY 15 MINUTE
STARTS '2022-01-21 00:00:00.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/srt/functions/bid.sql b/db/routines/srt/functions/bid.sql
index ee4ffc7d3f..84e30ed115 100644
--- a/db/routines/srt/functions/bid.sql
+++ b/db/routines/srt/functions/bid.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`bid`(vCode VARCHAR(3))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`bid`(vCode VARCHAR(3))
RETURNS int(11)
DETERMINISTIC
BEGIN
diff --git a/db/routines/srt/functions/bufferPool_get.sql b/db/routines/srt/functions/bufferPool_get.sql
index 1576381f58..f3e9d2596d 100644
--- a/db/routines/srt/functions/bufferPool_get.sql
+++ b/db/routines/srt/functions/bufferPool_get.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`bufferPool_get`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`bufferPool_get`()
RETURNS int(11)
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/functions/buffer_get.sql b/db/routines/srt/functions/buffer_get.sql
index 55150bd991..b666548394 100644
--- a/db/routines/srt/functions/buffer_get.sql
+++ b/db/routines/srt/functions/buffer_get.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`buffer_get`(vExpeditionFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`buffer_get`(vExpeditionFk INT)
RETURNS int(11)
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/functions/buffer_getRandom.sql b/db/routines/srt/functions/buffer_getRandom.sql
index bc7229594d..12134c1e3c 100644
--- a/db/routines/srt/functions/buffer_getRandom.sql
+++ b/db/routines/srt/functions/buffer_getRandom.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`buffer_getRandom`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`buffer_getRandom`()
RETURNS int(11)
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/functions/buffer_getState.sql b/db/routines/srt/functions/buffer_getState.sql
index b5c4ac2e4e..79d4551382 100644
--- a/db/routines/srt/functions/buffer_getState.sql
+++ b/db/routines/srt/functions/buffer_getState.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`buffer_getState`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`buffer_getState`(vSelf INT)
RETURNS varchar(20) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/functions/buffer_getType.sql b/db/routines/srt/functions/buffer_getType.sql
index 4b4194b3c2..0db73a0d3e 100644
--- a/db/routines/srt/functions/buffer_getType.sql
+++ b/db/routines/srt/functions/buffer_getType.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`buffer_getType`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`buffer_getType`(vSelf INT)
RETURNS varchar(20) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/functions/buffer_isFull.sql b/db/routines/srt/functions/buffer_isFull.sql
index a1ae08484e..b404a60d6f 100644
--- a/db/routines/srt/functions/buffer_isFull.sql
+++ b/db/routines/srt/functions/buffer_isFull.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`buffer_isFull`(vBufferFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`buffer_isFull`(vBufferFk INT)
RETURNS tinyint(1)
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/functions/dayMinute.sql b/db/routines/srt/functions/dayMinute.sql
index ab66dd7d23..a103678630 100644
--- a/db/routines/srt/functions/dayMinute.sql
+++ b/db/routines/srt/functions/dayMinute.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`dayMinute`(vDateTime DATETIME)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`dayMinute`(vDateTime DATETIME)
RETURNS int(11)
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/functions/expedition_check.sql b/db/routines/srt/functions/expedition_check.sql
index 314cafd96c..948ef449a3 100644
--- a/db/routines/srt/functions/expedition_check.sql
+++ b/db/routines/srt/functions/expedition_check.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`expedition_check`(vExpeditionFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`expedition_check`(vExpeditionFk INT)
RETURNS int(11)
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/functions/expedition_getDayMinute.sql b/db/routines/srt/functions/expedition_getDayMinute.sql
index 01ff534f57..1882dec0fd 100644
--- a/db/routines/srt/functions/expedition_getDayMinute.sql
+++ b/db/routines/srt/functions/expedition_getDayMinute.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `srt`.`expedition_getDayMinute`(vExpeditionFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `srt`.`expedition_getDayMinute`(vExpeditionFk INT)
RETURNS int(11)
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/srt/procedures/buffer_getExpCount.sql b/db/routines/srt/procedures/buffer_getExpCount.sql
index 5ead3d4213..d01feee79e 100644
--- a/db/routines/srt/procedures/buffer_getExpCount.sql
+++ b/db/routines/srt/procedures/buffer_getExpCount.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_getExpCount`(IN vBufferFk INT, OUT vExpCount INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_getExpCount`(IN vBufferFk INT, OUT vExpCount INT)
BEGIN
/* Devuelve el número de expediciones de un buffer
*
diff --git a/db/routines/srt/procedures/buffer_getStateType.sql b/db/routines/srt/procedures/buffer_getStateType.sql
index bba8202db0..4140cb3a63 100644
--- a/db/routines/srt/procedures/buffer_getStateType.sql
+++ b/db/routines/srt/procedures/buffer_getStateType.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_getStateType`(vBufferFk INT, OUT vStateFk INT, OUT vTypeFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_getStateType`(vBufferFk INT, OUT vStateFk INT, OUT vTypeFk INT)
BEGIN
/**
diff --git a/db/routines/srt/procedures/buffer_giveBack.sql b/db/routines/srt/procedures/buffer_giveBack.sql
index f8d3499144..755951e7ba 100644
--- a/db/routines/srt/procedures/buffer_giveBack.sql
+++ b/db/routines/srt/procedures/buffer_giveBack.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_giveBack`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_giveBack`(vSelf INT)
BEGIN
/* Devuelve una caja al celluveyor *
diff --git a/db/routines/srt/procedures/buffer_readPhotocell.sql b/db/routines/srt/procedures/buffer_readPhotocell.sql
index 2bf2cfa1dc..e2e1af8bbb 100644
--- a/db/routines/srt/procedures/buffer_readPhotocell.sql
+++ b/db/routines/srt/procedures/buffer_readPhotocell.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_readPhotocell`(vSelf INT, vNumber INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_readPhotocell`(vSelf INT, vNumber INT)
BEGIN
/**
* Establece el estado de un buffer en función del número de fotocélulas activas
diff --git a/db/routines/srt/procedures/buffer_setEmpty.sql b/db/routines/srt/procedures/buffer_setEmpty.sql
index e97d397ed8..776b25310b 100644
--- a/db/routines/srt/procedures/buffer_setEmpty.sql
+++ b/db/routines/srt/procedures/buffer_setEmpty.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_setEmpty`(vBufferFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_setEmpty`(vBufferFk INT)
BEGIN
/**
diff --git a/db/routines/srt/procedures/buffer_setState.sql b/db/routines/srt/procedures/buffer_setState.sql
index f0f1369425..3ac3c60da6 100644
--- a/db/routines/srt/procedures/buffer_setState.sql
+++ b/db/routines/srt/procedures/buffer_setState.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_setState`(vBufferFk INT(11), vStateFk INT(11))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_setState`(vBufferFk INT(11), vStateFk INT(11))
BEGIN
/**
diff --git a/db/routines/srt/procedures/buffer_setStateType.sql b/db/routines/srt/procedures/buffer_setStateType.sql
index 954a380acd..a9f66509e4 100644
--- a/db/routines/srt/procedures/buffer_setStateType.sql
+++ b/db/routines/srt/procedures/buffer_setStateType.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_setStateType`(vBufferFk INT, vState VARCHAR(25), vType VARCHAR(25))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_setStateType`(vBufferFk INT, vState VARCHAR(25), vType VARCHAR(25))
BEGIN
/**
diff --git a/db/routines/srt/procedures/buffer_setType.sql b/db/routines/srt/procedures/buffer_setType.sql
index 7d6c508dc4..b880262dd7 100644
--- a/db/routines/srt/procedures/buffer_setType.sql
+++ b/db/routines/srt/procedures/buffer_setType.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_setType`(vBufferFk INT(11), vTypeFk INT(11))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_setType`(vBufferFk INT(11), vTypeFk INT(11))
BEGIN
/**
* Cambia el tipo de un buffer, si está permitido
diff --git a/db/routines/srt/procedures/buffer_setTypeByName.sql b/db/routines/srt/procedures/buffer_setTypeByName.sql
index 9365d53992..ad6caff42b 100644
--- a/db/routines/srt/procedures/buffer_setTypeByName.sql
+++ b/db/routines/srt/procedures/buffer_setTypeByName.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`buffer_setTypeByName`(vBufferFk INT(11), vTypeName VARCHAR(100))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`buffer_setTypeByName`(vBufferFk INT(11), vTypeName VARCHAR(100))
BEGIN
/**
diff --git a/db/routines/srt/procedures/clean.sql b/db/routines/srt/procedures/clean.sql
index 3d02ae0cd8..3e90533004 100644
--- a/db/routines/srt/procedures/clean.sql
+++ b/db/routines/srt/procedures/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`clean`()
BEGIN
DECLARE vLastDated DATE DEFAULT TIMESTAMPADD(WEEK,-2,util.VN_CURDATE());
diff --git a/db/routines/srt/procedures/expeditionLoading_add.sql b/db/routines/srt/procedures/expeditionLoading_add.sql
index 7fb53c2c60..bb68e395cb 100644
--- a/db/routines/srt/procedures/expeditionLoading_add.sql
+++ b/db/routines/srt/procedures/expeditionLoading_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expeditionLoading_add`(vExpeditionFk INT, vBufferFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expeditionLoading_add`(vExpeditionFk INT, vBufferFk INT)
BEGIN
DECLARE vMessage VARCHAR(50) DEFAULT '';
diff --git a/db/routines/srt/procedures/expedition_arrived.sql b/db/routines/srt/procedures/expedition_arrived.sql
index 2d2c093bc2..03108e90d8 100644
--- a/db/routines/srt/procedures/expedition_arrived.sql
+++ b/db/routines/srt/procedures/expedition_arrived.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_arrived`(vExpeditionFk INT, vBufferFk INT, OUT vTypeFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_arrived`(vExpeditionFk INT, vBufferFk INT, OUT vTypeFk INT)
BEGIN
/**
* La expedición ha entrado en un buffer, superando fc2
diff --git a/db/routines/srt/procedures/expedition_bufferOut.sql b/db/routines/srt/procedures/expedition_bufferOut.sql
index 69e1fb7919..56d32614b9 100644
--- a/db/routines/srt/procedures/expedition_bufferOut.sql
+++ b/db/routines/srt/procedures/expedition_bufferOut.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_bufferOut`(vBufferToFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_bufferOut`(vBufferToFk INT)
BEGIN
/**
diff --git a/db/routines/srt/procedures/expedition_entering.sql b/db/routines/srt/procedures/expedition_entering.sql
index f1b773edb2..2eab7d0e05 100644
--- a/db/routines/srt/procedures/expedition_entering.sql
+++ b/db/routines/srt/procedures/expedition_entering.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_entering`(vExpeditionFk INT, OUT vExpeditionOutFk INT )
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_entering`(vExpeditionFk INT, OUT vExpeditionOutFk INT )
BEGIN
/**
diff --git a/db/routines/srt/procedures/expedition_get.sql b/db/routines/srt/procedures/expedition_get.sql
index 91a0e2ace1..d0edd4b159 100644
--- a/db/routines/srt/procedures/expedition_get.sql
+++ b/db/routines/srt/procedures/expedition_get.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_get`(vAntennaFk INT, OUT vExpeditionOutFk INT )
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_get`(vAntennaFk INT, OUT vExpeditionOutFk INT )
BEGIN
DECLARE vId INT;
diff --git a/db/routines/srt/procedures/expedition_groupOut.sql b/db/routines/srt/procedures/expedition_groupOut.sql
index 5c4540ff6d..3400492381 100644
--- a/db/routines/srt/procedures/expedition_groupOut.sql
+++ b/db/routines/srt/procedures/expedition_groupOut.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_groupOut`(vDayMinute INT, vBufferToFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_groupOut`(vDayMinute INT, vBufferToFk INT)
BEGIN
/**
diff --git a/db/routines/srt/procedures/expedition_in.sql b/db/routines/srt/procedures/expedition_in.sql
index c6f75876cd..ca783e78ff 100644
--- a/db/routines/srt/procedures/expedition_in.sql
+++ b/db/routines/srt/procedures/expedition_in.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_in`(vBufferFk INT, OUT vExpeditionFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_in`(vBufferFk INT, OUT vExpeditionFk INT)
proc:BEGIN
/**
diff --git a/db/routines/srt/procedures/expedition_moving.sql b/db/routines/srt/procedures/expedition_moving.sql
index 1277ed2bde..095c5f6b1a 100644
--- a/db/routines/srt/procedures/expedition_moving.sql
+++ b/db/routines/srt/procedures/expedition_moving.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_moving`(vBufferFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_moving`(vBufferFk INT)
BEGIN
/**
diff --git a/db/routines/srt/procedures/expedition_out.sql b/db/routines/srt/procedures/expedition_out.sql
index 5e66085615..7c5bb85268 100644
--- a/db/routines/srt/procedures/expedition_out.sql
+++ b/db/routines/srt/procedures/expedition_out.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_out`(vBufferFk INT, OUT vTypeFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_out`(vBufferFk INT, OUT vTypeFk INT)
proc:BEGIN
/**
* Una expedición ha salido de un buffer por el extremo distal
diff --git a/db/routines/srt/procedures/expedition_outAll.sql b/db/routines/srt/procedures/expedition_outAll.sql
index ffe925c9dc..109ddc8174 100644
--- a/db/routines/srt/procedures/expedition_outAll.sql
+++ b/db/routines/srt/procedures/expedition_outAll.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_outAll`(vBufferFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_outAll`(vBufferFk INT)
BEGIN
/**
diff --git a/db/routines/srt/procedures/expedition_relocate.sql b/db/routines/srt/procedures/expedition_relocate.sql
index 0f940beff6..8a5e41ca92 100644
--- a/db/routines/srt/procedures/expedition_relocate.sql
+++ b/db/routines/srt/procedures/expedition_relocate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_relocate`(vExpeditionFk INT, vBufferToFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_relocate`(vExpeditionFk INT, vBufferToFk INT)
proc:BEGIN
/**
diff --git a/db/routines/srt/procedures/expedition_reset.sql b/db/routines/srt/procedures/expedition_reset.sql
index 153edfad22..fd76981456 100644
--- a/db/routines/srt/procedures/expedition_reset.sql
+++ b/db/routines/srt/procedures/expedition_reset.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_reset`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_reset`()
BEGIN
DELETE FROM srt.moving;
diff --git a/db/routines/srt/procedures/expedition_routeOut.sql b/db/routines/srt/procedures/expedition_routeOut.sql
index d40384e1f0..325a6bb944 100644
--- a/db/routines/srt/procedures/expedition_routeOut.sql
+++ b/db/routines/srt/procedures/expedition_routeOut.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_routeOut`(vRouteFk INT, vBufferToFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_routeOut`(vRouteFk INT, vBufferToFk INT)
BEGIN
/**
diff --git a/db/routines/srt/procedures/expedition_scan.sql b/db/routines/srt/procedures/expedition_scan.sql
index e3fcfddef4..81caa4befb 100644
--- a/db/routines/srt/procedures/expedition_scan.sql
+++ b/db/routines/srt/procedures/expedition_scan.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_scan`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_scan`(vSelf INT)
BEGIN
/* Actualiza el estado de una expedicion a OUT, al ser escaneada manualmente
diff --git a/db/routines/srt/procedures/expedition_setDimensions.sql b/db/routines/srt/procedures/expedition_setDimensions.sql
index 0b4fea28fe..fba5f373cb 100644
--- a/db/routines/srt/procedures/expedition_setDimensions.sql
+++ b/db/routines/srt/procedures/expedition_setDimensions.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_setDimensions`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_setDimensions`(
vExpeditionFk INT,
vWeight DECIMAL(10,2),
vLength INT,
diff --git a/db/routines/srt/procedures/expedition_weighing.sql b/db/routines/srt/procedures/expedition_weighing.sql
index bb35edb274..3722125496 100644
--- a/db/routines/srt/procedures/expedition_weighing.sql
+++ b/db/routines/srt/procedures/expedition_weighing.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`expedition_weighing`(vWeight DECIMAL(10,2), vExpeditionFk INT, OUT vExpeditionOutFk INT )
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`expedition_weighing`(vWeight DECIMAL(10,2), vExpeditionFk INT, OUT vExpeditionOutFk INT )
BEGIN
/**
diff --git a/db/routines/srt/procedures/failureLog_add.sql b/db/routines/srt/procedures/failureLog_add.sql
index b572e85036..5ca49a2e05 100644
--- a/db/routines/srt/procedures/failureLog_add.sql
+++ b/db/routines/srt/procedures/failureLog_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`failureLog_add`(vDescription VARCHAR(100))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`failureLog_add`(vDescription VARCHAR(100))
BEGIN
/* Añade un registro a srt.failureLog
diff --git a/db/routines/srt/procedures/lastRFID_add.sql b/db/routines/srt/procedures/lastRFID_add.sql
index ec3c83d983..704e1baa86 100644
--- a/db/routines/srt/procedures/lastRFID_add.sql
+++ b/db/routines/srt/procedures/lastRFID_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`lastRFID_add`(vCode VARCHAR(20), vAntennaFk INT, vAntennaPortFk INT, vPeakRssi INT, vSeenCount INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`lastRFID_add`(vCode VARCHAR(20), vAntennaFk INT, vAntennaPortFk INT, vPeakRssi INT, vSeenCount INT)
BEGIN
/* Insert a new record in lastRFID table
diff --git a/db/routines/srt/procedures/lastRFID_add_beta.sql b/db/routines/srt/procedures/lastRFID_add_beta.sql
index bbeb32410e..01ad90affe 100644
--- a/db/routines/srt/procedures/lastRFID_add_beta.sql
+++ b/db/routines/srt/procedures/lastRFID_add_beta.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`lastRFID_add_beta`(vCode VARCHAR(20), vAntennaFk INT, vAntennaPortFk INT, vPeakRssi INT, vSeenCount INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`lastRFID_add_beta`(vCode VARCHAR(20), vAntennaFk INT, vAntennaPortFk INT, vPeakRssi INT, vSeenCount INT)
BEGIN
/* Insert a new record in lastRFID table
diff --git a/db/routines/srt/procedures/moving_CollidingSet.sql b/db/routines/srt/procedures/moving_CollidingSet.sql
index 69c4f9d9e9..bfaca4bbf5 100644
--- a/db/routines/srt/procedures/moving_CollidingSet.sql
+++ b/db/routines/srt/procedures/moving_CollidingSet.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`moving_CollidingSet`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`moving_CollidingSet`()
BEGIN
diff --git a/db/routines/srt/procedures/moving_between.sql b/db/routines/srt/procedures/moving_between.sql
index 41822d3418..ccb54353fe 100644
--- a/db/routines/srt/procedures/moving_between.sql
+++ b/db/routines/srt/procedures/moving_between.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`moving_between`(vBufferA INT, vBufferB INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`moving_between`(vBufferA INT, vBufferB INT)
BEGIN
DECLARE vExpeditionFk INT;
diff --git a/db/routines/srt/procedures/moving_clean.sql b/db/routines/srt/procedures/moving_clean.sql
index a5bbc7e70f..2380d17098 100644
--- a/db/routines/srt/procedures/moving_clean.sql
+++ b/db/routines/srt/procedures/moving_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`moving_clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`moving_clean`()
BEGIN
/**
* Elimina movimientos por inactividad
diff --git a/db/routines/srt/procedures/moving_delete.sql b/db/routines/srt/procedures/moving_delete.sql
index 38491105af..926b4b5953 100644
--- a/db/routines/srt/procedures/moving_delete.sql
+++ b/db/routines/srt/procedures/moving_delete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`moving_delete`(vExpeditionFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`moving_delete`(vExpeditionFk INT)
BEGIN
/* Elimina un movimiento
diff --git a/db/routines/srt/procedures/moving_groupOut.sql b/db/routines/srt/procedures/moving_groupOut.sql
index d901f0ca9f..28556d20df 100644
--- a/db/routines/srt/procedures/moving_groupOut.sql
+++ b/db/routines/srt/procedures/moving_groupOut.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`moving_groupOut`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`moving_groupOut`()
proc: BEGIN
DECLARE vDayMinute INT;
diff --git a/db/routines/srt/procedures/moving_next.sql b/db/routines/srt/procedures/moving_next.sql
index 6c76b8373d..75270aed10 100644
--- a/db/routines/srt/procedures/moving_next.sql
+++ b/db/routines/srt/procedures/moving_next.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`moving_next`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`moving_next`()
BEGIN
DECLARE vExpeditionFk INT;
diff --git a/db/routines/srt/procedures/photocell_setActive.sql b/db/routines/srt/procedures/photocell_setActive.sql
index c89e9dc9da..63858a83c5 100644
--- a/db/routines/srt/procedures/photocell_setActive.sql
+++ b/db/routines/srt/procedures/photocell_setActive.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`photocell_setActive`(vBufferFk int, vPosition int, vIsActive bool)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`photocell_setActive`(vBufferFk int, vPosition int, vIsActive bool)
BEGIN
REPLACE srt.photocell VALUES (vbufferFk, vPosition, vIsActive);
END$$
diff --git a/db/routines/srt/procedures/randomMoving.sql b/db/routines/srt/procedures/randomMoving.sql
index b4bdd6591b..01a9eaca46 100644
--- a/db/routines/srt/procedures/randomMoving.sql
+++ b/db/routines/srt/procedures/randomMoving.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`randomMoving`(vBufferMin INT, vBufferMax INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`randomMoving`(vBufferMin INT, vBufferMax INT)
BEGIN
DECLARE vBufferOld INT DEFAULT 0;
DECLARE vBufferFk INT;
diff --git a/db/routines/srt/procedures/randomMoving_Launch.sql b/db/routines/srt/procedures/randomMoving_Launch.sql
index 031e548732..84003a50a9 100644
--- a/db/routines/srt/procedures/randomMoving_Launch.sql
+++ b/db/routines/srt/procedures/randomMoving_Launch.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`randomMoving_Launch`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`randomMoving_Launch`()
BEGIN
DECLARE i INT DEFAULT 5;
diff --git a/db/routines/srt/procedures/restart.sql b/db/routines/srt/procedures/restart.sql
index 96adb3bfa9..41871863c5 100644
--- a/db/routines/srt/procedures/restart.sql
+++ b/db/routines/srt/procedures/restart.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`restart`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`restart`()
BEGIN
/*
diff --git a/db/routines/srt/procedures/start.sql b/db/routines/srt/procedures/start.sql
index 8e5250796c..51a0a300b8 100644
--- a/db/routines/srt/procedures/start.sql
+++ b/db/routines/srt/procedures/start.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`start`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`start`()
BEGIN
/*
diff --git a/db/routines/srt/procedures/stop.sql b/db/routines/srt/procedures/stop.sql
index a6fd12bb2e..d649412aa7 100644
--- a/db/routines/srt/procedures/stop.sql
+++ b/db/routines/srt/procedures/stop.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`stop`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`stop`()
BEGIN
/*
diff --git a/db/routines/srt/procedures/test.sql b/db/routines/srt/procedures/test.sql
index 59a76eb818..571e415f29 100644
--- a/db/routines/srt/procedures/test.sql
+++ b/db/routines/srt/procedures/test.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `srt`.`test`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `srt`.`test`()
BEGIN
SELECT 'procedimiento ejecutado con éxito';
diff --git a/db/routines/srt/triggers/buffer_afterDelete.sql b/db/routines/srt/triggers/buffer_afterDelete.sql
index d554e63647..bb92687dd9 100644
--- a/db/routines/srt/triggers/buffer_afterDelete.sql
+++ b/db/routines/srt/triggers/buffer_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`buffer_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `srt`.`buffer_afterDelete`
AFTER DELETE ON `buffer`
FOR EACH ROW
BEGIN
diff --git a/db/routines/srt/triggers/buffer_beforeInsert.sql b/db/routines/srt/triggers/buffer_beforeInsert.sql
index 6b1e05362c..9a13dde964 100644
--- a/db/routines/srt/triggers/buffer_beforeInsert.sql
+++ b/db/routines/srt/triggers/buffer_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`buffer_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `srt`.`buffer_beforeInsert`
BEFORE INSERT ON `buffer`
FOR EACH ROW
BEGIN
diff --git a/db/routines/srt/triggers/buffer_beforeUpdate.sql b/db/routines/srt/triggers/buffer_beforeUpdate.sql
index 86418a5510..ed6727855e 100644
--- a/db/routines/srt/triggers/buffer_beforeUpdate.sql
+++ b/db/routines/srt/triggers/buffer_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`buffer_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `srt`.`buffer_beforeUpdate`
BEFORE UPDATE ON `buffer`
FOR EACH ROW
BEGIN
diff --git a/db/routines/srt/triggers/config_afterDelete.sql b/db/routines/srt/triggers/config_afterDelete.sql
index 1e4af91047..e07925f3e5 100644
--- a/db/routines/srt/triggers/config_afterDelete.sql
+++ b/db/routines/srt/triggers/config_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`config_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `srt`.`config_afterDelete`
AFTER DELETE ON `config`
FOR EACH ROW
BEGIN
diff --git a/db/routines/srt/triggers/config_beforeInsert.sql b/db/routines/srt/triggers/config_beforeInsert.sql
index 7d83896463..59819654ea 100644
--- a/db/routines/srt/triggers/config_beforeInsert.sql
+++ b/db/routines/srt/triggers/config_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`config_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `srt`.`config_beforeInsert`
BEFORE INSERT ON `config`
FOR EACH ROW
BEGIN
diff --git a/db/routines/srt/triggers/config_beforeUpdate.sql b/db/routines/srt/triggers/config_beforeUpdate.sql
index 0002fb4d63..bd7faaf421 100644
--- a/db/routines/srt/triggers/config_beforeUpdate.sql
+++ b/db/routines/srt/triggers/config_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`config_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `srt`.`config_beforeUpdate`
BEFORE UPDATE ON `config`
FOR EACH ROW
BEGIN
diff --git a/db/routines/srt/triggers/expedition_beforeUpdate.sql b/db/routines/srt/triggers/expedition_beforeUpdate.sql
index b8933aaf51..335c69bab1 100644
--- a/db/routines/srt/triggers/expedition_beforeUpdate.sql
+++ b/db/routines/srt/triggers/expedition_beforeUpdate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`expedition_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `srt`.`expedition_beforeUpdate`
BEFORE UPDATE ON `expedition`
FOR EACH ROW
BEGIN
diff --git a/db/routines/srt/triggers/moving_afterInsert.sql b/db/routines/srt/triggers/moving_afterInsert.sql
index aaa09c99c4..dcf8a977ef 100644
--- a/db/routines/srt/triggers/moving_afterInsert.sql
+++ b/db/routines/srt/triggers/moving_afterInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `srt`.`moving_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `srt`.`moving_afterInsert`
AFTER INSERT ON `moving`
FOR EACH ROW
BEGIN
diff --git a/db/routines/srt/views/bufferDayMinute.sql b/db/routines/srt/views/bufferDayMinute.sql
index d2108e513b..0156b74f56 100644
--- a/db/routines/srt/views/bufferDayMinute.sql
+++ b/db/routines/srt/views/bufferDayMinute.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `srt`.`bufferDayMinute`
AS SELECT `b`.`id` AS `bufferFk`,
diff --git a/db/routines/srt/views/bufferFreeLength.sql b/db/routines/srt/views/bufferFreeLength.sql
index 4edf1db471..7035220a0e 100644
--- a/db/routines/srt/views/bufferFreeLength.sql
+++ b/db/routines/srt/views/bufferFreeLength.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `srt`.`bufferFreeLength`
AS SELECT cast(`b`.`id` AS decimal(10, 0)) AS `bufferFk`,
diff --git a/db/routines/srt/views/bufferStock.sql b/db/routines/srt/views/bufferStock.sql
index ca04d3c012..dd0b2f1c2a 100644
--- a/db/routines/srt/views/bufferStock.sql
+++ b/db/routines/srt/views/bufferStock.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `srt`.`bufferStock`
AS SELECT `e`.`id` AS `expeditionFk`,
diff --git a/db/routines/srt/views/routePalletized.sql b/db/routines/srt/views/routePalletized.sql
index 15b493c6a0..05113242a3 100644
--- a/db/routines/srt/views/routePalletized.sql
+++ b/db/routines/srt/views/routePalletized.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `srt`.`routePalletized`
AS SELECT `t`.`routeFk` AS `routeFk`,
diff --git a/db/routines/srt/views/ticketPalletized.sql b/db/routines/srt/views/ticketPalletized.sql
index 04ac24291e..812e3659e0 100644
--- a/db/routines/srt/views/ticketPalletized.sql
+++ b/db/routines/srt/views/ticketPalletized.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `srt`.`ticketPalletized`
AS SELECT `t`.`id` AS `ticketFk`,
diff --git a/db/routines/srt/views/upperStickers.sql b/db/routines/srt/views/upperStickers.sql
index 1cd72c12bd..fff8890f55 100644
--- a/db/routines/srt/views/upperStickers.sql
+++ b/db/routines/srt/views/upperStickers.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `srt`.`upperStickers`
AS SELECT `e`.`id` AS `expeditionFk`,
diff --git a/db/routines/stock/events/log_clean.sql b/db/routines/stock/events/log_clean.sql
index 973561a89c..68dec73858 100644
--- a/db/routines/stock/events/log_clean.sql
+++ b/db/routines/stock/events/log_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `stock`.`log_clean`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `stock`.`log_clean`
ON SCHEDULE EVERY 1 DAY
STARTS '2022-01-28 09:29:18.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/stock/events/log_syncNoWait.sql b/db/routines/stock/events/log_syncNoWait.sql
index 954d372193..e8f719ac29 100644
--- a/db/routines/stock/events/log_syncNoWait.sql
+++ b/db/routines/stock/events/log_syncNoWait.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `stock`.`log_syncNoWait`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `stock`.`log_syncNoWait`
ON SCHEDULE EVERY 5 SECOND
STARTS '2017-06-27 17:15:02.000'
ON COMPLETION NOT PRESERVE
diff --git a/db/routines/stock/procedures/inbound_addPick.sql b/db/routines/stock/procedures/inbound_addPick.sql
index 41b93a9868..136ade6c8e 100644
--- a/db/routines/stock/procedures/inbound_addPick.sql
+++ b/db/routines/stock/procedures/inbound_addPick.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_addPick`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`inbound_addPick`(
vSelf INT,
vOutboundFk INT,
vQuantity INT
diff --git a/db/routines/stock/procedures/inbound_removePick.sql b/db/routines/stock/procedures/inbound_removePick.sql
index e183e11712..75883bcb2f 100644
--- a/db/routines/stock/procedures/inbound_removePick.sql
+++ b/db/routines/stock/procedures/inbound_removePick.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_removePick`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`inbound_removePick`(
vSelf INT,
vOutboundFk INT,
vQuantity INT,
diff --git a/db/routines/stock/procedures/inbound_requestQuantity.sql b/db/routines/stock/procedures/inbound_requestQuantity.sql
index 1cbc1908bf..4c6fb4295d 100644
--- a/db/routines/stock/procedures/inbound_requestQuantity.sql
+++ b/db/routines/stock/procedures/inbound_requestQuantity.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_requestQuantity`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`inbound_requestQuantity`(
vSelf INT,
vRequested INT,
vDated DATETIME,
diff --git a/db/routines/stock/procedures/inbound_sync.sql b/db/routines/stock/procedures/inbound_sync.sql
index 77d3e42f7e..7d463e70d0 100644
--- a/db/routines/stock/procedures/inbound_sync.sql
+++ b/db/routines/stock/procedures/inbound_sync.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_sync`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`inbound_sync`(vSelf INT)
BEGIN
/**
* Associates a inbound with their possible outbounds, updating it's available.
diff --git a/db/routines/stock/procedures/log_clean.sql b/db/routines/stock/procedures/log_clean.sql
index 56634b371a..9215246e1b 100644
--- a/db/routines/stock/procedures/log_clean.sql
+++ b/db/routines/stock/procedures/log_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`log_clean`()
BEGIN
DELETE FROM inbound WHERE dated = vn.getInventoryDate();
DELETE FROM outbound WHERE dated = vn.getInventoryDate();
diff --git a/db/routines/stock/procedures/log_delete.sql b/db/routines/stock/procedures/log_delete.sql
index e3b631b4ea..8bf2aed569 100644
--- a/db/routines/stock/procedures/log_delete.sql
+++ b/db/routines/stock/procedures/log_delete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_delete`(vTableName VARCHAR(255), vTableId INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`log_delete`(vTableName VARCHAR(255), vTableId INT)
proc: BEGIN
/**
* Processes orphan transactions.
diff --git a/db/routines/stock/procedures/log_refreshAll.sql b/db/routines/stock/procedures/log_refreshAll.sql
index 3eaad07f21..9415379af1 100644
--- a/db/routines/stock/procedures/log_refreshAll.sql
+++ b/db/routines/stock/procedures/log_refreshAll.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshAll`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`log_refreshAll`()
BEGIN
/**
* Recalculates the entire cache. It takes a considerable time,
diff --git a/db/routines/stock/procedures/log_refreshBuy.sql b/db/routines/stock/procedures/log_refreshBuy.sql
index 874e140725..e8f2fd407a 100644
--- a/db/routines/stock/procedures/log_refreshBuy.sql
+++ b/db/routines/stock/procedures/log_refreshBuy.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshBuy`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`log_refreshBuy`(
`vTableName` VARCHAR(255),
`vTableId` INT)
BEGIN
diff --git a/db/routines/stock/procedures/log_refreshOrder.sql b/db/routines/stock/procedures/log_refreshOrder.sql
index ce5b31cc8e..787fb6aa58 100644
--- a/db/routines/stock/procedures/log_refreshOrder.sql
+++ b/db/routines/stock/procedures/log_refreshOrder.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshOrder`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`log_refreshOrder`(
`vTableName` VARCHAR(255),
`vTableId` INT)
BEGIN
diff --git a/db/routines/stock/procedures/log_refreshSale.sql b/db/routines/stock/procedures/log_refreshSale.sql
index 3054f8ecb2..f982d405ed 100644
--- a/db/routines/stock/procedures/log_refreshSale.sql
+++ b/db/routines/stock/procedures/log_refreshSale.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshSale`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`log_refreshSale`(
`vTableName` VARCHAR(255),
`vTableId` INT)
BEGIN
diff --git a/db/routines/stock/procedures/log_sync.sql b/db/routines/stock/procedures/log_sync.sql
index 5b03b6ab0e..349e4b3dbf 100644
--- a/db/routines/stock/procedures/log_sync.sql
+++ b/db/routines/stock/procedures/log_sync.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_sync`(vSync BOOL)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`log_sync`(vSync BOOL)
proc: BEGIN
DECLARE vDone BOOL;
DECLARE vLogId INT;
diff --git a/db/routines/stock/procedures/log_syncNoWait.sql b/db/routines/stock/procedures/log_syncNoWait.sql
index 00cc215fd4..897195f4df 100644
--- a/db/routines/stock/procedures/log_syncNoWait.sql
+++ b/db/routines/stock/procedures/log_syncNoWait.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_syncNoWait`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`log_syncNoWait`()
BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
diff --git a/db/routines/stock/procedures/outbound_requestQuantity.sql b/db/routines/stock/procedures/outbound_requestQuantity.sql
index 7ddc3545ca..2ee2624676 100644
--- a/db/routines/stock/procedures/outbound_requestQuantity.sql
+++ b/db/routines/stock/procedures/outbound_requestQuantity.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`outbound_requestQuantity`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`outbound_requestQuantity`(
vSelf INT,
vRequested INT,
vDated DATETIME,
diff --git a/db/routines/stock/procedures/outbound_sync.sql b/db/routines/stock/procedures/outbound_sync.sql
index 0de3521761..94b65e1b6c 100644
--- a/db/routines/stock/procedures/outbound_sync.sql
+++ b/db/routines/stock/procedures/outbound_sync.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`outbound_sync`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`outbound_sync`(vSelf INT)
BEGIN
/**
* Attaches a outbound with available inbounds.
diff --git a/db/routines/stock/procedures/visible_log.sql b/db/routines/stock/procedures/visible_log.sql
index cc88d3205e..cb11e9d3e7 100644
--- a/db/routines/stock/procedures/visible_log.sql
+++ b/db/routines/stock/procedures/visible_log.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`visible_log`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `stock`.`visible_log`(
vIsPicked BOOL,
vWarehouseFk INT,
vItemFk INT,
diff --git a/db/routines/stock/triggers/inbound_afterDelete.sql b/db/routines/stock/triggers/inbound_afterDelete.sql
index 451dcc5995..a436d04a01 100644
--- a/db/routines/stock/triggers/inbound_afterDelete.sql
+++ b/db/routines/stock/triggers/inbound_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `stock`.`inbound_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `stock`.`inbound_afterDelete`
AFTER DELETE ON `inbound`
FOR EACH ROW
BEGIN
diff --git a/db/routines/stock/triggers/inbound_beforeInsert.sql b/db/routines/stock/triggers/inbound_beforeInsert.sql
index 723cb3222f..3707a2b2a7 100644
--- a/db/routines/stock/triggers/inbound_beforeInsert.sql
+++ b/db/routines/stock/triggers/inbound_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `stock`.`inbound_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `stock`.`inbound_beforeInsert`
BEFORE INSERT ON `inbound`
FOR EACH ROW
BEGIN
diff --git a/db/routines/stock/triggers/outbound_afterDelete.sql b/db/routines/stock/triggers/outbound_afterDelete.sql
index e7d756871d..1c90c32932 100644
--- a/db/routines/stock/triggers/outbound_afterDelete.sql
+++ b/db/routines/stock/triggers/outbound_afterDelete.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `stock`.`outbound_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `stock`.`outbound_afterDelete`
AFTER DELETE ON `outbound`
FOR EACH ROW
BEGIN
diff --git a/db/routines/stock/triggers/outbound_beforeInsert.sql b/db/routines/stock/triggers/outbound_beforeInsert.sql
index 86546413e9..e0560d8f65 100644
--- a/db/routines/stock/triggers/outbound_beforeInsert.sql
+++ b/db/routines/stock/triggers/outbound_beforeInsert.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `stock`.`outbound_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `stock`.`outbound_beforeInsert`
BEFORE INSERT ON `outbound`
FOR EACH ROW
BEGIN
diff --git a/db/routines/tmp/events/clean.sql b/db/routines/tmp/events/clean.sql
index 34b7139ccc..75f0223626 100644
--- a/db/routines/tmp/events/clean.sql
+++ b/db/routines/tmp/events/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `tmp`.`clean`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `tmp`.`clean`
ON SCHEDULE EVERY 1 HOUR
STARTS '2022-03-01 00:00:00.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/tmp/procedures/clean.sql b/db/routines/tmp/procedures/clean.sql
index a15f98311c..90ea692167 100644
--- a/db/routines/tmp/procedures/clean.sql
+++ b/db/routines/tmp/procedures/clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `tmp`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `tmp`.`clean`()
BEGIN
DECLARE vTableName VARCHAR(255);
DECLARE vDone BOOL;
diff --git a/db/routines/util/events/log_clean.sql b/db/routines/util/events/log_clean.sql
index 8447069e6b..225dd35644 100644
--- a/db/routines/util/events/log_clean.sql
+++ b/db/routines/util/events/log_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `util`.`log_clean`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `util`.`log_clean`
ON SCHEDULE EVERY 1 DAY
STARTS '2024-07-09 00:30:00.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/util/events/slowLog_prune.sql b/db/routines/util/events/slowLog_prune.sql
index aa9b0c1844..1b339fbcda 100644
--- a/db/routines/util/events/slowLog_prune.sql
+++ b/db/routines/util/events/slowLog_prune.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `util`.`slowLog_prune`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `util`.`slowLog_prune`
ON SCHEDULE EVERY 1 DAY
STARTS '2021-10-08 00:00:00.000'
ON COMPLETION PRESERVE
diff --git a/db/routines/util/functions/VN_CURDATE.sql b/db/routines/util/functions/VN_CURDATE.sql
index 692f097a0f..0ceb0c4ede 100644
--- a/db/routines/util/functions/VN_CURDATE.sql
+++ b/db/routines/util/functions/VN_CURDATE.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`VN_CURDATE`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`VN_CURDATE`()
RETURNS date
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/VN_CURTIME.sql b/db/routines/util/functions/VN_CURTIME.sql
index ae66ea500e..954ed2273a 100644
--- a/db/routines/util/functions/VN_CURTIME.sql
+++ b/db/routines/util/functions/VN_CURTIME.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`VN_CURTIME`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`VN_CURTIME`()
RETURNS time
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/VN_NOW.sql b/db/routines/util/functions/VN_NOW.sql
index 47b1bb4fdb..44e3ece447 100644
--- a/db/routines/util/functions/VN_NOW.sql
+++ b/db/routines/util/functions/VN_NOW.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`VN_NOW`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`VN_NOW`()
RETURNS datetime
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/VN_UNIX_TIMESTAMP.sql b/db/routines/util/functions/VN_UNIX_TIMESTAMP.sql
index 7174598621..c168df9fd1 100644
--- a/db/routines/util/functions/VN_UNIX_TIMESTAMP.sql
+++ b/db/routines/util/functions/VN_UNIX_TIMESTAMP.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`VN_UNIX_TIMESTAMP`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`VN_UNIX_TIMESTAMP`()
RETURNS int(11)
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/VN_UTC_DATE.sql b/db/routines/util/functions/VN_UTC_DATE.sql
index 2b40b7dc29..803b6026fb 100644
--- a/db/routines/util/functions/VN_UTC_DATE.sql
+++ b/db/routines/util/functions/VN_UTC_DATE.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`VN_UTC_DATE`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`VN_UTC_DATE`()
RETURNS date
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/VN_UTC_TIME.sql b/db/routines/util/functions/VN_UTC_TIME.sql
index 930333d238..3eaa7f4314 100644
--- a/db/routines/util/functions/VN_UTC_TIME.sql
+++ b/db/routines/util/functions/VN_UTC_TIME.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`VN_UTC_TIME`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`VN_UTC_TIME`()
RETURNS time
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/VN_UTC_TIMESTAMP.sql b/db/routines/util/functions/VN_UTC_TIMESTAMP.sql
index 97d1258741..530198cb9d 100644
--- a/db/routines/util/functions/VN_UTC_TIMESTAMP.sql
+++ b/db/routines/util/functions/VN_UTC_TIMESTAMP.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`VN_UTC_TIMESTAMP`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`VN_UTC_TIMESTAMP`()
RETURNS datetime
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/accountNumberToIban.sql b/db/routines/util/functions/accountNumberToIban.sql
index 49d3c917e5..8119545476 100644
--- a/db/routines/util/functions/accountNumberToIban.sql
+++ b/db/routines/util/functions/accountNumberToIban.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`accountNumberToIban`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`accountNumberToIban`(
vAccount VARCHAR(20)
)
RETURNS varchar(4) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
diff --git a/db/routines/util/functions/accountShortToStandard.sql b/db/routines/util/functions/accountShortToStandard.sql
index 71e360bf37..a3379d9892 100644
--- a/db/routines/util/functions/accountShortToStandard.sql
+++ b/db/routines/util/functions/accountShortToStandard.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`accountShortToStandard`(vAccount VARCHAR(10))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`accountShortToStandard`(vAccount VARCHAR(10))
RETURNS varchar(10) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/binlogQueue_getDelay.sql b/db/routines/util/functions/binlogQueue_getDelay.sql
index d6cf49377d..adbf0e98a5 100644
--- a/db/routines/util/functions/binlogQueue_getDelay.sql
+++ b/db/routines/util/functions/binlogQueue_getDelay.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`binlogQueue_getDelay`(vCode VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`binlogQueue_getDelay`(vCode VARCHAR(255))
RETURNS BIGINT
READS SQL DATA
NOT DETERMINISTIC
diff --git a/db/routines/util/functions/capitalizeFirst.sql b/db/routines/util/functions/capitalizeFirst.sql
index 859777de20..50e5f508e2 100644
--- a/db/routines/util/functions/capitalizeFirst.sql
+++ b/db/routines/util/functions/capitalizeFirst.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`capitalizeFirst`(vString VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`capitalizeFirst`(vString VARCHAR(255))
RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/checkPrintableChars.sql b/db/routines/util/functions/checkPrintableChars.sql
index a4addce247..a327ed41df 100644
--- a/db/routines/util/functions/checkPrintableChars.sql
+++ b/db/routines/util/functions/checkPrintableChars.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`checkPrintableChars`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`checkPrintableChars`(
vString VARCHAR(255)
) RETURNS tinyint(1)
DETERMINISTIC
diff --git a/db/routines/util/functions/crypt.sql b/db/routines/util/functions/crypt.sql
index 664563cd0b..98308729e8 100644
--- a/db/routines/util/functions/crypt.sql
+++ b/db/routines/util/functions/crypt.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`crypt`(vText VARCHAR(255), vKey VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`crypt`(vText VARCHAR(255), vKey VARCHAR(255))
RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/util/functions/cryptOff.sql b/db/routines/util/functions/cryptOff.sql
index bc281e4ece..1c268f0700 100644
--- a/db/routines/util/functions/cryptOff.sql
+++ b/db/routines/util/functions/cryptOff.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`cryptOff`(vText VARCHAR(255), vKey VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`cryptOff`(vText VARCHAR(255), vKey VARCHAR(255))
RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
NOT DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/util/functions/dayEnd.sql b/db/routines/util/functions/dayEnd.sql
index 1da4dcfe6f..767e490d8a 100644
--- a/db/routines/util/functions/dayEnd.sql
+++ b/db/routines/util/functions/dayEnd.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`dayEnd`(vDated DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`dayEnd`(vDated DATE)
RETURNS datetime
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/firstDayOfMonth.sql b/db/routines/util/functions/firstDayOfMonth.sql
index 77971c7b86..298dba95af 100644
--- a/db/routines/util/functions/firstDayOfMonth.sql
+++ b/db/routines/util/functions/firstDayOfMonth.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`firstDayOfMonth`(vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`firstDayOfMonth`(vDate DATE)
RETURNS date
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/firstDayOfYear.sql b/db/routines/util/functions/firstDayOfYear.sql
index 710c3a6884..f7a9f8dafb 100644
--- a/db/routines/util/functions/firstDayOfYear.sql
+++ b/db/routines/util/functions/firstDayOfYear.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`firstDayOfYear`(vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`firstDayOfYear`(vDate DATE)
RETURNS date
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/formatRow.sql b/db/routines/util/functions/formatRow.sql
index b119df0155..b80e60e9fc 100644
--- a/db/routines/util/functions/formatRow.sql
+++ b/db/routines/util/functions/formatRow.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`formatRow`(vType CHAR(3), vValues VARCHAR(512))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`formatRow`(vType CHAR(3), vValues VARCHAR(512))
RETURNS varchar(512) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/formatTable.sql b/db/routines/util/functions/formatTable.sql
index 00a2b50bf7..a717e8c072 100644
--- a/db/routines/util/functions/formatTable.sql
+++ b/db/routines/util/functions/formatTable.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`formatTable`(vFields VARCHAR(512), vOldValues VARCHAR(512), vNewValues VARCHAR(512))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`formatTable`(vFields VARCHAR(512), vOldValues VARCHAR(512), vNewValues VARCHAR(512))
RETURNS text CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/hasDateOverlapped.sql b/db/routines/util/functions/hasDateOverlapped.sql
index 9441e201c2..ea73390e6f 100644
--- a/db/routines/util/functions/hasDateOverlapped.sql
+++ b/db/routines/util/functions/hasDateOverlapped.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`hasDateOverlapped`(vSarted1 DATE, vEnded1 DATE, vSarted2 DATE, vEnded2 DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`hasDateOverlapped`(vSarted1 DATE, vEnded1 DATE, vSarted2 DATE, vEnded2 DATE)
RETURNS tinyint(1)
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/hmacSha2.sql b/db/routines/util/functions/hmacSha2.sql
index 78611c118b..cb36cac873 100644
--- a/db/routines/util/functions/hmacSha2.sql
+++ b/db/routines/util/functions/hmacSha2.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`hmacSha2`(`vAlg` SMALLINT, `vMsg` MEDIUMBLOB, `vKey` MEDIUMBLOB)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`hmacSha2`(`vAlg` SMALLINT, `vMsg` MEDIUMBLOB, `vKey` MEDIUMBLOB)
RETURNS varchar(128) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/isLeapYear.sql b/db/routines/util/functions/isLeapYear.sql
index 2c7c96f3d5..c51e98cda1 100644
--- a/db/routines/util/functions/isLeapYear.sql
+++ b/db/routines/util/functions/isLeapYear.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`isLeapYear`(vYear INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`isLeapYear`(vYear INT)
RETURNS tinyint(1)
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/json_removeNulls.sql b/db/routines/util/functions/json_removeNulls.sql
index 5fa7413809..45797e1bfa 100644
--- a/db/routines/util/functions/json_removeNulls.sql
+++ b/db/routines/util/functions/json_removeNulls.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`json_removeNulls`(vObject JSON)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`json_removeNulls`(vObject JSON)
RETURNS longtext CHARSET utf8mb4 COLLATE utf8mb4_bin
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/lang.sql b/db/routines/util/functions/lang.sql
index 3431cdcc71..e7832993dd 100644
--- a/db/routines/util/functions/lang.sql
+++ b/db/routines/util/functions/lang.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`lang`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`lang`()
RETURNS char(2) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/lastDayOfYear.sql b/db/routines/util/functions/lastDayOfYear.sql
index 52607ae218..b60fc2cc78 100644
--- a/db/routines/util/functions/lastDayOfYear.sql
+++ b/db/routines/util/functions/lastDayOfYear.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`lastDayOfYear`(vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`lastDayOfYear`(vDate DATE)
RETURNS date
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/log_formatDate.sql b/db/routines/util/functions/log_formatDate.sql
index 84c2690279..0004461d13 100644
--- a/db/routines/util/functions/log_formatDate.sql
+++ b/db/routines/util/functions/log_formatDate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`log_formatDate`(vInstance JSON)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`log_formatDate`(vInstance JSON)
RETURNS longtext CHARSET utf8mb4 COLLATE utf8mb4_bin
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/midnight.sql b/db/routines/util/functions/midnight.sql
index b374156829..b36a9668c3 100644
--- a/db/routines/util/functions/midnight.sql
+++ b/db/routines/util/functions/midnight.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`midnight`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`midnight`()
RETURNS datetime
DETERMINISTIC
READS SQL DATA
diff --git a/db/routines/util/functions/mockTime.sql b/db/routines/util/functions/mockTime.sql
index ab7859e7d5..4dd050cf2d 100644
--- a/db/routines/util/functions/mockTime.sql
+++ b/db/routines/util/functions/mockTime.sql
@@ -1,11 +1,11 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTime`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`mockTime`()
RETURNS datetime
DETERMINISTIC
BEGIN
/**
* Returns current dateTime
- *
+ *
* @return current datetime
*/
RETURN NOW();
diff --git a/db/routines/util/functions/mockTimeBase.sql b/db/routines/util/functions/mockTimeBase.sql
deleted file mode 100644
index 7b3ea1a4ac..0000000000
--- a/db/routines/util/functions/mockTimeBase.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTimeBase`(vIsUtc BOOL)
- RETURNS datetime
- DETERMINISTIC
-BEGIN
-/**
- * Returns the date formatted to utc if vIsUtc or config.mocTz if not
- *
- * @param vIsUtc If date must be returned as UTC format
- * @return The formatted mock time
- */
-DECLARE vMockUtcTime DATETIME;
- DECLARE vMockTz VARCHAR(255);
-
- SELECT mockUtcTime, mockTz
- INTO vMockUtcTime, vMockTz
- FROM config
- LIMIT 1;
-
- IF vIsUtc OR vMockTz IS NULL THEN
- RETURN vMockUtcTime;
- ELSE
- RETURN CONVERT_TZ(vMockUtcTime, '+00:00', vMockTz);
- END IF;
-END$$
-DELIMITER ;
diff --git a/db/routines/util/functions/mockUtcTime.sql b/db/routines/util/functions/mockUtcTime.sql
index e79c3b2410..1a11872a26 100644
--- a/db/routines/util/functions/mockUtcTime.sql
+++ b/db/routines/util/functions/mockUtcTime.sql
@@ -1,25 +1,13 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockUtcTime`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`mockUtcTime`()
RETURNS datetime
DETERMINISTIC
BEGIN
/**
- * Returns the UTC datetime in mockTime format or timeStamp depending on config table
+ * Returns current UTC dateTime
*
* @return The UTC datetime format
*/
--- FIXME: #5041 Commented because there is slowness when querying a table
-/*
- DECLARE vMockEnabled BOOL;
-
- SELECT mockEnabled INTO vMockEnabled FROM config LIMIT 1;
-
- IF vMockEnabled THEN
- RETURN mockTimeBase(TRUE);
- ELSE
- RETURN UTC_TIMESTAMP();
- END IF;
-*/
RETURN UTC_TIMESTAMP();
END$$
DELIMITER ;
diff --git a/db/routines/util/functions/nextWeek.sql b/db/routines/util/functions/nextWeek.sql
index f764201aa4..fc6abc40d2 100644
--- a/db/routines/util/functions/nextWeek.sql
+++ b/db/routines/util/functions/nextWeek.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`nextWeek`(vYearWeek INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`nextWeek`(vYearWeek INT)
RETURNS int(11)
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/notification_send.sql b/db/routines/util/functions/notification_send.sql
index 981cde2d6d..87f5ec43aa 100644
--- a/db/routines/util/functions/notification_send.sql
+++ b/db/routines/util/functions/notification_send.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`notification_send`(vNotificationName VARCHAR(255), vParams TEXT, vAuthorFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`notification_send`(vNotificationName VARCHAR(255), vParams TEXT, vAuthorFk INT)
RETURNS int(11)
NOT DETERMINISTIC
MODIFIES SQL DATA
diff --git a/db/routines/util/functions/quarterFirstDay.sql b/db/routines/util/functions/quarterFirstDay.sql
index b8239ffc8e..a8d4c35ada 100644
--- a/db/routines/util/functions/quarterFirstDay.sql
+++ b/db/routines/util/functions/quarterFirstDay.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`quarterFirstDay`(vYear INT, vQuarter INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`quarterFirstDay`(vYear INT, vQuarter INT)
RETURNS date
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/quoteIdentifier.sql b/db/routines/util/functions/quoteIdentifier.sql
index 1c0c4c5436..96161b3ef8 100644
--- a/db/routines/util/functions/quoteIdentifier.sql
+++ b/db/routines/util/functions/quoteIdentifier.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`quoteIdentifier`(vString TEXT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`quoteIdentifier`(vString TEXT)
RETURNS text CHARSET utf8mb3 COLLATE utf8mb3_general_ci
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/stringXor.sql b/db/routines/util/functions/stringXor.sql
index 252cd00400..e16ca4c430 100644
--- a/db/routines/util/functions/stringXor.sql
+++ b/db/routines/util/functions/stringXor.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`stringXor`(vString MEDIUMBLOB, vConst TINYINT UNSIGNED)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`stringXor`(vString MEDIUMBLOB, vConst TINYINT UNSIGNED)
RETURNS mediumblob
DETERMINISTIC
NO SQL
diff --git a/db/routines/util/functions/today.sql b/db/routines/util/functions/today.sql
index d57b04071e..5f65fe2e14 100644
--- a/db/routines/util/functions/today.sql
+++ b/db/routines/util/functions/today.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`today`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`today`()
RETURNS date
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/tomorrow.sql b/db/routines/util/functions/tomorrow.sql
index 71fbcf8f51..e85af114eb 100644
--- a/db/routines/util/functions/tomorrow.sql
+++ b/db/routines/util/functions/tomorrow.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`tomorrow`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`tomorrow`()
RETURNS date
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/twoDaysAgo.sql b/db/routines/util/functions/twoDaysAgo.sql
index 2612ed6893..e00d965a47 100644
--- a/db/routines/util/functions/twoDaysAgo.sql
+++ b/db/routines/util/functions/twoDaysAgo.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`twoDaysAgo`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`twoDaysAgo`()
RETURNS date
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/yearRelativePosition.sql b/db/routines/util/functions/yearRelativePosition.sql
index e62e50eb45..bede2d809b 100644
--- a/db/routines/util/functions/yearRelativePosition.sql
+++ b/db/routines/util/functions/yearRelativePosition.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`yearRelativePosition`(vYear INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`yearRelativePosition`(vYear INT)
RETURNS varchar(20) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/functions/yesterday.sql b/db/routines/util/functions/yesterday.sql
index a1938ab10f..bc21a263ae 100644
--- a/db/routines/util/functions/yesterday.sql
+++ b/db/routines/util/functions/yesterday.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`yesterday`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `util`.`yesterday`()
RETURNS date
DETERMINISTIC
BEGIN
diff --git a/db/routines/util/procedures/checkHex.sql b/db/routines/util/procedures/checkHex.sql
index 3cd5452e81..8fc4003f48 100644
--- a/db/routines/util/procedures/checkHex.sql
+++ b/db/routines/util/procedures/checkHex.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`checkHex`(vParam VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`checkHex`(vParam VARCHAR(255))
BEGIN
/**
* Comprueba si vParam es un número hexadecimal que empieza por # y tiene una longitud total de 7 dígitos
diff --git a/db/routines/util/procedures/connection_kill.sql b/db/routines/util/procedures/connection_kill.sql
index b38509d1bc..3b9ea17f37 100644
--- a/db/routines/util/procedures/connection_kill.sql
+++ b/db/routines/util/procedures/connection_kill.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`connection_kill`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`connection_kill`(
vConnectionId BIGINT
)
BEGIN
diff --git a/db/routines/util/procedures/debugAdd.sql b/db/routines/util/procedures/debugAdd.sql
index a8f7b3aa2e..cf1c92606c 100644
--- a/db/routines/util/procedures/debugAdd.sql
+++ b/db/routines/util/procedures/debugAdd.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`debugAdd`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`debugAdd`(
vVariable VARCHAR(255),
vValue TEXT
)
diff --git a/db/routines/util/procedures/exec.sql b/db/routines/util/procedures/exec.sql
index ca66884a57..5fec91ec7b 100644
--- a/db/routines/util/procedures/exec.sql
+++ b/db/routines/util/procedures/exec.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`exec`(vSqlQuery TEXT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`exec`(vSqlQuery TEXT)
SQL SECURITY INVOKER
BEGIN
/**
diff --git a/db/routines/util/procedures/log_add.sql b/db/routines/util/procedures/log_add.sql
index a5b1519c43..aa0ec23881 100644
--- a/db/routines/util/procedures/log_add.sql
+++ b/db/routines/util/procedures/log_add.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`log_add`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`log_add`(
vSchema VARCHAR(45),
vEntity VARCHAR(45),
vChangedModel VARCHAR(45),
diff --git a/db/routines/util/procedures/log_addWithUser.sql b/db/routines/util/procedures/log_addWithUser.sql
index 2e20821a69..50c86ecedb 100644
--- a/db/routines/util/procedures/log_addWithUser.sql
+++ b/db/routines/util/procedures/log_addWithUser.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`log_addWithUser`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`log_addWithUser`(
vSchema VARCHAR(45),
vEntity VARCHAR(45),
vChangedModel VARCHAR(45),
diff --git a/db/routines/util/procedures/log_clean.sql b/db/routines/util/procedures/log_clean.sql
index aeed9dc442..484279b62a 100644
--- a/db/routines/util/procedures/log_clean.sql
+++ b/db/routines/util/procedures/log_clean.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`log_clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`log_clean`()
BEGIN
/**
* Hace limpieza de los datos de las tablas log,
diff --git a/db/routines/util/procedures/log_cleanInstances.sql b/db/routines/util/procedures/log_cleanInstances.sql
index 756a8d1f35..029b50eea4 100644
--- a/db/routines/util/procedures/log_cleanInstances.sql
+++ b/db/routines/util/procedures/log_cleanInstances.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`log_cleanInstances`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`log_cleanInstances`(
vActionCode VARCHAR(45),
INOUT vOldInstance JSON,
INOUT vNewInstance JSON)
diff --git a/db/routines/util/procedures/procNoOverlap.sql b/db/routines/util/procedures/procNoOverlap.sql
index 9bb2f109ea..2a00138c47 100644
--- a/db/routines/util/procedures/procNoOverlap.sql
+++ b/db/routines/util/procedures/procNoOverlap.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`procNoOverlap`(procName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`procNoOverlap`(procName VARCHAR(255))
SQL SECURITY INVOKER
proc: BEGIN
/**
diff --git a/db/routines/util/procedures/proc_changedPrivs.sql b/db/routines/util/procedures/proc_changedPrivs.sql
index 220652d1a7..69b2125994 100644
--- a/db/routines/util/procedures/proc_changedPrivs.sql
+++ b/db/routines/util/procedures/proc_changedPrivs.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`proc_changedPrivs`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`proc_changedPrivs`()
BEGIN
SELECT s.*
FROM proc_privs s
diff --git a/db/routines/util/procedures/proc_restorePrivs.sql b/db/routines/util/procedures/proc_restorePrivs.sql
index 0d502a6db9..8e7c287c2c 100644
--- a/db/routines/util/procedures/proc_restorePrivs.sql
+++ b/db/routines/util/procedures/proc_restorePrivs.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`proc_restorePrivs`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`proc_restorePrivs`()
BEGIN
/**
* Restores the privileges saved by proc_savePrivs().
diff --git a/db/routines/util/procedures/proc_savePrivs.sql b/db/routines/util/procedures/proc_savePrivs.sql
index 75c289f7b7..25545ca699 100644
--- a/db/routines/util/procedures/proc_savePrivs.sql
+++ b/db/routines/util/procedures/proc_savePrivs.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`proc_savePrivs`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`proc_savePrivs`()
BEGIN
/**
* Saves routine privileges, used to simplify the task of keeping
diff --git a/db/routines/util/procedures/slowLog_prune.sql b/db/routines/util/procedures/slowLog_prune.sql
index d676ae3d9c..59327c1c28 100644
--- a/db/routines/util/procedures/slowLog_prune.sql
+++ b/db/routines/util/procedures/slowLog_prune.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`slowLog_prune`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`slowLog_prune`()
BEGIN
/**
* Prunes MySQL slow query log table deleting all records older than one week.
diff --git a/db/routines/util/procedures/throw.sql b/db/routines/util/procedures/throw.sql
index 260915e0db..b391d38804 100644
--- a/db/routines/util/procedures/throw.sql
+++ b/db/routines/util/procedures/throw.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`throw`(vMessage CHAR(55))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`throw`(vMessage CHAR(55))
BEGIN
/**
* Throws a user-defined exception.
diff --git a/db/routines/util/procedures/time_generate.sql b/db/routines/util/procedures/time_generate.sql
index 14cc1edc59..cc93cd372b 100644
--- a/db/routines/util/procedures/time_generate.sql
+++ b/db/routines/util/procedures/time_generate.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`time_generate`(vStarted DATE, vEnded DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`time_generate`(vStarted DATE, vEnded DATE)
BEGIN
/**
* Generate a temporary table between the days passed as parameters
diff --git a/db/routines/util/procedures/tx_commit.sql b/db/routines/util/procedures/tx_commit.sql
index 35f96df8df..1f708c5339 100644
--- a/db/routines/util/procedures/tx_commit.sql
+++ b/db/routines/util/procedures/tx_commit.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(vIsTx BOOL)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`tx_commit`(vIsTx BOOL)
BEGIN
/**
* Confirma los cambios asociados a una transacción.
diff --git a/db/routines/util/procedures/tx_rollback.sql b/db/routines/util/procedures/tx_rollback.sql
index 4b00f9ec1a..38ee77613d 100644
--- a/db/routines/util/procedures/tx_rollback.sql
+++ b/db/routines/util/procedures/tx_rollback.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(vIsTx BOOL)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`tx_rollback`(vIsTx BOOL)
BEGIN
/**
* Deshace los cambios asociados a una transacción.
diff --git a/db/routines/util/procedures/tx_start.sql b/db/routines/util/procedures/tx_start.sql
index 41f8c94eea..ac1a443d3f 100644
--- a/db/routines/util/procedures/tx_start.sql
+++ b/db/routines/util/procedures/tx_start.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(vIsTx BOOL)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`tx_start`(vIsTx BOOL)
BEGIN
/**
* Inicia una transacción.
diff --git a/db/routines/util/procedures/warn.sql b/db/routines/util/procedures/warn.sql
index e1dd33c9c4..92e40a83d9 100644
--- a/db/routines/util/procedures/warn.sql
+++ b/db/routines/util/procedures/warn.sql
@@ -1,5 +1,5 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`warn`(vCode CHAR(35))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `util`.`warn`(vCode CHAR(35))
BEGIN
DECLARE w VARCHAR(1) DEFAULT '__';
SET @warn = vCode;
diff --git a/db/routines/util/views/eventLogGrouped.sql b/db/routines/util/views/eventLogGrouped.sql
index 8615458b5e..8f3c9f264b 100644
--- a/db/routines/util/views/eventLogGrouped.sql
+++ b/db/routines/util/views/eventLogGrouped.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `util`.`eventLogGrouped`
AS SELECT max(`t`.`date`) AS `lastHappened`,
diff --git a/db/routines/vn/procedures/catalog_calculate.sql b/db/routines/vn/procedures/catalog_calculate.sql
index 39bf2b441b..09f42f09aa 100644
--- a/db/routines/vn/procedures/catalog_calculate.sql
+++ b/db/routines/vn/procedures/catalog_calculate.sql
@@ -19,13 +19,15 @@ BEGIN
* @return tmp.ticketComponentPrice
*/
DECLARE vAvailableCalc INT;
- DECLARE vAvailableNoRaidsCalc INT;
+ DECLARE vAvailabled DATETIME;
+ DECLARE vDone BOOL;
+ DECLARE vHour INT;
DECLARE vShipped DATE;
DECLARE vWarehouseFk SMALLINT;
DECLARE vZoneFk INT;
- DECLARE vDone BOOL;
+
DECLARE cTravelTree CURSOR FOR
- SELECT zoneFk, warehouseFk, shipped FROM tmp.zoneGetShipped;
+ SELECT zoneFk, warehouseFk, shipped, `hour` FROM tmp.zoneGetShipped;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
@@ -66,14 +68,15 @@ BEGIN
OPEN cTravelTree;
l: LOOP
SET vDone = FALSE;
- FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
+ FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped, vHour;
+
+ SET vAvailabled = vShipped + INTERVAL HOUR(vHour) HOUR;
IF vDone THEN
LEAVE l;
END IF;
-
- CALL `cache`.available_refresh(vAvailableCalc, FALSE, vWarehouseFk, vShipped);
- CALL `cache`.availableNoRaids_refresh(vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
+
+ CALL `cache`.available_refresh(vAvailableCalc, FALSE, vWarehouseFk, vAvailabled);
CALL buy_getUltimate(NULL, vWarehouseFk, vShipped);
INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
@@ -83,31 +86,10 @@ BEGIN
bu.buyFk,
vZoneFk
FROM `cache`.available a
- LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id
- AND anr.calc_id = vAvailableNoRaidsCalc
JOIN tmp.item i ON i.itemFk = a.item_id
JOIN item it ON it.id = i.itemFk
JOIN `zone` z ON z.id = vZoneFk
LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id
- LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk
- LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
- LEFT JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
- LEFT JOIN (SELECT isVNHSupplier, isEarlyBird, TRUE AS itemAllowed
- FROM addressFilter af
- JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed
- FROM address ad
- JOIN province p ON p.id = ad.provinceFk
- WHERE ad.id = vAddressFk
- ) sub2 ON sub2.provinceFk <=> IFNULL(af.provinceFk, sub2.provinceFk)
- AND sub2.countryFk <=> IFNULL(af.countryFk, sub2.countryFk)
- AND sub2.isLogifloraAllowed <=> IFNULL(af.isLogifloraAllowed, sub2.isLogifloraAllowed)
- WHERE vWarehouseFk = af.warehouseFk
- AND (vShipped < af.beforeDated
- OR ISNULL(af.beforeDated)
- OR vShipped > af.afterDated
- OR ISNULL(af.afterDated))
- ) sub ON sub.isVNHSupplier = v.isVNHSupplier
- AND (sub.isEarlyBird = mp.isEarlyBird OR ISNULL(sub.isEarlyBird))
JOIN agencyMode am ON am.id = vAgencyModeFk
JOIN agency ag ON ag.id = am.agencyFk
JOIN itemType itt ON itt.id = it.typeFk
@@ -124,7 +106,6 @@ BEGIN
AND ait.itemTypeFk = itt.id
WHERE a.calc_id = vAvailableCalc
AND a.available > 0
- AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
AND (ag.isAnyVolumeAllowed OR NOT itt.isUnconventionalSize)
AND (it.`size` IS NULL
OR IF(itc.isReclining,
diff --git a/db/routines/vn/procedures/collection_new.sql b/db/routines/vn/procedures/collection_new.sql
index 84133d36eb..42ab85dfdb 100644
--- a/db/routines/vn/procedures/collection_new.sql
+++ b/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
diff --git a/db/routines/vn/procedures/item_getBalance.sql b/db/routines/vn/procedures/item_getBalance.sql
index c4974491cc..a68724eb50 100644
--- a/db/routines/vn/procedures/item_getBalance.sql
+++ b/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,
diff --git a/db/routines/vn/procedures/item_getLack.sql b/db/routines/vn/procedures/item_getLack.sql
index 45a6a6260b..1a54f03962 100644
--- a/db/routines/vn/procedures/item_getLack.sql
+++ b/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;
diff --git a/db/routines/vn/procedures/item_getSimilar.sql b/db/routines/vn/procedures/item_getSimilar.sql
index 336f3521e7..9a4417d84b 100644
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/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;
diff --git a/db/routines/vn/procedures/item_getStock.sql b/db/routines/vn/procedures/item_getStock.sql
index cd5bc4bdc6..4639521857 100644
--- a/db/routines/vn/procedures/item_getStock.sql
+++ b/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
diff --git a/db/routines/vn/procedures/prepareTicketList.sql b/db/routines/vn/procedures/prepareTicketList.sql
index 7c44bb9946..cfe9492ee0 100644
--- a/db/routines/vn/procedures/prepareTicketList.sql
+++ b/db/routines/vn/procedures/prepareTicketList.sql
@@ -1,16 +1,18 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`prepareTicketList`(vStartingDate DATETIME, vEndingDate DATETIME)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`prepareTicketList`(
+ vStartingDate DATETIME,
+ vEndingDate DATETIME
+)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.productionTicket;
CREATE TEMPORARY TABLE tmp.productionTicket
(PRIMARY KEY (ticketFk))
ENGINE = MEMORY
- SELECT t.id ticketFk, t.clientFk
+ SELECT t.id ticketFk
FROM ticket t
JOIN alertLevel al ON al.code = 'DELIVERED'
LEFT JOIN ticketState ts ON ts.ticketFk = t.id
JOIN client c ON c.id = t.clientFk
-
WHERE c.typeFk IN ('normal','handMaking','internalUse')
AND (
t.shipped BETWEEN util.VN_CURDATE() AND vEndingDate
diff --git a/db/routines/vn/procedures/productionControl.sql b/db/routines/vn/procedures/productionControl.sql
index aa52a52c55..fdb927a6e0 100644
--- a/db/routines/vn/procedures/productionControl.sql
+++ b/db/routines/vn/procedures/productionControl.sql
@@ -24,24 +24,31 @@ proc: BEGIN
CALL prepareTicketList(util.yesterday(), vEndingDate);
CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
- SELECT * FROM tmp.productionTicket;
-
- CALL prepareClientList();
-
- CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
- FROM tmp.productionTicket tt
- JOIN ticket t ON t.id = tt.ticketFk;
+ SELECT ticketFk
+ FROM tmp.productionTicket;
CALL ticket_getProblems(vIsTodayRelative);
CREATE OR REPLACE TEMPORARY TABLE tmp.productionBuffer
(PRIMARY KEY(ticketFk), previaParking VARCHAR(255))
ENGINE = MEMORY
+ WITH saleProblemsDescription AS(
+ SELECT s.ticketFk,
+ LEFT(CONCAT('F: ', GROUP_CONCAT(CONCAT(i.id, ' ', i.longName) SEPARATOR ', ')), 250) itemShortage,
+ LEFT(CONCAT('R: ', GROUP_CONCAT(CONCAT(i2.id, ' ', i2.longName) SEPARATOR ', ')), 250) itemDelay,
+ LEFT(CONCAT('I: ', GROUP_CONCAT(CONCAT(i3.id, ' ', i3.longName) SEPARATOR ', ')), 250) itemLost
+ FROM tmp.saleProblems sp
+ JOIN vn.sale s ON s.id = sp.saleFk
+ LEFT JOIN vn.item i ON i.id = s.itemFk AND sp.hasItemShortage
+ LEFT JOIN vn.item i2 ON i2.id = s.itemFk AND sp.hasItemDelay
+ LEFT JOIN vn.item i3 ON i3.id = s.itemFk AND sp.hasItemLost
+ WHERE hasItemShortage OR hasItemDelay OR hasItemLost
+ GROUP BY s.ticketFk
+ )
SELECT tt.ticketFk,
- tt.clientFk,
+ t.clientFk,
t.warehouseFk,
t.nickname,
t.packages,
@@ -59,7 +66,17 @@ proc: BEGIN
0 `lines`,
CAST( 0 AS DECIMAL(5,2)) m3,
CAST( 0 AS DECIMAL(5,2)) preparationRate,
- "" problem,
+ TRIM(CAST(CONCAT( IFNULL(sp.itemShortage, ''),
+ IFNULL(sp.itemDelay, ''),
+ IFNULL(sp.itemLost, ''),
+ IF(tpr.isFreezed, ' CONGELADO',''),
+ IF(tpr.hasHighRisk, ' RIESGO',''),
+ IF(tpr.hasTicketRequest, ' COD 100',''),
+ 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', '')
+ ) AS char(255))) problem,
IFNULL(tls.state,2) state,
w.code workerCode,
DATE(t.shipped) shipped,
@@ -74,34 +91,37 @@ proc: BEGIN
pk.code parking,
0 H,
0 V,
+ 0 A,
0 N,
st.isOk,
ag.isOwn,
rm.bufferFk
FROM tmp.productionTicket tt
- JOIN ticket t ON tt.ticketFk = t.id
- JOIN alertLevel al ON al.code = 'FREE'
- LEFT JOIN ticketStateToday tst ON tst.ticketFk = t.id
- LEFT JOIN `state` st ON st.id = tst.state
- LEFT JOIN client c ON c.id = t.clientFk
- LEFT JOIN worker wk ON wk.id = c.salesPersonFk
- JOIN address a ON a.id = t.addressFk
- LEFT JOIN province p ON p.id = a.provinceFk
- JOIN agencyMode am ON am.id = t.agencyModeFk
- JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
- JOIN agency ag ON ag.id = am.agencyFk
- LEFT JOIN ticketState tls ON tls.ticketFk = tt.ticketFk
- LEFT JOIN ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
- LEFT JOIN worker w ON w.id = tls.userFk
- LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
- LEFT JOIN `zone` z ON z.id = t.zoneFk
- LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+ JOIN vn.ticket t ON tt.ticketFk = t.id
+ JOIN vn.alertLevel al ON al.code = 'FREE'
+ LEFT JOIN vn.ticketStateToday tst ON tst.ticketFk = t.id
+ LEFT JOIN vn.`state` st ON st.id = tst.state
+ LEFT JOIN vn.client c ON c.id = t.clientFk
+ LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
+ JOIN vn.address a ON a.id = t.addressFk
+ LEFT JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ JOIN vn.agency ag ON ag.id = am.agencyFk
+ LEFT JOIN vn.ticketState tls ON tls.ticketFk = tt.ticketFk
+ LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
+ LEFT JOIN vn.worker w ON w.id = tls.userFk
+ LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+ LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
+ LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
AND DATE(t.shipped) = zc.dated
- LEFT JOIN ticketParking tp ON tp.ticketFk = t.id
- LEFT JOIN parking pk ON pk.id = tp.parkingFk
+ LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+ LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
+ LEFT JOIN tmp.ticketProblems tpr ON tpr.ticketFk = tt.ticketFk
+ LEFT JOIN saleProblemsDescription sp ON sp.ticketFk = tt.ticketFk
WHERE t.warehouseFk = vWarehouseFk
AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
-
+
UPDATE tmp.productionBuffer pb
JOIN (
SELECT pb.ticketFk, GROUP_CONCAT(p.code) previaParking
@@ -119,21 +139,9 @@ proc: BEGIN
CHANGE COLUMN `problem` `problem` VARCHAR(255),
ADD COLUMN `collectionH` INT,
ADD COLUMN `collectionV` INT,
+ ADD COLUMN `collectionA` INT,
ADD COLUMN `collectionN` INT;
- UPDATE tmp.productionBuffer pb
- JOIN tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
- SET pb.problem = TRIM(CAST(CONCAT( IFNULL(tp.itemShortage, ''),
- IFNULL(tp.itemDelay, ''),
- IFNULL(tp.itemLost, ''),
- IF(tp.isFreezed, ' CONGELADO',''),
- IF(tp.hasHighRisk, ' RIESGO',''),
- IF(tp.hasTicketRequest, ' COD 100',''),
- IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
- IF(tp.hasComponentLack, ' COMPONENTES', ''),
- IF(HOUR(util.VN_NOW()) < pb.HH AND tp.isTooLittle, ' PEQUEÑO', '')
- ) AS char(255)));
-
-- Clientes Nuevos o Recuperados
UPDATE tmp.productionBuffer pb
LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = pb.clientFk
@@ -172,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
@@ -190,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
@@ -197,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
@@ -278,7 +290,8 @@ proc: BEGIN
DROP TEMPORARY TABLE
tmp.productionTicket,
tmp.ticket,
- tmp.ticket_problems,
+ tmp.ticketProblems,
+ tmp.saleProblems,
tmp.ticketWithPrevia,
tItemShelvingStock,
tItemPackingType;
diff --git a/db/routines/vn/procedures/report_print.sql b/db/routines/vn/procedures/report_print.sql
index a5e08538eb..17c0c921bb 100644
--- a/db/routines/vn/procedures/report_print.sql
+++ b/db/routines/vn/procedures/report_print.sql
@@ -1,83 +1,86 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`report_print`(
- vReportName VARCHAR(100),
- vPrinterFk INT,
- vUserFk INT,
- vParams JSON,
- vPriorityName VARCHAR(100)
- )
+ vReportName VARCHAR(100),
+ vPrinterFk INT,
+ vUserFk INT,
+ vParams JSON,
+ vPriorityName VARCHAR(100)
+)
BEGIN
-/**
- * Inserts in the print queue the report to be printed and the necessary parameters for this
- * one taking into account the paper size of both the printer and the report.
- *
- * @param vReportName the report to be printed.
- * @param vPrinterFk the printer selected.
- * @param vUserFk user id.
- * @param vParams JSON with report parameters.
- * @param vPriorityName the printing priority.
- */
- DECLARE vI INT DEFAULT 0;
- DECLARE vKeys TEXT DEFAULT JSON_KEYS(vParams);
- DECLARE vLength INT DEFAULT JSON_LENGTH(vKeys);
- DECLARE vKey VARCHAR(255);
- DECLARE vVal VARCHAR(255);
- DECLARE vPrintQueueFk INT;
- DECLARE vReportSize VARCHAR(255);
- DECLARE vIsThePrinterReal INT;
- DECLARE vPrinteSize VARCHAR(255);
- DECLARE vPriorityFk INT;
- DECLARE vReportFk INT;
- DECLARE EXIT HANDLER FOR SQLEXCEPTION
- BEGIN
- ROLLBACK;
- RESIGNAL;
- END;
+ /**
+ * Inserts in the print queue the report to be printed and the necessary parameters for this
+ * one taking into account the paper size of both the printer and the report.
+ *
+ * @param vReportName the report to be printed.
+ * @param vPrinterFk the printer selected.
+ * @param vUserFk user id.
+ * @param vParams JSON with report parameters.
+ * @param vPriorityName the printing priority.
+ */
+ DECLARE vI INT DEFAULT 0;
+ DECLARE vKeys TEXT DEFAULT JSON_KEYS(vParams);
+ DECLARE vLength INT DEFAULT JSON_LENGTH(vKeys);
+ DECLARE vKey VARCHAR(255);
+ DECLARE vVal VARCHAR(255);
+ DECLARE vPrintQueueFk INT;
+ DECLARE vReportSize VARCHAR(255);
+ DECLARE vIsThePrinterReal INT;
+ DECLARE vPrinterSize VARCHAR(255);
+ DECLARE vPriorityFk INT;
+ DECLARE vReportFk INT;
+ DECLARE vTx BOOLEAN DEFAULT NOT @@in_transaction;
- SELECT id, paperSizeFk INTO vReportFk, vReportSize
- FROM report
- WHERE name = vReportName;
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ CALL util.tx_rollback(vTx);
+ RESIGNAL;
+ END;
- SELECT id, paperSizeFk INTO vIsThePrinterReal, vPrinteSize
- FROM printer
- WHERE id = vPrinterFk;
- SELECT id INTO vPriorityFk
- FROM queuePriority
- WHERE code = vPriorityName;
+ SELECT id, paperSizeFk INTO vReportFk, vReportSize
+ FROM report
+ WHERE name = vReportName;
- IF vIsThePrinterReal IS NULL THEN
- CALL util.throw('printerNotExists');
- END IF;
+ SELECT id, paperSizeFk INTO vIsThePrinterReal, vPrinterSize
+ FROM printer
+ WHERE id = vPrinterFk;
- IF vReportFk IS NULL THEN
- CALL util.throw('reportNotExists');
- END IF;
+ SELECT id INTO vPriorityFk
+ FROM queuePriority
+ WHERE code = vPriorityName;
- IF vReportSize <> vPrinteSize THEN
- CALL util.throw('incorrectSize');
- END IF;
+ IF vIsThePrinterReal IS NULL THEN
+ CALL util.throw('printerNotExists');
+ END IF;
- START TRANSACTION;
- INSERT INTO printQueue
- SET printerFk = vPrinterFk,
- priorityFk = vPriorityFk,
- reportFk = vReportFk,
- workerFk = vUserFk;
-
- SET vPrintQueueFk = LAST_INSERT_ID();
+ IF vReportFk IS NULL THEN
+ CALL util.throw('reportNotExists');
+ END IF;
- WHILE vI < vLength DO
- SET vKey = JSON_VALUE(vKeys, CONCAT('$[', vI ,']'));
- SET vVal = JSON_VALUE(vParams, CONCAT('$.', vKey));
+ IF vReportSize <> vPrinterSize THEN
+ CALL util.throw('incorrectSize');
+ END IF;
+ CALL util.tx_start(vTx);
+ INSERT INTO printQueue
+ SET printerFk = vPrinterFk,
+ priorityFk = vPriorityFk,
+ reportFk = vReportFk,
+ workerFk = vUserFk;
- INSERT INTO printQueueArgs
- SET printQueueFk = vPrintQueueFk,
- name = vKey,
- value = vVal;
+ SET vPrintQueueFk = LAST_INSERT_ID();
- SET vI = vI + 1;
- END WHILE;
- COMMIT;
+ WHILE vI < vLength DO
+ SET vKey = JSON_VALUE(vKeys, CONCAT('$[', vI ,']'));
+ SET vVal = JSON_VALUE(vParams, CONCAT('$.', vKey));
+
+ INSERT INTO printQueueArgs
+ SET printQueueFk = vPrintQueueFk,
+ name = vKey,
+ value = vVal;
+
+ SET vI = vI + 1;
+ END WHILE;
+
+ CALL util.tx_commit(vTx);
END$$
DELIMITER ;
diff --git a/db/routines/vn/procedures/sale_getProblems.sql b/db/routines/vn/procedures/sale_getProblems.sql
index e016f3ab4e..ca81660b8d 100644
--- a/db/routines/vn/procedures/sale_getProblems.sql
+++ b/db/routines/vn/procedures/sale_getProblems.sql
@@ -1,86 +1,42 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblems`(
- vIsTodayRelative tinyint(1)
+ vIsTodayRelative TINYINT(1)
)
BEGIN
/**
- * Calcula los problemas de cada venta para un conjunto de tickets.
+ * Calcula los problemas para un conjunto de sale
*
* @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
- * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Tickets a calcular
- * @return tmp.sale_problems
+ * @table tmp.sale(saleFk) Identificadores de los sale a calcular
+ * @return tmp.saleProblems
*/
- DECLARE vWarehouseFk INT;
+ DECLARE vWarehouseFk INT;
DECLARE vDate DATE;
- DECLARE vAvailableCache INT;
+ DECLARE vAvailableCache INT;
DECLARE vVisibleCache INT;
DECLARE vDone BOOL;
- DECLARE vCursor CURSOR FOR
- SELECT DISTINCT warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(shipped))
- FROM tmp.sale_getProblems
- WHERE shipped BETWEEN util.VN_CURDATE()
- AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY);
+ DECLARE vCursor CURSOR FOR
+ SELECT t.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(t.shipped)) dated
+ FROM tmp.sale ts
+ JOIN sale s ON s.id = ts.saleFk
+ JOIN ticket t ON t.id = s.ticketFk
+ WHERE t.shipped BETWEEN util.VN_CURDATE()
+ AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY)
+ GROUP BY warehouseFk, dated;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
- CREATE OR REPLACE TEMPORARY TABLE tmp.sale_problems (
- ticketFk INT(11),
+ CREATE OR REPLACE TEMPORARY TABLE tmp.saleProblems(
saleFk INT(11),
- isFreezed INTEGER(1) DEFAULT 0,
- risk DECIMAL(10,1) DEFAULT 0,
- hasRisk TINYINT(1) DEFAULT 0,
- hasHighRisk TINYINT(1) DEFAULT 0,
- hasTicketRequest INTEGER(1) DEFAULT 0,
- itemShortage VARCHAR(255),
- isTaxDataChecked INTEGER(1) DEFAULT 1,
- itemDelay VARCHAR(255),
- itemLost VARCHAR(255),
- hasComponentLack INTEGER(1),
- hasRounding VARCHAR(255),
- isTooLittle BOOL DEFAULT FALSE,
- isVip BOOL DEFAULT FALSE,
- PRIMARY KEY (ticketFk, saleFk)
- ); -- No memory
+ hasItemShortage BOOL DEFAULT FALSE,
+ hasItemLost BOOL DEFAULT FALSE,
+ hasComponentLack BOOL DEFAULT FALSE,
+ hasItemDelay BOOL DEFAULT FALSE,
+ hasRounding BOOL DEFAULT FALSE,
+ PRIMARY KEY (saleFk)
+ ) ENGINE = MEMORY;
- INSERT INTO tmp.sale_problems(ticketFk,
- saleFk,
- isFreezed,
- risk,
- hasRisk,
- hasHighRisk,
- hasTicketRequest,
- isTaxDataChecked,
- hasComponentLack,
- isTooLittle)
- SELECT sgp.ticketFk,
- s.id,
- IF(FIND_IN_SET('isFreezed', t.problem), TRUE, FALSE) isFreezed,
- t.risk,
- IF(FIND_IN_SET('hasRisk', t.problem), TRUE, FALSE) hasRisk,
- IF(FIND_IN_SET('hasHighRisk', t.problem), TRUE, FALSE) hasHighRisk,
- IF(FIND_IN_SET('hasTicketRequest', t.problem), TRUE, FALSE) hasTicketRequest,
- IF(FIND_IN_SET('isTaxDataChecked', t.problem), FALSE, TRUE) isTaxDataChecked,
- IF(FIND_IN_SET('hasComponentLack', s.problem), TRUE, FALSE) hasComponentLack,
- IF(FIND_IN_SET('isTooLittle', t.problem)
- AND util.VN_NOW() < (util.VN_CURDATE() + INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL MINUTE(zc.`hour`) MINUTE,
- TRUE, FALSE) isTooLittle
- FROM tmp.sale_getProblems sgp
- JOIN ticket t ON t.id = sgp.ticketFk
- LEFT JOIN sale s ON s.ticketFk = t.id
- LEFT JOIN item i ON i.id = s.itemFk
- LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
- AND zc.dated = util.VN_CURDATE()
- WHERE s.problem <> '' OR t.problem <> '' OR t.risk
- GROUP BY t.id, s.id;
-
- INSERT INTO tmp.sale_problems(ticketFk, isVip)
- SELECT sgp.ticketFk, TRUE
- FROM tmp.sale_getProblems sgp
- JOIN client c ON c.id = sgp.clientFk
- WHERE c.businessTypeFk = 'VIP'
- ON DUPLICATE KEY UPDATE isVIP = TRUE;
-
- CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock_byWarehouse
+ CREATE OR REPLACE TEMPORARY TABLE tItemShelving
(INDEX (itemFk, warehouseFk))
ENGINE = MEMORY
SELECT ish.itemFk itemFk,
@@ -92,6 +48,14 @@ BEGIN
JOIN sector s ON s.id = p.sectorFk
GROUP BY ish.itemFk, s.warehouseFk;
+ -- Componentes: Algún componente obligatorio no se ha calcualdo
+ INSERT INTO tmp.saleProblems(saleFk, hasComponentLack)
+ SELECT s.id, TRUE
+ FROM tmp.sale ts
+ JOIN sale s ON s.id = ts.saleFk
+ WHERE FIND_IN_SET('hasComponentLack', s.problem)
+ GROUP BY s.id;
+
-- Disponible, faltas, inventario y retrasos
OPEN vCursor;
l: LOOP
@@ -104,130 +68,112 @@ BEGIN
-- Disponible: no va a haber suficiente producto para preparar todos los pedidos
CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, vDate);
-
- -- Faltas: visible, disponible y ubicado son menores que la cantidad vendida
+
+ -- Faltas: visible, disponible y ubicado son menores que la cantidad vendida
CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
- INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk)
- SELECT ticketFk, problem, saleFk
- FROM (
- SELECT sgp.ticketFk,
- LEFT(CONCAT('F: ', GROUP_CONCAT(i.id, ' ', i.longName, ' ')), 250) problem,
- s.id saleFk
- FROM tmp.sale_getProblems sgp
- JOIN ticket t ON t.id = sgp.ticketFk
- JOIN sale s ON s.ticketFk = t.id
- JOIN item i ON i.id = s.itemFk
- JOIN itemType it ON it.id = i.typeFk
- JOIN itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = i.id
- AND v.calc_id = vVisibleCache
- LEFT JOIN cache.available av ON av.item_id = i.id
- AND av.calc_id = vAvailableCache
- LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
- AND issw.warehouseFk = t.warehouseFk
- WHERE IFNULL(v.visible, 0) < s.quantity
- AND IFNULL(av.available, 0) < 0
- AND IFNULL(issw.visible, 0) < s.quantity
- AND NOT s.isPicked
- AND NOT s.reserved
- AND ic.merchandise
- AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
- AND NOT i.generic
- AND util.VN_CURDATE() = vDate
- AND t.warehouseFk = vWarehouseFk
- GROUP BY sgp.ticketFk) sub
- ON DUPLICATE KEY UPDATE itemShortage = sub.problem, saleFk = sub.saleFk;
-
- -- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
- INSERT INTO tmp.sale_problems(ticketFk, itemLost, saleFk)
- SELECT ticketFk, problem, saleFk
- FROM (
- SELECT sgp.ticketFk,
- LEFT(GROUP_CONCAT('I: ', i.id, ' ', i.longName, ' '), 250) problem,
- s.id saleFk
- FROM tmp.sale_getProblems sgp
- JOIN ticket t ON t.id = sgp.ticketFk
- JOIN sale s ON s.ticketFk = t.id
- JOIN item i ON i.id = s.itemFk
- JOIN itemType it ON it.id = i.typeFk
- JOIN itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = s.itemFk
- AND v.calc_id = vVisibleCache
- LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
- AND issw.warehouseFk = t.warehouseFk
- WHERE IFNULL(v.visible, 0) >= s.quantity
- AND IFNULL(issw.visible, 0) < s.quantity
- AND s.quantity > 0
- AND NOT s.isPicked
- AND NOT s.reserved
- AND ic.merchandise
- AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
- AND NOT i.generic
- AND util.VN_CURDATE() = vDate
- AND t.warehouseFk = vWarehouseFk
- GROUP BY sgp.ticketFk
- ) sub
- ON DUPLICATE KEY UPDATE itemLost = sub.problem, saleFk = sub.saleFk;
-
- -- Retraso: Disponible suficiente, pero no visible ni ubicado
- INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk)
- SELECT ticketFk, problem, saleFk
- FROM (
- SELECT sgp.ticketFk,
- LEFT(GROUP_CONCAT('R: ', i.id, ' ', i.longName, ' '), 250) problem,
- s.id saleFk
- FROM tmp.sale_getProblems sgp
- JOIN ticket t ON t.id = sgp.ticketFk
- JOIN sale s ON s.ticketFk = t.id
- JOIN item i ON i.id = s.itemFk
- JOIN itemType it ON it.id = i.typeFk
- JOIN itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = s.itemFk
- AND v.calc_id = vVisibleCache
- LEFT JOIN cache.available av ON av.item_id = i.id
- AND av.calc_id = vAvailableCache
- LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
- AND issw.warehouseFk = t.warehouseFk
- WHERE IFNULL(v.visible, 0) < s.quantity
- AND IFNULL(av.available, 0) >= 0
- AND IFNULL(issw.visible, 0) < s.quantity
- AND s.quantity > 0
- AND NOT s.isPicked
- AND NOT s.reserved
- AND ic.merchandise
- AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
- AND NOT i.generic
- AND util.VN_CURDATE() = vDate
- AND t.warehouseFk = vWarehouseFk
- GROUP BY sgp.ticketFk
- ) sub
- ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
+ INSERT INTO tmp.saleProblems(saleFk, hasItemShortage)
+ SELECT s.id, TRUE
+ FROM tmp.sale ts
+ JOIN sale s ON s.id = ts.saleFk
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = i.id
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN cache.available av ON av.item_id = i.id
+ AND av.calc_id = vAvailableCache
+ LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
+ AND tis.warehouseFk = t.warehouseFk
+ WHERE (s.quantity > v.visible OR (s.quantity > 0 AND v.visible IS NULL))
+ AND (av.available < 0 OR av.available IS NULL)
+ AND (s.quantity > tis.visible OR tis.visible IS NULL)
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND ic.merchandise
+ AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
+ AND NOT i.generic
+ AND util.VN_CURDATE() = vDate
+ AND t.warehouseFk = vWarehouseFk
+ GROUP BY s.id
+ ON DUPLICATE KEY UPDATE hasItemShortage = TRUE;
- -- Redondeo: cantidad incorrecta con respecto al grouping
+ -- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
+ INSERT INTO tmp.saleProblems(saleFk, hasItemLost)
+ SELECT s.id, TRUE
+ FROM tmp.sale ts
+ JOIN sale s ON s.id = ts.saleFk
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
+ AND tis.warehouseFk = t.warehouseFk
+ WHERE (v.visible >= s.quantity OR v.visible IS NULL)
+ AND (s.quantity > tis.visible AND tis.visible IS NOT NULL)
+ AND s.quantity > 0
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND ic.merchandise
+ AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
+ AND NOT i.generic
+ AND util.VN_CURDATE() = vDate
+ AND t.warehouseFk = vWarehouseFk
+ GROUP BY s.id
+ ON DUPLICATE KEY UPDATE hasItemLost = TRUE;
+
+ -- Retraso: Disponible suficiente, pero no visible ni ubicado
+ INSERT INTO tmp.saleProblems(saleFk, hasItemDelay)
+ SELECT s.id, TRUE
+ FROM tmp.sale ts
+ JOIN sale s ON s.id = ts.saleFk
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN cache.available av ON av.item_id = i.id
+ AND av.calc_id = vAvailableCache
+ LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
+ AND tis.warehouseFk = t.warehouseFk
+ WHERE (s.quantity > v.visible AND v.visible IS NULL)
+ AND (av.available >= 0 OR av.available IS NULL)
+ AND (s.quantity > tis.visible AND tis.visible IS NOT NULL)
+ AND s.quantity > 0
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND ic.merchandise
+ AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
+ AND NOT i.generic
+ AND util.VN_CURDATE() = vDate
+ AND t.warehouseFk = vWarehouseFk
+ GROUP BY s.id
+ ON DUPLICATE KEY UPDATE hasItemDelay = TRUE;
+
+ -- Redondeo: cantidad incorrecta con respecto al grouping
CALL buy_getUltimate(NULL, vWarehouseFk, vDate);
- INSERT INTO tmp.sale_problems(ticketFk, hasRounding, saleFk)
- SELECT ticketFk, problem, saleFk
- FROM (
- SELECT sgp.ticketFk,
- s.id saleFk,
- LEFT(GROUP_CONCAT('RE: ',i.id, ' ', IFNULL(i.longName,'') SEPARATOR ', '), 250) problem
- FROM tmp.sale_getProblems sgp
- JOIN ticket t ON t.id = sgp.ticketFk
- AND t.warehouseFk = vWarehouseFk
- JOIN sale s ON s.ticketFk = sgp.ticketFk
- JOIN item i ON i.id = s.itemFk
- JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
- JOIN buy b ON b.id = bu.buyFk
- WHERE MOD(s.quantity, b.`grouping`)
- GROUP BY sgp.ticketFk
- )sub
- ON DUPLICATE KEY UPDATE hasRounding = sub.problem, saleFk = sub.saleFk;
+
+ INSERT INTO tmp.saleProblems(saleFk, hasRounding)
+ SELECT s.id, TRUE
+ FROM tmp.sale ts
+ JOIN sale s ON s.id = ts.saleFk
+ JOIN ticket t ON t.id = s.ticketFk
+ AND t.warehouseFk = vWarehouseFk
+ JOIN item i ON i.id = s.itemFk
+ JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+ JOIN buy b ON b.id = bu.buyFk
+ WHERE MOD(s.quantity, b.`grouping`)
+ GROUP BY s.id
+ ON DUPLICATE KEY UPDATE hasRounding = TRUE;
DROP TEMPORARY TABLE tmp.buyUltimate;
END LOOP;
CLOSE vCursor;
- DROP TEMPORARY TABLE tItemShelvingStock_byWarehouse;
+ DROP TEMPORARY TABLE tItemShelving;
END$$
DELIMITER ;
diff --git a/db/routines/vn/procedures/sale_getProblemsByTicket.sql b/db/routines/vn/procedures/sale_getProblemsByTicket.sql
index ff419989d4..fdfd5c8bc8 100644
--- a/db/routines/vn/procedures/sale_getProblemsByTicket.sql
+++ b/db/routines/vn/procedures/sale_getProblemsByTicket.sql
@@ -1,25 +1,25 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblemsByTicket`(IN vTicketFk INT, IN vIsTodayRelative TINYINT(1))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblemsByTicket`(
+ IN vTicketFk INT,
+ IN vIsTodayRelative TINYINT(1)
+)
BEGIN
/**
- * Calcula los problemas de cada venta
- * para un conjunto de tickets.
+ * Calcula los problemas de cada venta para un tickets.
*
* @return Problems result
*/
- CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems
- (INDEX (ticketFk))
- ENGINE = MEMORY
- SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped
- FROM ticket t
- WHERE t.id = vTicketFk;
+ CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+ (INDEX (saleFk))
+ ENGINE = MEMORY
+ SELECT id saleFk FROM sale WHERE ticketFk = vTicketFk;
- CALL sale_getProblems(vIsTodayRelative);
+ CALL sale_getProblems(vIsTodayRelative);
- SELECT * FROM tmp.sale_problems;
+ SELECT * FROM tmp.saleProblems;
- DROP TEMPORARY TABLE
- tmp.sale_getProblems,
- tmp.sale_problems;
+ DROP TEMPORARY TABLE
+ tmp.saleProblems,
+ tmp.sale;
END$$
DELIMITER ;
diff --git a/db/routines/vn/procedures/sale_replaceItem.sql b/db/routines/vn/procedures/sale_replaceItem.sql
index a61d260cc0..b2b30092b4 100644
--- a/db/routines/vn/procedures/sale_replaceItem.sql
+++ b/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 ;
diff --git a/db/routines/vn/procedures/ticket_canbePostponed.sql b/db/routines/vn/procedures/ticket_canbePostponed.sql
index a21e171cfa..f8457adf1d 100644
--- a/db/routines/vn/procedures/ticket_canbePostponed.sql
+++ b/db/routines/vn/procedures/ticket_canbePostponed.sql
@@ -30,11 +30,16 @@ BEGIN
st.code stateCode,
sub2.code futureStateCode,
st.classColor,
- sub2.classColor futureClassColor
+ sub2.classColor futureClassColor,
+ am.id agencyFk,
+ am.name agency,
+ sub2.agencyModeFk futureAgencyFk,
+ sub2.agencyMode futureAgency
FROM vn.saleVolume sv
JOIN vn.sale s ON s.id = sv.saleFk
JOIN vn.item i ON i.id = s.itemFk
JOIN vn.ticket t ON t.id = sv.ticketFk
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
JOIN vn.address a ON a.id = t.addressFk
JOIN vn.province p ON p.id = a.provinceFk
JOIN vn.country c ON c.id = p.countryFk
@@ -54,16 +59,19 @@ BEGIN
st.name state,
st.code,
st.classColor,
+ am.id agencyModeFk,
+ am.name agencyMode,
GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd
- FROM vn.ticket t
- JOIN vn.ticketState ts ON ts.ticketFk = t.id
- JOIN vn.state st ON st.id = ts.stateFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- WHERE t.shipped BETWEEN vFutureDated
- AND util.dayend(vFutureDated)
- AND t.warehouseFk = vWarehouseFk
- GROUP BY t.id
+ FROM vn.ticket t
+ JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+ JOIN vn.ticketState ts ON ts.ticketFk = t.id
+ JOIN vn.state st ON st.id = ts.stateFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ JOIN vn.item i ON i.id = s.itemFk
+ WHERE t.shipped BETWEEN vFutureDated
+ AND util.dayend(vFutureDated)
+ AND t.warehouseFk = vWarehouseFk
+ GROUP BY t.id
) sub
GROUP BY sub.addressFk
) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id
diff --git a/db/routines/vn/procedures/ticket_getProblems.sql b/db/routines/vn/procedures/ticket_getProblems.sql
index 1851bce47f..a65413f5f8 100644
--- a/db/routines/vn/procedures/ticket_getProblems.sql
+++ b/db/routines/vn/procedures/ticket_getProblems.sql
@@ -1,53 +1,109 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_getProblems`(
- vIsTodayRelative tinyint(1)
+ vIsTodayRelative TINYINT(1)
)
BEGIN
/**
* Calcula los problemas para un conjunto de tickets.
- * Agrupados por ticket
*
- * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
- * @return tmp.ticket_problems
+ * @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
+ * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
+ * @return tmp.ticketProblems, tmp.saleProblems
*/
+ CREATE OR REPLACE TEMPORARY TABLE tmp.sale (
+ saleFk INT(11),
+ PRIMARY KEY (saleFk)
+ ) ENGINE = MEMORY
+ SELECT DISTINCT s.id saleFk
+ FROM tmp.ticket tt
+ JOIN ticket t ON t.id = tt.ticketFk
+ JOIN sale s ON s.ticketFk = t.id
+ GROUP BY s.id;
+
CALL sale_getProblems(vIsTodayRelative);
- CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_problems
- (PRIMARY KEY (ticketFk))
- ENGINE = MEMORY
- SELECT ticketFk,
- MAX(isFreezed) isFreezed,
- MAX(risk) risk,
- MAX(hasRisk) hasRisk,
- MAX(hasHighRisk) hasHighRisk,
- MAX(hasTicketRequest) hasTicketRequest,
- MAX(itemShortage) itemShortage,
- MIN(isTaxDataChecked) isTaxDataChecked,
- MAX(hasComponentLack) hasComponentLack,
- MAX(isTooLittle) isTooLittle,
- MAX(itemDelay) itemDelay,
- MAX(hasRounding) hasRounding,
- MAX(itemLost) itemLost,
- MAX(isVip) isVip,
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketProblems (
+ ticketFk INT(11),
+ isFreezed BOOL DEFAULT FALSE,
+ risk DECIMAL(10,1) DEFAULT 0,
+ hasRisk BOOL DEFAULT FALSE,
+ hasHighRisk BOOL DEFAULT FALSE,
+ hasTicketRequest BOOL DEFAULT FALSE,
+ isTaxDataChecked BOOL DEFAULT FALSE,
+ isTooLittle BOOL DEFAULT FALSE,
+ isVip BOOL DEFAULT FALSE,
+ hasItemShortage BOOL DEFAULT FALSE,
+ hasItemDelay BOOL DEFAULT FALSE,
+ hasItemLost BOOL DEFAULT FALSE,
+ hasComponentLack BOOL DEFAULT FALSE,
+ hasRounding BOOL DEFAULT FALSE,
+ PRIMARY KEY (ticketFk)
+ ) ENGINE = MEMORY
+ WITH hasItemShortage AS(
+ SELECT s.ticketFk
+ FROM tmp.saleProblems sp
+ JOIN vn.sale s ON s.id = sp.saleFk
+ WHERE sp.hasItemShortage
+ GROUP BY s.ticketFk
+ ),hasItemLost AS(
+ SELECT s.ticketFk
+ FROM tmp.saleProblems sp
+ JOIN vn.sale s ON s.id = sp.saleFk
+ WHERE sp.hasItemLost
+ GROUP BY s.ticketFk
+ ),hasRounding AS(
+ SELECT s.ticketFk
+ FROM tmp.saleProblems sp
+ JOIN vn.sale s ON s.id = sp.saleFk
+ WHERE sp.hasRounding
+ GROUP BY s.ticketFk
+ ), hasItemDelay AS(
+ SELECT s.ticketFk
+ FROM tmp.saleProblems sp
+ JOIN vn.sale s ON s.id = sp.saleFk
+ WHERE sp.hasItemDelay
+ GROUP BY s.ticketFk
+ ), hasComponentLack AS(
+ SELECT s.ticketFk
+ FROM tmp.saleProblems sp
+ JOIN vn.sale s ON s.id = sp.saleFk
+ WHERE sp.hasComponentLack
+ GROUP BY s.ticketFk
+ )SELECT tt.ticketFk,
+ FIND_IN_SET('isFreezed', t.problem) > 0 isFreezed,
+ t.risk,
+ FIND_IN_SET('hasRisk', t.problem) > 0 hasRisk,
+ FIND_IN_SET('hasHighRisk', t.problem) > 0 hasHighRisk,
+ FIND_IN_SET('hasTicketRequest', t.problem) > 0 hasTicketRequest,
+ FIND_IN_SET('isTaxDataChecked', t.problem) > 0 isTaxDataChecked,
+ FIND_IN_SET('isTooLittle', t.problem) > 0
+ AND util.VN_NOW() < (util.VN_CURDATE() +
+ INTERVAL HOUR(zc.`hour`) HOUR) +
+ INTERVAL MINUTE(zc.`hour`) MINUTE isTooLittle,
+ c.businessTypeFk = 'VIP' isVip,
+ NOT (his.ticketFk IS NULL) hasItemShortage,
+ NOT (hid.ticketFk IS NULL) hasItemDelay,
+ NOT (hil.ticketFk IS NULL) hasItemLost,
+ NOT (hcl.ticketFk IS NULL) hasComponentLack,
+ NOT (hr.ticketFk IS NULL) hasRounding,
0 totalProblems
- FROM tmp.sale_problems
- GROUP BY ticketFk;
+ FROM tmp.ticket tt
+ JOIN vn.ticket t ON t.id = tt.ticketFk
+ JOIN vn.client c ON c.id = t.clientFk
+ LEFT JOIN hasItemShortage his ON his.ticketFk = t.id
+ LEFT JOIN hasItemLost hil ON hil.ticketFk = t.id
+ LEFT JOIN hasRounding hr ON hr.ticketFk = t.id
+ LEFT JOIN hasItemDelay hid ON hid.ticketFk = t.id
+ LEFT JOIN hasComponentLack hcl ON hcl.ticketFk = t.id
+ LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
+ AND zc.dated = util.VN_CURDATE()
+ GROUP BY t.id;
- UPDATE tmp.ticket_problems
- SET totalProblems = (
- (isFreezed) +
- (hasHighRisk) +
- (hasTicketRequest) +
- (!isTaxDataChecked) +
- (hasComponentLack) +
- (itemDelay IS NOT NULL) +
- (isTooLittle) +
- (itemLost IS NOT NULL) +
- (hasRounding IS NOT NULL) +
- (itemShortage IS NOT NULL) +
- (isVip)
- );
+ UPDATE tmp.ticketProblems
+ SET totalProblems = isFreezed + hasHighRisk + hasTicketRequest +
+ isTaxDataChecked + hasComponentLack + hasItemDelay +
+ isTooLittle + hasItemLost + hasRounding + hasItemShortage + isVip;
- DROP TEMPORARY TABLE tmp.sale_problems;
+ DROP TEMPORARY TABLE tmp.sale;
END$$
DELIMITER ;
diff --git a/db/routines/vn/triggers/claim_beforeInsert.sql b/db/routines/vn/triggers/claim_beforeInsert.sql
index dc3ef8c7a2..25d103c4cf 100644
--- a/db/routines/vn/triggers/claim_beforeInsert.sql
+++ b/db/routines/vn/triggers/claim_beforeInsert.sql
@@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`claim_beforeInsert`
FOR EACH ROW
BEGIN
SET NEW.editorFk = account.myUser_getId();
+
+ IF (SELECT shipped FROM ticket WHERE id = NEW.ticketFk) > util.VN_NOW() THEN
+ CALL util.throw('Future ticket date not allowed');
+ END IF;
END$$
DELIMITER ;
diff --git a/db/routines/vn2008/views/Agencias.sql b/db/routines/vn2008/views/Agencias.sql
index 1176d02c41..ae5a9e5103 100644
--- a/db/routines/vn2008/views/Agencias.sql
+++ b/db/routines/vn2008/views/Agencias.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Agencias`
AS SELECT `am`.`id` AS `Id_Agencia`,
diff --git a/db/routines/vn2008/views/Articles.sql b/db/routines/vn2008/views/Articles.sql
index 87f1b6d5ef..dd6b3a1963 100644
--- a/db/routines/vn2008/views/Articles.sql
+++ b/db/routines/vn2008/views/Articles.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Articles`
AS SELECT `i`.`id` AS `Id_Article`,
diff --git a/db/routines/vn2008/views/Bancos.sql b/db/routines/vn2008/views/Bancos.sql
index 6e850f365a..7f8d289f9f 100644
--- a/db/routines/vn2008/views/Bancos.sql
+++ b/db/routines/vn2008/views/Bancos.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Bancos`
AS SELECT `a`.`id` AS `Id_Banco`,
diff --git a/db/routines/vn2008/views/Bancos_poliza.sql b/db/routines/vn2008/views/Bancos_poliza.sql
index 4cd443545b..915f6a64d9 100644
--- a/db/routines/vn2008/views/Bancos_poliza.sql
+++ b/db/routines/vn2008/views/Bancos_poliza.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Bancos_poliza`
AS SELECT `bp`.`id` AS `poliza_id`,
diff --git a/db/routines/vn2008/views/Cajas.sql b/db/routines/vn2008/views/Cajas.sql
index 54b9ee1892..59b96a1cc1 100644
--- a/db/routines/vn2008/views/Cajas.sql
+++ b/db/routines/vn2008/views/Cajas.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Cajas`
AS SELECT `t`.`id` AS `Id_Caja`,
diff --git a/db/routines/vn2008/views/Clientes.sql b/db/routines/vn2008/views/Clientes.sql
index 9f8ef712e1..ef5d4e410f 100644
--- a/db/routines/vn2008/views/Clientes.sql
+++ b/db/routines/vn2008/views/Clientes.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Clientes`
AS SELECT `c`.`id` AS `id_cliente`,
diff --git a/db/routines/vn2008/views/Comparativa.sql b/db/routines/vn2008/views/Comparativa.sql
index 875a5c370e..92e8adf1fe 100644
--- a/db/routines/vn2008/views/Comparativa.sql
+++ b/db/routines/vn2008/views/Comparativa.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Comparativa`
AS SELECT `c`.`timePeriod` AS `Periodo`,
diff --git a/db/routines/vn2008/views/Compres.sql b/db/routines/vn2008/views/Compres.sql
index b99dd2b73c..786aef3cba 100644
--- a/db/routines/vn2008/views/Compres.sql
+++ b/db/routines/vn2008/views/Compres.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Compres`
AS SELECT `c`.`id` AS `Id_Compra`,
diff --git a/db/routines/vn2008/views/Consignatarios.sql b/db/routines/vn2008/views/Consignatarios.sql
index 13a426f4da..df7d07fb3c 100644
--- a/db/routines/vn2008/views/Consignatarios.sql
+++ b/db/routines/vn2008/views/Consignatarios.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Consignatarios`
AS SELECT `a`.`id` AS `id_consigna`,
diff --git a/db/routines/vn2008/views/Cubos.sql b/db/routines/vn2008/views/Cubos.sql
index 7ca82e66e8..c09376595e 100644
--- a/db/routines/vn2008/views/Cubos.sql
+++ b/db/routines/vn2008/views/Cubos.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Cubos`
AS SELECT `p`.`id` AS `Id_Cubo`,
diff --git a/db/routines/vn2008/views/Cubos_Retorno.sql b/db/routines/vn2008/views/Cubos_Retorno.sql
index bc56f275b0..152d72c99a 100644
--- a/db/routines/vn2008/views/Cubos_Retorno.sql
+++ b/db/routines/vn2008/views/Cubos_Retorno.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Cubos_Retorno`
AS SELECT `rb`.`id` AS `idCubos_Retorno`,
diff --git a/db/routines/vn2008/views/Entradas.sql b/db/routines/vn2008/views/Entradas.sql
index 78b73bb246..b6a029e57f 100644
--- a/db/routines/vn2008/views/Entradas.sql
+++ b/db/routines/vn2008/views/Entradas.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Entradas`
AS SELECT `e`.`id` AS `Id_Entrada`,
diff --git a/db/routines/vn2008/views/Entradas_orden.sql b/db/routines/vn2008/views/Entradas_orden.sql
index 66f46a929b..ddc2948486 100644
--- a/db/routines/vn2008/views/Entradas_orden.sql
+++ b/db/routines/vn2008/views/Entradas_orden.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Entradas_orden`
AS SELECT `eo`.`entryFk` AS `Id_Entrada`,
diff --git a/db/routines/vn2008/views/Impresoras.sql b/db/routines/vn2008/views/Impresoras.sql
index c4782ab72a..76118af1e1 100644
--- a/db/routines/vn2008/views/Impresoras.sql
+++ b/db/routines/vn2008/views/Impresoras.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Impresoras`
AS SELECT `vn`.`printer`.`id` AS `Id_impresora`,
diff --git a/db/routines/vn2008/views/Monedas.sql b/db/routines/vn2008/views/Monedas.sql
index 3693885be2..88a2cf495a 100644
--- a/db/routines/vn2008/views/Monedas.sql
+++ b/db/routines/vn2008/views/Monedas.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Monedas`
AS SELECT `c`.`id` AS `Id_Moneda`,
diff --git a/db/routines/vn2008/views/Movimientos.sql b/db/routines/vn2008/views/Movimientos.sql
index da41c51bb5..458ae4d48d 100644
--- a/db/routines/vn2008/views/Movimientos.sql
+++ b/db/routines/vn2008/views/Movimientos.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Movimientos`
AS SELECT `m`.`id` AS `Id_Movimiento`,
diff --git a/db/routines/vn2008/views/Movimientos_componentes.sql b/db/routines/vn2008/views/Movimientos_componentes.sql
index 440fbfb6af..a88e5f7d1b 100644
--- a/db/routines/vn2008/views/Movimientos_componentes.sql
+++ b/db/routines/vn2008/views/Movimientos_componentes.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Movimientos_componentes`
AS SELECT `sc`.`saleFk` AS `Id_Movimiento`,
diff --git a/db/routines/vn2008/views/Movimientos_mark.sql b/db/routines/vn2008/views/Movimientos_mark.sql
index 10ef2fc086..cc42e565e8 100644
--- a/db/routines/vn2008/views/Movimientos_mark.sql
+++ b/db/routines/vn2008/views/Movimientos_mark.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Movimientos_mark`
AS SELECT `mm`.`saleFk` AS `Id_Movimiento`,
diff --git a/db/routines/vn2008/views/Ordenes.sql b/db/routines/vn2008/views/Ordenes.sql
index de31f8f99c..a8266ab98f 100644
--- a/db/routines/vn2008/views/Ordenes.sql
+++ b/db/routines/vn2008/views/Ordenes.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Ordenes`
AS SELECT `tr`.`id` AS `Id_ORDEN`,
diff --git a/db/routines/vn2008/views/Origen.sql b/db/routines/vn2008/views/Origen.sql
index 5bb1d9b7fa..58658a1af7 100644
--- a/db/routines/vn2008/views/Origen.sql
+++ b/db/routines/vn2008/views/Origen.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Origen`
AS SELECT `o`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/Paises.sql b/db/routines/vn2008/views/Paises.sql
index 99d2835f06..72636de442 100644
--- a/db/routines/vn2008/views/Paises.sql
+++ b/db/routines/vn2008/views/Paises.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Paises`
AS SELECT `c`.`id` AS `Id`,
diff --git a/db/routines/vn2008/views/PreciosEspeciales.sql b/db/routines/vn2008/views/PreciosEspeciales.sql
index cea9f87fd8..a175035330 100644
--- a/db/routines/vn2008/views/PreciosEspeciales.sql
+++ b/db/routines/vn2008/views/PreciosEspeciales.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`PreciosEspeciales`
AS SELECT `sp`.`id` AS `Id_PrecioEspecial`,
diff --git a/db/routines/vn2008/views/Proveedores.sql b/db/routines/vn2008/views/Proveedores.sql
index 203d4295f3..293732d236 100644
--- a/db/routines/vn2008/views/Proveedores.sql
+++ b/db/routines/vn2008/views/Proveedores.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Proveedores`
AS SELECT `s`.`id` AS `Id_Proveedor`,
diff --git a/db/routines/vn2008/views/Proveedores_cargueras.sql b/db/routines/vn2008/views/Proveedores_cargueras.sql
index c1dc6ad236..4ff9bd6278 100644
--- a/db/routines/vn2008/views/Proveedores_cargueras.sql
+++ b/db/routines/vn2008/views/Proveedores_cargueras.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Proveedores_cargueras`
AS SELECT `fs`.`supplierFk` AS `Id_Proveedor`
diff --git a/db/routines/vn2008/views/Proveedores_gestdoc.sql b/db/routines/vn2008/views/Proveedores_gestdoc.sql
index c25623b8b0..1a27f7a7db 100644
--- a/db/routines/vn2008/views/Proveedores_gestdoc.sql
+++ b/db/routines/vn2008/views/Proveedores_gestdoc.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Proveedores_gestdoc`
AS SELECT `sd`.`supplierFk` AS `Id_Proveedor`,
diff --git a/db/routines/vn2008/views/Recibos.sql b/db/routines/vn2008/views/Recibos.sql
index 93ec7bc6fe..8b710cb230 100644
--- a/db/routines/vn2008/views/Recibos.sql
+++ b/db/routines/vn2008/views/Recibos.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Recibos`
AS SELECT `r`.`Id` AS `Id`,
diff --git a/db/routines/vn2008/views/Remesas.sql b/db/routines/vn2008/views/Remesas.sql
index 9e8c18ada6..2986ec6f25 100644
--- a/db/routines/vn2008/views/Remesas.sql
+++ b/db/routines/vn2008/views/Remesas.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Remesas`
AS SELECT `r`.`id` AS `Id_Remesa`,
diff --git a/db/routines/vn2008/views/Rutas.sql b/db/routines/vn2008/views/Rutas.sql
index c8ade24e94..eabfbfd724 100644
--- a/db/routines/vn2008/views/Rutas.sql
+++ b/db/routines/vn2008/views/Rutas.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Rutas`
AS SELECT `r`.`id` AS `Id_Ruta`,
diff --git a/db/routines/vn2008/views/Split.sql b/db/routines/vn2008/views/Split.sql
index eec90a5f8e..812cec8fe1 100644
--- a/db/routines/vn2008/views/Split.sql
+++ b/db/routines/vn2008/views/Split.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Splits`
AS SELECT `s`.`id` AS `Id_Split`,
diff --git a/db/routines/vn2008/views/Tickets.sql b/db/routines/vn2008/views/Tickets.sql
index 59dcb91006..18646dbaba 100644
--- a/db/routines/vn2008/views/Tickets.sql
+++ b/db/routines/vn2008/views/Tickets.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Tickets`
AS SELECT `t`.`id` AS `Id_Ticket`,
diff --git a/db/routines/vn2008/views/Tickets_state.sql b/db/routines/vn2008/views/Tickets_state.sql
index be59a750f3..fbbc00170f 100644
--- a/db/routines/vn2008/views/Tickets_state.sql
+++ b/db/routines/vn2008/views/Tickets_state.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Tickets_state`
AS SELECT `t`.`ticketFk` AS `Id_Ticket`,
diff --git a/db/routines/vn2008/views/Tickets_turno.sql b/db/routines/vn2008/views/Tickets_turno.sql
index 28bc2d55fa..6d16a57804 100644
--- a/db/routines/vn2008/views/Tickets_turno.sql
+++ b/db/routines/vn2008/views/Tickets_turno.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Tickets_turno`
AS SELECT `tw`.`ticketFk` AS `Id_Ticket`,
diff --git a/db/routines/vn2008/views/Tintas.sql b/db/routines/vn2008/views/Tintas.sql
index 2299aa759a..729cfa9d6c 100644
--- a/db/routines/vn2008/views/Tintas.sql
+++ b/db/routines/vn2008/views/Tintas.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Tintas`
AS SELECT `i`.`id` AS `Id_Tinta`,
diff --git a/db/routines/vn2008/views/Tipos.sql b/db/routines/vn2008/views/Tipos.sql
index 5b96c1766c..5a99e2aca3 100644
--- a/db/routines/vn2008/views/Tipos.sql
+++ b/db/routines/vn2008/views/Tipos.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Tipos`
AS SELECT `it`.`id` AS `tipo_id`,
diff --git a/db/routines/vn2008/views/Trabajadores.sql b/db/routines/vn2008/views/Trabajadores.sql
index 72b53e54e3..a5c8353d2b 100644
--- a/db/routines/vn2008/views/Trabajadores.sql
+++ b/db/routines/vn2008/views/Trabajadores.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Trabajadores`
AS SELECT `w`.`id` AS `Id_Trabajador`,
diff --git a/db/routines/vn2008/views/Tramos.sql b/db/routines/vn2008/views/Tramos.sql
index 6919a610b2..a9847a1b15 100644
--- a/db/routines/vn2008/views/Tramos.sql
+++ b/db/routines/vn2008/views/Tramos.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Tramos`
AS SELECT `s`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/V_edi_item_track.sql b/db/routines/vn2008/views/V_edi_item_track.sql
index 64cfdc1c58..8e01827194 100644
--- a/db/routines/vn2008/views/V_edi_item_track.sql
+++ b/db/routines/vn2008/views/V_edi_item_track.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`V_edi_item_track`
AS SELECT `edi`.`item_track`.`item_id` AS `item_id`,
diff --git a/db/routines/vn2008/views/Vehiculos_consumo.sql b/db/routines/vn2008/views/Vehiculos_consumo.sql
index 422a774994..2808371c70 100644
--- a/db/routines/vn2008/views/Vehiculos_consumo.sql
+++ b/db/routines/vn2008/views/Vehiculos_consumo.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Vehiculos_consumo`
AS SELECT `vc`.`id` AS `Vehiculos_consumo_id`,
diff --git a/db/routines/vn2008/views/account_conciliacion.sql b/db/routines/vn2008/views/account_conciliacion.sql
index 66db78eee6..e652648f58 100644
--- a/db/routines/vn2008/views/account_conciliacion.sql
+++ b/db/routines/vn2008/views/account_conciliacion.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`account_conciliacion`
AS SELECT `ar`.`id` AS `idaccount_conciliacion`,
diff --git a/db/routines/vn2008/views/account_detail.sql b/db/routines/vn2008/views/account_detail.sql
index 74d35ae41a..874f1f90cf 100644
--- a/db/routines/vn2008/views/account_detail.sql
+++ b/db/routines/vn2008/views/account_detail.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`account_detail`
AS SELECT `ac`.`id` AS `account_detail_id`,
diff --git a/db/routines/vn2008/views/account_detail_type.sql b/db/routines/vn2008/views/account_detail_type.sql
index 6def86a9a6..5f6f22cd92 100644
--- a/db/routines/vn2008/views/account_detail_type.sql
+++ b/db/routines/vn2008/views/account_detail_type.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`account_detail_type`
AS SELECT `adt`.`id` AS `account_detail_type_id`,
diff --git a/db/routines/vn2008/views/agency.sql b/db/routines/vn2008/views/agency.sql
index 637bb09101..015149e605 100644
--- a/db/routines/vn2008/views/agency.sql
+++ b/db/routines/vn2008/views/agency.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`agency`
AS SELECT `a`.`id` AS `agency_id`,
diff --git a/db/routines/vn2008/views/airline.sql b/db/routines/vn2008/views/airline.sql
index 786206b1c1..364e61ab16 100644
--- a/db/routines/vn2008/views/airline.sql
+++ b/db/routines/vn2008/views/airline.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`airline`
AS SELECT `a`.`id` AS `airline_id`,
diff --git a/db/routines/vn2008/views/airport.sql b/db/routines/vn2008/views/airport.sql
index 0e8ab39d29..3e4238e51e 100644
--- a/db/routines/vn2008/views/airport.sql
+++ b/db/routines/vn2008/views/airport.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`airport`
AS SELECT `a`.`id` AS `airport_id`,
diff --git a/db/routines/vn2008/views/albaran.sql b/db/routines/vn2008/views/albaran.sql
index b1055ff56a..1851834cd4 100644
--- a/db/routines/vn2008/views/albaran.sql
+++ b/db/routines/vn2008/views/albaran.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`albaran`
AS SELECT `dn`.`id` AS `albaran_id`,
diff --git a/db/routines/vn2008/views/albaran_gestdoc.sql b/db/routines/vn2008/views/albaran_gestdoc.sql
index ffde86937d..d4d0ecbce5 100644
--- a/db/routines/vn2008/views/albaran_gestdoc.sql
+++ b/db/routines/vn2008/views/albaran_gestdoc.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`albaran_gestdoc`
AS SELECT `dnd`.`dmsFk` AS `gestdoc_id`,
diff --git a/db/routines/vn2008/views/albaran_state.sql b/db/routines/vn2008/views/albaran_state.sql
index a15938f45d..03056d7f07 100644
--- a/db/routines/vn2008/views/albaran_state.sql
+++ b/db/routines/vn2008/views/albaran_state.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`albaran_state`
AS SELECT `dn`.`id` AS `albaran_state_id`,
diff --git a/db/routines/vn2008/views/awb.sql b/db/routines/vn2008/views/awb.sql
index a325718888..c37a425b75 100644
--- a/db/routines/vn2008/views/awb.sql
+++ b/db/routines/vn2008/views/awb.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`awb`
AS SELECT `a`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/awb_component.sql b/db/routines/vn2008/views/awb_component.sql
index 8053c4a590..39eec27332 100644
--- a/db/routines/vn2008/views/awb_component.sql
+++ b/db/routines/vn2008/views/awb_component.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`awb_component`
AS SELECT `ac`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/awb_component_template.sql b/db/routines/vn2008/views/awb_component_template.sql
index bc8fd1cd8f..cdf178fe17 100644
--- a/db/routines/vn2008/views/awb_component_template.sql
+++ b/db/routines/vn2008/views/awb_component_template.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`awb_component_template`
AS SELECT`act`.`id` AS `awb_component_template_id`,
diff --git a/db/routines/vn2008/views/awb_component_type.sql b/db/routines/vn2008/views/awb_component_type.sql
index 45921e11cb..f65df513ff 100644
--- a/db/routines/vn2008/views/awb_component_type.sql
+++ b/db/routines/vn2008/views/awb_component_type.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`awb_component_type`
AS SELECT `act`.`id` AS `awb_component_type_id`,
diff --git a/db/routines/vn2008/views/awb_gestdoc.sql b/db/routines/vn2008/views/awb_gestdoc.sql
index 6b5c58d56a..16715ce6b7 100644
--- a/db/routines/vn2008/views/awb_gestdoc.sql
+++ b/db/routines/vn2008/views/awb_gestdoc.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`awb_gestdoc`
AS SELECT `ad`.`id` AS `awb_gestdoc_id`,
diff --git a/db/routines/vn2008/views/awb_recibida.sql b/db/routines/vn2008/views/awb_recibida.sql
index c7586214d1..9f04e0e35e 100644
--- a/db/routines/vn2008/views/awb_recibida.sql
+++ b/db/routines/vn2008/views/awb_recibida.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`awb_recibida`
AS SELECT `aii`.`awbFk` AS `awb_id`,
diff --git a/db/routines/vn2008/views/awb_role.sql b/db/routines/vn2008/views/awb_role.sql
index 5ef0042445..3905ee5722 100644
--- a/db/routines/vn2008/views/awb_role.sql
+++ b/db/routines/vn2008/views/awb_role.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`awb_role`
AS SELECT `ar`.`id` AS `awb_role_id`,
diff --git a/db/routines/vn2008/views/awb_unit.sql b/db/routines/vn2008/views/awb_unit.sql
index 7d1193105b..28ad75204a 100644
--- a/db/routines/vn2008/views/awb_unit.sql
+++ b/db/routines/vn2008/views/awb_unit.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`awb_unit`
AS SELECT `au`.`id` AS `awb_unit_id`,
diff --git a/db/routines/vn2008/views/balance_nest_tree.sql b/db/routines/vn2008/views/balance_nest_tree.sql
index 66d048d7f6..e232edba82 100644
--- a/db/routines/vn2008/views/balance_nest_tree.sql
+++ b/db/routines/vn2008/views/balance_nest_tree.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`balance_nest_tree`
AS SELECT `bnt`.`lft` AS `lft`,
diff --git a/db/routines/vn2008/views/barcodes.sql b/db/routines/vn2008/views/barcodes.sql
index f366e15fa0..8cf8be064a 100644
--- a/db/routines/vn2008/views/barcodes.sql
+++ b/db/routines/vn2008/views/barcodes.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`barcodes`
AS SELECT `b`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/buySource.sql b/db/routines/vn2008/views/buySource.sql
index 8504838330..d6db662a7a 100644
--- a/db/routines/vn2008/views/buySource.sql
+++ b/db/routines/vn2008/views/buySource.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`buySource`
AS SELECT `b`.`entryFk` AS `Id_Entrada`,
diff --git a/db/routines/vn2008/views/buy_edi.sql b/db/routines/vn2008/views/buy_edi.sql
index d00196e95b..85e4a6b28a 100644
--- a/db/routines/vn2008/views/buy_edi.sql
+++ b/db/routines/vn2008/views/buy_edi.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`buy_edi`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/buy_edi_k012.sql b/db/routines/vn2008/views/buy_edi_k012.sql
index 8ef89e5c9f..790e330790 100644
--- a/db/routines/vn2008/views/buy_edi_k012.sql
+++ b/db/routines/vn2008/views/buy_edi_k012.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`buy_edi_k012`
AS SELECT `eek`.`id` AS `buy_edi_k012_id`,
diff --git a/db/routines/vn2008/views/buy_edi_k03.sql b/db/routines/vn2008/views/buy_edi_k03.sql
index 04ca10ef55..aef0fb391e 100644
--- a/db/routines/vn2008/views/buy_edi_k03.sql
+++ b/db/routines/vn2008/views/buy_edi_k03.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`buy_edi_k03`
AS SELECT `eek`.`id` AS `buy_edi_k03_id`,
diff --git a/db/routines/vn2008/views/buy_edi_k04.sql b/db/routines/vn2008/views/buy_edi_k04.sql
index 3c32e3b88b..e207e4317c 100644
--- a/db/routines/vn2008/views/buy_edi_k04.sql
+++ b/db/routines/vn2008/views/buy_edi_k04.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`buy_edi_k04`
AS SELECT `eek`.`id` AS `buy_edi_k04_id`,
diff --git a/db/routines/vn2008/views/cdr.sql b/db/routines/vn2008/views/cdr.sql
index 9d0d2f1720..d13c7dd32b 100644
--- a/db/routines/vn2008/views/cdr.sql
+++ b/db/routines/vn2008/views/cdr.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cdr`
AS SELECT `c`.`call_date` AS `calldate`,
diff --git a/db/routines/vn2008/views/chanel.sql b/db/routines/vn2008/views/chanel.sql
index 9d2ed0d9c6..0480ca5881 100644
--- a/db/routines/vn2008/views/chanel.sql
+++ b/db/routines/vn2008/views/chanel.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`chanel`
AS SELECT `c`.`id` AS `chanel_id`,
diff --git a/db/routines/vn2008/views/cl_act.sql b/db/routines/vn2008/views/cl_act.sql
index a62ac3efe9..9678d2fbbd 100644
--- a/db/routines/vn2008/views/cl_act.sql
+++ b/db/routines/vn2008/views/cl_act.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cl_act`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/cl_cau.sql b/db/routines/vn2008/views/cl_cau.sql
index a835a94c95..8bb352710e 100644
--- a/db/routines/vn2008/views/cl_cau.sql
+++ b/db/routines/vn2008/views/cl_cau.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cl_cau`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/cl_con.sql b/db/routines/vn2008/views/cl_con.sql
index b4f596d566..c224a01aa9 100644
--- a/db/routines/vn2008/views/cl_con.sql
+++ b/db/routines/vn2008/views/cl_con.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cl_con`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/cl_det.sql b/db/routines/vn2008/views/cl_det.sql
index cef5c821d3..80c87c51ea 100644
--- a/db/routines/vn2008/views/cl_det.sql
+++ b/db/routines/vn2008/views/cl_det.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cl_det`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/cl_main.sql b/db/routines/vn2008/views/cl_main.sql
index ef0c2cb8ab..04d0e10cdd 100644
--- a/db/routines/vn2008/views/cl_main.sql
+++ b/db/routines/vn2008/views/cl_main.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cl_main`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/cl_mot.sql b/db/routines/vn2008/views/cl_mot.sql
index 60fb27041f..6dfdb702af 100644
--- a/db/routines/vn2008/views/cl_mot.sql
+++ b/db/routines/vn2008/views/cl_mot.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cl_mot`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/cl_res.sql b/db/routines/vn2008/views/cl_res.sql
index e82ee73b0d..31c1da6c18 100644
--- a/db/routines/vn2008/views/cl_res.sql
+++ b/db/routines/vn2008/views/cl_res.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cl_res`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/cl_sol.sql b/db/routines/vn2008/views/cl_sol.sql
index 23f2b8594e..3321ce0e4f 100644
--- a/db/routines/vn2008/views/cl_sol.sql
+++ b/db/routines/vn2008/views/cl_sol.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`cl_sol`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/config_host.sql b/db/routines/vn2008/views/config_host.sql
index 2d4d6fa4c0..b9dbaae359 100644
--- a/db/routines/vn2008/views/config_host.sql
+++ b/db/routines/vn2008/views/config_host.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`config_host`
AS SELECT `vn`.`host`.`code` AS `config_host_id`,
diff --git a/db/routines/vn2008/views/consignatarios_observation.sql b/db/routines/vn2008/views/consignatarios_observation.sql
index 1f4c2eeb22..13bbe431a2 100644
--- a/db/routines/vn2008/views/consignatarios_observation.sql
+++ b/db/routines/vn2008/views/consignatarios_observation.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`consignatarios_observation`
AS SELECT `co`.`id` AS `consignatarios_observation_id`,
diff --git a/db/routines/vn2008/views/credit.sql b/db/routines/vn2008/views/credit.sql
index 0de60b9679..e1f71e267d 100644
--- a/db/routines/vn2008/views/credit.sql
+++ b/db/routines/vn2008/views/credit.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`credit`
AS SELECT
diff --git a/db/routines/vn2008/views/definitivo.sql b/db/routines/vn2008/views/definitivo.sql
index 1bc5541614..397b33dbd6 100644
--- a/db/routines/vn2008/views/definitivo.sql
+++ b/db/routines/vn2008/views/definitivo.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`definitivo`
AS SELECT `d`.`id` AS `definitivo_id`,
diff --git a/db/routines/vn2008/views/edi_article.sql b/db/routines/vn2008/views/edi_article.sql
index 34bb641498..68c7a581a1 100644
--- a/db/routines/vn2008/views/edi_article.sql
+++ b/db/routines/vn2008/views/edi_article.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`edi_article`
AS SELECT `edi`.`item`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/edi_bucket.sql b/db/routines/vn2008/views/edi_bucket.sql
index 1af487a6c0..0d744e6a73 100644
--- a/db/routines/vn2008/views/edi_bucket.sql
+++ b/db/routines/vn2008/views/edi_bucket.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`edi_bucket`
AS SELECT cast(
diff --git a/db/routines/vn2008/views/edi_bucket_type.sql b/db/routines/vn2008/views/edi_bucket_type.sql
index 8e3af20801..845124d495 100644
--- a/db/routines/vn2008/views/edi_bucket_type.sql
+++ b/db/routines/vn2008/views/edi_bucket_type.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`edi_bucket_type`
AS SELECT `edi`.`bucket_type`.`bucket_type_id` AS `bucket_type_id`,
diff --git a/db/routines/vn2008/views/edi_specie.sql b/db/routines/vn2008/views/edi_specie.sql
index 33e38482ed..c25a5601c9 100644
--- a/db/routines/vn2008/views/edi_specie.sql
+++ b/db/routines/vn2008/views/edi_specie.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`edi_specie`
AS SELECT `edi`.`specie`.`specie_id` AS `specie_id`,
diff --git a/db/routines/vn2008/views/edi_supplier.sql b/db/routines/vn2008/views/edi_supplier.sql
index 51f96b83d6..d7dd6c3538 100644
--- a/db/routines/vn2008/views/edi_supplier.sql
+++ b/db/routines/vn2008/views/edi_supplier.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`edi_supplier`
AS SELECT `edi`.`supplier`.`supplier_id` AS `supplier_id`,
diff --git a/db/routines/vn2008/views/empresa.sql b/db/routines/vn2008/views/empresa.sql
index 8c80a06e82..6c93cb910a 100644
--- a/db/routines/vn2008/views/empresa.sql
+++ b/db/routines/vn2008/views/empresa.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`empresa`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/empresa_grupo.sql b/db/routines/vn2008/views/empresa_grupo.sql
index 35ba272793..a626f2c60d 100644
--- a/db/routines/vn2008/views/empresa_grupo.sql
+++ b/db/routines/vn2008/views/empresa_grupo.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`empresa_grupo`
AS SELECT `vn`.`companyGroup`.`id` AS `empresa_grupo_id`,
diff --git a/db/routines/vn2008/views/entrySource.sql b/db/routines/vn2008/views/entrySource.sql
index 7326036177..5657748403 100644
--- a/db/routines/vn2008/views/entrySource.sql
+++ b/db/routines/vn2008/views/entrySource.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`entrySource`
AS SELECT `e`.`gestDocFk` AS `gestdoc_id`,
diff --git a/db/routines/vn2008/views/financialProductType.sql b/db/routines/vn2008/views/financialProductType.sql
index 89a0638569..10a8ece21e 100644
--- a/db/routines/vn2008/views/financialProductType.sql
+++ b/db/routines/vn2008/views/financialProductType.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`financialProductType`AS
SELECT * FROM vn.financialProductType;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/flight.sql b/db/routines/vn2008/views/flight.sql
index 2df5362f77..194cb5a94d 100644
--- a/db/routines/vn2008/views/flight.sql
+++ b/db/routines/vn2008/views/flight.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`flight`
AS SELECT
diff --git a/db/routines/vn2008/views/gastos_resumen.sql b/db/routines/vn2008/views/gastos_resumen.sql
index d40d6d229c..8db91c1b60 100644
--- a/db/routines/vn2008/views/gastos_resumen.sql
+++ b/db/routines/vn2008/views/gastos_resumen.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`gastos_resumen`
AS SELECT
diff --git a/db/routines/vn2008/views/integra2.sql b/db/routines/vn2008/views/integra2.sql
index 05840d6bbd..cb0847e8a5 100644
--- a/db/routines/vn2008/views/integra2.sql
+++ b/db/routines/vn2008/views/integra2.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`integra2`
AS SELECT
diff --git a/db/routines/vn2008/views/integra2_province.sql b/db/routines/vn2008/views/integra2_province.sql
index bc099adb32..f0a5e13ee4 100644
--- a/db/routines/vn2008/views/integra2_province.sql
+++ b/db/routines/vn2008/views/integra2_province.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`integra2_province`
AS SELECT
diff --git a/db/routines/vn2008/views/mail.sql b/db/routines/vn2008/views/mail.sql
index 3074dfa95d..c0d4de6026 100644
--- a/db/routines/vn2008/views/mail.sql
+++ b/db/routines/vn2008/views/mail.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`mail`
AS SELECT `m`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/mandato.sql b/db/routines/vn2008/views/mandato.sql
index dde43b48dc..a2dbc4be62 100644
--- a/db/routines/vn2008/views/mandato.sql
+++ b/db/routines/vn2008/views/mandato.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`mandato`
AS SELECT `m`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/mandato_tipo.sql b/db/routines/vn2008/views/mandato_tipo.sql
index bc3f746328..b2c5a3990c 100644
--- a/db/routines/vn2008/views/mandato_tipo.sql
+++ b/db/routines/vn2008/views/mandato_tipo.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`mandato_tipo`
AS SELECT `m`.`id` AS `idmandato_tipo`,
diff --git a/db/routines/vn2008/views/pago.sql b/db/routines/vn2008/views/pago.sql
index 546496070b..08506afda7 100644
--- a/db/routines/vn2008/views/pago.sql
+++ b/db/routines/vn2008/views/pago.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`pago`
AS SELECT `p`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/pago_sdc.sql b/db/routines/vn2008/views/pago_sdc.sql
index 29480e3769..ef75741fb2 100644
--- a/db/routines/vn2008/views/pago_sdc.sql
+++ b/db/routines/vn2008/views/pago_sdc.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`pago_sdc`
AS SELECT `ei`.`id` AS `pago_sdc_id`,
diff --git a/db/routines/vn2008/views/pay_dem.sql b/db/routines/vn2008/views/pay_dem.sql
index 1ef00d645d..55468d6e33 100644
--- a/db/routines/vn2008/views/pay_dem.sql
+++ b/db/routines/vn2008/views/pay_dem.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`pay_dem`
AS SELECT `pd`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/pay_dem_det.sql b/db/routines/vn2008/views/pay_dem_det.sql
index 822897ed85..b9b4485d93 100644
--- a/db/routines/vn2008/views/pay_dem_det.sql
+++ b/db/routines/vn2008/views/pay_dem_det.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`pay_dem_det`
AS SELECT `pdd`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/pay_met.sql b/db/routines/vn2008/views/pay_met.sql
index 63e2b30e06..c64d01ce47 100644
--- a/db/routines/vn2008/views/pay_met.sql
+++ b/db/routines/vn2008/views/pay_met.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`pay_met`
AS SELECT `pm`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/payrollWorker.sql b/db/routines/vn2008/views/payrollWorker.sql
index 6199e98b89..7557d61ec5 100644
--- a/db/routines/vn2008/views/payrollWorker.sql
+++ b/db/routines/vn2008/views/payrollWorker.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`payroll_employee` AS
SELECT
diff --git a/db/routines/vn2008/views/payroll_categorias.sql b/db/routines/vn2008/views/payroll_categorias.sql
index b71e69019f..b1eb5f5960 100644
--- a/db/routines/vn2008/views/payroll_categorias.sql
+++ b/db/routines/vn2008/views/payroll_categorias.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`payroll_categorias`
AS SELECT `pc`.`id` AS `codcategoria`,
diff --git a/db/routines/vn2008/views/payroll_centros.sql b/db/routines/vn2008/views/payroll_centros.sql
index b7e162f906..2160234671 100644
--- a/db/routines/vn2008/views/payroll_centros.sql
+++ b/db/routines/vn2008/views/payroll_centros.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`payroll_centros`
AS SELECT `pwc`.`workCenterFkA3` AS `cod_centro`,
diff --git a/db/routines/vn2008/views/payroll_conceptos.sql b/db/routines/vn2008/views/payroll_conceptos.sql
index a7c6ece5bd..e96ca1d29f 100644
--- a/db/routines/vn2008/views/payroll_conceptos.sql
+++ b/db/routines/vn2008/views/payroll_conceptos.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`payroll_conceptos`
AS SELECT `pc`.`id` AS `conceptoid`,
diff --git a/db/routines/vn2008/views/plantpassport.sql b/db/routines/vn2008/views/plantpassport.sql
index b1be6a80b2..c983fab0a8 100644
--- a/db/routines/vn2008/views/plantpassport.sql
+++ b/db/routines/vn2008/views/plantpassport.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`plantpassport`
AS SELECT `pp`.`producerFk` AS `producer_id`,
diff --git a/db/routines/vn2008/views/plantpassport_authority.sql b/db/routines/vn2008/views/plantpassport_authority.sql
index 4548bbeded..b8566a8f3a 100644
--- a/db/routines/vn2008/views/plantpassport_authority.sql
+++ b/db/routines/vn2008/views/plantpassport_authority.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`plantpassport_authority`
AS SELECT `ppa`.`id` AS `plantpassport_authority_id`,
diff --git a/db/routines/vn2008/views/price_fixed.sql b/db/routines/vn2008/views/price_fixed.sql
index ce8170e7c7..306e9d8878 100644
--- a/db/routines/vn2008/views/price_fixed.sql
+++ b/db/routines/vn2008/views/price_fixed.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`price_fixed`
AS SELECT `pf`.`itemFk` AS `item_id`,
diff --git a/db/routines/vn2008/views/producer.sql b/db/routines/vn2008/views/producer.sql
index babfb887ea..dbf7833ca6 100644
--- a/db/routines/vn2008/views/producer.sql
+++ b/db/routines/vn2008/views/producer.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`producer`
AS SELECT `p`.`id` AS `producer_id`,
diff --git a/db/routines/vn2008/views/promissoryNote.sql b/db/routines/vn2008/views/promissoryNote.sql
index 0db0fa86f0..e8d3b8718f 100644
--- a/db/routines/vn2008/views/promissoryNote.sql
+++ b/db/routines/vn2008/views/promissoryNote.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`Pagares`
AS SELECT `p`.`id` AS `Id_Pagare`,
diff --git a/db/routines/vn2008/views/proveedores_clientes.sql b/db/routines/vn2008/views/proveedores_clientes.sql
index e08f4a3a7c..1e5c75f544 100644
--- a/db/routines/vn2008/views/proveedores_clientes.sql
+++ b/db/routines/vn2008/views/proveedores_clientes.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`proveedores_clientes`
AS SELECT `Proveedores`.`Id_Proveedor` AS `Id_Proveedor`,
diff --git a/db/routines/vn2008/views/province.sql b/db/routines/vn2008/views/province.sql
index 1477ec8034..1a08497bc0 100644
--- a/db/routines/vn2008/views/province.sql
+++ b/db/routines/vn2008/views/province.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`province`
AS SELECT `p`.`id` AS `province_id`,
diff --git a/db/routines/vn2008/views/recibida.sql b/db/routines/vn2008/views/recibida.sql
index 76b86505e1..ae48debb6d 100644
--- a/db/routines/vn2008/views/recibida.sql
+++ b/db/routines/vn2008/views/recibida.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`recibida`
AS SELECT `r`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/recibida_intrastat.sql b/db/routines/vn2008/views/recibida_intrastat.sql
index 402781931e..fd472c55aa 100644
--- a/db/routines/vn2008/views/recibida_intrastat.sql
+++ b/db/routines/vn2008/views/recibida_intrastat.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`recibida_intrastat`
AS SELECT `i`.`invoiceInFk` AS `recibida_id`,
diff --git a/db/routines/vn2008/views/recibida_iva.sql b/db/routines/vn2008/views/recibida_iva.sql
index 7d948a6ffb..96f5c1736e 100644
--- a/db/routines/vn2008/views/recibida_iva.sql
+++ b/db/routines/vn2008/views/recibida_iva.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`recibida_iva`
AS SELECT `i`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/recibida_vencimiento.sql b/db/routines/vn2008/views/recibida_vencimiento.sql
index 813ae40d7a..d06230e37a 100644
--- a/db/routines/vn2008/views/recibida_vencimiento.sql
+++ b/db/routines/vn2008/views/recibida_vencimiento.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`recibida_vencimiento`
AS SELECT `r`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/recovery.sql b/db/routines/vn2008/views/recovery.sql
index 5bbff31247..905ffc347c 100644
--- a/db/routines/vn2008/views/recovery.sql
+++ b/db/routines/vn2008/views/recovery.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`recovery`
AS SELECT `r`.`id` AS `recovery_id`,
diff --git a/db/routines/vn2008/views/reference_rate.sql b/db/routines/vn2008/views/reference_rate.sql
index eb0f1c25ec..e0d09db58e 100644
--- a/db/routines/vn2008/views/reference_rate.sql
+++ b/db/routines/vn2008/views/reference_rate.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`reference_rate`
AS SELECT `rr`.`currencyFk` AS `moneda_id`,
diff --git a/db/routines/vn2008/views/reinos.sql b/db/routines/vn2008/views/reinos.sql
index 4d98d1f09b..3b1299bb02 100644
--- a/db/routines/vn2008/views/reinos.sql
+++ b/db/routines/vn2008/views/reinos.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`reinos`
AS SELECT `r`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/state.sql b/db/routines/vn2008/views/state.sql
index 9f7fcccd81..3602e257d2 100644
--- a/db/routines/vn2008/views/state.sql
+++ b/db/routines/vn2008/views/state.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`state`
AS SELECT `s`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/tag.sql b/db/routines/vn2008/views/tag.sql
index 25b3ab82e1..9a1c5c6753 100644
--- a/db/routines/vn2008/views/tag.sql
+++ b/db/routines/vn2008/views/tag.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`tag`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/tarifa_componentes.sql b/db/routines/vn2008/views/tarifa_componentes.sql
index bec53abd94..72f15bfeef 100644
--- a/db/routines/vn2008/views/tarifa_componentes.sql
+++ b/db/routines/vn2008/views/tarifa_componentes.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`tarifa_componentes`
AS SELECT `tarifa_componentes`.`Id_Componente` AS `Id_Componente`,
diff --git a/db/routines/vn2008/views/tarifa_componentes_series.sql b/db/routines/vn2008/views/tarifa_componentes_series.sql
index a1d1887094..ecf425b198 100644
--- a/db/routines/vn2008/views/tarifa_componentes_series.sql
+++ b/db/routines/vn2008/views/tarifa_componentes_series.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`tarifa_componentes_series`
AS SELECT `tarifa_componentes_series`.`tarifa_componentes_series_id` AS `tarifa_componentes_series_id`,
diff --git a/db/routines/vn2008/views/tblContadores.sql b/db/routines/vn2008/views/tblContadores.sql
index 129d3ce8be..360171a8b3 100644
--- a/db/routines/vn2008/views/tblContadores.sql
+++ b/db/routines/vn2008/views/tblContadores.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`tblContadores`
AS SELECT `c`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/thermograph.sql b/db/routines/vn2008/views/thermograph.sql
index f51b83d243..209d89e912 100644
--- a/db/routines/vn2008/views/thermograph.sql
+++ b/db/routines/vn2008/views/thermograph.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`thermograph`
AS SELECT `t`.`id` AS `thermograph_id`,
diff --git a/db/routines/vn2008/views/ticket_observation.sql b/db/routines/vn2008/views/ticket_observation.sql
index deb85e4b6b..d2aa4733b3 100644
--- a/db/routines/vn2008/views/ticket_observation.sql
+++ b/db/routines/vn2008/views/ticket_observation.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`ticket_observation`
AS SELECT `to`.`id` AS `ticket_observation_id`,
diff --git a/db/routines/vn2008/views/tickets_gestdoc.sql b/db/routines/vn2008/views/tickets_gestdoc.sql
index a8682db577..707ca8ad86 100644
--- a/db/routines/vn2008/views/tickets_gestdoc.sql
+++ b/db/routines/vn2008/views/tickets_gestdoc.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`tickets_gestdoc`
AS SELECT `td`.`ticketFk` AS `Id_Ticket`,
diff --git a/db/routines/vn2008/views/time.sql b/db/routines/vn2008/views/time.sql
index f3bbc86076..72104e5706 100644
--- a/db/routines/vn2008/views/time.sql
+++ b/db/routines/vn2008/views/time.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`time`
AS SELECT `t`.`dated` AS `date`,
diff --git a/db/routines/vn2008/views/travel.sql b/db/routines/vn2008/views/travel.sql
index 5dc993d330..3c27f6566a 100644
--- a/db/routines/vn2008/views/travel.sql
+++ b/db/routines/vn2008/views/travel.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`travel`
AS SELECT `t`.`id` AS `id`,
diff --git a/db/routines/vn2008/views/v_Articles_botanical.sql b/db/routines/vn2008/views/v_Articles_botanical.sql
index 8640bb6380..18db5bf2e3 100644
--- a/db/routines/vn2008/views/v_Articles_botanical.sql
+++ b/db/routines/vn2008/views/v_Articles_botanical.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`v_Articles_botanical`
AS SELECT `ib`.`itemFk` AS `itemFk`,
diff --git a/db/routines/vn2008/views/v_compres.sql b/db/routines/vn2008/views/v_compres.sql
index 633feb4717..8d9c6b96b7 100644
--- a/db/routines/vn2008/views/v_compres.sql
+++ b/db/routines/vn2008/views/v_compres.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`v_compres`
AS SELECT `TP`.`Id_Tipo` AS `Familia`,
diff --git a/db/routines/vn2008/views/v_empresa.sql b/db/routines/vn2008/views/v_empresa.sql
index 5a6d6e0f59..16c9646c23 100644
--- a/db/routines/vn2008/views/v_empresa.sql
+++ b/db/routines/vn2008/views/v_empresa.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`v_empresa`
AS SELECT `e`.`logo` AS `logo`,
diff --git a/db/routines/vn2008/views/versiones.sql b/db/routines/vn2008/views/versiones.sql
index 3d27f4f927..3066327c9c 100644
--- a/db/routines/vn2008/views/versiones.sql
+++ b/db/routines/vn2008/views/versiones.sql
@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`versiones`
AS SELECT `m`.`app` AS `programa`,
diff --git a/db/routines/vn2008/views/warehouse_pickup.sql b/db/routines/vn2008/views/warehouse_pickup.sql
index c3a7268a17..739d6d9750 100644
--- a/db/routines/vn2008/views/warehouse_pickup.sql
+++ b/db/routines/vn2008/views/warehouse_pickup.sql
@@ -1,5 +1,5 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
SQL SECURITY DEFINER
VIEW `vn2008`.`warehouse_pickup`
AS SELECT
diff --git a/db/versions/10936-wheatAnthurium/00-updateACL.sql b/db/versions/10936-wheatAnthurium/00-updateACL.sql
new file mode 100644
index 0000000000..16073a23d7
--- /dev/null
+++ b/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');
diff --git a/db/versions/11132-aquaDracena/00-firstScript.sql b/db/versions/11132-aquaDracena/00-firstScript.sql
new file mode 100644
index 0000000000..08bfca3edc
--- /dev/null
+++ b/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';
diff --git a/db/versions/11306-greenMonstera/00-firstScript.sql b/db/versions/11306-greenMonstera/00-firstScript.sql
new file mode 100644
index 0000000000..c9edc6bfb9
--- /dev/null
+++ b/db/versions/11306-greenMonstera/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+ VALUES ('Ticket','getTicketProblems','READ','ALLOW','ROLE','employee');
diff --git a/db/versions/11334-grayRoebelini/00-firstScript.sql b/db/versions/11334-grayRoebelini/00-firstScript.sql
new file mode 100644
index 0000000000..5eb1076947
--- /dev/null
+++ b/db/versions/11334-grayRoebelini/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.claimConfig ADD IF NOT EXISTS daysToClaim int(11) NOT NULL DEFAULT 7 COMMENT 'Dias para reclamar';
diff --git a/db/versions/11389-yellowChico/00-firstScript.sql b/db/versions/11389-yellowChico/00-firstScript.sql
new file mode 100644
index 0000000000..feaca12788
--- /dev/null
+++ b/db/versions/11389-yellowChico/00-firstScript.sql
@@ -0,0 +1,23 @@
+CREATE TABLE vn.parkingCoordinates (
+ parkingFk int(11) NOT NULL,
+ x varchar(5) NOT NULL,
+ y varchar(5) NOT NULL,
+ z varchar(5) NOT NULL,
+ CONSTRAINT parkingCoordinates_pk PRIMARY KEY (parkingFk),
+ CONSTRAINT parkingCoordinates_parking_FK FOREIGN KEY (parkingFk) REFERENCES vn.parking(id) ON DELETE CASCADE ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO vn.parkingCoordinates (parkingFk, x, y, z)
+ SELECT id, `column`, `row`, `floor`
+ FROM vn.parking
+ WHERE `column` IS NOT NULL
+ OR `row` IS NOT NULL
+ OR `floor` IS NOT NULL;
+
+ALTER TABLE vn.parking
+ DROP COLUMN `column`,
+ DROP COLUMN `row`,
+ DROP COLUMN `floor`;
diff --git a/db/versions/11394-brownAsparagus/00-firstScript.sql b/db/versions/11394-brownAsparagus/00-firstScript.sql
new file mode 100644
index 0000000000..13b6cfa0dd
--- /dev/null
+++ b/db/versions/11394-brownAsparagus/00-firstScript.sql
@@ -0,0 +1,41 @@
+USE vn;
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+ VALUES ('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+ ('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+ ('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+ ('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('Vehicle', '__get__active', 'READ', 'ALLOW', 'ROLE', 'employee'),
+ ('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+ ('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+ ('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('Vehicle', 'create', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+ ('Vehicle', 'create', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+ ('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+ ('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative' ),
+ ('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant' ),
+ ('VehicleType', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+ ('DeliveryPoint', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
+ ('DeliveryPoint', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative');
+
+CREATE TABLE IF NOT EXISTS vehicleType (
+ id INT(11) PRIMARY KEY AUTO_INCREMENT,
+ name VARCHAR(45) NOT NULL
+);
+
+INSERT IGNORE INTO vehicleType (id, name)
+ VALUES (1,'vehículo empresa'),
+ (2, 'furgoneta'),
+ (3, 'cabeza tractora'),
+ (4, 'remolque');
+
+ALTER TABLE vehicle ADD COLUMN importCooler decimal(10,2) DEFAULT NULL;
+ALTER TABLE vehicle ADD COLUMN vehicleTypeFk INT(11) DEFAULT 1;
+ALTER TABLE vehicle ADD CONSTRAINT fk_vehicle_vehicleType FOREIGN KEY (vehicleTypeFk) REFERENCES vehicleType(id);
+
diff --git a/db/versions/11399-bronzeOak/00-firstScript.sql b/db/versions/11399-bronzeOak/00-firstScript.sql
new file mode 100644
index 0000000000..513cc96c5b
--- /dev/null
+++ b/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;
diff --git a/db/versions/11401-azureMoss/00-claimConfig.sql b/db/versions/11401-azureMoss/00-claimConfig.sql
new file mode 100644
index 0000000000..8942de33b4
--- /dev/null
+++ b/db/versions/11401-azureMoss/00-claimConfig.sql
@@ -0,0 +1,14 @@
+ALTER TABLE `vn`.`claimConfig`
+ ADD COLUMN `pickupDeliveryFk` INT(11)
+ COMMENT 'Agencia utilizada para las recogidas mediante reparto',
+ ADD COLUMN `warehouseFk` smallint(6) unsigned
+ COMMENT 'Almacén usado para los tickets de reclamaciones',
+
+ ADD CONSTRAINT `fk_claimConfig_pickupdeliveryFk`
+ FOREIGN KEY (`pickupdeliveryFk`)
+ REFERENCES `agencyMode` (`id`),
+
+ ADD CONSTRAINT `fk_claimConfig_warehouseFk`
+ FOREIGN KEY (`warehouseFk`)
+ REFERENCES `warehouse` (`id`);
+
diff --git a/db/versions/11401-azureMoss/01-createState.sql b/db/versions/11401-azureMoss/01-createState.sql
new file mode 100644
index 0000000000..8162e45a9d
--- /dev/null
+++ b/db/versions/11401-azureMoss/01-createState.sql
@@ -0,0 +1,2 @@
+INSERT IGNORE INTO vn.state (name,`order`,alertLevel,code,isPreviousPreparable,isPicked)
+ VALUES ('Recogido',3,4,'PICKED_UP',0,1)
diff --git a/db/versions/11401-azureMoss/02-claimEnd.sql b/db/versions/11401-azureMoss/02-claimEnd.sql
new file mode 100644
index 0000000000..8cc03279d2
--- /dev/null
+++ b/db/versions/11401-azureMoss/02-claimEnd.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`claimEnd`
+ ADD COLUMN `shelvingFk` INT(11) DEFAULT NULL AFTER `editorFk`,
+ ADD INDEX `claimEnd_fk_shelving` (`shelvingFk`),
+ ADD CONSTRAINT `claimEnd_fk_shelving` FOREIGN KEY (`shelvingFk`)
+ REFERENCES `shelving` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/db/versions/11401-azureMoss/03-claimDestination.sql b/db/versions/11401-azureMoss/03-claimDestination.sql
new file mode 100644
index 0000000000..09da25a88e
--- /dev/null
+++ b/db/versions/11401-azureMoss/03-claimDestination.sql
@@ -0,0 +1,8 @@
+UPDATE vn.claimDestination cd
+ SET cd.addressFk = NULL
+ WHERE code IN ('garbage/loss','manufacturing','supplierClaim','corrected');
+
+UPDATE vn.claimDestination cd
+ JOIN vn.addressWaste aw ON aw.`type` = 'fault'
+ SET cd.addressFk = aw.addressFk
+ WHERE code IN ('good');
diff --git a/db/versions/11404-azureAnthurium/00-firstScript.sql b/db/versions/11404-azureAnthurium/00-firstScript.sql
new file mode 100644
index 0000000000..58e74cbfb6
--- /dev/null
+++ b/db/versions/11404-azureAnthurium/00-firstScript.sql
@@ -0,0 +1,6 @@
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+VALUES
+ ('WorkerDms', 'hasHighPrivs', 'READ', 'ALLOW', 'ROLE', 'hr'),
+ ('Business', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
+ ('Worker', '__get__business', 'READ', 'ALLOW', 'ROLE', 'hr')
+ ;
\ No newline at end of file
diff --git a/db/versions/11441-limeCyca/00-firstScript.sql b/db/versions/11441-limeCyca/00-firstScript.sql
new file mode 100644
index 0000000000..ac0e871beb
--- /dev/null
+++ b/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';
diff --git a/db/versions/11441-limeCyca/01-firstScript.sql b/db/versions/11441-limeCyca/01-firstScript.sql
new file mode 100644
index 0000000000..f417a2c8ef
--- /dev/null
+++ b/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;
\ No newline at end of file
diff --git a/db/versions/11449-limeDracena/00-deprecate.sql b/db/versions/11449-limeDracena/00-deprecate.sql
new file mode 100644
index 0000000000..2ade5cb8bd
--- /dev/null
+++ b/db/versions/11449-limeDracena/00-deprecate.sql
@@ -0,0 +1,10 @@
+ALTER TABLE `account`.`user` DROP COLUMN `recoverPass__`;
+ALTER TABLE `account`.`user` DROP COLUMN `sync__`;
+ALTER TABLE `vn`.`client` DROP COLUMN `gestdocFk__`;
+DROP TABLE `vn`.`itemShelvingLog__`;
+DROP TABLE `vn`.`inventoryFailure__`;
+DROP TABLE `vn`.`entryVirtual__`;
+DROP TABLE `vn`.`machineWorkerConfig__`;
+DROP TABLE `vn`.`machineWorker__`;
+DROP TABLE `vn`.`inventoryFailureCause__`;
+DROP TABLE `vn`.`workerTimeControlParams__`;
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 923bb57809..0000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -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
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index eeb32f545e..d9cb3ed476 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -58,10 +58,10 @@
"Swift / BIC can't be empty": "Swift / BIC can't be empty",
"Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
"Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
- "Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}} {{ticketWeekly}}",
"Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
- "Changed sale quantity": "I have changed {{changes}} of the ticket [{{ticketId}}]({{{ticketUrl}}})",
+ "Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
+ "Changed sale quantity": "I have changed {{changes}} of the ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
"Changes in sales": "the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}*",
"Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
"Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
@@ -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",
@@ -253,5 +254,10 @@
"Sales already moved": "Sales already moved",
"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."
-}
\ No newline at end of file
+ "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 }}",
+ "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",
+ "The introduced warehouse already exists": "The introduced warehouse already exists",
+ "The code already exists": "The code already exists"
+}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index dca19e4a63..7783182c01 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -1,401 +1,404 @@
{
- "Phone format is invalid": "El formato del teléfono no es correcto",
- "You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
- "Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
- "The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
- "Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
- "Can't be blank": "No puede estar en blanco",
- "Invalid TIN": "NIF/CIF inválido",
- "TIN must be unique": "El NIF/CIF debe ser único",
- "A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
- "Is invalid": "Es inválido",
- "Quantity cannot be zero": "La cantidad no puede ser cero",
- "Enter an integer different to zero": "Introduce un entero distinto de cero",
- "Package cannot be blank": "El embalaje no puede estar en blanco",
- "The company name must be unique": "La razón social debe ser única",
- "Invalid email": "Correo electrónico inválido",
- "The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
- "That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
- "That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
- "State cannot be blank": "El estado no puede estar en blanco",
- "Worker cannot be blank": "El trabajador no puede estar en blanco",
- "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 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",
- "Phone cannot be blank": "El teléfono no puede estar en blanco",
- "Period cannot be blank": "El periodo no puede estar en blanco",
- "Choose a company": "Selecciona una empresa",
- "Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
- "Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
- "Cannot be blank": "El campo no puede estar en blanco",
- "The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
- "Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
- "Description cannot be blank": "Se debe rellenar el campo de texto",
- "The price of the item changed": "El precio del artículo cambió",
- "The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
- "The value should be a number": "El valor debe ser un numero",
- "This order is not editable": "Esta orden no se puede modificar",
- "You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
- "You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
- "is not a valid date": "No es una fecha valida",
- "Barcode must be unique": "El código de barras debe ser único",
- "The warehouse can't be repeated": "El almacén no puede repetirse",
- "The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
- "The observation type can't be repeated": "El tipo de observación no puede repetirse",
- "A claim with that sale already exists": "Ya existe una reclamación para esta línea",
- "You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
- "Warehouse cannot be blank": "El almacén no puede quedar en blanco",
- "Agency cannot be blank": "La agencia no puede quedar en blanco",
- "Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
- "This address doesn't exist": "Este consignatario no existe",
- "You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
- "You don't have enough privileges": "No tienes suficientes permisos",
- "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
- "You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos básicos de una orden con artículos",
- "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no está permitido el uso de la letra ñ",
- "You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
- "You can't create a ticket for an inactive client": "No puedes crear un ticket para un cliente inactivo",
- "Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
- "ORDER_EMPTY": "Cesta vacía",
- "You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
- "NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
- "Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
- "Street cannot be empty": "Dirección no puede estar en blanco",
- "City cannot be empty": "Ciudad no puede estar en blanco",
- "Code cannot be blank": "Código no puede estar en blanco",
- "You cannot remove this department": "No puedes eliminar este departamento",
- "The extension must be unique": "La extensión debe ser unica",
- "The secret can't be blank": "La contraseña no puede estar en blanco",
- "We weren't able to send this SMS": "No hemos podido enviar el SMS",
- "This client can't be invoiced": "Este cliente no puede ser facturado",
- "You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
- "This ticket can't be invoiced": "Este ticket no puede ser facturado",
- "You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
- "This ticket can not be modified": "Este ticket no puede ser modificado",
- "The introduced hour already exists": "Esta hora ya ha sido introducida",
- "INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
- "The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
- "NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
- "ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
- "The current ticket can't be modified": "El ticket actual no puede ser modificado",
- "The current claim can't be modified": "La reclamación actual no puede ser modificada",
- "The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
- "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
- "Please select at least one sale": "Por favor selecciona al menos una linea",
- "All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
- "NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
- "This item doesn't exists": "El artículo no existe",
- "NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
- "Extension format is invalid": "El formato de la extensión es inválido",
- "Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
- "This item is not available": "Este artículo no está disponible",
- "This postcode already exists": "Este código postal ya existe",
- "Concept cannot be blank": "El concepto no puede quedar en blanco",
- "File doesn't exists": "El archivo no existe",
- "You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
- "This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
- "Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
- "Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
- "You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
- "The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
- "Invalid quantity": "Cantidad invalida",
- "This postal code is not valid": "Este código postal no es válido",
- "is invalid": "es inválido",
- "The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
- "The department name can't be repeated": "El nombre del departamento no puede repetirse",
- "This phone already exists": "Este teléfono ya existe",
- "You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
- "You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
- "You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
- "You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
- "You should specify a date": "Debes especificar una fecha",
- "You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fin",
- "Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fin",
- "You should mark at least one week day": "Debes marcar al menos un día de la semana",
- "Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
- "Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
- "Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
- "Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
- "Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
- "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
- "Changed sale quantity": "He cambiado {{changes}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
- "Changes in sales": "la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}*",
- "State": "Estado",
- "regular": "normal",
- "reserved": "reservado",
- "Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
- "Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
- "MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
- "Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
- "Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
- "Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
- "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*, con el tipo de recogida *{{claimPickup}}*",
- "Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
- "Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
- "ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
- "Distance must be lesser than 4000": "La distancia debe ser inferior a 4000",
- "This ticket is deleted": "Este ticket está eliminado",
- "Unable to clone this travel": "No ha sido posible clonar este travel",
- "This thermograph id already exists": "La id del termógrafo ya existe",
- "Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
- "ORDER_ALREADY_CONFIRMED": "ORDEN YA CONFIRMADA",
- "Invalid password": "Invalid password",
- "Password does not meet requirements": "La contraseña no cumple los requisitos",
- "Role already assigned": "Rol ya asignado",
- "Invalid role name": "Nombre de rol no válido",
- "Role name must be written in camelCase": "El nombre del rol debe escribirse en camelCase",
- "Email already exists": "El correo ya existe",
- "User already exists": "El/La usuario/a ya existe",
- "Absence change notification on the labour calendar": "Notificación de cambio de ausencia en el calendario laboral",
- "Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
- "Created absence": "El empleado {{author}} ha añadido una ausencia de tipo '{{absenceType}}' a {{employee}} para el día {{dated}}.",
- "Deleted absence": "El empleado {{author}} ha eliminado una ausencia de tipo '{{absenceType}}' a {{employee}} del día {{dated}}.",
- "I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
- "I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
- "You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
- "Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "agencyModeFk": "Agencia",
- "clientFk": "Cliente",
- "zoneFk": "Zona",
- "warehouseFk": "Almacén",
- "shipped": "F. envío",
- "landed": "F. entrega",
- "addressFk": "Consignatario",
- "companyFk": "Empresa",
- "agency": "Agencia",
- "delivery": "Reparto",
- "The social name cannot be empty": "La razón social no puede quedar en blanco",
- "The nif cannot be empty": "El NIF no puede quedar en blanco",
- "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
- "ASSIGN_ZONE_FIRST": "Asigna una zona primero",
- "Amount cannot be zero": "El importe no puede ser cero",
- "Company has to be official": "Empresa inválida",
- "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
- "Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
- "The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
- "New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
- "New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
- "Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
- "This BIC already exist.": "Este BIC ya existe.",
- "That item doesn't exists": "Ese artículo no existe",
- "There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
- "Invalid account": "Cuenta inválida",
- "Compensation account is empty": "La cuenta para compensar está vacia",
- "This genus already exist": "Este genus ya existe",
- "This specie already exist": "Esta especie ya existe",
- "Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
- "None": "Ninguno",
- "The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
- "Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
- "This document already exists on this ticket": "Este documento ya existe en el ticket",
- "Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
- "You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
- "nickname": "nickname",
- "INACTIVE_PROVIDER": "Proveedor inactivo",
- "This client is not invoiceable": "Este cliente no es facturable",
- "serial non editable": "Esta serie no permite asignar la referencia",
- "Max shipped required": "La fecha límite es requerida",
- "Can't invoice to future": "No se puede facturar a futuro",
- "Can't invoice to past": "No se puede facturar a pasado",
- "This ticket is already invoiced": "Este ticket ya está facturado",
- "A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
- "A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
- "Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
- "Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
- "Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
- "You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
- "You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
- "Amounts do not match": "Las cantidades no coinciden",
- "The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
- "The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
- "You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
- "The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
- "The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
- "You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
- "The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
- "Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
- "You don't have privileges to create refund": "No tienes permisos para crear un abono",
- "The item is required": "El artículo es requerido",
- "The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
- "date in the future": "Fecha en el futuro",
- "reference duplicated": "Referencia duplicada",
- "This ticket is already a refund": "Este ticket ya es un abono",
- "isWithoutNegatives": "Sin negativos",
- "routeFk": "routeFk",
- "Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
- "No hay un contrato en vigor": "No hay un contrato en vigor",
- "No se permite fichar a futuro": "No se permite fichar a futuro",
- "No está permitido trabajar": "No está permitido trabajar",
- "Fichadas impares": "Fichadas impares",
- "Descanso diario 12h.": "Descanso diario 12h.",
- "Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
- "Dirección incorrecta": "Dirección incorrecta",
- "Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
- "Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
- "Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
- "This route does not exists": "Esta ruta no existe",
- "Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
- "You don't have grant privilege": "No tienes privilegios para dar privilegios",
- "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
- "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
- "Already has this status": "Ya tiene este estado",
- "There aren't records for this week": "No existen registros para esta semana",
- "Empty data source": "Origen de datos vacio",
- "App locked": "Aplicación bloqueada por el usuario {{userId}}",
- "Email verify": "Correo de verificación",
- "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
- "Receipt's bank was not found": "No se encontró el banco del recibo",
- "This receipt was not compensated": "Este recibo no ha sido compensado",
- "Client's email was not found": "No se encontró el email del cliente",
- "Negative basis": "Base negativa",
- "This worker code already exists": "Este codigo de trabajador ya existe",
- "This personal mail already exists": "Este correo personal ya existe",
- "This worker already exists": "Este trabajador ya existe",
- "App name does not exist": "El nombre de aplicación no es válido",
- "Try again": "Vuelve a intentarlo",
- "Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
- "Failed to upload delivery note": "Error al subir albarán {{id}}",
- "The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
- "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
- "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
- "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
- "A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
- "There is no assigned email for this client": "No hay correo asignado para este cliente",
- "Exists an invoice with a future date": "Existe una factura con fecha posterior",
- "Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
- "Warehouse inventory not set": "El almacén inventario no está establecido",
- "This locker has already been assigned": "Esta taquilla ya ha sido asignada",
- "Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %s",
- "Not exist this branch": "La rama no existe",
- "This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
- "Collection does not exist": "La colección no existe",
- "Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
- "Insert a date range": "Inserte un rango de fechas",
- "Added observation": "{{user}} añadió esta observacion: {{text}} {{defaulterId}} ({{{defaulterUrl}}})",
- "Comment added to client": "Observación añadida al cliente {{clientFk}}",
- "Invalid auth code": "Código de verificación incorrecto",
- "Invalid or expired verification code": "Código de verificación incorrecto o expirado",
- "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
- "company": "Compañía",
- "country": "País",
- "clientId": "Id cliente",
- "clientSocialName": "Cliente",
- "amount": "Importe",
- "taxableBase": "Base",
- "ticketFk": "Id ticket",
- "isActive": "Activo",
- "hasToInvoice": "Facturar",
- "isTaxDataChecked": "Datos comprobados",
- "comercialId": "Id comercial",
- "comercialName": "Comercial",
- "Pass expired": "La contraseña ha caducado, cambiela desde Salix",
- "Invalid NIF for VIES": "Invalid NIF for VIES",
- "Ticket does not exist": "Este ticket no existe",
- "Ticket is already signed": "Este ticket ya ha sido firmado",
- "Authentication failed": "Autenticación fallida",
- "You can't use the same password": "No puedes usar la misma contraseña",
- "You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
- "Fecha fuera de rango": "Fecha fuera de rango",
- "Error while generating PDF": "Error al generar PDF",
- "Error when sending mail to client": "Error al enviar el correo al cliente",
- "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
- "The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
- "Valid priorities": "Prioridades válidas: %d",
- "hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
- "hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
- "You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
- "This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
- "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
- "You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
- "This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
- "You don't have enough privileges.": "No tienes suficientes permisos.",
- "This ticket is locked": "Este ticket está bloqueado.",
- "This ticket is not editable.": "Este ticket no es editable.",
- "The ticket doesn't exist.": "No existe el ticket.",
- "Social name should be uppercase": "La razón social debe ir en mayúscula",
- "Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
- "Ticket without Route": "Ticket sin ruta",
- "Select a different client": "Seleccione un cliente distinto",
- "Fill all the fields": "Rellene todos los campos",
- "The response is not a PDF": "La respuesta no es un PDF",
- "Booking completed": "Reserva completada",
- "The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
- "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
- "User disabled": "Usuario desactivado",
- "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
- "quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
- "Cannot past travels with entries": "No se pueden pasar envíos con entradas",
- "It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
- "This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
- "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
- "Field are invalid": "El campo '{{tag}}' no es válido",
- "Incorrect pin": "Pin incorrecto.",
- "You already have the mailAlias": "Ya tienes este alias de correo",
- "The alias cant be modified": "Este alias de correo no puede ser modificado",
- "No tickets to invoice": "No hay tickets para facturar que cumplan los requisitos de facturación",
- "this warehouse has not dms": "El Almacén no acepta documentos",
- "This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
- "Name should be uppercase": "El nombre debe ir en mayúscula",
- "Bank entity must be specified": "La entidad bancaria es obligatoria",
- "An email is necessary": "Es necesario un email",
- "You cannot update these fields": "No puedes actualizar estos campos",
- "CountryFK cannot be empty": "El país no puede estar vacío",
- "Cmr file does not exist": "El archivo del cmr no existe",
- "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
- "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
- "No invoice series found for these parameters": "No se encontró una serie para estos parámetros",
- "The line could not be marked": "La linea no puede ser marcada",
- "Through this procedure, it is not possible to modify the password of users with verified email": "Mediante este procedimiento, no es posible modificar la contraseña de usuarios con correo verificado",
- "They're not your subordinate": "No es tu subordinado/a.",
- "No results found": "No se han encontrado resultados",
- "InvoiceIn is already booked": "La factura recibida está contabilizada",
- "This workCenter is already assigned to this agency": "Este centro de trabajo ya está asignado a esta agencia",
- "Select ticket or client": "Elija un ticket o un client",
- "It was not able to create the invoice": "No se pudo crear la factura",
- "Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE",
- "You can not use the same password": "No puedes usar la misma contraseña",
- "This PDA is already assigned to another user": "Este PDA ya está asignado a otro usuario",
- "You can only have one PDA": "Solo puedes tener un PDA",
- "The invoices have been created but the PDFs could not be generated": "Se ha facturado pero no se ha podido generar el PDF",
- "It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono",
- "Payment method is required": "El método de pago es obligatorio",
- "Cannot send mail": "Não é possível enviar o email",
- "CONSTRAINT `supplierAccountTooShort` failed for `vn`.`supplier`": "La cuenta debe tener exactamente 10 dígitos",
- "The sale not exists in the item shelving": "La venta no existe en la estantería del artículo",
- "The entry not have stickers": "La entrada no tiene etiquetas",
- "Too many records": "Demasiados registros",
- "Original invoice not found": "Factura original no encontrada",
- "The entry has no lines or does not exist": "La entrada no tiene lineas o no existe",
- "Weight already set": "El peso ya está establecido",
- "This ticket is not allocated to your department": "Este ticket no está asignado a tu departamento",
- "There is already a tray with the same height": "Ya existe una bandeja con la misma altura",
- "The height must be greater than 50cm": "La altura debe ser superior a 50cm",
- "The maximum height of the wagon is 200cm": "La altura máxima es 200cm",
- "The entry does not have stickers": "La entrada no tiene etiquetas",
- "This buyer has already made a reservation for this date": "Este comprador ya ha hecho una reserva para esta fecha",
- "No valid travel thermograph found": "No se encontró un termógrafo válido",
- "The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea",
- "type cannot be blank": "Se debe rellenar el tipo",
- "There are tickets for this area, delete them first": "Hay tickets para esta sección, borralos primero",
- "There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén",
- "You do not have permission to modify the booked field": "No tienes permisos para modificar el campo contabilizada",
- "ticketLostExpedition": "El ticket [{{ticketId}}]({{{ticketUrl}}}) tiene la siguiente expedición perdida:{{ expeditionId }}",
- "The web user's email already exists": "El correo del usuario web ya existe",
- "Sales already moved": "Ya han sido transferidas",
- "The raid information is not correct": "La información de la redada no es correcta",
- "An item type with the same code already exists": "Un tipo con el mismo código ya existe",
- "Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
- "All tickets have a route order": "Todos los tickets tienen orden de ruta",
- "There are tickets to be invoiced": "La zona tiene tickets por facturar",
- "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"
-
-}
+ "Phone format is invalid": "El formato del teléfono no es correcto",
+ "You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
+ "Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
+ "The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
+ "Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
+ "Can't be blank": "No puede estar en blanco",
+ "Invalid TIN": "NIF/CIF inválido",
+ "TIN must be unique": "El NIF/CIF debe ser único",
+ "A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
+ "Is invalid": "Es inválido",
+ "Quantity cannot be zero": "La cantidad no puede ser cero",
+ "Enter an integer different to zero": "Introduce un entero distinto de cero",
+ "Package cannot be blank": "El embalaje no puede estar en blanco",
+ "The company name must be unique": "La razón social debe ser única",
+ "Invalid email": "Correo electrónico inválido",
+ "The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
+ "That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
+ "That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
+ "State cannot be blank": "El estado no puede estar en blanco",
+ "Worker cannot be blank": "El trabajador no puede estar en blanco",
+ "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 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",
+ "Phone cannot be blank": "El teléfono no puede estar en blanco",
+ "Period cannot be blank": "El periodo no puede estar en blanco",
+ "Choose a company": "Selecciona una empresa",
+ "Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
+ "Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
+ "Cannot be blank": "El campo no puede estar en blanco",
+ "The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
+ "Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
+ "Description cannot be blank": "Se debe rellenar el campo de texto",
+ "The price of the item changed": "El precio del artículo cambió",
+ "The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
+ "The value should be a number": "El valor debe ser un numero",
+ "This order is not editable": "Esta orden no se puede modificar",
+ "You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
+ "You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
+ "is not a valid date": "No es una fecha valida",
+ "Barcode must be unique": "El código de barras debe ser único",
+ "The warehouse can't be repeated": "El almacén no puede repetirse",
+ "The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
+ "The observation type can't be repeated": "El tipo de observación no puede repetirse",
+ "A claim with that sale already exists": "Ya existe una reclamación para esta línea",
+ "You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
+ "Warehouse cannot be blank": "El almacén no puede quedar en blanco",
+ "Agency cannot be blank": "La agencia no puede quedar en blanco",
+ "Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
+ "This address doesn't exist": "Este consignatario no existe",
+ "You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
+ "You don't have enough privileges": "No tienes suficientes permisos",
+ "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
+ "You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos básicos de una orden con artículos",
+ "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no está permitido el uso de la letra ñ",
+ "You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
+ "You can't create a ticket for an inactive client": "No puedes crear un ticket para un cliente inactivo",
+ "Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
+ "ORDER_EMPTY": "Cesta vacía",
+ "You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
+ "NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
+ "Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
+ "Street cannot be empty": "Dirección no puede estar en blanco",
+ "City cannot be empty": "Ciudad no puede estar en blanco",
+ "Code cannot be blank": "Código no puede estar en blanco",
+ "You cannot remove this department": "No puedes eliminar este departamento",
+ "The extension must be unique": "La extensión debe ser unica",
+ "The secret can't be blank": "La contraseña no puede estar en blanco",
+ "We weren't able to send this SMS": "No hemos podido enviar el SMS",
+ "This client can't be invoiced": "Este cliente no puede ser facturado",
+ "You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
+ "This ticket can't be invoiced": "Este ticket no puede ser facturado",
+ "You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
+ "This ticket can not be modified": "Este ticket no puede ser modificado",
+ "The introduced hour already exists": "Esta hora ya ha sido introducida",
+ "INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
+ "The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
+ "NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
+ "ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
+ "The current ticket can't be modified": "El ticket actual no puede ser modificado",
+ "The current claim can't be modified": "La reclamación actual no puede ser modificada",
+ "The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
+ "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
+ "Please select at least one sale": "Por favor selecciona al menos una linea",
+ "All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
+ "NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
+ "This item doesn't exists": "El artículo no existe",
+ "NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
+ "Extension format is invalid": "El formato de la extensión es inválido",
+ "Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
+ "This item is not available": "Este artículo no está disponible",
+ "This postcode already exists": "Este código postal ya existe",
+ "Concept cannot be blank": "El concepto no puede quedar en blanco",
+ "File doesn't exists": "El archivo no existe",
+ "You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
+ "This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
+ "Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
+ "Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
+ "You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
+ "The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
+ "Invalid quantity": "Cantidad invalida",
+ "This postal code is not valid": "Este código postal no es válido",
+ "is invalid": "es inválido",
+ "The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
+ "The department name can't be repeated": "El nombre del departamento no puede repetirse",
+ "This phone already exists": "Este teléfono ya existe",
+ "You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
+ "You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
+ "You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
+ "You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
+ "You should specify a date": "Debes especificar una fecha",
+ "You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fin",
+ "Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fin",
+ "You should mark at least one week day": "Debes marcar al menos un día de la semana",
+ "Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
+ "Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
+ "Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
+ "Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
+ "Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
+ "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}} {{ticketWeekly}}",
+ "Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}} ",
+ "Changed sale quantity": "He cambiado {{changes}} del ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
+ "Changes in sales": "la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}*",
+ "State": "Estado",
+ "regular": "normal",
+ "reserved": "reservado",
+ "Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
+ "Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
+ "MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
+ "Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
+ "Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
+ "Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
+ "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*, con el tipo de recogida *{{claimPickup}}*",
+ "Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
+ "Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
+ "ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
+ "Distance must be lesser than 4000": "La distancia debe ser inferior a 4000",
+ "This ticket is deleted": "Este ticket está eliminado",
+ "Unable to clone this travel": "No ha sido posible clonar este travel",
+ "This thermograph id already exists": "La id del termógrafo ya existe",
+ "Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
+ "ORDER_ALREADY_CONFIRMED": "ORDEN YA CONFIRMADA",
+ "Invalid password": "Invalid password",
+ "Password does not meet requirements": "La contraseña no cumple los requisitos",
+ "Role already assigned": "Rol ya asignado",
+ "Invalid role name": "Nombre de rol no válido",
+ "Role name must be written in camelCase": "El nombre del rol debe escribirse en camelCase",
+ "Email already exists": "El correo ya existe",
+ "User already exists": "El/La usuario/a ya existe",
+ "Absence change notification on the labour calendar": "Notificación de cambio de ausencia en el calendario laboral",
+ "Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
+ "Created absence": "El empleado {{author}} ha añadido una ausencia de tipo '{{absenceType}}' a {{employee}} para el día {{dated}}.",
+ "Deleted absence": "El empleado {{author}} ha eliminado una ausencia de tipo '{{absenceType}}' a {{employee}} del día {{dated}}.",
+ "I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
+ "I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
+ "You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
+ "Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "agencyModeFk": "Agencia",
+ "clientFk": "Cliente",
+ "zoneFk": "Zona",
+ "warehouseFk": "Almacén",
+ "shipped": "F. envío",
+ "landed": "F. entrega",
+ "addressFk": "Consignatario",
+ "companyFk": "Empresa",
+ "agency": "Agencia",
+ "delivery": "Reparto",
+ "The social name cannot be empty": "La razón social no puede quedar en blanco",
+ "The nif cannot be empty": "El NIF no puede quedar en blanco",
+ "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
+ "ASSIGN_ZONE_FIRST": "Asigna una zona primero",
+ "Amount cannot be zero": "El importe no puede ser cero",
+ "Company has to be official": "Empresa inválida",
+ "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
+ "Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
+ "The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
+ "New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
+ "New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
+ "Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
+ "This BIC already exist.": "Este BIC ya existe.",
+ "That item doesn't exists": "Ese artículo no existe",
+ "There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
+ "Invalid account": "Cuenta inválida",
+ "Compensation account is empty": "La cuenta para compensar está vacia",
+ "This genus already exist": "Este genus ya existe",
+ "This specie already exist": "Esta especie ya existe",
+ "Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
+ "None": "Ninguno",
+ "The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
+ "Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
+ "This document already exists on this ticket": "Este documento ya existe en el ticket",
+ "Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
+ "You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
+ "nickname": "nickname",
+ "INACTIVE_PROVIDER": "Proveedor inactivo",
+ "This client is not invoiceable": "Este cliente no es facturable",
+ "serial non editable": "Esta serie no permite asignar la referencia",
+ "Max shipped required": "La fecha límite es requerida",
+ "Can't invoice to future": "No se puede facturar a futuro",
+ "Can't invoice to past": "No se puede facturar a pasado",
+ "This ticket is already invoiced": "Este ticket ya está facturado",
+ "A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
+ "A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
+ "Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
+ "Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
+ "Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
+ "You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
+ "You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
+ "Amounts do not match": "Las cantidades no coinciden",
+ "The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
+ "The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
+ "You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
+ "The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
+ "The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
+ "You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
+ "The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
+ "Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
+ "You don't have privileges to create refund": "No tienes permisos para crear un abono",
+ "The item is required": "El artículo es requerido",
+ "The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
+ "date in the future": "Fecha en el futuro",
+ "reference duplicated": "Referencia duplicada",
+ "This ticket is already a refund": "Este ticket ya es un abono",
+ "isWithoutNegatives": "Sin negativos",
+ "routeFk": "routeFk",
+ "Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
+ "No hay un contrato en vigor": "No hay un contrato en vigor",
+ "No se permite fichar a futuro": "No se permite fichar a futuro",
+ "No está permitido trabajar": "No está permitido trabajar",
+ "Fichadas impares": "Fichadas impares",
+ "Descanso diario 12h.": "Descanso diario 12h.",
+ "Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
+ "Dirección incorrecta": "Dirección incorrecta",
+ "Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
+ "Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
+ "Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
+ "This route does not exists": "Esta ruta no existe",
+ "Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
+ "You don't have grant privilege": "No tienes privilegios para dar privilegios",
+ "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
+ "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
+ "Already has this status": "Ya tiene este estado",
+ "There aren't records for this week": "No existen registros para esta semana",
+ "Empty data source": "Origen de datos vacio",
+ "App locked": "Aplicación bloqueada por el usuario {{userId}}",
+ "Email verify": "Correo de verificación",
+ "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
+ "Receipt's bank was not found": "No se encontró el banco del recibo",
+ "This receipt was not compensated": "Este recibo no ha sido compensado",
+ "Client's email was not found": "No se encontró el email del cliente",
+ "Negative basis": "Base negativa",
+ "This worker code already exists": "Este codigo de trabajador ya existe",
+ "This personal mail already exists": "Este correo personal ya existe",
+ "This worker already exists": "Este trabajador ya existe",
+ "App name does not exist": "El nombre de aplicación no es válido",
+ "Try again": "Vuelve a intentarlo",
+ "Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
+ "Failed to upload delivery note": "Error al subir albarán {{id}}",
+ "The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
+ "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
+ "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
+ "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
+ "A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
+ "There is no assigned email for this client": "No hay correo asignado para este cliente",
+ "Exists an invoice with a future date": "Existe una factura con fecha posterior",
+ "Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
+ "Warehouse inventory not set": "El almacén inventario no está establecido",
+ "This locker has already been assigned": "Esta taquilla ya ha sido asignada",
+ "Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %s",
+ "Not exist this branch": "La rama no existe",
+ "This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
+ "Collection does not exist": "La colección no existe",
+ "Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
+ "Insert a date range": "Inserte un rango de fechas",
+ "Added observation": "{{user}} añadió esta observacion: {{text}} {{defaulterId}} ({{{defaulterUrl}}})",
+ "Comment added to client": "Observación añadida al cliente {{clientFk}}",
+ "Invalid auth code": "Código de verificación incorrecto",
+ "Invalid or expired verification code": "Código de verificación incorrecto o expirado",
+ "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
+ "company": "Compañía",
+ "country": "País",
+ "clientId": "Id cliente",
+ "clientSocialName": "Cliente",
+ "amount": "Importe",
+ "taxableBase": "Base",
+ "ticketFk": "Id ticket",
+ "isActive": "Activo",
+ "hasToInvoice": "Facturar",
+ "isTaxDataChecked": "Datos comprobados",
+ "comercialId": "Id comercial",
+ "comercialName": "Comercial",
+ "Pass expired": "La contraseña ha caducado, cambiela desde Salix",
+ "Invalid NIF for VIES": "Invalid NIF for VIES",
+ "Ticket does not exist": "Este ticket no existe",
+ "Ticket is already signed": "Este ticket ya ha sido firmado",
+ "Authentication failed": "Autenticación fallida",
+ "You can't use the same password": "No puedes usar la misma contraseña",
+ "You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
+ "Fecha fuera de rango": "Fecha fuera de rango",
+ "Error while generating PDF": "Error al generar PDF",
+ "Error when sending mail to client": "Error al enviar el correo al cliente",
+ "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
+ "The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
+ "Valid priorities": "Prioridades válidas: %d",
+ "hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
+ "hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
+ "You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
+ "This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
+ "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
+ "You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
+ "This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
+ "You don't have enough privileges.": "No tienes suficientes permisos.",
+ "This ticket is locked": "Este ticket está bloqueado.",
+ "This ticket is not editable.": "Este ticket no es editable.",
+ "The ticket doesn't exist.": "No existe el ticket.",
+ "Social name should be uppercase": "La razón social debe ir en mayúscula",
+ "Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
+ "Ticket without Route": "Ticket sin ruta",
+ "Select a different client": "Seleccione un cliente distinto",
+ "Fill all the fields": "Rellene todos los campos",
+ "The response is not a PDF": "La respuesta no es un PDF",
+ "Booking completed": "Reserva completada",
+ "The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
+ "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
+ "User disabled": "Usuario desactivado",
+ "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
+ "quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
+ "Cannot past travels with entries": "No se pueden pasar envíos con entradas",
+ "It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+ "This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
+ "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
+ "Field are invalid": "El campo '{{tag}}' no es válido",
+ "Incorrect pin": "Pin incorrecto.",
+ "You already have the mailAlias": "Ya tienes este alias de correo",
+ "The alias cant be modified": "Este alias de correo no puede ser modificado",
+ "No tickets to invoice": "No hay tickets para facturar que cumplan los requisitos de facturación",
+ "this warehouse has not dms": "El Almacén no acepta documentos",
+ "This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
+ "Name should be uppercase": "El nombre debe ir en mayúscula",
+ "Bank entity must be specified": "La entidad bancaria es obligatoria",
+ "An email is necessary": "Es necesario un email",
+ "You cannot update these fields": "No puedes actualizar estos campos",
+ "CountryFK cannot be empty": "El país no puede estar vacío",
+ "Cmr file does not exist": "El archivo del cmr no existe",
+ "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
+ "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
+ "No invoice series found for these parameters": "No se encontró una serie para estos parámetros",
+ "The line could not be marked": "La linea no puede ser marcada",
+ "Through this procedure, it is not possible to modify the password of users with verified email": "Mediante este procedimiento, no es posible modificar la contraseña de usuarios con correo verificado",
+ "They're not your subordinate": "No es tu subordinado/a.",
+ "No results found": "No se han encontrado resultados",
+ "InvoiceIn is already booked": "La factura recibida está contabilizada",
+ "This workCenter is already assigned to this agency": "Este centro de trabajo ya está asignado a esta agencia",
+ "Select ticket or client": "Elija un ticket o un client",
+ "It was not able to create the invoice": "No se pudo crear la factura",
+ "Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE",
+ "You can not use the same password": "No puedes usar la misma contraseña",
+ "This PDA is already assigned to another user": "Este PDA ya está asignado a otro usuario",
+ "You can only have one PDA": "Solo puedes tener un PDA",
+ "The invoices have been created but the PDFs could not be generated": "Se ha facturado pero no se ha podido generar el PDF",
+ "It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono",
+ "Payment method is required": "El método de pago es obligatorio",
+ "Cannot send mail": "Não é possível enviar o email",
+ "CONSTRAINT `supplierAccountTooShort` failed for `vn`.`supplier`": "La cuenta debe tener exactamente 10 dígitos",
+ "The sale not exists in the item shelving": "La venta no existe en la estantería del artículo",
+ "The entry not have stickers": "La entrada no tiene etiquetas",
+ "Too many records": "Demasiados registros",
+ "Original invoice not found": "Factura original no encontrada",
+ "The entry has no lines or does not exist": "La entrada no tiene lineas o no existe",
+ "Weight already set": "El peso ya está establecido",
+ "This ticket is not allocated to your department": "Este ticket no está asignado a tu departamento",
+ "There is already a tray with the same height": "Ya existe una bandeja con la misma altura",
+ "The height must be greater than 50cm": "La altura debe ser superior a 50cm",
+ "The maximum height of the wagon is 200cm": "La altura máxima es 200cm",
+ "The entry does not have stickers": "La entrada no tiene etiquetas",
+ "This buyer has already made a reservation for this date": "Este comprador ya ha hecho una reserva para esta fecha",
+ "No valid travel thermograph found": "No se encontró un termógrafo válido",
+ "The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea",
+ "type cannot be blank": "Se debe rellenar el tipo",
+ "There are tickets for this area, delete them first": "Hay tickets para esta sección, borralos primero",
+ "There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén",
+ "You do not have permission to modify the booked field": "No tienes permisos para modificar el campo contabilizada",
+ "ticketLostExpedition": "El ticket [{{ticketId}}]({{{ticketUrl}}}) tiene la siguiente expedición perdida:{{ expeditionId }}",
+ "The web user's email already exists": "El correo del usuario web ya existe",
+ "Sales already moved": "Ya han sido transferidas",
+ "The raid information is not correct": "La información de la redada no es correcta",
+ "An item type with the same code already exists": "Un tipo con el mismo código ya existe",
+ "Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
+ "All tickets have a route order": "Todos los tickets tienen orden de ruta",
+ "There are tickets to be invoiced": "La zona tiene tickets por facturar",
+ "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}}",
+ "negativeReplaced": "Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
+ "The introduced warehouse already exists": "El almacén seleccionado ya existe en la zona",
+ "The code already exists": "El código ya existe"
+}
\ No newline at end of file
diff --git a/loopback/locale/fr.json b/loopback/locale/fr.json
index 378b0d2671..1dd33fed96 100644
--- a/loopback/locale/fr.json
+++ b/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."
-}
\ No newline at end of file
+ "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}}})"
+}
diff --git a/loopback/locale/pt.json b/loopback/locale/pt.json
index 35fe3d4f17..84bd14a6de 100644
--- a/loopback/locale/pt.json
+++ b/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."
-}
\ No newline at end of file
+ "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}}})"
+}
diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
index a0dc2248c4..5a08140e7f 100644
--- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
+++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
@@ -74,66 +74,77 @@ module.exports = Self => {
}
try {
- const worker = await models.Worker.findOne({
- where: {id: userId}
- }, myOptions);
-
- const obsevationType = await models.ObservationType.findOne({
- where: {code: 'salesPerson'}
- }, myOptions);
-
- const agencyMode = await models.AgencyMode.findOne({
- where: {code: 'refund'}
- }, myOptions);
-
- const state = await models.State.findOne({
- where: {code: 'DELIVERED'}
- }, myOptions);
-
- const zone = await models.Zone.findOne({
- where: {agencyModeFk: agencyMode.id}
- }, myOptions);
-
const claim = await models.Claim.findOne(filter, myOptions);
const today = Date.vnNew();
+ let agencyModeFk;
+ let nickname;
+ let state;
+ let discountValue = null;
+ let packages = 0;
+ const claimConfig = await models.ClaimConfig.findOne();
+ const warehouseFk = claimConfig.warehouseFk;
+ if (claim.pickup === null || claim.pickup == 'agency') {
+ state = await models.State.findOne({
+ where: {code: 'DELIVERED'}
+ }, myOptions);
+ const agencyMode = await models.AgencyMode.findOne({
+ where: {code: 'refund'}
+ }, myOptions);
+ agencyModeFk = agencyMode.id;
+ nickname = `Abono del: ${claim.ticketFk}`;
+ } else {
+ discountValue = 100;
+ packages = 1;
+ state = await models.State.findOne({
+ where: {code: 'WAITING_FOR_PICKUP'}
+ }, myOptions);
+
+ nickname = `Recogida pendiente del: ${claim.ticketFk}`;
+
+ agencyModeFk = claimConfig.pickupDeliveryFk;
+ }
+ const nextShipped = await models.Agency.getShipped(
+ ctx, today, claim.ticket().addressFk, agencyModeFk, warehouseFk, myOptions
+ );
const newRefundTicket = await models.Ticket.create({
clientFk: claim.ticket().clientFk,
- shipped: today,
- landed: today,
- nickname: `Abono del: ${claim.ticketFk}`,
- warehouseFk: claim.ticket().warehouseFk,
+ shipped: nextShipped,
+ landed: null,
+ nickname,
+ warehouseFk,
companyFk: claim.ticket().companyFk,
addressFk: claim.ticket().addressFk,
- agencyModeFk: agencyMode.id,
- zoneFk: zone.id
+ agencyModeFk,
+ zoneFk: claim.ticket().zoneFk,
+ packages
}, myOptions);
+ if (claim.pickup == 'pickup') {
+ const observationDelivery =
+ await models.ObservationType.findOne({where: {code: 'delivery'}}, myOptions);
+
+ await saveObservation({
+ description: `recoger reclamación: ${claim.id}`,
+ ticketFk: newRefundTicket.id,
+ observationTypeFk: observationDelivery.id
+ }, myOptions);
+ }
await models.TicketRefund.create({
refundTicketFk: newRefundTicket.id,
originalTicketFk: claim.ticket().id
}, myOptions);
- await saveObservation({
- description: `Reclama ticket: ${claim.ticketFk}`,
- ticketFk: newRefundTicket.id,
- observationTypeFk: obsevationType.id
- }, myOptions);
+ const salesToRefund = await models.ClaimBeginning.find(salesFilter, myOptions);
+ const createdSales = await addSalesToTicket(salesToRefund, newRefundTicket.id, discountValue, myOptions);
+ await insertIntoClaimEnd(createdSales, id, userId, myOptions);
await models.Ticket.state(ctx, {
ticketFk: newRefundTicket.id,
stateFk: state.id,
- userFk: worker.id
+ userFk: userId
}, myOptions);
- const salesToRefund = await models.ClaimBeginning.find(salesFilter, myOptions);
- const createdSales = await addSalesToTicket(salesToRefund, newRefundTicket.id, myOptions);
- await insertIntoClaimEnd(createdSales, id, worker.id, myOptions);
-
- await Self.rawSql('CALL vn.ticketCalculateClon(?, ?)', [
- newRefundTicket.id, claim.ticketFk
- ], myOptions);
-
if (tx) await tx.commit();
return newRefundTicket;
@@ -143,23 +154,36 @@ module.exports = Self => {
}
};
- async function addSalesToTicket(salesToRefund, ticketId, options) {
- let formatedSales = [];
- salesToRefund.forEach(sale => {
- let formatedSale = {
- itemFk: sale.sale().itemFk,
- ticketFk: ticketId,
- concept: sale.sale().concept,
- quantity: -Math.abs(sale.quantity),
- price: sale.sale().price,
- discount: sale.sale().discount,
- reserved: sale.sale().reserved,
- isPicked: sale.sale().isPicked,
- created: sale.sale().created
+ async function addSalesToTicket(salesToRefund, newTicketId, discountValue, options) {
+ const createdSales = [];
+ const models = Self.app.models;
+ for (const saleToRefund of salesToRefund) {
+ const oldSale = saleToRefund.sale();
+ const newSaleData = {
+ itemFk: oldSale.itemFk,
+ ticketFk: newTicketId,
+ concept: oldSale.concept,
+ quantity: -Math.abs(saleToRefund.quantity),
+ price: oldSale.price,
+ discount: discountValue ?? oldSale.discount,
+ reserved: oldSale.reserved,
+ isPicked: oldSale.isPicked,
+ created: oldSale.created
};
- formatedSales.push(formatedSale);
- });
- return await Self.app.models.Sale.create(formatedSales, options);
+ const newSale = await models.Sale.create(newSaleData, options);
+ const oldSaleComponents = await models.SaleComponent.find({
+ where: {saleFk: oldSale.id}
+ }, options);
+ const newComponents = oldSaleComponents.map(component => {
+ const data = component.toJSON ? component.toJSON() : {...component};
+ delete data.id;
+ data.saleFk = newSale.id;
+ return data;
+ });
+ await models.SaleComponent.create(newComponents, options);
+ createdSales.push(newSale);
+ }
+ return createdSales;
}
async function insertIntoClaimEnd(createdSales, claimId, workerId, options) {
diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js
deleted file mode 100644
index 156caaeec6..0000000000
--- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const app = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
-const models = app.models;
-
-describe('claimBeginning', () => {
- const claimManagerId = 72;
- const activeCtx = {
- accessToken: {userId: claimManagerId},
- __: value => value
- };
- const ctx = {req: activeCtx};
-
- describe('importToNewRefundTicket()', () => {
- it('should create a new ticket with negative sales and insert the negative sales into claimEnd', async() => {
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- let claimId = 1;
-
- const tx = await models.Entry.beginTransaction({});
- try {
- const options = {transaction: tx};
-
- const ticket = await models.ClaimBeginning.importToNewRefundTicket(ctx, claimId, options);
-
- const refundTicketSales = await models.Sale.find({
- where: {ticketFk: ticket.id}
- }, options);
- const salesInsertedInClaimEnd = await models.ClaimEnd.find({
- where: {claimFk: claimId}
- }, options);
-
- expect(refundTicketSales.length).toEqual(1);
- expect(refundTicketSales[0].quantity).toEqual(-5);
- expect(salesInsertedInClaimEnd[0].saleFk).toEqual(refundTicketSales[0].id);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
- });
-});
diff --git a/modules/claim/back/methods/claim-beginning/specs/claim-beginning.spec.js b/modules/claim/back/methods/claim-beginning/specs/claim-beginning.spec.js
index b7974ad237..8b56f3a1c3 100644
--- a/modules/claim/back/methods/claim-beginning/specs/claim-beginning.spec.js
+++ b/modules/claim/back/methods/claim-beginning/specs/claim-beginning.spec.js
@@ -4,7 +4,7 @@ const LoopBackContext = require('loopback-context');
describe('ClaimBeginning model()', () => {
const claimFk = 1;
const activeCtx = {
- accessToken: {userId: 18},
+ accessToken: {userId: 72},
headers: {origin: 'localhost:5000'},
__: () => {}
};
diff --git a/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js b/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js
new file mode 100644
index 0000000000..7771310674
--- /dev/null
+++ b/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js
@@ -0,0 +1,99 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+const models = app.models;
+
+describe('importToNewRefundTicket()', () => {
+ let tx;
+ const claimManagerId = 72;
+ const activeCtx = {
+ accessToken: {userId: claimManagerId},
+ };
+ let ctx = {req: activeCtx};
+ let options;
+ const claimId = 1;
+ const expectedDate = Date.vnNew();
+
+ beforeEach(async() => {
+ LoopBackContext.getCurrentContext = () => ({
+ active: activeCtx,
+ });
+ tx = await models.Entry.beginTransaction({});
+ options = {transaction: tx};
+ spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve(expectedDate));
+ });
+
+ afterEach(async() => {
+ await tx.rollback();
+ });
+
+ it('should create a new ticket with negative sales and insert the negative sales into claimEnd', async() => {
+ const ticket = await models.ClaimBeginning.importToNewRefundTicket(ctx, claimId, options);
+
+ const refundTicketSales = await models.Sale.find({
+ where: {ticketFk: ticket.id}
+ }, options);
+ const salesInsertedInClaimEnd = await models.ClaimEnd.find({
+ where: {claimFk: claimId}
+ }, options);
+
+ expect(refundTicketSales.length).toEqual(1);
+ expect(refundTicketSales[0].quantity).toEqual(-5);
+ expect(salesInsertedInClaimEnd[0].saleFk).toEqual(refundTicketSales[0].id);
+ });
+
+ it('should set DELIVERED state and refund agency mode', async() => {
+ const state = await models.State.findOne({
+ where: {code: 'DELIVERED'}
+ }, options);
+ const ticket = await models.ClaimBeginning.importToNewRefundTicket(ctx, claimId, options);
+ const ticketTracking = await models.TicketTracking.findOne({
+ where: {ticketFk: ticket.id},
+ order: 'id DESC'
+ }, options);
+
+ const newSales = await models.Sale.find({
+ where: {ticketFk: ticket.id}
+ }, options);
+
+ newSales.forEach(sale => {
+ expect(sale.discount).toEqual(0);
+ });
+
+ expect(ticketTracking.stateFk).toEqual(state.id);
+ });
+
+ it('should set WAITING_FOR_PICKUP state for delivery pickups', async() => {
+ const state = await models.State.findOne({
+ where: {code: 'WAITING_FOR_PICKUP'}
+ }, options);
+ await models.Claim.updateAll({id: claimId}, {pickup: 'delivery'}, options);
+ const ticket = await models.ClaimBeginning.importToNewRefundTicket(ctx, claimId, options);
+ const ticketTracking = await models.TicketTracking.findOne({
+ where: {ticketFk: ticket.id},
+ order: 'id DESC'
+ }, options);
+ const newSales = await models.Sale.find({
+ where: {ticketFk: ticket.id}
+ }, options);
+
+ newSales.forEach(sale => {
+ expect(sale.discount).toEqual(100);
+ });
+
+ expect(ticketTracking.stateFk).toEqual(state.id);
+ });
+
+ it('should set DELIVERED state for agency pickups', async() => {
+ const state = await models.State.findOne({
+ where: {code: 'DELIVERED'}
+ }, options);
+ await models.Claim.updateAll({id: claimId}, {pickup: 'agency'}, options);
+ const ticket = await models.ClaimBeginning.importToNewRefundTicket(ctx, claimId, options);
+ const ticketTracking = await models.TicketTracking.findOne({
+ where: {ticketFk: ticket.id},
+ order: 'id DESC'
+ }, options);
+
+ expect(ticketTracking.stateFk).toEqual(state.id);
+ });
+});
diff --git a/modules/claim/back/methods/claim-end/filter.js b/modules/claim/back/methods/claim-end/filter.js
index 0dda16a3a7..c4f4879969 100644
--- a/modules/claim/back/methods/claim-end/filter.js
+++ b/modules/claim/back/methods/claim-end/filter.js
@@ -40,21 +40,24 @@ module.exports = Self => {
const stmt = new ParameterizedSQL(
`SELECT *
FROM (
- SELECT
+ SELECT
ce.id,
ce.claimFk,
- s.itemFk,
- s.ticketFk,
- ce.claimDestinationFk,
- t.landed,
- s.quantity,
- s.concept,
- s.price,
+ s.itemFk,
+ s.ticketFk,
+ ce.claimDestinationFk,
+ t.landed,
+ s.quantity,
+ s.concept,
+ s.price,
s.discount,
- s.quantity * s.price * ((100 - s.discount) / 100) total
+ s.quantity * s.price * ((100 - s.discount) / 100) total,
+ ce.shelvingFk,
+ sh.code shelvingCode
FROM vn.claimEnd ce
- LEFT JOIN vn.sale s ON s.id = ce.saleFk
+ LEFT JOIN vn.sale s ON s.id = ce.saleFk
LEFT JOIN vn.ticket t ON t.id = s.ticketFk
+ LEFT JOIN vn.shelving sh ON sh.id = ce.shelvingFk
) ce`
);
diff --git a/modules/claim/back/methods/claim/regularizeClaim.js b/modules/claim/back/methods/claim/regularizeClaim.js
index a51b114ef2..b1c34d2f40 100644
--- a/modules/claim/back/methods/claim/regularizeClaim.js
+++ b/modules/claim/back/methods/claim/regularizeClaim.js
@@ -3,12 +3,14 @@ module.exports = Self => {
description: `Imports lines from claimBeginning to a new ticket
with specific shipped, landed dates, agency and company`,
accessType: 'WRITE',
- accepts: [{
- arg: 'id',
- type: 'number',
- description: 'The claim id',
- http: {source: 'path'}
- }],
+ accepts: [
+ {
+ arg: 'id',
+ type: 'number',
+ description: 'The claim id',
+ http: {source: 'path'}
+ }
+ ],
returns: {
type: ['Object'],
root: true
@@ -22,8 +24,6 @@ module.exports = Self => {
Self.regularizeClaim = async(ctx, claimFk, options) => {
const models = Self.app.models;
const $t = ctx.req.__; // $translate
- const resolvedState = 3;
-
let tx;
const myOptions = {};
@@ -37,25 +37,39 @@ module.exports = Self => {
try {
const claimEnds = await models.ClaimEnd.find({
- include: {
- relation: 'claimDestination',
- fields: ['addressFk']
- },
- where: {claimFk: claimFk}
+ where: {claimFk: claimFk},
+ include: [
+ {
+ relation: 'claimDestination',
+ scope: {fields: ['addressFk']}
+ },
+ {
+ relation: 'shelving',
+ scope: {
+ fields: ['code', 'parkingFk'],
+ include: {
+ relation: 'parking',
+ scope: {
+ fields: ['sectorFk'],
+ include: {
+ relation: 'sector',
+ scope: {fields: ['warehouseFk']}
+ }
+ }
+ }
+ }
+ }
+ ]
}, myOptions);
for (let claimEnd of claimEnds) {
const destination = claimEnd.claimDestination();
const sale = await getSale(claimEnd.saleFk, myOptions);
- const addressId = destination && destination.addressFk;
-
- let address;
- if (addressId)
- address = await models.Address.findById(addressId, null, myOptions);
+ const addressId = destination?.addressFk;
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
- const nickname = address && address.nickname || destination.description;
+ const nickname = destination.description;
const url = await Self.app.models.Url.getUrl();
const message = $t('Sent units from ticket', {
quantity: sale.quantity,
@@ -69,18 +83,21 @@ module.exports = Self => {
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
}
- if (!address) continue;
+ if (!addressId) continue;
+
+ const warehouseFk = claimEnd.shelving().parking().sector().warehouseFk;
+ const address = await models.Address.findById(addressId, null, myOptions);
let ticketFk = await getTicketId({
addressFk: addressId,
companyFk: sale.ticket().companyFk,
- warehouseFk: sale.ticket().warehouseFk
+ warehouseFk: warehouseFk
}, myOptions);
if (!ticketFk) {
ctx.args = {
clientId: address.clientFk,
- warehouseId: sale.ticket().warehouseFk,
+ warehouseId: warehouseFk,
companyId: sale.ticket().companyFk,
addressId: addressId
};
@@ -90,15 +107,43 @@ module.exports = Self => {
ticketFk: ticketFk,
itemFk: sale.itemFk,
concept: sale.concept,
- quantity: -sale.quantity,
+ quantity: sale.quantity,
price: sale.price,
discount: 100
}, myOptions);
+
+ const [buyFk] = await Self.rawSql('SELECT vn.buy_getLastWithoutInventory(?, ?) buyFk',
+ [sale.itemFk, warehouseFk], myOptions
+ );
+ await Self.rawSql('CALL vn.itemShelving_add(?, ?, ?, NULL, NULL, NULL, ?)',
+ [claimEnd.shelving().code, buyFk.buyFk, -sale.quantity, warehouseFk],
+ myOptions
+ );
+ const operator = await models.Operator.findById(
+ ctx.req.accessToken.userId, {fields: ['labelerFk']}, myOptions);
+
+ const params = JSON.stringify({
+ copies: 1,
+ id: buyFk.buyFk,
+ labelType: 'qr'
+ });
+
+ await Self.rawSql(`CALL vn.report_print( ?, ?, ?, ?, ?)`,
+ ['LabelBuy',
+ operator?.labelerFk,
+ ctx.req.accessToken.userId,
+ params,
+ 'normal'
+ ],
+ myOptions);
}
+ const resolvedState = await models.ClaimState.findOne({
+ where: {code: 'resolved'}
+ }, myOptions);
let claim = await Self.findById(claimFk, null, myOptions);
claim = await claim.updateAttributes({
- claimStateFk: resolvedState
+ claimStateFk: resolvedState.id
}, myOptions);
if (tx) await tx.commit();
@@ -151,7 +196,7 @@ module.exports = Self => {
}
}, options);
- return ticket && ticket.id;
+ return ticket?.id;
}
async function createTicket(ctx, options) {
diff --git a/modules/claim/back/methods/claim/specs/createFromSales.spec.js b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
index 25414d1db7..75caf278ef 100644
--- a/modules/claim/back/methods/claim/specs/createFromSales.spec.js
+++ b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
@@ -3,22 +3,18 @@ const LoopBackContext = require('loopback-context');
describe('Claim createFromSales()', () => {
const ticketId = 23;
- const newSale = [{
- id: 31,
- instance: 0,
- quantity: 10
- }];
- const activeCtx = {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- };
-
- const ctx = {
- req: activeCtx
- };
+ const newSale = [{id: 31, instance: 0, quantity: 10}];
+ let activeCtx;
+ let ctx;
beforeEach(() => {
+ activeCtx = {
+ accessToken: {userId: 72},
+ headers: {origin: 'localhost:5000'},
+ __: () => {}
+ };
+ ctx = {req: activeCtx};
+
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
diff --git a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
index 55d76ed7a7..f0ad1ce470 100644
--- a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
+++ b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
@@ -1,11 +1,8 @@
const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
describe('claim regularizeClaim()', () => {
- const userId = 18;
- const ctx = beforeAll.mockLoopBackContext(userId);
- ctx.req.__ = (value, params) => {
- return params.nickname;
- };
+ const userId = 72;
const chatModel = models.Chat;
const claimId = 1;
const ticketId = 1;
@@ -13,9 +10,27 @@ describe('claim regularizeClaim()', () => {
const resolvedState = 3;
const trashDestination = 2;
const okDestination = 1;
- const trashAddress = 12;
let claimEnds = [];
- let trashTicket;
+ const activeCtx = {accessToken: {userId}};
+ let ctx = {req: activeCtx};
+ let tx;
+ let options;
+
+ beforeEach(async() => {
+ LoopBackContext.getCurrentContext = () => ({
+ active: activeCtx,
+ });
+
+ ctx.req.__ = (_value, params) => {
+ return params.nickname;
+ };
+ tx = await models.Claim.beginTransaction({});
+ options = {transaction: tx};
+ });
+
+ afterEach(async() => {
+ await tx.rollback();
+ });
async function importTicket(ticketId, claimId, userId, options) {
const ticketSales = await models.Sale.find({
@@ -34,84 +49,73 @@ describe('claim regularizeClaim()', () => {
}
it('should send a chat message with value "Trash" and then change claim state to resolved', async() => {
- const tx = await models.Claim.beginTransaction({});
+ spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
- try {
- const options = {transaction: tx};
+ claimEnds = await importTicket(ticketId, claimId, userId, options);
- spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
+ for (const claimEnd of claimEnds)
+ await claimEnd.updateAttributes({claimDestinationFk: trashDestination}, options);
- claimEnds = await importTicket(ticketId, claimId, userId, options);
+ let claimBefore = await models.Claim.findById(claimId, null, options);
+ await models.Claim.regularizeClaim(ctx, claimId, options);
+ let claimAfter = await models.Claim.findById(claimId, null, options);
- for (const claimEnd of claimEnds)
- await claimEnd.updateAttributes({claimDestinationFk: trashDestination}, options);
-
- let claimBefore = await models.Claim.findById(claimId, null, options);
- await models.Claim.regularizeClaim(ctx, claimId, options);
- let claimAfter = await models.Claim.findById(claimId, null, options);
-
- trashTicket = await models.Ticket.findOne({where: {addressFk: 12}}, options);
-
- expect(trashTicket.addressFk).toEqual(trashAddress);
- expect(claimBefore.claimStateFk).toEqual(pendentState);
- expect(claimAfter.claimStateFk).toEqual(resolvedState);
- expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Trash');
- expect(chatModel.sendCheckingPresence).toHaveBeenCalledTimes(4);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(claimBefore.claimStateFk).toEqual(pendentState);
+ expect(claimAfter.claimStateFk).toEqual(resolvedState);
});
- it('should send a chat message with value "Bueno" and then change claim state to resolved', async() => {
- const tx = await models.Claim.beginTransaction({});
+ it('should change claim state to resolved', async() => {
+ const addressMissingFk = 11;
+ const shelvingFk = 1;
+ const warehouseFk = 6;
+ const minDate = Date.vnNew();
+ minDate.setHours(0, 0, 0, 0);
- try {
- const options = {transaction: tx};
+ const maxDate = Date.vnNew();
+ maxDate.setHours(23, 59, 59, 59);
- spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
+ spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
- claimEnds = await importTicket(ticketId, claimId, userId, options);
+ claimEnds = await importTicket(ticketId, claimId, userId, options);
- for (claimEnd of claimEnds)
- await claimEnd.updateAttributes({claimDestinationFk: okDestination}, options);
+ for (let claimEnd of claimEnds)
+ await claimEnd.updateAttributes({claimDestinationFk: okDestination, shelvingFk}, options);
- await models.Claim.regularizeClaim(ctx, claimId, options);
+ const sale = await models.Sale.findOne({
+ include: [
+ {
+ relation: 'ticket',
+ scope: {
+ fields: ['clientFk', 'companyFk']
+ }
+ }],
+ where: {id: claimEnds[0].saleFk}
+ }, options);
- expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Bueno');
- expect(chatModel.sendCheckingPresence).toHaveBeenCalledTimes(4);
+ await models.Claim.regularizeClaim(ctx, claimId, options);
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
+ const ticket = await models.Ticket.findOne({
+ where: {
+ addressFk: addressMissingFk,
+ companyFk: sale.ticket().companyFk,
+ warehouseFk: warehouseFk,
+ shipped: {between: [minDate, maxDate]},
+ landed: {between: [minDate, maxDate]}
+ }
+ }, options);
- it('should send a chat message to the salesPerson when claim isPickUp is enabled', async() => {
- const tx = await models.Claim.beginTransaction({});
+ const missingSale = await models.Sale.findOne({
+ where: {
+ ticketFk: ticket.id
+ }
+ }, options);
- try {
- const options = {transaction: tx};
+ const claimBeginning = await models.ClaimBeginning.findOne({
+ where: {
+ claimFk: claimId
+ }
+ }, options);
- spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
-
- claimEnds = await importTicket(ticketId, claimId, userId, options);
-
- for (claimEnd of claimEnds)
- await claimEnd.updateAttributes({claimDestinationFk: okDestination}, options);
-
- await models.Claim.regularizeClaim(ctx, claimId, options);
-
- expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Bueno');
- expect(chatModel.sendCheckingPresence).toHaveBeenCalledTimes(4);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(missingSale.quantity).toBe(claimBeginning.quantity);
});
});
diff --git a/modules/claim/back/model-config.json b/modules/claim/back/model-config.json
index d90ed4c1e8..6183a31423 100644
--- a/modules/claim/back/model-config.json
+++ b/modules/claim/back/model-config.json
@@ -2,6 +2,9 @@
"Claim": {
"dataSource": "vn"
},
+ "ClaimConfig": {
+ "dataSource": "vn"
+ },
"ClaimContainer": {
"dataSource": "claimStorage"
},
@@ -43,5 +46,5 @@
},
"ClaimObservation": {
"dataSource": "vn"
- }
+ }
}
diff --git a/modules/claim/back/models/claim-beginning.js b/modules/claim/back/models/claim-beginning.js
index 3dc9261c3d..41c064c751 100644
--- a/modules/claim/back/models/claim-beginning.js
+++ b/modules/claim/back/models/claim-beginning.js
@@ -1,6 +1,7 @@
const UserError = require('vn-loopback/util/user-error');
const LoopBackContext = require('loopback-context');
+const moment = require('moment');
module.exports = Self => {
require('../methods/claim-beginning/importToNewRefundTicket')(Self);
@@ -13,10 +14,51 @@ module.exports = Self => {
const options = ctx.options;
const models = Self.app.models;
const saleFk = ctx?.currentInstance?.saleFk || ctx?.instance?.saleFk;
+ const claimFk = ctx?.instance?.claimFk || ctx?.currentInstance?.claimFk;
+ const myOptions = {};
+ const accessToken = ctx?.options?.accessToken || LoopBackContext.getCurrentContext().active.accessToken;
+ const ctxToken = {req: {accessToken}};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
const sale = await models.Sale.findById(saleFk, {fields: ['ticketFk', 'quantity']}, options);
+ const canCreateClaimAfterDeadline = models.ACL.checkAccessAcl(
+ ctxToken,
+ 'Claim',
+ 'createAfterDeadline',
+ myOptions
+ );
+
+ const canUpdateClaim = models.ACL.checkAccessAcl(
+ ctxToken,
+ 'Claim',
+ 'updateClaim',
+ myOptions
+ );
+
+ if (!canUpdateClaim && !canCreateClaimAfterDeadline)
+ throw new UserError(`You don't have permission to modify this claim`);
+
+ if (canUpdateClaim) {
+ const query = `
+ SELECT daysToClaim
+ FROM vn.claimConfig`;
+ const res = await Self.rawSql(query);
+ const daysToClaim = res[0]?.daysToClaim;
+
+ const claim = await models.Claim.findById(claimFk, {fields: ['created']}, options);
+ const claimDate = moment.utc(claim.created);
+ const currentDate = moment.utc();
+ const daysSinceSale = currentDate.diff(claimDate, 'days');
+
+ if (daysSinceSale > daysToClaim && !canCreateClaimAfterDeadline)
+ throw new UserError(`You can't modify this claim because the deadline has already passed`);
+ }
+
if (ctx.isNewInstance) {
- const claim = await models.Claim.findById(ctx.instance.claimFk, {fields: ['ticketFk']}, options);
+ const claim = await models.Claim.findById(claimFk, {fields: ['ticketFk']}, options);
if (sale.ticketFk != claim.ticketFk)
throw new UserError(`Cannot create a new claimBeginning from a different ticket`);
}
@@ -41,7 +83,7 @@ module.exports = Self => {
if (ctx.options && ctx.options.transaction)
myOptions.transaction = ctx.options.transaction;
- const claimBeginning = ctx.instance ?? await Self.findById(ctx.where.id);
+ const claimBeginning = ctx.instance ?? await Self.findById(ctx?.where?.id);
const filter = {
where: {id: claimBeginning.claimFk},
diff --git a/modules/claim/back/models/claim-config.json b/modules/claim/back/models/claim-config.json
new file mode 100644
index 0000000000..6b90909953
--- /dev/null
+++ b/modules/claim/back/models/claim-config.json
@@ -0,0 +1,42 @@
+
+{
+ "name": "ClaimConfig",
+ "base": "VnModel",
+ "mixins": {
+ "Loggable": true
+ },
+ "options": {
+ "mysql": {
+ "table": "claimConfig"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "maxResponsibility": {
+ "type": "number"
+ },
+ "monthsToRefund": {
+ "type": "number"
+ },
+ "minShipped": {
+ "type": "date"
+ },
+ "pickupdeliveryFk": {
+ "type": "number"
+ },
+ "warehouseFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "pickupDelivery": {
+ "type": "belongsTo",
+ "model": "AgencyMode",
+ "foreignKey": "pickupdeliveryFk"
+ }
+ }
+}
diff --git a/modules/claim/back/models/claim-end.json b/modules/claim/back/models/claim-end.json
index ef5477f50e..aa66824f71 100644
--- a/modules/claim/back/models/claim-end.json
+++ b/modules/claim/back/models/claim-end.json
@@ -41,6 +41,11 @@
"type": "belongsTo",
"model": "ClaimDestination",
"foreignKey": "claimDestinationFk"
+ },
+ "shelving": {
+ "type": "belongsTo",
+ "model": "Shelving",
+ "foreignKey": "shelvingFk"
}
}
}
diff --git a/modules/client/back/methods/client/createWithUser.js b/modules/client/back/methods/client/createWithUser.js
index 1d5e71fcae..ad20171dc9 100644
--- a/modules/client/back/methods/client/createWithUser.js
+++ b/modules/client/back/methods/client/createWithUser.js
@@ -43,6 +43,17 @@ module.exports = function(Self) {
password: String(Math.random() * 100000000000000)
};
+ const supplier = await models.Supplier.findOne({
+ where: {nif: data.fi}
+ });
+
+ const role = supplier ? await models.VnRole.findOne({
+ where: {name: 'supplier'}
+ }) : null;
+
+ if (role)
+ user.roleFk = role.id;
+
try {
const province = await models.Province.findOne({
where: {id: data.provinceFk},
diff --git a/modules/client/back/methods/client/specs/createWithUser.spec.js b/modules/client/back/methods/client/specs/createWithUser.spec.js
index 8cff96ac54..fdc0797958 100644
--- a/modules/client/back/methods/client/specs/createWithUser.spec.js
+++ b/modules/client/back/methods/client/specs/createWithUser.spec.js
@@ -48,11 +48,11 @@ describe('Client Create', () => {
expect(error.message).toEqual('An email is necessary');
});
- it('should create a new account with dailyInvoice', async() => {
+ it('should create a new account with dailyInvoice and role supplier', async() => {
const newAccount = {
userName: 'deadpool',
email: 'deadpool@marvel.com',
- fi: '16195279J',
+ fi: '07972486L',
name: 'Wade',
socialName: 'DEADPOOL MARVEL',
street: 'WALL STREET',
@@ -61,33 +61,30 @@ describe('Client Create', () => {
provinceFk: 1
};
- try {
- const province = await models.Province.findById(newAccount.provinceFk, {
- fields: ['id', 'name', 'autonomyFk'],
- include: {
- relation: 'autonomy'
- }
- }, options);
+ const province = await models.Province.findById(newAccount.provinceFk, {
+ fields: ['id', 'name', 'autonomyFk'],
+ include: {
+ relation: 'autonomy'
+ }
+ }, options);
- const client = await models.Client.createWithUser(newAccount, options);
- const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
+ const client = await models.Client.createWithUser(newAccount, options);
+ const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
+ const supplierRole = await models.VnRole.findOne({where: {name: 'supplier'}}, options);
- expect(province.autonomy().hasDailyInvoice).toBeTruthy();
- expect(account.name).toEqual(newAccount.userName);
- expect(client.id).toEqual(account.id);
- expect(client.name).toEqual(newAccount.name);
- expect(client.email).toEqual(newAccount.email);
- expect(client.fi).toEqual(newAccount.fi);
- expect(client.socialName).toEqual(newAccount.socialName);
- expect(client.businessTypeFk).toEqual(newAccount.businessTypeFk);
- expect(client.hasDailyInvoice).toBeTruthy();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(account.roleFk).toEqual(supplierRole.id);
+ expect(province.autonomy().hasDailyInvoice).toBeTruthy();
+ expect(account.name).toEqual(newAccount.userName);
+ expect(client.id).toEqual(account.id);
+ expect(client.name).toEqual(newAccount.name);
+ expect(client.email).toEqual(newAccount.email);
+ expect(client.fi).toEqual(newAccount.fi);
+ expect(client.socialName).toEqual(newAccount.socialName);
+ expect(client.businessTypeFk).toEqual(newAccount.businessTypeFk);
+ expect(client.hasDailyInvoice).toBeTruthy();
});
- it('should create a new account without dailyInvoice', async() => {
+ it('should create a new account without dailyInvoice and role customer', async() => {
const newAccount = {
userName: 'deadpool',
email: 'deadpool@marvel.com',
@@ -100,22 +97,20 @@ describe('Client Create', () => {
provinceFk: 3
};
- try {
- const province = await models.Province.findById(newAccount.provinceFk, {
- fields: ['id', 'name', 'autonomyFk'],
- include: {
- relation: 'autonomy'
- }
- }, options);
+ const province = await models.Province.findById(newAccount.provinceFk, {
+ fields: ['id', 'name', 'autonomyFk'],
+ include: {
+ relation: 'autonomy'
+ }
+ }, options);
- const client = await models.Client.createWithUser(newAccount, options);
+ const client = await models.Client.createWithUser(newAccount, options);
+ const vnUser = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
+ const customerRole = await models.VnRole.findOne({where: {name: 'customer'}}, options);
- expect(province.autonomy.hasDailyInvoice).toBeFalsy();
- expect(client.hasDailyInvoice).toBeFalsy();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(vnUser.roleFk).toEqual(customerRole.id);
+ expect(province.autonomy.hasDailyInvoice).toBeFalsy();
+ expect(client.hasDailyInvoice).toBeFalsy();
});
it('should not be able to create a user if exists', async() => {
diff --git a/modules/entry/back/methods/entry-buys/getBuyList.js b/modules/entry/back/methods/entry-buys/getBuyList.js
new file mode 100644
index 0000000000..a038dca02a
--- /dev/null
+++ b/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];
+ };
+};
diff --git a/modules/entry/back/methods/entry-buys/getBuyUltimate.js b/modules/entry/back/methods/entry-buys/getBuyUltimate.js
new file mode 100644
index 0000000000..7322c43b3b
--- /dev/null
+++ b/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
+ );
+ };
+};
diff --git a/modules/entry/back/methods/entry/cloneEntry.js b/modules/entry/back/methods/entry/cloneEntry.js
new file mode 100644
index 0000000000..fa4b479060
--- /dev/null
+++ b/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;
+ }
+ };
+};
diff --git a/modules/entry/back/methods/entry/deleteEntry.js b/modules/entry/back/methods/entry/deleteEntry.js
new file mode 100644
index 0000000000..f1701c3551
--- /dev/null
+++ b/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;
+ }
+ };
+};
diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index e5eae85fd3..1f5154d74d 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/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));
diff --git a/modules/entry/back/methods/entry/recalcEntryPrices.js b/modules/entry/back/methods/entry/recalcEntryPrices.js
new file mode 100644
index 0000000000..ef90091ec3
--- /dev/null
+++ b/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;
+ }
+ };
+};
diff --git a/modules/entry/back/methods/stock-bought/getStockBought.js b/modules/entry/back/methods/stock-bought/getStockBought.js
index 9768b58e72..e94f2dfb1a 100644
--- a/modules/entry/back/methods/stock-bought/getStockBought.js
+++ b/modules/entry/back/methods/stock-bought/getStockBought.js
@@ -45,7 +45,7 @@ module.exports = Self => {
{
relation: 'user',
scope: {
- fields: ['id', 'name']
+ fields: ['id', 'nickname']
}
}
]
diff --git a/modules/entry/back/model-config.json b/modules/entry/back/model-config.json
index 49c2df2db8..fed2999124 100644
--- a/modules/entry/back/model-config.json
+++ b/modules/entry/back/model-config.json
@@ -31,5 +31,8 @@
},
"InventoryConfig": {
"dataSource": "vn"
+ },
+ "EntryConfig": {
+ "dataSource": "vn"
}
}
diff --git a/modules/entry/back/models/entry-config.json b/modules/entry/back/models/entry-config.json
new file mode 100644
index 0000000000..39d651ab6b
--- /dev/null
+++ b/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"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js
index 03cbd6e7f9..03bf1a6e2b 100644
--- a/modules/entry/back/models/entry.js
+++ b/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;
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index 1ff0621196..92bf909f18 100644
--- a/modules/entry/back/models/entry.json
+++ b/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"
+ }
}
}
diff --git a/modules/invoiceIn/back/methods/invoice-in/toUnbook.js b/modules/invoiceIn/back/methods/invoice-in/toUnbook.js
index c27354d73e..7d63e6a876 100644
--- a/modules/invoiceIn/back/methods/invoice-in/toUnbook.js
+++ b/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 {
diff --git a/modules/item/back/methods/fixed-price/filter.js b/modules/item/back/methods/fixed-price/filter.js
index 488c2441df..cd9fa08ba2 100644
--- a/modules/item/back/methods/fixed-price/filter.js
+++ b/modules/item/back/methods/fixed-price/filter.js
@@ -22,6 +22,11 @@ module.exports = Self => {
type: 'integer',
description: 'The item id',
},
+ {
+ arg: 'name',
+ type: 'string',
+ description: 'The item name',
+ },
{
arg: 'typeFk',
type: 'integer',
@@ -112,6 +117,8 @@ module.exports = Self => {
: {'it.code': {like: `%${value}%`}};
case 'categoryFk':
return {'it.categoryFk': value};
+ case 'name':
+ return {'i.name': {like: `%${value}%`}};
case 'buyerFk':
return {'it.workerFk': value};
case 'warehouseFk':
diff --git a/modules/item/back/methods/item/getSimilar.js b/modules/item/back/methods/item/getSimilar.js
new file mode 100644
index 0000000000..2479d08b52
--- /dev/null
+++ b/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;
+ };
+};
diff --git a/modules/item/back/methods/item/regularize.js b/modules/item/back/methods/item/regularize.js
index dfbcaa69f6..546515093d 100644
--- a/modules/item/back/methods/item/regularize.js
+++ b/modules/item/back/methods/item/regularize.js
@@ -46,29 +46,24 @@ module.exports = Self => {
}
try {
- const itemDestination = await models.ClaimDestination.findOne({
- include: {
- relation: 'address',
- scope: {
- fields: ['clientFk']
- }
- },
- where: {description: 'Corregido'}
+ const addressWaste = await models.AddressWaste.findOne({
+ where: {type: 'fault'},
+ include: 'address'
}, myOptions);
const item = await models.Item.findById(itemFk, null, myOptions);
let ticketId = await getTicketId({
- clientFk: itemDestination.address.clientFk,
- addressFk: itemDestination.addressFk,
+ clientFk: addressWaste.address().clientFk,
+ addressFk: addressWaste.addressFk,
warehouseFk: warehouseFk
}, myOptions);
if (!ticketId) {
ctx.args = {
- clientId: itemDestination.address().clientFk,
+ clientId: addressWaste.address().clientFk,
warehouseId: warehouseFk,
- addressId: itemDestination.addressFk
+ addressId: addressWaste.addressFk
};
ticketId = await createTicket(ctx, myOptions);
}
@@ -121,7 +116,7 @@ module.exports = Self => {
}
}, options);
- return ticket && ticket.id;
+ return ticket?.id;
}
};
};
diff --git a/modules/item/back/methods/item/search.js b/modules/item/back/methods/item/search.js
new file mode 100644
index 0000000000..447e0fadd4
--- /dev/null
+++ b/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);
+ };
+};
diff --git a/modules/item/back/methods/item/specs/filter.spec.js b/modules/item/back/methods/item/specs/filter.spec.js
index a8aaca786a..6245abea01 100644
--- a/modules/item/back/methods/item/specs/filter.spec.js
+++ b/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);
diff --git a/modules/item/back/methods/item/specs/getSimilar.spec.js b/modules/item/back/methods/item/specs/getSimilar.spec.js
new file mode 100644
index 0000000000..5dec077b66
--- /dev/null
+++ b/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);
+ });
+});
diff --git a/modules/item/back/methods/tag/specs/filterValue.spec.js b/modules/item/back/methods/tag/specs/filterValue.spec.js
index 9e5cf2da26..5bac40f61e 100644
--- a/modules/item/back/methods/tag/specs/filterValue.spec.js
+++ b/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');
diff --git a/modules/item/back/models/ink.json b/modules/item/back/models/ink.json
index 6a39daafe3..4bed79e76c 100644
--- a/modules/item/back/models/ink.json
+++ b/modules/item/back/models/ink.json
@@ -17,6 +17,9 @@
},
"showOrder": {
"type": "number"
+ },
+ "hexJson": {
+ "type": "string"
}
},
"acls": [
diff --git a/modules/item/back/models/item.js b/modules/item/back/models/item.js
index 44a51594cd..5ecd174057 100644
--- a/modules/item/back/models/item.js
+++ b/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'});
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 4947edeafb..ce50fec6aa 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -258,10 +258,10 @@ module.exports = Self => {
stmts.push(`SET SESSION optimizer_search_depth = @_optimizer_search_depth`);
stmt = new ParameterizedSQL(`
- CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
+ SELECT f.id ticketFk
FROM tmp.filter f
LEFT JOIN alertLevel al ON al.id = f.alertLevel
WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
@@ -282,7 +282,7 @@ module.exports = Self => {
stmts.push('CALL ticket_getWarnings()');
stmt = new ParameterizedSQL(`
- UPDATE tmp.ticket_problems
+ UPDATE tmp.ticketProblems
SET risk = IF(hasRisk, risk, 0)
`);
stmts.push(stmt);
@@ -290,7 +290,7 @@ module.exports = Self => {
stmt = new ParameterizedSQL(`
SELECT *
FROM tmp.filter f
- LEFT JOIN tmp.ticket_problems tp ON tp.ticketFk = f.id
+ LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
LEFT JOIN tmp.ticket_warnings tw ON tw.ticketFk = f.id
`);
stmts.push(stmt);
@@ -307,8 +307,8 @@ module.exports = Self => {
{'tp.hasRisk': true},
{'tp.hasTicketRequest': true},
{'tp.hasComponentLack': true},
- {'tp.isTaxDataChecked': false},
- {'tp.itemShortage': {neq: null}},
+ {'tp.isTaxDataChecked': true},
+ {'tp.hasItemShortage': true},
{'tp.isTooLittle': true}
]};
} else if (hasProblems === false) {
@@ -317,8 +317,8 @@ module.exports = Self => {
{'tp.hasRisk': false},
{'tp.hasTicketRequest': false},
{'tp.hasComponentLack': false},
- {'tp.isTaxDataChecked': true},
- {'tp.itemShortage': null},
+ {'tp.isTaxDataChecked': false},
+ {'tp.hasItemShortage': false},
{'tp.isTooLittle': false}
]};
}
@@ -392,9 +392,9 @@ module.exports = Self => {
stmts.push(`
DROP TEMPORARY TABLE
+ tmp.ticket,
tmp.filter,
- tmp.ticket_problems,
- tmp.sale_getProblems,
+ tmp.ticketProblems,
tmp.sale_getWarnings,
tmp.ticket_warnings
`);
diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
index 738af52199..1b4616de73 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
@@ -68,7 +68,7 @@ describe('SalesMonitor salesFilter()', () => {
const filter = {};
const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
- expect(result.length).toEqual(4);
+ expect(result.length).toEqual(5);
await tx.rollback();
} catch (e) {
diff --git a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
index 0acc6c1a7b..73264ad546 100644
--- a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
+++ b/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) {
diff --git a/modules/route/back/methods/route/specs/unlink.spec.js b/modules/route/back/methods/route/specs/unlink.spec.js
index 808cedccc1..9d1f48be8b 100644
--- a/modules/route/back/methods/route/specs/unlink.spec.js
+++ b/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);
diff --git a/modules/route/back/methods/vehicle/filter.js b/modules/route/back/methods/vehicle/filter.js
new file mode 100644
index 0000000000..cb55f5f3ca
--- /dev/null
+++ b/modules/route/back/methods/vehicle/filter.js
@@ -0,0 +1,128 @@
+const {ParameterizedSQL} = require('loopback-connector');
+const {buildFilter, mergeFilters} = require('vn-loopback/util/filter');
+
+module.exports = Self => {
+ Self.remoteMethodCtx('filter', {
+ description: 'Find all instances of the model matched by filter from the data source.',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where, order, skip and limit - must be a JSON-encoded string',
+ http: {source: 'query'}
+ }, {
+ arg: 'search',
+ type: 'string',
+ description: 'Searchs the vehicle by id or numberPlate',
+ http: {source: 'query'}
+ }, {
+ arg: 'id',
+ type: 'number'
+ }, {
+ arg: 'description',
+ type: 'string'
+ }, {
+ arg: 'companyFk',
+ type: 'number'
+ }, {
+ arg: 'tradeMark',
+ type: 'string'
+ }, {
+ arg: 'numberPlate',
+ type: 'string'
+ }, {
+ arg: 'warehouseFk',
+ type: 'number'
+ }, {
+ arg: 'chassis',
+ type: 'string'
+ }, {
+ arg: 'leasing',
+ type: 'string'
+ }, {
+ arg: 'countryCodeFk',
+ type: 'string'
+ }, {
+ arg: 'vehicleTypeFk',
+ type: 'number'
+ }, {
+ arg: 'vehicleStateFk',
+ type: 'number'
+ }],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/filter`,
+ verb: `GET`
+ }
+ });
+
+ Self.filter = async(ctx, filter, options) => {
+ const conn = Self.dataSource.connector;
+ const myOptions = {};
+
+ if (typeof options == 'object') Object.assign(myOptions, options);
+
+ const where = buildFilter(ctx.args, (param, value) => {
+ switch (param) {
+ case 'search':
+ return {or: [{'v.id': value}, {numberPlate: {like: `%${value}%`}}]};
+ case 'id':
+ return {'v.id': value};
+ case 'description':
+ case 'tradeMark':
+ case 'numberPlate':
+ case 'chassis':
+ case 'leasing':
+ return {[param]: {like: `%${value}%`}};
+ case 'companyFk':
+ case 'warehouseFk':
+ case 'countryCodeFk':
+ case 'vehicleStateFk':
+ case 'vehicleTypeFk':
+ return {[param]: value};
+ }
+ });
+
+ filter = mergeFilters(filter, {where});
+
+ const stmt = new ParameterizedSQL(`
+ SELECT v.id,
+ v.numberPlate,
+ v.tradeMark,
+ v.model,
+ v.m3,
+ v.description,
+ v.isActive,
+ v.countryCodeFk,
+ v.chassis,
+ v.leasing,
+ vt.name type,
+ w.name warehouse,
+ c.code company,
+ sub.state
+ FROM vehicle v
+ JOIN vehicleType vt ON vt.id = v.vehicleTypeFk
+ LEFT JOIN warehouse w ON w.id = v.warehouseFk
+ LEFT JOIN company c ON c.id = v.companyFk
+ LEFT JOIN (
+ SELECT e.vehicleFk,
+ e.vehicleStateFk,
+ s.state,
+ ROW_NUMBER() OVER (PARTITION BY e.vehicleFk ORDER BY e.started DESC) rn
+ FROM vehicleEvent e
+ LEFT JOIN vehicleState s ON e.vehicleStateFk = s.id
+ ) sub ON sub.vehicleFk = v.id AND sub.rn = 1
+ `);
+
+ const sqlWhere = conn.makeWhere(filter.where);
+ stmt.merge(sqlWhere);
+ stmt.merge(conn.makePagination(filter));
+
+ const sql = ParameterizedSQL.join([stmt], ';');
+
+ return conn.executeStmt(sql, myOptions);
+ };
+};
diff --git a/modules/route/back/methods/vehicle/specs/filter.spec.js b/modules/route/back/methods/vehicle/specs/filter.spec.js
new file mode 100644
index 0000000000..52e0b8a397
--- /dev/null
+++ b/modules/route/back/methods/vehicle/specs/filter.spec.js
@@ -0,0 +1,127 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('Vehicle filter()', () => {
+ const deliveryAssiId = 123;
+ const ctx = beforeAll.getCtx(deliveryAssiId);
+ let options;
+ let tx;
+
+ beforeEach(async() => {
+ ctx.args = {};
+ options = {};
+ tx = await models.Sale.beginTransaction({});
+ options.transaction = tx;
+ });
+
+ afterEach(async() => {
+ await tx.rollback();
+ });
+
+ it('should return the vehicles matching "search"', async() => {
+ const {id} = await models.Vehicle.findById(1, null, options);
+ const {numberPlate} = await models.Vehicle.findById(2, null, options);
+
+ ctx.args = {search: id};
+ const [searchResult] = await models.Vehicle.filter(ctx);
+ ctx.args = {search: numberPlate};
+ const [searchResult2] = await models.Vehicle.filter(ctx);
+
+ expect(searchResult.id).toEqual(id);
+ expect(searchResult2.numberPlate).toEqual(numberPlate);
+ });
+
+ it('should return the vehicles matching "companyFk"', async() => {
+ const company = await models.Company.findOne({where: {code: 'VNL'}}, options);
+ ctx.args = {companyFk: company.id};
+ const searchResult = await models.Vehicle.filter(ctx, null, options);
+ searchResult.forEach(record => {
+ expect(record.company).toEqual(company.code);
+ });
+ });
+
+ it('should return the vehicles matching "tradeMark"', async() => {
+ const tradeMark = 'WAYNE INDUSTRIES';
+ ctx.args = {tradeMark};
+ const searchResult = await models.Vehicle.filter(ctx);
+ searchResult.forEach(record => {
+ expect(record.tradeMark).toEqual(tradeMark);
+ });
+ });
+
+ it('should return the vehicles matching "numberPlate"', async() => {
+ const {numberPlate} = await models.Vehicle.findById(1, null, options);
+ ctx.args = {numberPlate};
+
+ const searchResult = await models.Vehicle.filter(ctx);
+
+ searchResult.forEach(record => {
+ expect(record.numberPlate).toEqual(numberPlate);
+ });
+ });
+
+ it('should return the vehicles matching "warehouseFk"', async() => {
+ const warehouse = await models.Warehouse.findById(1, null, options);
+ ctx.args = {warehouseFk: warehouse.id};
+ const searchResult = await models.Vehicle.filter(ctx);
+ searchResult.forEach(record => {
+ expect(record.warehouse).toEqual(warehouse.name);
+ });
+ });
+
+ it('should return the vehicles matching "chassis"', async() => {
+ const {chassis} = await models.Vehicle.findById(1, null, options);
+ ctx.args = {chassis};
+ const [searchResult] = await models.Vehicle.filter(ctx);
+
+ expect(searchResult.chassis).toEqual(chassis);
+ });
+
+ it('should return the vehicles matching "leasing"', async() => {
+ const leasing = 'Wayne leasing';
+ ctx.args = {leasing};
+ const searchResult = await models.Vehicle.filter(ctx);
+ searchResult.forEach(record => {
+ expect(record.leasing).toEqual(leasing);
+ });
+ });
+
+ it('should return the vehicles matching "countryCodeFk"', async() => {
+ const countryCodeFk = 'ES';
+ ctx.args = {countryCodeFk};
+
+ const searchResult = await models.Vehicle.filter(ctx);
+ searchResult.forEach(record => {
+ expect(record.countryCodeFk).toEqual(countryCodeFk);
+ });
+ });
+
+ it('should return the vehicles matching "vehicleTypeFk"', async() => {
+ const {name, id} = await models.VehicleType.findById(1, null, options);
+ ctx.args = {vehicleTypeFk: id};
+
+ const searchResult = await models.Vehicle.filter(ctx);
+ searchResult.forEach(record => {
+ expect(record.type).toEqual(name);
+ });
+ });
+
+ it('should return the vehicles matching "vehicleStateFk"', async() => {
+ const {state, id} = await models.VehicleState.findById(3);
+ ctx.args = {vehicleStateFk: id};
+
+ const searchResult = await models.Vehicle.filter(ctx);
+ searchResult.forEach(record => {
+ expect(record.state).toEqual(state);
+ });
+ });
+
+ it('should return the vehicles matching "description"', async() => {
+ const {description} = await models.Vehicle.findById(2);
+ ctx.args = {description};
+
+ const searchResult = await models.Vehicle.filter(ctx);
+ searchResult.forEach(record => {
+ expect(record.description).toEqual(description);
+ });
+ });
+});
diff --git a/modules/route/back/model-config.json b/modules/route/back/model-config.json
index fb1c5d7fdd..3a7c9e06b5 100644
--- a/modules/route/back/model-config.json
+++ b/modules/route/back/model-config.json
@@ -5,12 +5,21 @@
"AgencyTermConfig": {
"dataSource": "vn"
},
+ "BankPolicy": {
+ "dataSource": "vn"
+ },
"Cmr": {
"dataSource": "vn"
},
"DeliveryPoint": {
"dataSource": "vn"
},
+ "FuelType": {
+ "dataSource": "vn"
+ },
+ "Ppe": {
+ "dataSource": "vn"
+ },
"RoadmapAddress": {
"dataSource": "vn"
},
@@ -35,6 +44,12 @@
"Vehicle": {
"dataSource": "vn"
},
+ "VehicleState": {
+ "dataSource": "vn"
+ },
+ "VehicleType": {
+ "dataSource": "vn"
+ },
"RoutesMonitor": {
"dataSource": "vn"
}
diff --git a/modules/route/back/models/bank-policy.json b/modules/route/back/models/bank-policy.json
new file mode 100644
index 0000000000..55a409a671
--- /dev/null
+++ b/modules/route/back/models/bank-policy.json
@@ -0,0 +1,21 @@
+{
+ "name": "BankPolicy",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "bankPolicy"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true
+ },
+ "ref": {
+ "type": "string"
+ },
+ "dmsFk": {
+ "type": "number"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/route/back/models/fuel-type.json b/modules/route/back/models/fuel-type.json
new file mode 100644
index 0000000000..d426148371
--- /dev/null
+++ b/modules/route/back/models/fuel-type.json
@@ -0,0 +1,30 @@
+{
+ "name": "FuelType",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "fuelType"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "name": {
+ "type": "string"
+ },
+ "code": {
+ "type": "string"
+ }
+ },
+ "acls": [
+ {
+ "accessType": "READ",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/modules/route/back/models/ppe.json b/modules/route/back/models/ppe.json
new file mode 100644
index 0000000000..0825d348ca
--- /dev/null
+++ b/modules/route/back/models/ppe.json
@@ -0,0 +1,15 @@
+{
+ "name": "Ppe",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "ppe"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/route/back/models/vehicle-state.json b/modules/route/back/models/vehicle-state.json
new file mode 100644
index 0000000000..b53719f631
--- /dev/null
+++ b/modules/route/back/models/vehicle-state.json
@@ -0,0 +1,21 @@
+{
+ "name": "VehicleState",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "vehicleState"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true
+ },
+ "state": {
+ "type": "string"
+ },
+ "hasToNotify": {
+ "type": "number"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/route/back/models/vehicle-type.json b/modules/route/back/models/vehicle-type.json
new file mode 100644
index 0000000000..34beb6dfba
--- /dev/null
+++ b/modules/route/back/models/vehicle-type.json
@@ -0,0 +1,19 @@
+{
+ "name": "VehicleType",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "vehicleType"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/route/back/models/vehicle.js b/modules/route/back/models/vehicle.js
index 73e3214435..59aa7cb8b7 100644
--- a/modules/route/back/models/vehicle.js
+++ b/modules/route/back/models/vehicle.js
@@ -1,3 +1,4 @@
module.exports = Self => {
require('../methods/vehicle/sorted')(Self);
+ require('../methods/vehicle/filter')(Self);
};
diff --git a/modules/route/back/models/vehicle.json b/modules/route/back/models/vehicle.json
index 34a376b897..d64f3df794 100644
--- a/modules/route/back/models/vehicle.json
+++ b/modules/route/back/models/vehicle.json
@@ -3,7 +3,7 @@
"base": "VnModel",
"options": {
"mysql": {
- "table": "vehicle"
+ "table": "vehicle"
}
},
"properties": {
@@ -29,6 +29,39 @@
},
"isActive": {
"type": "number"
+ },
+ "countryCodeFk": {
+ "type": "string"
+ },
+ "chassis": {
+ "type": "string"
+ },
+ "leasing": {
+ "type": "string"
+ },
+ "isKmTruckRate": {
+ "type": "number"
+ },
+ "fuelTypeFk": {
+ "type": "number"
+ },
+ "import": {
+ "type": "number"
+ },
+ "importCooler": {
+ "type": "number"
+ },
+ "vin": {
+ "type": "string"
+ },
+ "ppeFk": {
+ "type": "number"
+ },
+ "vehicleTypeFk": {
+ "type": "number"
+ },
+ "deliveryPointFk": {
+ "type": "number"
}
},
"relations": {
@@ -46,21 +79,57 @@
"type": "belongsTo",
"model": "DeliveryPoint",
"foreignKey": "deliveryPointFk"
+ },
+ "event": {
+ "type": "hasMany",
+ "model": "VehicleEvent",
+ "foreignKey": "vehicleFk",
+ "property": "id"
+ },
+ "supplier": {
+ "type": "belongsTo",
+ "model": "Supplier",
+ "foreignKey": "supplierFk"
+ },
+ "supplierCooler": {
+ "type": "belongsTo",
+ "model": "Supplier",
+ "foreignKey": "supplierCoolerFk"
+ },
+ "bankPolicy": {
+ "type": "belongsTo",
+ "model": "BankPolicy",
+ "foreignKey": "bankPolicyFk"
+ },
+ "fuelType": {
+ "type": "belongsTo",
+ "model": "FuelType",
+ "foreignKey": "fuelTypeFk"
+ },
+ "ppe": {
+ "type": "hasOne",
+ "model": "Ppe",
+ "foreignKey": "id",
+ "property": "ppeFk"
+ },
+ "type": {
+ "type": "hasOne",
+ "model": "VehicleType",
+ "foreignKey": "id",
+ "property": "vehicleTypeFk"
}
},
- "scope": {
- "where": {
- "isActive": {
+ "scopes": {
+ "active": {
+ "fields": [
+ "id",
+ "numberPlate"
+ ],
+ "where": {
+ "isActive": {
"neq": false
}
}
- },
- "acls": [
- {
- "accessType": "READ",
- "principalType": "ROLE",
- "principalId": "$everyone",
- "permission": "ALLOW"
}
- ]
-}
+ }
+}
\ No newline at end of file
diff --git a/modules/shelving/back/models/parking.js b/modules/shelving/back/models/parking.js
new file mode 100644
index 0000000000..027f1e8ae6
--- /dev/null
+++ b/modules/shelving/back/models/parking.js
@@ -0,0 +1,5 @@
+module.exports = Self => {
+ Self.validatesUniquenessOf('code', {
+ message: `The code already exists`
+ });
+};
diff --git a/modules/shelving/back/models/shelving.js b/modules/shelving/back/models/shelving.js
index bf611d2ba1..207224266e 100644
--- a/modules/shelving/back/models/shelving.js
+++ b/modules/shelving/back/models/shelving.js
@@ -1,4 +1,8 @@
module.exports = Self => {
require('../methods/shelving/getSummary')(Self);
require('../methods/shelving/addLog')(Self);
+
+ Self.validatesUniquenessOf('code', {
+ message: `The code already exists`
+ });
};
diff --git a/modules/supplier/back/methods/supplier/specs/getItemsPackaging.spec.js b/modules/supplier/back/methods/supplier/specs/getItemsPackaging.spec.js
index 66b328bb08..2bda3f1e85 100644
--- a/modules/supplier/back/methods/supplier/specs/getItemsPackaging.spec.js
+++ b/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);
});
});
diff --git a/modules/ticket/back/methods/boxing/getVideo.js b/modules/ticket/back/methods/boxing/getVideo.js
index 6f471e837f..fe951a3705 100644
--- a/modules/ticket/back/methods/boxing/getVideo.js
+++ b/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]);
diff --git a/modules/ticket/back/methods/boxing/getVideoList.js b/modules/ticket/back/methods/boxing/getVideoList.js
index ba989936e5..41930c7f7d 100644
--- a/modules/ticket/back/methods/boxing/getVideoList.js
+++ b/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);
};
};
diff --git a/modules/ticket/back/methods/boxing/specs/getVideoList.spec.js b/modules/ticket/back/methods/boxing/specs/getVideoList.spec.js
index c6d1a3e07c..82780c5866 100644
--- a/modules/ticket/back/methods/boxing/specs/getVideoList.spec.js
+++ b/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}`);
});
});
diff --git a/modules/ticket/back/methods/sale/getClaimableFromTicket.js b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
index c51781f595..cb10bdb0e0 100644
--- a/modules/ticket/back/methods/sale/getClaimableFromTicket.js
+++ b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
@@ -30,7 +30,6 @@ module.exports = Self => {
SELECT
s.id AS saleFk,
t.id AS ticketFk,
- t.landed,
s.concept,
s.itemFk,
s.quantity,
@@ -41,11 +40,10 @@ module.exports = Self => {
INNER JOIN vn.sale s ON s.ticketFk = t.id
LEFT JOIN vn.claimBeginning cb ON cb.saleFk = s.id
- WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, ?)
- AND t.id = ? AND cb.id IS NULL
- ORDER BY t.landed DESC, t.id DESC`;
+ WHERE t.id = ?
+ AND cb.id IS NULL`;
- const claimableSales = await Self.rawSql(query, [date, ticketFk], myOptions);
+ const claimableSales = await Self.rawSql(query, [ticketFk], myOptions);
return claimableSales;
};
diff --git a/modules/ticket/back/methods/sale/replaceItem.js b/modules/ticket/back/methods/sale/replaceItem.js
new file mode 100644
index 0000000000..b1702f17f5
--- /dev/null
+++ b/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;
+ }
+ };
+};
diff --git a/modules/ticket/back/methods/sale/specs/replaceItem.spec.js b/modules/ticket/back/methods/sale/specs/replaceItem.spec.js
new file mode 100644
index 0000000000..6cb91aacef
--- /dev/null
+++ b/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(/^\+/);
+ });
+});
diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index d4f128082d..287a6a9222 100644
--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@@ -113,6 +113,12 @@ module.exports = Self => {
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
const url = await Self.app.models.Url.getUrl();
+
+ const saleCloned = await Self.app.models.SaleCloned.findById(sale.id, {
+ include: 'saleOriginal',
+ });
+ const ticketWeekly = saleCloned?.saleOriginal()?.ticketFk || null;
+
const message = $t('Changed sale price', {
ticketId: sale.ticket().id,
itemId: sale.itemFk,
@@ -121,7 +127,8 @@ module.exports = Self => {
oldPrice: oldPrice,
newPrice: newPrice,
ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
- itemUrl: `${url}item/${sale.itemFk}/summary`
+ itemUrl: `${url}item/${sale.itemFk}/summary`,
+ ticketWeekly: ticketWeekly ? $t('clonedFromTicketWeekly', {ticketWeekly}) : null
});
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
diff --git a/modules/ticket/back/methods/sale/updateQuantity.js b/modules/ticket/back/methods/sale/updateQuantity.js
index 4de1bcbd65..5561c77efb 100644
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@@ -72,6 +72,12 @@ module.exports = Self => {
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
const url = await Self.app.models.Url.getUrl();
+
+ const saleCloned = await Self.app.models.SaleCloned.findById(sale.id, {
+ include: 'saleOriginal',
+ });
+ const ticketWeekly = saleCloned?.saleOriginal()?.ticketFk || null;
+
const change = $t('Changes in sales', {
itemId: sale.itemFk,
concept: sale.concept,
@@ -84,6 +90,7 @@ module.exports = Self => {
ticketId: sale.ticket().id,
changes: JSON.stringify(change),
ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
+ ticketWeekly: ticketWeekly ? $t('clonedFromTicketWeekly', {ticketWeekly}) : null
});
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 75e37d40a4..d300b1815d 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -294,21 +294,17 @@ module.exports = Self => {
stmts.push(stmt);
stmt = new ParameterizedSQL(`
- CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
- FROM tmp.filter f
- LEFT JOIN alertLevel al ON al.id = f.alertLevel
- WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
- AND f.shipped >= ?
- `, [date]);
+ SELECT f.id ticketFk
+ FROM tmp.filter f`);
stmts.push(stmt);
stmts.push('CALL ticket_getProblems(FALSE)');
stmt = new ParameterizedSQL(`
- UPDATE tmp.ticket_problems
+ UPDATE tmp.ticketProblems
SET risk = IF(hasRisk, risk, 0)
`);
stmts.push(stmt);
@@ -316,43 +312,19 @@ module.exports = Self => {
stmt = new ParameterizedSQL(`
SELECT f.*, tp.*
FROM tmp.filter f
- LEFT JOIN tmp.ticket_problems tp ON tp.ticketFk = f.id
+ LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
`);
if (args.problems != undefined && (!args.from && !args.to))
throw new UserError('Choose a date range or days forward');
- let condition;
- let hasProblem;
- let range;
- let hasWhere;
- switch (args.problems) {
- case true:
- condition = `or`;
- hasProblem = true;
- range = {neq: null};
- hasWhere = true;
- break;
-
- case false:
- condition = `and`;
- hasProblem = null;
- range = null;
- hasWhere = true;
- break;
+ if (typeof args.problems == 'boolean') {
+ let condition = 0;
+ if (args.problems)
+ condition = {neq: condition};
+ stmt.merge(conn.makeWhere({'tp.totalProblems': condition}));
}
- const problems = {[condition]: [
- {'tp.isFreezed': hasProblem},
- {'tp.hasRisk': hasProblem},
- {'tp.hasTicketRequest': hasProblem},
- {'tp.itemShortage': range},
- {'tp.hasRounding': hasProblem}
- ]};
-
- if (hasWhere)
- stmt.merge(conn.makeWhere(problems));
-
if (filter.order) {
if (typeof filter.order == 'string') filter.order = [filter.order];
const index = filter.order.findIndex(o => o.includes('stateFk'));
@@ -371,8 +343,9 @@ module.exports = Self => {
stmts.push(
`DROP TEMPORARY TABLE
+ tmp.ticket,
tmp.filter,
- tmp.ticket_problems`);
+ tmp.ticketProblems`);
const sql = ParameterizedSQL.join(stmts, ';');
const result = await conn.executeStmt(sql, myOptions);
diff --git a/modules/ticket/back/methods/ticket/getSales.js b/modules/ticket/back/methods/ticket/getSales.js
index 5b2288d317..574fd36732 100644
--- a/modules/ticket/back/methods/ticket/getSales.js
+++ b/modules/ticket/back/methods/ticket/getSales.js
@@ -98,14 +98,10 @@ module.exports = Self => {
for (let sale of sales) {
const problems = saleProblems.get(sale.id);
- const itemStock = itemAvailable.get(sale.itemFk);
- sale.available = itemStock.available;
- sale.visible = itemStock.visible;
sale.claim = claimedSales.get(sale.id);
if (problems) {
- sale.itemShortage = problems.itemShortage;
- sale.hasTicketRequest = problems.hasTicketRequest;
- sale.hasComponentLack = problems.hasComponentLack;
+ for (const problem in problems)
+ sale[problem] = problems[problem];
}
if (salesWithLogs.includes(sale.id))
sale.$hasLogs = true;
diff --git a/modules/ticket/back/methods/ticket/getTicketProblems.js b/modules/ticket/back/methods/ticket/getTicketProblems.js
new file mode 100644
index 0000000000..351e07b679
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/getTicketProblems.js
@@ -0,0 +1,83 @@
+const {buildFilter} = require('vn-loopback/util/filter');
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+ Self.remoteMethodCtx('getTicketProblems', {
+ description: 'Get problems for a ticket',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The ticket id',
+ http: {source: 'path'}
+ }],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/:id/getTicketProblems`,
+ verb: 'get'
+ }
+ });
+
+ Self.getTicketProblems = async(ctx, id, options) => {
+ const myOptions = {};
+ const stmts = [];
+ const conn = Self.dataSource.connector;
+ let stmt;
+ const ticketId = id;
+ const where = buildFilter(ctx.args, param => {
+ switch (param) {
+ case 'id':
+ return {'t.id': ticketId};
+ }
+ });
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ stmt = new ParameterizedSQL(`
+ CREATE OR REPLACE TEMPORARY TABLE tmp.filter
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT t.id
+ FROM ticket t
+ `);
+
+ stmt.merge(conn.makeWhere(where));
+ stmts.push(stmt);
+
+ stmt = new ParameterizedSQL(`
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
+ (INDEX (ticketFk))
+ ENGINE = MEMORY
+ SELECT f.id AS ticketFk
+ FROM tmp.filter f
+ `);
+ stmts.push(stmt);
+
+ stmts.push('CALL ticket_getProblems(FALSE)');
+
+ stmt = new ParameterizedSQL(`
+ SELECT f.*, tp.*
+ FROM tmp.filter f
+ LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
+ `);
+ const ticketsIndex = stmts.push(stmt) - 1;
+
+ stmts.push(`
+ DROP TEMPORARY TABLE IF EXISTS
+ tmp.filter,
+ tmp.ticket,
+ tmp.ticketProblems
+ `);
+
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql, myOptions);
+
+ return result[ticketsIndex];
+ };
+};
diff --git a/modules/ticket/back/methods/ticket/getTicketsFuture.js b/modules/ticket/back/methods/ticket/getTicketsFuture.js
index 2479245912..88f40bc3ef 100644
--- a/modules/ticket/back/methods/ticket/getTicketsFuture.js
+++ b/modules/ticket/back/methods/ticket/getTicketsFuture.js
@@ -146,10 +146,10 @@ module.exports = Self => {
stmts.push(stmt);
stmt = new ParameterizedSQL(`
- CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped, f.lines, f.liters
+ SELECT f.id ticketFk
FROM tmp.filter f
LEFT JOIN alertLevel al ON al.id = f.alertLevel
WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
@@ -159,7 +159,7 @@ module.exports = Self => {
stmts.push('CALL ticket_getProblems(FALSE)');
stmt = new ParameterizedSQL(`
- UPDATE tmp.ticket_problems
+ UPDATE tmp.ticketProblems
SET risk = IF(hasRisk, risk, 0)
`);
stmts.push(stmt);
@@ -167,7 +167,7 @@ module.exports = Self => {
stmt = new ParameterizedSQL(`
SELECT f.*, tp.*
FROM tmp.filter f
- LEFT JOIN tmp.ticket_problems tp ON tp.ticketFk = f.id
+ LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
`);
if (args.problems != undefined && (!args.originScopeDays && !args.futureScopeDays))
@@ -175,20 +175,17 @@ module.exports = Self => {
let condition;
let hasProblem;
- let range;
let hasWhere;
switch (args.problems) {
case true:
condition = `or`;
hasProblem = true;
- range = {neq: null};
hasWhere = true;
break;
case false:
condition = `and`;
hasProblem = null;
- range = null;
hasWhere = true;
break;
}
@@ -198,7 +195,7 @@ module.exports = Self => {
{'tp.isFreezed': hasProblem},
{'tp.hasRisk': hasProblem},
{'tp.hasTicketRequest': hasProblem},
- {'tp.itemShortage': range},
+ {'tp.hasItemShortage': hasProblem},
{'tp.hasComponentLack': hasProblem},
{'tp.isTooLittle': hasProblem},
{'tp.hasRounding': hasProblem}
@@ -216,8 +213,9 @@ module.exports = Self => {
stmts.push(
`DROP TEMPORARY TABLE
+ tmp.ticket,
tmp.filter,
- tmp.ticket_problems`);
+ tmp.ticketProblems`);
const sql = ParameterizedSQL.join(stmts, ';');
const result = await conn.executeStmt(sql, myOptions);
diff --git a/modules/ticket/back/methods/ticket/itemLack.js b/modules/ticket/back/methods/ticket/itemLack.js
new file mode 100644
index 0000000000..7cda324598
--- /dev/null
+++ b/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];
+ };
+};
diff --git a/modules/ticket/back/methods/ticket/itemLackDetail.js b/modules/ticket/back/methods/ticket/itemLackDetail.js
new file mode 100644
index 0000000000..fb8ce682f6
--- /dev/null
+++ b/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;
+ };
+};
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index d0edb24e39..cbd799431e 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -42,11 +42,11 @@ describe('ticket filter()', () => {
const result = await models.Ticket.filter(ctx, filter, options);
const hasProblemTicket = result.some(ticket =>
- ticket.isFreezed === true ||
- ticket.hasRisk === true ||
- ticket.hasTicketRequest === true ||
- (typeof ticket.hasRounding === 'string' && ticket.hasRounding.trim().length > 0) ||
- (typeof ticket.itemShortage === 'string' && ticket.itemShortage.trim().length > 0)
+ ticket.isFreezed == true ||
+ ticket.hasRisk == true ||
+ ticket.hasTicketRequest == true ||
+ ticket.hasRounding == true ||
+ ticket.hasItemShortage == true
);
expect(hasProblemTicket).toBe(true);
@@ -80,11 +80,11 @@ describe('ticket filter()', () => {
const result = await models.Ticket.filter(ctx, filter, options);
result.forEach(ticket => {
- expect(ticket.isFreezed).toEqual(null);
- expect(ticket.hasRisk).toEqual(null);
- expect(ticket.hasTicketRequest).toEqual(null);
- expect(ticket.itemShortage).toEqual(null);
- expect(ticket.hasRounding).toEqual(null);
+ expect(ticket.isFreezed).toEqual(0);
+ expect(ticket.hasRisk).toEqual(0);
+ expect(ticket.hasTicketRequest).toEqual(0);
+ expect(ticket.hasItemShortage).toEqual(0);
+ expect(ticket.hasRounding).toEqual(0);
});
await tx.rollback();
diff --git a/modules/ticket/back/methods/ticket/specs/getSales.spec.js b/modules/ticket/back/methods/ticket/specs/getSales.spec.js
index 7c0a67d451..f0a99b90b6 100644
--- a/modules/ticket/back/methods/ticket/specs/getSales.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getSales.spec.js
@@ -15,7 +15,6 @@ describe('ticket getSales()', () => {
expect(sales[1].item).toBeDefined();
expect(sales[2].item).toBeDefined();
expect(sales[3].item).toBeDefined();
- expect(sales[0].claim).toBeDefined();
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketProblems.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketProblems.spec.js
new file mode 100644
index 0000000000..f46c27e4dc
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/specs/getTicketProblems.spec.js
@@ -0,0 +1,21 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('ticket getTicketProblems()', () => {
+ const ctx = {req: {accessToken: 9}};
+ it('should return the problems of a ticket', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const problems = await models.Ticket.getTicketProblems(ctx, 11, options);
+
+ expect(problems[7].totalProblems).toEqual(3);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/ticket/back/methods/ticket/specs/itemLack.spec.js b/modules/ticket/back/methods/ticket/specs/itemLack.spec.js
new file mode 100644
index 0000000000..c746d989d9
--- /dev/null
+++ b/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);
+ });
+});
diff --git a/modules/ticket/back/methods/ticket/specs/itemLackDetail.spec.js b/modules/ticket/back/methods/ticket/specs/itemLackDetail.spec.js
new file mode 100644
index 0000000000..4e7b68bdce
--- /dev/null
+++ b/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;
+ }
+ });
+});
diff --git a/modules/ticket/back/methods/ticket/specs/split.spec.js b/modules/ticket/back/methods/ticket/specs/split.spec.js
new file mode 100644
index 0000000000..7543e47d65
--- /dev/null
+++ b/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);
+ });
+});
diff --git a/modules/ticket/back/methods/ticket/split.js b/modules/ticket/back/methods/ticket/split.js
new file mode 100644
index 0000000000..23223db7d7
--- /dev/null
+++ b/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};
+ }
+ };
+};
diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index 2e8bec27a8..0175e43c54 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -166,10 +166,18 @@ module.exports = Self => {
const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) {
const url = await Self.app.models.Url.getUrl();
+
+ const saleId = sales[0].id;
+ const saleCloned = await Self.app.models.SaleCloned.findById(saleId, {
+ include: 'saleOriginal',
+ });
+ const ticketWeekly = saleCloned?.saleOriginal()?.ticketFk || null;
+
const message = $t('Changed sale discount', {
ticketId: id,
ticketUrl: `${url}ticket/${id}/sale`,
- changes: changesMade
+ changes: changesMade,
+ ticketWeekly: ticketWeekly ? $t('clonedFromTicketWeekly', {ticketWeekly}) : null
});
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
diff --git a/modules/ticket/back/models/sale.js b/modules/ticket/back/models/sale.js
index 3aa4cbf2ad..0e135c75b9 100644
--- a/modules/ticket/back/models/sale.js
+++ b/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`
diff --git a/modules/ticket/back/models/ticket-config.json b/modules/ticket/back/models/ticket-config.json
index 6dd2808eac..7a008f97e3 100644
--- a/modules/ticket/back/models/ticket-config.json
+++ b/modules/ticket/back/models/ticket-config.json
@@ -26,6 +26,12 @@
},
"defaultAttenderFk": {
"type": "number"
+ },
+ "lackAlertPrice": {
+ "type": "number"
+ },
+ "lackScopeDays": {
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/ticket-methods.js b/modules/ticket/back/models/ticket-methods.js
index 620b3e1841..52cecb95a2 100644
--- a/modules/ticket/back/models/ticket-methods.js
+++ b/modules/ticket/back/models/ticket-methods.js
@@ -46,4 +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);
};
diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html
index cceca266f7..dec8e1e855 100644
--- a/modules/ticket/front/future/index.html
+++ b/modules/ticket/front/future/index.html
@@ -92,7 +92,7 @@
|
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 26e5553edc..08a6e3f7b6 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -40,7 +40,7 @@
diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js
index 2f3f998d6e..5c294a9651 100644
--- a/modules/travel/back/methods/travel/extraCommunityFilter.js
+++ b/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':
diff --git a/modules/travel/back/methods/travel/filter.js b/modules/travel/back/methods/travel/filter.js
index 837e30b305..ad7a71d11d 100644
--- a/modules/travel/back/methods/travel/filter.js
+++ b/modules/travel/back/methods/travel/filter.js
@@ -173,6 +173,7 @@ module.exports = Self => {
t.isRaid,
t.daysInForward,
t.awbFk,
+ t.availabled,
am.name agencyModeName,
a.code awbCode,
win.name warehouseInName,
diff --git a/modules/travel/back/models/travel.json b/modules/travel/back/models/travel.json
index a2a9e478e3..feeb24f698 100644
--- a/modules/travel/back/models/travel.json
+++ b/modules/travel/back/models/travel.json
@@ -56,6 +56,9 @@
},
"daysInForward": {
"type": "number"
+ },
+ "availabled": {
+ "type": "date"
}
},
"relations": {
diff --git a/modules/worker/back/methods/worker-dms/filter.js b/modules/worker/back/methods/worker-dms/filter.js
index 240a905d28..a6e5d67e76 100644
--- a/modules/worker/back/methods/worker-dms/filter.js
+++ b/modules/worker/back/methods/worker-dms/filter.js
@@ -1,5 +1,6 @@
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
const {mergeFilters, mergeWhere} = require('vn-loopback/util/filter');
+const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('filter', {
@@ -33,7 +34,10 @@ module.exports = Self => {
const conn = Self.dataSource.connector;
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
+ const hasPrivs = await models.ACL.checkAccessAcl(ctx, 'WorkerDms', 'hasHighPrivs', '*');
+ if (!hasPrivs && userId !== id)
+ throw new UserError('You don\'t have enough privileges');
// Get ids alloweds
const account = await models.VnUser.findById(userId);
diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json
index b75bf67325..799c8bb6c8 100644
--- a/modules/worker/back/models/operator.json
+++ b/modules/worker/back/models/operator.json
@@ -16,13 +16,16 @@
"type": "number"
},
"trainFk": {
- "type": "number"
+ "type": "number",
+ "required": true
},
"itemPackingTypeFk": {
- "type": "string"
+ "type": "string",
+ "required": true
},
"warehouseFk": {
- "type": "number"
+ "type": "number",
+ "required": true
},
"sectorFk": {
"type": "number"
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index 68f9ea908f..16b3d25025 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -155,6 +155,11 @@
"type": "hasMany",
"model": "WorkerRelative",
"foreignKey": "workerFK"
+ },
+ "business": {
+ "type": "hasMany",
+ "model": "Business",
+ "foreignKey": "workerFk"
}
},
"acls": [
diff --git a/modules/zone/back/models/zone-warehouse.js b/modules/zone/back/models/zone-warehouse.js
new file mode 100644
index 0000000000..c9713f28c3
--- /dev/null
+++ b/modules/zone/back/models/zone-warehouse.js
@@ -0,0 +1,9 @@
+let UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.rewriteDbError(function(err) {
+ if (err.code === 'ER_DUP_ENTRY')
+ return new UserError(`The introduced warehouse already exists`);
+ return err;
+ });
+};
diff --git a/package.json b/package.json
index 72f8e2d1ba..8e64b82528 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "25.06.0",
+ "version": "25.10.0",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
@@ -60,7 +60,7 @@
"@babel/register": "^7.7.7",
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0",
- "@verdnatura/myt": "^1.6.12",
+ "@verdnatura/myt": "^1.6.13",
"angular-mocks": "^1.7.9",
"babel-jest": "^26.0.1",
"babel-loader": "^8.2.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 042b91fe02..22dbce27ea 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -143,8 +143,8 @@ devDependencies:
specifier: ^19.1.0
version: 19.1.0
'@verdnatura/myt':
- specifier: ^1.6.12
- version: 1.6.12
+ specifier: ^1.6.13
+ version: 1.6.13
angular-mocks:
specifier: ^1.7.9
version: 1.8.3
@@ -2846,8 +2846,8 @@ packages:
dev: false
optional: true
- /@verdnatura/myt@1.6.12:
- resolution: {integrity: sha512-t/SiDuQW9KJkcjhwQ9AkrcoTwghxQ7IyQ56e+88eYdoMi24l6bQGF0wHzMaIPRfQAoR8hqgfMOief4OAqW4Iqw==}
+ /@verdnatura/myt@1.6.13:
+ resolution: {integrity: sha512-Qw5cfXa2FnjrMBbzP3InYc3vIjbNhyHhmle12Y7FaYFeYE+CXlerryuMqtcoe4+9PsCqwDCKlW37YKmipy2cnQ==}
hasBin: true
dependencies:
'@sqltools/formatter': 1.2.5
|