diff --git a/db/changes/10240-allSaints/00-ACL.sql b/db/changes/10240-allSaints/00-ACL.sql
deleted file mode 100644
index 332c7677e..000000000
--- a/db/changes/10240-allSaints/00-ACL.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-UPDATE `salix`.`ACL` SET `principalId` = 'deliveryBoss' WHERE (`id` = '194');
-UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '97');
-UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '100');
-UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '103');
-UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '202');
-
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Town', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Province', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
diff --git a/db/changes/10240-allSaints/00-claimState.sql b/db/changes/10240-allSaints/00-claimState.sql
deleted file mode 100644
index 64ec0f30d..000000000
--- a/db/changes/10240-allSaints/00-claimState.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '3');
-UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '4');
-UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '5');
\ No newline at end of file
diff --git a/db/changes/10240-allSaints/00-observationType.sql b/db/changes/10240-allSaints/00-observationType.sql
deleted file mode 100644
index 426fa1b55..000000000
--- a/db/changes/10240-allSaints/00-observationType.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-ALTER TABLE `vn`.`observationType` 
-ADD COLUMN `code` VARCHAR(45) NOT NULL AFTER `description`;
-
-UPDATE `vn`.`observationType` SET `code` = 'itemPicker' WHERE (`id` = '1');
-UPDATE `vn`.`observationType` SET `code` = 'packager' WHERE (`id` = '2');
-UPDATE `vn`.`observationType` SET `code` = 'salesPerson' WHERE (`id` = '4');
-UPDATE `vn`.`observationType` SET `code` = 'administrative' WHERE (`id` = '5');
-UPDATE `vn`.`observationType` SET `code` = 'weight' WHERE (`id` = '6');
-UPDATE `vn`.`observationType` SET `code` = 'delivery' WHERE (`id` = '3');
diff --git a/db/changes/10240-allSaints/00-roleRole.sql b/db/changes/10240-allSaints/00-roleRole.sql
deleted file mode 100644
index e9882c6a6..000000000
--- a/db/changes/10240-allSaints/00-roleRole.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `account`.`roleRole`
-	ADD `id` INT UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
-	ADD PRIMARY KEY (`id`);
-
-UPDATE `account`.`role` SET id = 100 WHERE `name` = 'root';
-
-CALL account.role_sync;
diff --git a/db/changes/10240-allSaints/00-role_syncPrivileges.sql b/db/changes/10240-allSaints/00-role_syncPrivileges.sql
deleted file mode 100644
index 88f1779e1..000000000
--- a/db/changes/10240-allSaints/00-role_syncPrivileges.sql
+++ /dev/null
@@ -1,504 +0,0 @@
-DROP PROCEDURE IF EXISTS account.role_syncPrivileges;
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `account`.`role_syncPrivileges`()
-BEGIN
-/**
- * Synchronizes permissions of MySQL role users based on role hierarchy.
- * The computed role users of permission mix will be named according to 
- * pattern z-[role_name].
- *
- * If any@localhost user exists, it will be taken as a template for basic
- * attributes.
- *
- * Warning! This procedure should only be called when MySQL privileges
- * are modified. If role hierarchy is modified, you must call the role_sync()
- * procedure wich calls this internally.
- */
-	DECLARE vIsMysql BOOL DEFAULT VERSION() NOT LIKE '%MariaDB%';
-	DECLARE vVersion INT DEFAULT SUBSTRING_INDEX(VERSION(), '.', 1);
-	DECLARE vTplUser VARCHAR(255) DEFAULT 'any';
-	DECLARE vTplHost VARCHAR(255) DEFAULT '%';
-	DECLARE vRoleHost VARCHAR(255) DEFAULT 'localhost';
-	DECLARE vAllHost VARCHAR(255) DEFAULT '%';
-	DECLARE vPrefix VARCHAR(2) DEFAULT 'z-';
-	DECLARE vPrefixedLike VARCHAR(255);
-	DECLARE vPassword VARCHAR(255) DEFAULT '';
-
-	-- Deletes computed role users
-
-	SET vPrefixedLike = CONCAT(vPrefix, '%');
-
-	IF vIsMysql THEN
-		DELETE FROM mysql.user
-			WHERE `User` LIKE vPrefixedLike;
-	ELSE
-		DELETE FROM mysql.global_priv
-			WHERE `User` LIKE vPrefixedLike;
-	END IF;
-
-	DELETE FROM mysql.db
-		WHERE `User` LIKE vPrefixedLike;
-
-	DELETE FROM mysql.tables_priv
-		WHERE `User` LIKE vPrefixedLike;
-
-	DELETE FROM mysql.columns_priv
-		WHERE `User` LIKE vPrefixedLike;
-
-	DELETE FROM mysql.procs_priv
-		WHERE `User` LIKE vPrefixedLike;
-
-	DELETE FROM mysql.proxies_priv
-		WHERE `Proxied_user` LIKE vPrefixedLike;
-
-	-- Temporary tables
-
-	DROP TEMPORARY TABLE IF EXISTS tRole;
-	CREATE TEMPORARY TABLE tRole
-		(INDEX (id))
-		ENGINE = MEMORY
-		SELECT
-			id,
-			`name` role,
-			CONCAT(vPrefix, `name`) prefixedRole
-			FROM role
-				WHERE hasLogin;
-
-	DROP TEMPORARY TABLE IF EXISTS tRoleInherit;
-	CREATE TEMPORARY TABLE tRoleInherit
-		(INDEX (inheritsFrom))
-		ENGINE = MEMORY
-		SELECT
-			r.prefixedRole,
-			ri.`name` inheritsFrom
-			FROM tRole r
-				JOIN roleRole rr ON rr.role = r.id
-				JOIN role ri ON ri.id = rr.inheritsFrom;
-
-	-- Recreate role users
-
-	IF vIsMysql THEN
-		DROP TEMPORARY TABLE IF EXISTS tUser;
-		CREATE TEMPORARY TABLE tUser
-			SELECT
-				r.prefixedRole `User`,
-				vTplHost `Host`,
-				IFNULL(t.`authentication_string`,
-					'') `authentication_string`,
-				IFNULL(t.`plugin`,
-					'mysql_native_password') `plugin`,
-				IFNULL(IF('' != u.`ssl_type`,
-					u.`ssl_type`, t.`ssl_type`),
-					'') `ssl_type`,
-				IFNULL(IF('' != u.`ssl_cipher`,
-					u.`ssl_cipher`, t.`ssl_cipher`),
-					'') `ssl_cipher`,
-				IFNULL(IF('' != u.`x509_issuer`,
-					u.`x509_issuer`, t.`x509_issuer`),
-					'') `x509_issuer`,
-				IFNULL(IF('' != u.`x509_subject`,
-					u.`x509_subject`, t.`x509_subject`),
-					'') `x509_subject`,
-				IFNULL(IF(0 != u.`max_questions`,
-					u.`max_questions`, t.`max_questions`),
-					0) `max_questions`,
-				IFNULL(IF(0 != u.`max_updates`,
-					u.`max_updates`, t.`max_updates`),
-					0) `max_updates`,
-				IFNULL(IF(0 != u.`max_connections`,
-					u.`max_connections`, t.`max_connections`),
-					0) `max_connections`,
-				IFNULL(IF(0 != u.`max_user_connections`,
-					u.`max_user_connections`, t.`max_user_connections`),
-					0) `max_user_connections`
-				FROM tRole r
-					LEFT JOIN mysql.user t
-						ON t.`User` = vTplUser
-							AND t.`Host` = vRoleHost
-					LEFT JOIN mysql.user u
-						ON u.`User` = r.role
-							AND u.`Host` = vRoleHost;
-
-		IF vVersion <= 5 THEN
-			SELECT `Password` INTO vPassword
-				FROM mysql.user
-				WHERE `User` = vTplUser
-					AND `Host` = vRoleHost;
-
-			INSERT INTO mysql.user (
-					`User`,
-					`Host`,
-					`Password`,
-					`authentication_string`,
-					`plugin`,
-					`ssl_type`,
-					`ssl_cipher`,
-					`x509_issuer`,
-					`x509_subject`,
-					`max_questions`,
-					`max_updates`,
-					`max_connections`,
-					`max_user_connections`
-				)
-				SELECT
-					`User`,
-					`Host`,
-					vPassword,
-					`authentication_string`,
-					`plugin`,
-					`ssl_type`,
-					`ssl_cipher`,
-					`x509_issuer`,
-					`x509_subject`,
-					`max_questions`,
-					`max_updates`,
-					`max_connections`,
-					`max_user_connections`
-					FROM tUser;
-		ELSE
-			INSERT INTO mysql.user (
-					`User`,
-					`Host`,
-					`authentication_string`,
-					`plugin`,
-					`ssl_type`,
-					`ssl_cipher`,
-					`x509_issuer`,
-					`x509_subject`,
-					`max_questions`,
-					`max_updates`,
-					`max_connections`,
-					`max_user_connections`
-				)
-				SELECT
-					`User`,
-					`Host`,
-					`authentication_string`,
-					`plugin`,
-					`ssl_type`,
-					`ssl_cipher`,
-					`x509_issuer`,
-					`x509_subject`,
-					`max_questions`,
-					`max_updates`,
-					`max_connections`,
-					`max_user_connections`
-					FROM tUser;
-		END IF;
-
-		DROP TEMPORARY TABLE IF EXISTS tUser;
-	ELSE
-		INSERT INTO mysql.global_priv (
-				`User`,
-				`Host`,
-				`Priv`
-			)
-			SELECT 
-				r.prefixedRole,
-				vTplHost,
-				JSON_MERGE_PATCH(
-					IFNULL(t.`Priv`, '{}'),
-					IFNULL(u.`Priv`, '{}'),
-					JSON_OBJECT(
-						'mysql_old_password', JSON_VALUE(t.`Priv`, '$.mysql_old_password'),
-						'mysql_native_password', JSON_VALUE(t.`Priv`, '$.mysql_native_password'),
-						'authentication_string', JSON_VALUE(t.`Priv`, '$.authentication_string'),
-						'ssl_type', JSON_VALUE(t.`Priv`, '$.ssl_type')
-					)
-				)
-				FROM tRole r
-					LEFT JOIN mysql.global_priv t
-						ON t.`User` = vTplUser
-							AND t.`Host` = vRoleHost
-					LEFT JOIN mysql.global_priv u
-						ON u.`User` = r.role
-							AND u.`Host` = vRoleHost;
-	END IF;
-
-	INSERT INTO mysql.proxies_priv (
-		`User`,
-		`Host`,
-		`Proxied_user`,
-		`Proxied_host`,
-		`Grantor`
-	)
-	SELECT
-		'',
-		vAllHost,
-		prefixedRole,
-		vTplHost,
-		CONCAT(prefixedRole, '@', vTplHost)
-		FROM tRole;
-
-	-- Copies global privileges
-
-	DROP TEMPORARY TABLE IF EXISTS tUserPriv;
-
-	IF vIsMysql THEN
-		CREATE TEMPORARY TABLE tUserPriv
-			(INDEX (prefixedRole))
-			ENGINE = MEMORY
-			SELECT
-				r.prefixedRole,
-				MAX(u.`Select_priv`) `Select_priv`,
-				MAX(u.`Insert_priv`) `Insert_priv`,
-				MAX(u.`Update_priv`) `Update_priv`,
-				MAX(u.`Delete_priv`) `Delete_priv`,
-				MAX(u.`Create_priv`) `Create_priv`,
-				MAX(u.`Drop_priv`) `Drop_priv`,
-				MAX(u.`Reload_priv`) `Reload_priv`,
-				MAX(u.`Shutdown_priv`) `Shutdown_priv`,
-				MAX(u.`Process_priv`) `Process_priv`,
-				MAX(u.`File_priv`) `File_priv`,
-				MAX(u.`Grant_priv`) `Grant_priv`,
-				MAX(u.`References_priv`) `References_priv`,
-				MAX(u.`Index_priv`) `Index_priv`,
-				MAX(u.`Alter_priv`) `Alter_priv`,
-				MAX(u.`Show_db_priv`) `Show_db_priv`,
-				MAX(u.`Super_priv`) `Super_priv`,
-				MAX(u.`Create_tmp_table_priv`) `Create_tmp_table_priv`,
-				MAX(u.`Lock_tables_priv`) `Lock_tables_priv`,
-				MAX(u.`Execute_priv`) `Execute_priv`,
-				MAX(u.`Repl_slave_priv`) `Repl_slave_priv`,
-				MAX(u.`Repl_client_priv`) `Repl_client_priv`,
-				MAX(u.`Create_view_priv`) `Create_view_priv`,
-				MAX(u.`Show_view_priv`) `Show_view_priv`,
-				MAX(u.`Create_routine_priv`) `Create_routine_priv`,
-				MAX(u.`Alter_routine_priv`) `Alter_routine_priv`,
-				MAX(u.`Create_user_priv`) `Create_user_priv`,
-				MAX(u.`Event_priv`) `Event_priv`,
-				MAX(u.`Trigger_priv`) `Trigger_priv`,
-				MAX(u.`Create_tablespace_priv`) `Create_tablespace_priv`
-				FROM tRoleInherit r
-					JOIN mysql.user u
-						ON u.`User` = r.inheritsFrom
-							AND u.`Host`= vRoleHost
-				GROUP BY r.prefixedRole;
-	
-		UPDATE mysql.user u
-			JOIN tUserPriv t
-				ON u.`User` = t.prefixedRole
-					AND u.`Host` = vTplHost
-			SET
-				u.`Select_priv`
-					= t.`Select_priv`,
-				u.`Insert_priv`
-					= t.`Insert_priv`,
-				u.`Update_priv`
-					= t.`Update_priv`,
-				u.`Delete_priv`
-					= t.`Delete_priv`,
-				u.`Create_priv`
-					= t.`Create_priv`,
-				u.`Drop_priv`
-					= t.`Drop_priv`,
-				u.`Reload_priv`
-					= t.`Reload_priv`,
-				u.`Shutdown_priv`
-					= t.`Shutdown_priv`,
-				u.`Process_priv`
-					= t.`Process_priv`,
-				u.`File_priv`
-					= t.`File_priv`,
-				u.`Grant_priv`
-					= t.`Grant_priv`,
-				u.`References_priv`
-					= t.`References_priv`,
-				u.`Index_priv`
-					= t.`Index_priv`,
-				u.`Alter_priv`
-					= t.`Alter_priv`,
-				u.`Show_db_priv`
-					= t.`Show_db_priv`,
-				u.`Super_priv`
-					= t.`Super_priv`,
-				u.`Create_tmp_table_priv`
-					= t.`Create_tmp_table_priv`,
-				u.`Lock_tables_priv`
-					= t.`Lock_tables_priv`,
-				u.`Execute_priv`
-					= t.`Execute_priv`,
-				u.`Repl_slave_priv`
-					= t.`Repl_slave_priv`,
-				u.`Repl_client_priv`
-					= t.`Repl_client_priv`,
-				u.`Create_view_priv`
-					= t.`Create_view_priv`,
-				u.`Show_view_priv`
-					= t.`Show_view_priv`,
-				u.`Create_routine_priv`
-					= t.`Create_routine_priv`,
-				u.`Alter_routine_priv`
-					= t.`Alter_routine_priv`,
-				u.`Create_user_priv`
-					= t.`Create_user_priv`,
-				u.`Event_priv`
-					= t.`Event_priv`,
-				u.`Trigger_priv`
-					= t.`Trigger_priv`,
-				u.`Create_tablespace_priv`
-					= t.`Create_tablespace_priv`;
-	ELSE
-		CREATE TEMPORARY TABLE tUserPriv
-			(INDEX (prefixedRole))
-			SELECT
-				r.prefixedRole,
-				BIT_OR(JSON_VALUE(p.`Priv`, '$.access')) access
-				FROM tRoleInherit r
-					JOIN mysql.global_priv p
-						ON p.`User` = r.inheritsFrom
-							AND p.`Host`= vRoleHost
-				GROUP BY r.prefixedRole;
-		
-		UPDATE mysql.global_priv p
-			JOIN tUserPriv t
-				ON p.`User` = t.prefixedRole
-					AND p.`Host` = vTplHost
-			SET
-				p.`Priv` = JSON_SET(p.`Priv`, '$.access', t.access);
-	END IF;
-
-	DROP TEMPORARY TABLE tUserPriv;
-
-	-- Copy schema level privileges
-
-	INSERT INTO mysql.db (
-			`User`,
-			`Host`,
-			`Db`,
-			`Select_priv`,
-			`Insert_priv`,
-			`Update_priv`,
-			`Delete_priv`,
-			`Create_priv`,
-			`Drop_priv`,
-			`Grant_priv`,
-			`References_priv`,
-			`Index_priv`,
-			`Alter_priv`,
-			`Create_tmp_table_priv`,
-			`Lock_tables_priv`,
-			`Create_view_priv`,
-			`Show_view_priv`,
-			`Create_routine_priv`,
-			`Alter_routine_priv`,
-			`Execute_priv`,
-			`Event_priv`,
-			`Trigger_priv`
-		)
-		SELECT
-			r.prefixedRole,
-			vTplHost,
-			t.`Db`,
-			MAX(t.`Select_priv`),
-			MAX(t.`Insert_priv`),
-			MAX(t.`Update_priv`),
-			MAX(t.`Delete_priv`),
-			MAX(t.`Create_priv`),
-			MAX(t.`Drop_priv`),
-			MAX(t.`Grant_priv`),
-			MAX(t.`References_priv`),
-			MAX(t.`Index_priv`),
-			MAX(t.`Alter_priv`),
-			MAX(t.`Create_tmp_table_priv`),
-			MAX(t.`Lock_tables_priv`),
-			MAX(t.`Create_view_priv`),
-			MAX(t.`Show_view_priv`),
-			MAX(t.`Create_routine_priv`),
-			MAX(t.`Alter_routine_priv`),
-			MAX(t.`Execute_priv`),
-			MAX(t.`Event_priv`),
-			MAX(t.`Trigger_priv`)
-			FROM tRoleInherit r
-				JOIN mysql.db t
-					ON t.`User` = r.inheritsFrom
-						AND t.`Host`= vRoleHost
-			GROUP BY r.prefixedRole, t.`Db`;
-
-	-- Copy table level privileges
-
-	INSERT INTO mysql.tables_priv (
-			`User`,
-			`Host`,
-			`Db`,
-			`Table_name`,
-			`Grantor`,
-			`Timestamp`,
-			`Table_priv`,
-			`Column_priv`
-		)
-		SELECT
-			r.prefixedRole,
-			vTplHost,
-			t.`Db`,
-			t.`Table_name`,
-			t.`Grantor`,
-			MAX(t.`Timestamp`),
-			IFNULL(GROUP_CONCAT(NULLIF(t.`Table_priv`, '')), ''),
-			IFNULL(GROUP_CONCAT(NULLIF(t.`Column_priv`, '')), '')
-			FROM tRoleInherit r
-				JOIN mysql.tables_priv t
-					ON t.`User` = r.inheritsFrom
-						AND t.`Host`= vRoleHost
-			GROUP BY r.prefixedRole, t.`Db`, t.`Table_name`;
-
-	-- Copy column level privileges
-
-	INSERT INTO mysql.columns_priv (
-			`User`,
-			`Host`,
-			`Db`,
-			`Table_name`,
-			`Column_name`,
-			`Timestamp`,
-			`Column_priv`
-		)
-		SELECT
-			r.prefixedRole,
-			vTplHost,
-			t.`Db`,
-			t.`Table_name`,
-			t.`Column_name`,
-			MAX(t.`Timestamp`),
-			IFNULL(GROUP_CONCAT(NULLIF(t.`Column_priv`, '')), '')
-			FROM tRoleInherit r
-				JOIN mysql.columns_priv t
-					ON t.`User` = r.inheritsFrom
-						AND t.`Host`= vRoleHost
-			GROUP BY r.prefixedRole, t.`Db`, t.`Table_name`, t.`Column_name`;
-
-	-- Copy routine privileges
-
-	INSERT IGNORE INTO mysql.procs_priv (
-			`User`,
-			`Host`,
-			`Db`,
-			`Routine_name`,
-			`Routine_type`,
-			`Grantor`,
-			`Timestamp`,
-			`Proc_priv`
-		)
-		SELECT
-			r.prefixedRole,
-			vTplHost,
-			t.`Db`,
-			t.`Routine_name`,
-			t.`Routine_type`,
-			t.`Grantor`,
-			t.`Timestamp`,
-			t.`Proc_priv`
-			FROM tRoleInherit r
-				JOIN mysql.procs_priv t
-					ON t.`User` = r.inheritsFrom
-						AND t.`Host`= vRoleHost;
-
-	-- Free memory
-
-	DROP TEMPORARY TABLE
-		tRole,
-		tRoleInherit;
-
-	FLUSH PRIVILEGES;
-END$$
-DELIMITER ;
diff --git a/db/changes/10240-allSaints/00-sambaConfig.sql b/db/changes/10240-allSaints/00-sambaConfig.sql
deleted file mode 100644
index c8a628dd7..000000000
--- a/db/changes/10240-allSaints/00-sambaConfig.sql
+++ /dev/null
@@ -1,36 +0,0 @@
-ALTER TABLE account.sambaConfig ADD adUser VARCHAR(255) DEFAULT NULL NULL COMMENT 'Active directory user';
-ALTER TABLE account.sambaConfig ADD adPassword varchar(255) DEFAULT NULL NULL COMMENT 'Active directory password';
-ALTER TABLE account.sambaConfig ADD userDn varchar(255) DEFAULT NULL NULL COMMENT 'The base DN for users';
-ALTER TABLE account.sambaConfig DROP COLUMN uidBase;
-ALTER TABLE account.sambaConfig CHANGE sshPass sshPassword varchar(255) DEFAULT NULL NULL COMMENT 'The SSH password';
-
-ALTER TABLE account.ldapConfig DROP COLUMN `filter`;
-ALTER TABLE account.ldapConfig CHANGE baseDn userDn varchar(255) DEFAULT NULL NULL COMMENT 'The base DN to do the query';
-ALTER TABLE account.ldapConfig CHANGE host server varchar(255) NOT NULL COMMENT 'The hostname of LDAP server';
-ALTER TABLE account.ldapConfig MODIFY COLUMN password varchar(255) NOT NULL COMMENT 'The LDAP password';
-
--- Updated
-
-ALTER TABLE account.sambaConfig DROP COLUMN sshUser;
-ALTER TABLE account.sambaConfig DROP COLUMN sshPassword;
-ALTER TABLE account.sambaConfig CHANGE host adController varchar(255) DEFAULT NULL NULL COMMENT 'The hosname of domain controller';
-ALTER TABLE account.sambaConfig MODIFY COLUMN adController varchar(255) DEFAULT NULL NULL COMMENT 'The hosname of domain controller';
-
-ALTER TABLE account.sambaConfig DROP COLUMN userDn;
-ALTER TABLE account.sambaConfig ADD adDomain varchar(255) NOT NULL AFTER id;
-ALTER TABLE account.sambaConfig ADD verifyCert TINYINT UNSIGNED NOT NULL DEFAULT TRUE AFTER adPassword;
-ALTER TABLE account.sambaConfig MODIFY COLUMN adController varchar(255) NOT NULL COMMENT 'The hosname of domain controller';
-
-ALTER TABLE account.user
-	ADD COLUMN `realm` varchar(512) CHARACTER SET utf8 DEFAULT NULL AFTER id,
-	ADD COLUMN `emailVerified` tinyint(1) DEFAULT NULL AFTER email,
-	ADD COLUMN `verificationToken` varchar(512) DEFAULT NULL AFTER emailVerified;
-  
-DROP TABLE salix.user;
-
-CREATE OR REPLACE VIEW salix.User
-	AS SELECT id, realm, name AS username, bcryptPassword AS password, email, emailVerified, verificationToken
-		FROM account.user;
-	
-ALTER TABLE account.`user`
-	MODIFY COLUMN bcryptPassword varchar(512) DEFAULT NULL NULL;
diff --git a/db/changes/10240-allSaints/00-supplierLog.sql b/db/changes/10240-allSaints/00-supplierLog.sql
deleted file mode 100644
index 5ab76ac37..000000000
--- a/db/changes/10240-allSaints/00-supplierLog.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE `vn`.`supplierLog` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `originFk` int(11) NOT NULL,
-  `userFk` int(10) unsigned NOT NULL,
-  `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT current_timestamp(),
-  `description` text CHARACTER SET utf8 DEFAULT NULL,
-  `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `changedModelId` int(11) DEFAULT NULL,
-  `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `logSupplier_ibfk_1` (`originFk`),
-  KEY `supplierLog_ibfk_2` (`userFk`),
-  CONSTRAINT `supplierLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `supplier` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `supplierLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-
diff --git a/db/changes/10240-allSaints/00-supplier_contact.sql b/db/changes/10240-allSaints/00-supplier_contact.sql
deleted file mode 100644
index 5054366b0..000000000
--- a/db/changes/10240-allSaints/00-supplier_contact.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-CREATE TABLE `vn`.`supplierContact` (
-  `id` INT(11) NOT NULL AUTO_INCREMENT,
-  `supplierFk` INT(11) NULL DEFAULT NULL,
-  `phone` VARCHAR(16) NULL DEFAULT NULL,
-  `mobile` VARCHAR(16) NULL DEFAULT NULL,
-  `email` VARCHAR(255) NULL DEFAULT NULL,
-  `observation` TEXT NULL DEFAULT NULL,
-  `name` VARCHAR(255) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB;
-
-
-ALTER TABLE `vn`.`supplierContact` 
-ADD CONSTRAINT `supplier_id`
-  FOREIGN KEY (`supplierFk`)
-  REFERENCES `vn`.`supplier` (`id`)
-  ON DELETE CASCADE
-  ON UPDATE CASCADE;
-  
-INSERT INTO vn.supplierContact(supplierFk,phone,mobile,email,observation,`name`)
-	SELECT r.Id_Proveedor,c.Telefono,c.Movil,c.email,c.Notas,concat(c.Nombre," ", IFNULL(c.Apellidos,""))
-	FROM vn2008.Contactos c
-		JOIN vn2008.Relaciones r ON r.Id_Contacto = c.Id_Contacto
-		JOIN vn.supplier s ON s.id = r.Id_Proveedor;
\ No newline at end of file
diff --git a/db/changes/10240-allSaints/00-ticket_beforeUpdate.sql b/db/changes/10240-allSaints/00-ticket_beforeUpdate.sql
deleted file mode 100644
index 183636081..000000000
--- a/db/changes/10240-allSaints/00-ticket_beforeUpdate.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-DROP TRIGGER IF EXISTS `vn`.`ticket_afterUpdate`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` TRIGGER `ticket_afterUpdate`
-	AFTER UPDATE ON `ticket`
-    FOR EACH ROW
-BEGIN
-    IF !(NEW.id <=> OLD.id)
-    OR !(NEW.warehouseFk <=> OLD.warehouseFk)
-    OR !(NEW.shipped <=> OLD.shipped) THEN
-		CALL stock.log_add('ticket', NEW.id, OLD.id);
-	END IF;
-   
-    IF NEW.clientFk = 2067 AND !(NEW.clientFk <=> OLD.clientFk)  THEN
-		-- Fallo que se insertan no se sabe como tickets en este cliente
-		INSERT INTO vn.mail SET
-			`sender` = 'jgallego@verdnatura.es',
-			`replyTo` = 'jgallego@verdnatura.es',
-			`subject` = 'Modificado ticket al cliente 2067',
-			`body` = CONCAT(account.myUserGetName(), ' ha modificado el ticket ',
-				NEW.id);
-    END IF;
-END$$
-DELIMITER ;
diff --git a/db/changes/10240-allSaints/00-ticket_componentPreview.sql b/db/changes/10240-allSaints/00-ticket_componentPreview.sql
deleted file mode 100644
index 8f2a5e1eb..000000000
--- a/db/changes/10240-allSaints/00-ticket_componentPreview.sql
+++ /dev/null
@@ -1,107 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_componentPreview`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentPreview`(
-	vTicketFk INT,
-    vLanded DATE, 
-    vAddressFk INT,
-    vZoneFk INT,
-    vWarehouseFk SMALLINT)
-BEGIN
-/**
- * Calcula los componentes de los articulos de un ticket
- *
- * @param vTicketFk id del ticket
- * @param vLanded nueva fecha de entrega
- * @param vAddressFk nuevo consignatario
- * @param vZoneFk nueva zona
- * @param vWarehouseFk nuevo warehouse
- *
- * @return tmp.ticketComponentPreview (warehouseFk, itemFk, componentFk, cost)
- */
-	DECLARE vHasDataChanged BOOL DEFAULT FALSE;    
-	DECLARE vHasAddressChanged BOOL;
-	DECLARE vHasZoneChanged BOOL DEFAULT FALSE;
-	DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE;
-
-	DECLARE vShipped DATE;
-	DECLARE vAddressTypeRateFk INT DEFAULT NULL;
-	DECLARE vAgencyModeTypeRateFk INT DEFAULT NULL;
-
-	DECLARE vHasChangeAll BOOL DEFAULT FALSE;
-
-	SELECT DATE(landed) <> vLanded, 
-			addressFk <> vAddressFk, 
-			zoneFk <> vZoneFk,
-			warehouseFk <> vWarehouseFk
-		INTO
-			vHasDataChanged,
-			vHasAddressChanged,
-			vHasZoneChanged,
-			vHasWarehouseChanged
-		FROM vn.ticket t
-		WHERE t.id = vTicketFk;
-
-	IF vHasDataChanged OR vHasWarehouseChanged THEN
-		SET vHasChangeAll = TRUE;
-	END IF;
-
-	IF vHasAddressChanged THEN
-		SET vAddressTypeRateFk = 5;
-	END IF;
-
-	IF vHasZoneChanged THEN
-		SET vAgencyModeTypeRateFk = 6;
-	END IF;
-
-	SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped 
-		FROM zone
-		WHERE id = vZoneFk;
-		
-	CALL buyUltimate(vWarehouseFk, vShipped);
-		
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-	CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( 
-	SELECT 
-			vWarehouseFk AS warehouseFk,
-			NULL AS available,
-			s.itemFk,
-			bu.buyFk,
-			vZoneFk zoneFk
-		FROM sale s
-			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-		WHERE s.ticketFk = vTicketFk
-		GROUP BY bu.warehouseFk, bu.itemFk);
-
-	CALL catalog_componentPrepare();
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-	REPLACE INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT t.warehouseFk, s.itemFk, sc.componentFk, sc.value
-			FROM saleComponent sc
-				JOIN sale s ON s.id = sc.saleFk
-				JOIN ticket t ON t.id = s.ticketFk
-				JOIN `component` c ON c.id = sc.componentFk
-			WHERE s.ticketFk = vTicketFk 
-				AND (c.isRenewable = FALSE 
-					OR 
-					(NOT vHasChangeAll
-						AND (NOT (c.typeFk <=> vAddressTypeRateFk
-						OR c.typeFk <=> vAgencyModeTypeRateFk))));
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPreview;
-	CREATE TEMPORARY TABLE tmp.ticketComponentPreview
-		SELECT * FROM tmp.ticketComponent;
-
-	CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-
-	IF vShipped IS NULL THEN
-		CALL util.throw('NO_ZONE_AVAILABLE');
-	END IF;
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10250-curfew/00-ACL.sql b/db/changes/10250-curfew/00-ACL.sql
deleted file mode 100644
index 9c7fe1712..000000000
--- a/db/changes/10250-curfew/00-ACL.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-UPDATE `salix`.`ACL` SET `principalId` = 'deliveryBoss' WHERE (`id` = '194');
-UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '97');
-UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '100');
-UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '103');
-UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '202');
-
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Town', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Province', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Supplier', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Supplier', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('SupplierLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('SupplierContact', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
\ No newline at end of file
diff --git a/db/changes/10250-curfew/00-claimState.sql b/db/changes/10250-curfew/00-claimState.sql
deleted file mode 100644
index 64ec0f30d..000000000
--- a/db/changes/10250-curfew/00-claimState.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '3');
-UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '4');
-UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '5');
\ No newline at end of file
diff --git a/db/changes/10250-curfew/00-imageCollection.sql b/db/changes/10250-curfew/00-imageCollection.sql
deleted file mode 100644
index f08f2f670..000000000
--- a/db/changes/10250-curfew/00-imageCollection.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-
-ALTER TABLE `hedera`.`imageCollection` 
-ADD COLUMN `readRoleFk` VARCHAR(45) NULL DEFAULT NULL AFTER `column`;
-
-update `hedera`.`imageCollection` set `readRoleFk` = 1;
\ No newline at end of file
diff --git a/db/changes/10250-curfew/00-observationType.sql b/db/changes/10250-curfew/00-observationType.sql
deleted file mode 100644
index 426fa1b55..000000000
--- a/db/changes/10250-curfew/00-observationType.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-ALTER TABLE `vn`.`observationType` 
-ADD COLUMN `code` VARCHAR(45) NOT NULL AFTER `description`;
-
-UPDATE `vn`.`observationType` SET `code` = 'itemPicker' WHERE (`id` = '1');
-UPDATE `vn`.`observationType` SET `code` = 'packager' WHERE (`id` = '2');
-UPDATE `vn`.`observationType` SET `code` = 'salesPerson' WHERE (`id` = '4');
-UPDATE `vn`.`observationType` SET `code` = 'administrative' WHERE (`id` = '5');
-UPDATE `vn`.`observationType` SET `code` = 'weight' WHERE (`id` = '6');
-UPDATE `vn`.`observationType` SET `code` = 'delivery' WHERE (`id` = '3');
diff --git a/db/changes/10250-curfew/00-supplierLog.sql b/db/changes/10250-curfew/00-supplierLog.sql
deleted file mode 100644
index 5ab76ac37..000000000
--- a/db/changes/10250-curfew/00-supplierLog.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE `vn`.`supplierLog` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `originFk` int(11) NOT NULL,
-  `userFk` int(10) unsigned NOT NULL,
-  `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT current_timestamp(),
-  `description` text CHARACTER SET utf8 DEFAULT NULL,
-  `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `changedModelId` int(11) DEFAULT NULL,
-  `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `logSupplier_ibfk_1` (`originFk`),
-  KEY `supplierLog_ibfk_2` (`userFk`),
-  CONSTRAINT `supplierLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `supplier` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `supplierLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-
diff --git a/db/changes/10250-curfew/00-ticket_beforeUpdate.sql b/db/changes/10250-curfew/00-ticket_beforeUpdate.sql
deleted file mode 100644
index 183636081..000000000
--- a/db/changes/10250-curfew/00-ticket_beforeUpdate.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-DROP TRIGGER IF EXISTS `vn`.`ticket_afterUpdate`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` TRIGGER `ticket_afterUpdate`
-	AFTER UPDATE ON `ticket`
-    FOR EACH ROW
-BEGIN
-    IF !(NEW.id <=> OLD.id)
-    OR !(NEW.warehouseFk <=> OLD.warehouseFk)
-    OR !(NEW.shipped <=> OLD.shipped) THEN
-		CALL stock.log_add('ticket', NEW.id, OLD.id);
-	END IF;
-   
-    IF NEW.clientFk = 2067 AND !(NEW.clientFk <=> OLD.clientFk)  THEN
-		-- Fallo que se insertan no se sabe como tickets en este cliente
-		INSERT INTO vn.mail SET
-			`sender` = 'jgallego@verdnatura.es',
-			`replyTo` = 'jgallego@verdnatura.es',
-			`subject` = 'Modificado ticket al cliente 2067',
-			`body` = CONCAT(account.myUserGetName(), ' ha modificado el ticket ',
-				NEW.id);
-    END IF;
-END$$
-DELIMITER ;
diff --git a/db/changes/10250-curfew/00-ticket_componentPreview.sql b/db/changes/10250-curfew/00-ticket_componentPreview.sql
deleted file mode 100644
index 8f2a5e1eb..000000000
--- a/db/changes/10250-curfew/00-ticket_componentPreview.sql
+++ /dev/null
@@ -1,107 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_componentPreview`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentPreview`(
-	vTicketFk INT,
-    vLanded DATE, 
-    vAddressFk INT,
-    vZoneFk INT,
-    vWarehouseFk SMALLINT)
-BEGIN
-/**
- * Calcula los componentes de los articulos de un ticket
- *
- * @param vTicketFk id del ticket
- * @param vLanded nueva fecha de entrega
- * @param vAddressFk nuevo consignatario
- * @param vZoneFk nueva zona
- * @param vWarehouseFk nuevo warehouse
- *
- * @return tmp.ticketComponentPreview (warehouseFk, itemFk, componentFk, cost)
- */
-	DECLARE vHasDataChanged BOOL DEFAULT FALSE;    
-	DECLARE vHasAddressChanged BOOL;
-	DECLARE vHasZoneChanged BOOL DEFAULT FALSE;
-	DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE;
-
-	DECLARE vShipped DATE;
-	DECLARE vAddressTypeRateFk INT DEFAULT NULL;
-	DECLARE vAgencyModeTypeRateFk INT DEFAULT NULL;
-
-	DECLARE vHasChangeAll BOOL DEFAULT FALSE;
-
-	SELECT DATE(landed) <> vLanded, 
-			addressFk <> vAddressFk, 
-			zoneFk <> vZoneFk,
-			warehouseFk <> vWarehouseFk
-		INTO
-			vHasDataChanged,
-			vHasAddressChanged,
-			vHasZoneChanged,
-			vHasWarehouseChanged
-		FROM vn.ticket t
-		WHERE t.id = vTicketFk;
-
-	IF vHasDataChanged OR vHasWarehouseChanged THEN
-		SET vHasChangeAll = TRUE;
-	END IF;
-
-	IF vHasAddressChanged THEN
-		SET vAddressTypeRateFk = 5;
-	END IF;
-
-	IF vHasZoneChanged THEN
-		SET vAgencyModeTypeRateFk = 6;
-	END IF;
-
-	SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped 
-		FROM zone
-		WHERE id = vZoneFk;
-		
-	CALL buyUltimate(vWarehouseFk, vShipped);
-		
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-	CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( 
-	SELECT 
-			vWarehouseFk AS warehouseFk,
-			NULL AS available,
-			s.itemFk,
-			bu.buyFk,
-			vZoneFk zoneFk
-		FROM sale s
-			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-		WHERE s.ticketFk = vTicketFk
-		GROUP BY bu.warehouseFk, bu.itemFk);
-
-	CALL catalog_componentPrepare();
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-	REPLACE INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT t.warehouseFk, s.itemFk, sc.componentFk, sc.value
-			FROM saleComponent sc
-				JOIN sale s ON s.id = sc.saleFk
-				JOIN ticket t ON t.id = s.ticketFk
-				JOIN `component` c ON c.id = sc.componentFk
-			WHERE s.ticketFk = vTicketFk 
-				AND (c.isRenewable = FALSE 
-					OR 
-					(NOT vHasChangeAll
-						AND (NOT (c.typeFk <=> vAddressTypeRateFk
-						OR c.typeFk <=> vAgencyModeTypeRateFk))));
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPreview;
-	CREATE TEMPORARY TABLE tmp.ticketComponentPreview
-		SELECT * FROM tmp.ticketComponent;
-
-	CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-
-	IF vShipped IS NULL THEN
-		CALL util.throw('NO_ZONE_AVAILABLE');
-	END IF;
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10250-curfew/00-timeControlCalculate.sql b/db/changes/10250-curfew/00-timeControlCalculate.sql
deleted file mode 100644
index 90d9acca9..000000000
--- a/db/changes/10250-curfew/00-timeControlCalculate.sql
+++ /dev/null
@@ -1,43 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`timeControl_calculate`;
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`timeControl_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
-BEGIN
-	SET @vIsOdd := TRUE;
-	SET @vUser := NULL;
-	SET @vDated := NULL;	
- 
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
-    
-	CREATE TEMPORARY TABLE tmp.timeControlCalculate
-        SELECT
-            userFk,
-            dated,
-            IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds,
-            SEC_TO_TIME(@timeWork ) timeWorkSexagesimal,
-            @timeWork / 3600 timeWorkDecimal,
-            timed
-            FROM (SELECT SUM(timeWork) timeWork,
-                    userFk,
-                    dated,
-                    GROUP_CONCAT(DATE_FORMAT(sub.timed,"%H:%i")  ORDER BY sub.timed ASC SEPARATOR ' - ') timed
-                    FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk),
-                        IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE),
-                        IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd),
-                        IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed),
-                        IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork,
-                        IF(direction='in', @vDated := DATE(wtc.timed), @vDated :=@vDated) dated,
-                        wtc.timed timed,
-                        wtc.userFk,
-                        direction
-                        FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
-                                FROM workerTimeControl wtc
-                                    JOIN tmp.`user` w ON w.userFk = wtc.userFk
-                                WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo
-                                ORDER BY userFk, timed ASC
-                            ) wtc
-                    WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo
-                    ) sub
-                GROUP BY userFk, dated
-            )sub2;
-END$$
-DELIMITER ;
\ No newline at end of file
diff --git a/db/changes/10250-curfew/00-user.sql b/db/changes/10250-curfew/00-user.sql
deleted file mode 100644
index 90bcf8fc5..000000000
--- a/db/changes/10250-curfew/00-user.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `account`.`user` 
-ADD COLUMN `image` VARCHAR(255) NULL AFTER `password`;
diff --git a/db/changes/10250-curfew/01-supplierFreighter.sql b/db/changes/10250-curfew/01-supplierFreighter.sql
deleted file mode 100644
index 56c5f7680..000000000
--- a/db/changes/10250-curfew/01-supplierFreighter.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE `vn`.supplierFreighter
-(
-    supplierFk INT NOT NULL,
-    CONSTRAINT supplierFreighter_pk
-        PRIMARY KEY (supplierFk),
-    CONSTRAINT supplier_id_fk
-        FOREIGN KEY (supplierFk) REFERENCES supplier (id)
-            ON UPDATE CASCADE ON DELETE CASCADE
-);
-
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (286);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (454);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (582);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (470);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (775);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (812);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (1112);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (1242);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (1281);
-INSERT IGNORE INTO `vn`.supplierFreighter (supplierFk) VALUES (1765);
\ No newline at end of file
diff --git a/db/changes/10250-curfew/02-travel.sql b/db/changes/10250-curfew/02-travel.sql
deleted file mode 100644
index 3bd84d61f..000000000
--- a/db/changes/10250-curfew/02-travel.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `vn`.travel
-    DROP FOREIGN KEY travel_ibfk_4;
-
-ALTER TABLE `vn`.travel
-    ADD CONSTRAINT supplierFreighter_fk_4
-        FOREIGN KEY (cargoSupplierFk) REFERENCES supplierFreighter (supplierFk)
-            ON UPDATE CASCADE ON DELETE SET NULL;
diff --git a/db/changes/10250-curfew/03-continent.sql b/db/changes/10250-curfew/03-continent.sql
deleted file mode 100644
index 279a73669..000000000
--- a/db/changes/10250-curfew/03-continent.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE `vn`.continent
-(
-    id   TINYINT(4) AUTO_INCREMENT,
-    name VARCHAR(50) NOT NULL,
-    code VARCHAR(2) NOT NULL COLLATE utf8_general_ci,
-    CONSTRAINT continent_pk
-        PRIMARY KEY (id)
-)
-    COMMENT 'World continents';
-
-CREATE UNIQUE INDEX continent_name_uindex
-    ON `vn`.continent (name);
-
-INSERT IGNORE INTO `vn`.continent (`name`, `code`) 
-    VALUES 
-        ('Asia', 'AS'),
-        ('América', 'AM'),
-        ('África', 'AF'),
-        ('Europa', 'EU'),
-        ('Oceanía', 'OC');
\ No newline at end of file
diff --git a/db/changes/10250-curfew/04-country.sql b/db/changes/10250-curfew/04-country.sql
deleted file mode 100644
index e7ffbc67f..000000000
--- a/db/changes/10250-curfew/04-country.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTER TABLE `vn`.`country` 
-    ADD COLUMN `continentFk` TINYINT(4) NULL AFTER `ibanLength`,
-    ADD INDEX `continent_id_fk_idx` (`continentFk` ASC);
-
-ALTER TABLE `vn`.`country` 
-ADD CONSTRAINT `continent_id_fk`
-  FOREIGN KEY (`continentFk`)
-  REFERENCES `vn`.`continent` (`id`)
-  ON DELETE NO ACTION
-  ON UPDATE CASCADE;
-
-UPDATE `vn`.`country` SET `continentFk` = '2' WHERE (`id` = '11');
-UPDATE `vn`.`country` SET `continentFk` = '2' WHERE (`id` = '13');
diff --git a/db/changes/10260-holidays/00-ACL.sql b/db/changes/10260-holidays/00-ACL.sql
deleted file mode 100644
index 83b8aded6..000000000
--- a/db/changes/10260-holidays/00-ACL.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) VALUES ('Image', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10260-holidays/00-entryObservation.sql b/db/changes/10260-holidays/00-entryObservation.sql
deleted file mode 100644
index 6184cf3bd..000000000
--- a/db/changes/10260-holidays/00-entryObservation.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE `vn`.`entryObservation` (
-    id int NOT NULL AUTO_INCREMENT,
-    entryFk int NOT NULL,
-    observationTypeFk TINYINT(3) UNSIGNED,
-    description TEXT,
-    PRIMARY KEY (id),
-    CONSTRAINT entry_id_entryFk
-    FOREIGN KEY (entryFk) REFERENCES entry(id),
-    CONSTRAINT observationType_id_observationTypeFk
-    FOREIGN KEY (observationTypeFk) REFERENCES observationType(id)
-);
-
-ALTER TABLE `vn`.`entryObservation` 
-ADD UNIQUE INDEX `entryFk_observationTypeFk_UNIQUE` (`entryFk` ASC,`observationTypeFk` ASC);
\ No newline at end of file
diff --git a/db/changes/10260-holidays/00-travel_cloneWithEntries.sql b/db/changes/10260-holidays/00-travel_cloneWithEntries.sql
deleted file mode 100644
index 1302a78ca..000000000
--- a/db/changes/10260-holidays/00-travel_cloneWithEntries.sql
+++ /dev/null
@@ -1,135 +0,0 @@
--- DROP PROCEDURE `vn`.`clonTravelComplete`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE
-    DEFINER = root@`%` PROCEDURE `vn`.`travel_cloneWithEntries`(IN vTravelFk INT, IN vDateStart DATE, IN vDateEnd DATE,
-                                                    IN vRef VARCHAR(255), OUT vNewTravelFk INT)
-BEGIN
-	DECLARE vEntryNew INT;
-	DECLARE vDone BOOLEAN DEFAULT FALSE;
-	DECLARE vAuxEntryFk INT;
-	DECLARE vRsEntry CURSOR FOR
-		SELECT e.id
-			FROM entry e
-				JOIN travel t 
-					ON t.id = e.travelFk
-			WHERE e.travelFk = vTravelFk;
-		
-	 DECLARE vRsBuy CURSOR FOR
-		SELECT b.*
-			FROM buy b
-				JOIN entry  e 
-				ON  b.entryFk = e.id
-		WHERE 	e.travelFk = vNewTravelFk and b.entryFk=vNewTravelFk
-		ORDER BY e.id;
-		
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION 
-		BEGIN 
-			ROLLBACK;
-			RESIGNAL;
-		END;
-		  
-	START TRANSACTION;
-		  
-	INSERT INTO travel (shipped,landed, warehouseInFk, warehouseOutFk, agencyFk, ref, isDelivered, isReceived, m3, kg)
-		SELECT vDateStart, vDateEnd,warehouseInFk, warehouseOutFk, agencyFk, vRef, isDelivered, isReceived, m3, kg
-			FROM travel
-			WHERE id = vTravelFk;
-		
-	SET vNewTravelFk = LAST_INSERT_ID();
-	SET vDone = FALSE;	 
-	OPEN vRsEntry ;
-	FETCH vRsEntry INTO vAuxEntryFk;
-	
-		WHILE NOT vDone DO
-			INSERT INTO entry (supplierFk,
-								ref,
-								isInventory,
-								isConfirmed, 
-								isOrdered,
-								isRaid,
-								commission,
-								created,
-								evaNotes,
-								travelFk,
-								currencyFk,
-								companyFk,
-								gestDocFk, 
-								invoiceInFk)
-					 SELECT supplierFk,
-							ref,
-							isInventory,
-							isConfirmed, 
-							isOrdered,
-							isRaid,
-							commission,
-							created,
-							evaNotes,
-							vNewTravelFk,
-							currencyFk,
-							companyFk,
-							gestDocFk, 
-							invoiceInFk
-					FROM entry
-					WHERE id = vAuxEntryFk;
-								
-			SET vEntryNew  = LAST_INSERT_ID();
-			
-						
-				 INSERT INTO buy (entryFk,
-									itemFk,
-									quantity,
-									buyingValue,
-									packageFk,
-									stickers,
-									freightValue,
-									packageValue,
-									comissionValue,
-									packing,
-									`grouping`,
-									groupingMode,
-									location,
-									price1,
-									price2,
-									price3,
-									minPrice,
-									producer,
-									printedStickers,
-									isChecked,
-									weight)
-							SELECT vEntryNew,
-									itemFk,
-									quantity,
-									buyingValue,
-									packageFk,
-									stickers,
-									freightValue,
-									packageValue,
-									comissionValue,
-									packing,
-									`grouping`,
-									groupingMode,
-									location,
-									price1,
-									price2,
-									price3,
-									minPrice,
-									producer,
-									printedStickers,
-									isChecked,
-									weight
-								FROM buy
-								WHERE entryFk = vAuxEntryFk;       
-								
-						  
-			FETCH vRsEntry INTO vAuxEntryFk;
-		END WHILE;
-	CLOSE vRsEntry;
-	COMMIT;
-END;$$
-DELIMITER ;
-
-
diff --git a/db/changes/10260-holidays/00-zoneLog.sql b/db/changes/10260-holidays/00-zoneLog.sql
deleted file mode 100644
index 13d81bc92..000000000
--- a/db/changes/10260-holidays/00-zoneLog.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-CREATE TABLE `vn`.`zoneLog` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `originFk` int(10) NOT NULL,
-  `userFk` int(10) unsigned DEFAULT NULL,
-  `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT current_timestamp(),
-  `description` text CHARACTER SET utf8 DEFAULT NULL,
-  `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `changedModelId` int(11) DEFAULT NULL,
-  `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `originFk` (`originFk`),
-  KEY `userFk` (`userFk`),
-  CONSTRAINT `zoneLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn`.`zone` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `zoneLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/db/changes/10260-holidays/01-role.sql b/db/changes/10260-holidays/01-role.sql
deleted file mode 100644
index e5b1e313e..000000000
--- a/db/changes/10260-holidays/01-role.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-INSERT INTO account.role (id, name, description)
-    VALUES
-        (74, 'userPhotos', 'Privilegios para subir fotos de usuario'),
-        (75, 'catalogPhotos', 'Privilegios para subir fotos del catálogo');
-
-INSERT INTO account.roleInherit (role, inheritsFrom)
-    VALUES 
-        (37, (SELECT id FROM account.role WHERE name = 'userPhotos')),
-        (51, (SELECT id FROM account.role WHERE name = 'userPhotos')),
-        (51, (SELECT id FROM account.role WHERE name = 'catalogPhotos')),
-        (35, (SELECT id FROM account.role WHERE name = 'catalogPhotos'));
-
-CALL account.role_sync();
\ No newline at end of file
diff --git a/db/changes/10260-holidays/02-imageCollection.sql b/db/changes/10260-holidays/02-imageCollection.sql
deleted file mode 100644
index b32e591c7..000000000
--- a/db/changes/10260-holidays/02-imageCollection.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-ALTER TABLE `hedera`.`imageCollection`
-    ADD writeRoleFk INT UNSIGNED NULL DEFAULT 1;
-
-ALTER TABLE `hedera`.`imageCollection`
-    ADD CONSTRAINT role_id_writeRoleFk
-        FOREIGN KEY (writeRoleFk) REFERENCES account.role (id)
-            ON UPDATE CASCADE;
-
-ALTER TABLE `hedera`.`imageCollection` modify readRoleFk INT UNSIGNED default 1 null;
-
-ALTER TABLE `hedera`.`imageCollection`
-    ADD CONSTRAINT role_id_readRoleFk
-        FOREIGN KEY (readRoleFk) REFERENCES account.role (id)
-            ON UPDATE CASCADE;
-
-UPDATE hedera.imageCollection t SET t.writeRoleFk = (
-    SELECT id FROM `account`.`role` WHERE name = 'catalogPhotos'
-)
-WHERE t.name = 'catalog';
-
-UPDATE hedera.imageCollection t SET t.writeRoleFk = (
-    SELECT id FROM `account`.`role` WHERE name = 'userPhotos'
-) 
-WHERE t.name = 'user';
-
-UPDATE hedera.imageCollection t SET t.writeRoleFk = 9
-WHERE t.name IN ('link', 'news');
diff --git a/db/changes/10270-wisemen/00-itemTag.sql b/db/changes/10270-wisemen/00-itemTag.sql
deleted file mode 100644
index f1e9370d5..000000000
--- a/db/changes/10270-wisemen/00-itemTag.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-DROP TRIGGER IF EXISTS `vn`.`itemTag_afterUpdate`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`itemTag_afterUpdate`
-	AFTER UPDATE ON `itemTag` FOR EACH ROW
-trig: BEGIN
-	IF @isTriggerDisabled THEN
-		LEAVE trig;
-	END IF;
-    
-	DROP TEMPORARY TABLE IF EXISTS tmp.item;
-	CREATE TEMPORARY TABLE tmp.item
-		SELECT NEW.itemFk id;
-
-	CALL item_refreshTags();
-	DROP TEMPORARY TABLE tmp.item;
-END$$
-DELIMITER ;
\ No newline at end of file
diff --git a/db/changes/10271-wisemen/00-ACL.sql b/db/changes/10271-wisemen/00-ACL.sql
deleted file mode 100644
index 5cb5a746a..000000000
--- a/db/changes/10271-wisemen/00-ACL.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) 
-    VALUES 
-        ('FixedPrice', '*', '*', 'ALLOW', 'ROLE', 'buyer'),
-        ('PayDem', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
-        ('Client', 'createReceipt', '*', 'ALLOW', 'ROLE', 'administrative'),
-        ('PrintServerQueue', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');
diff --git a/db/changes/10271-wisemen/01-doCompensation.sql b/db/changes/10271-wisemen/01-doCompensation.sql
deleted file mode 100644
index d1021ae42..000000000
--- a/db/changes/10271-wisemen/01-doCompensation.sql
+++ /dev/null
@@ -1,82 +0,0 @@
-DROP PROCEDURE IF EXISTS vn.ledger_doCompensation;
-
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ledger_doCompensation`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10))
-BEGIN
-/**
- * Compensa un pago o un recibo insertando en contabilidad
- *
- * @param vDated fecha en la cual se anota
- * @param vCompensationAccount cuenta contable contra la que se compensa
- * @param vBankFk banco de la compensacion
- * @param vConcept descripcion
- * @param vAmount cantidad que se compensa
- * @param vCompany empresa
- * @param vOriginalAccount cuenta contable desde la cual se compensa 
- * 
- */   
-	DECLARE vNewBookEntry INT;
-    DECLARE vIsClientCompensation INT;
-	DECLARE vClientFk INT;
-    DECLARE vSupplierFk INT;
-  	DECLARE vIsOriginalAClient BOOL;
-    DECLARE vPayMethodCompensation INT;
-    
-	CALL ledger_next(vNewBookEntry);
-
-	SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci;
-
-	SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation 
-		FROM client 
-		WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci;
-	
-	SET @vAmount1:= 0.0;
-	SET @vAmount2:= 0.0;
-
-    INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) 
-		VALUES ( 	vNewBookEntry, 
-					vDated, 
-					vOriginalAccount, 
-					vCompensationAccount, 
-					vConcept, 
-					@vAmount1:= IF(
-						(vIsOriginalAClient OR NOT vIsOriginalAClient)
-						AND vAmount > 0, 
-						0, 
-						ABS(vAmount)
-					),
-					@vAmount2:= IF(@vAmount1,
-						0,
-						ABS(vAmount)
-					),
-					vCompanyFk
-				),
-                (	vNewBookEntry, 
-               		vDated, 
-               		vCompensationAccount, 
-               		vOriginalAccount, 
-               		vConcept, 
-               		@vAmount2,
-					@vAmount1,
-               		vCompanyFk);
-   
-    IF vIsClientCompensation THEN
-    	IF vIsOriginalAClient THEN
-    		SET vAmount = -vAmount;
-    	END IF;
-		INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) 
-			VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE);
-    ELSE
-    	IF NOT vIsOriginalAClient THEN
-    		SET vAmount = -vAmount;
-    	END IF;
-	    SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci;
-		SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation';
-	
-		INSERT INTO payment (received, dueDated, supplierFk, amount, bankFk, payMethodFk, concept, companyFk, isConciliated)
-			VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE);
-    END IF;
-END$$
-DELIMITER ;
diff --git a/db/changes/10271-wisemen/02-triggerReceipt.sql b/db/changes/10271-wisemen/02-triggerReceipt.sql
deleted file mode 100644
index 9b08a302f..000000000
--- a/db/changes/10271-wisemen/02-triggerReceipt.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-DROP TRIGGER IF EXISTS vn.receipt_beforInsert;
-
-DELIMITER $$
-$$
-CREATE TRIGGER receipt_beforInsert
-BEFORE INSERT
-ON receipt FOR EACH ROW
-BEGIN 
-	SELECT isAutoConciliated INTO @isAutoConciliated 
-		FROM accounting a 
-			JOIN accountingType at2 ON at2.id = a.accountingTypeFk 
-		WHERE a.id =NEW.bankFk;
-
-	SET NEW.isConciliate = @isAutoConciliated;
-END
-$$
-DELIMITER ;
diff --git a/db/changes/10281-valentineDay/00-ACL.sql b/db/changes/10281-valentineDay/00-ACL.sql
index 88a641a69..861db5777 100644
--- a/db/changes/10281-valentineDay/00-ACL.sql
+++ b/db/changes/10281-valentineDay/00-ACL.sql
@@ -1,4 +1,5 @@
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) 
     VALUES 
         ('SupplierAccount', '*', '*', 'ALLOW', 'ROLE', 'administrative'),
-        ('Entry', '*', '*', 'ALLOW', 'ROLE', 'administrative');
+        ('Entry', '*', '*', 'ALLOW', 'ROLE', 'administrative'),
+        ('InvoiceIn', '*', '*', 'ALLOW', 'ROLE', 'administrative');
diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql
index ec7be51e9..627d7cdc1 100644
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@@ -1,10 +1,10 @@
 
 USE `util`;
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: util
+-- Host: test-db.verdnatura.es    Database: util
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -12,7 +12,6 @@ USE `util`;
 /*!40101 SET NAMES utf8 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -23,26 +22,25 @@ USE `util`;
 
 LOCK TABLES `config` WRITE;
 /*!40000 ALTER TABLE `config` DISABLE KEYS */;
-INSERT INTO `config` VALUES (1,'10240',0,'production',NULL);
+INSERT INTO `config` VALUES (1,'10280',0,'test','2021-02-09 04:05:43');
 /*!40000 ALTER TABLE `config` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:34:37
+-- Dump completed on 2021-02-09 12:15:11
 USE `account`;
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: account
+-- Host: test-db.verdnatura.es    Database: account
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -50,7 +48,6 @@ USE `account`;
 /*!40101 SET NAMES utf8 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -61,7 +58,7 @@ USE `account`;
 
 LOCK TABLES `role` WRITE;
 /*!40000 ALTER TABLE `role` DISABLE KEYS */;
-INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',0,'2018-02-26 15:28:23','2019-01-21 12:57:21'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09'),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25'),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07'),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46'),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27'),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41'),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07');
+INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',0,'2018-02-26 15:28:23','2019-01-21 12:57:21'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09'),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25'),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07'),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46'),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27'),(74,'userPhotos','Privilegios para subir fotos de usuario',1,'2021-02-03 10:24:27','2021-02-03 10:24:27'),(75,'catalogPhotos','Privilegios para subir fotos del catálogo',1,'2021-02-03 10:24:27','2021-02-03 10:24:27'),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41'),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07');
 /*!40000 ALTER TABLE `role` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -71,7 +68,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `roleInherit` WRITE;
 /*!40000 ALTER TABLE `roleInherit` DISABLE KEYS */;
-INSERT INTO `roleInherit` VALUES (1,1,2),(2,1,3),(3,1,70),(4,2,11),(5,3,11),(6,5,1),(7,5,21),(8,5,33),(124,5,76),(123,9,76),(9,9,100),(10,11,6),(11,13,1),(12,15,35),(13,15,57),(114,15,76),(14,16,13),(15,16,15),(127,16,76),(16,17,20),(17,17,37),(18,17,39),(19,17,64),(136,17,76),(20,18,1),(132,18,76),(21,19,21),(22,20,13),(23,20,16),(24,20,65),(134,20,76),(25,21,13),(26,21,18),(27,21,53),(131,21,76),(28,22,13),(29,22,21),(30,30,5),(31,30,20),(32,30,22),(33,30,53),(34,30,64),(118,30,76),(35,31,1),(36,32,1),(37,34,1),(38,34,13),(39,34,33),(40,35,1),(129,35,76),(41,36,44),(42,36,47),(43,37,1),(125,37,76),(44,38,37),(45,38,64),(126,38,76),(46,39,5),(47,39,21),(48,39,57),(115,39,76),(49,40,1),(50,40,49),(51,41,13),(52,41,35),(53,41,40),(135,41,76),(54,42,35),(55,42,49),(128,42,76),(56,43,13),(57,43,42),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(62,48,13),(63,48,47),(64,49,36),(65,49,58),(66,50,13),(67,50,21),(68,50,35),(69,50,49),(70,50,57),(71,50,59),(133,50,76),(72,51,1),(73,52,13),(74,52,19),(75,52,35),(76,52,51),(137,52,76),(77,53,1),(78,54,1),(79,55,13),(80,55,54),(81,56,1),(82,57,13),(83,57,56),(138,57,76),(84,58,1),(85,59,13),(109,59,50),(87,60,5),(88,60,37),(89,60,50),(90,60,57),(130,60,76),(91,61,13),(92,61,36),(93,65,19),(94,65,35),(95,65,50),(117,65,76),(122,66,76),(96,66,100),(97,67,5),(98,67,37),(99,69,35),(100,69,47),(101,70,11),(102,71,1),(103,71,58),(104,72,13),(105,72,18),(106,73,5),(108,73,19),(107,73,64);
+INSERT INTO `roleInherit` VALUES (1,1,2),(2,1,3),(3,1,70),(4,2,11),(5,3,11),(6,5,1),(7,5,21),(8,5,33),(124,5,76),(123,9,76),(9,9,100),(10,11,6),(11,13,1),(12,15,35),(13,15,57),(114,15,76),(14,16,13),(15,16,15),(127,16,76),(16,17,20),(17,17,37),(18,17,39),(19,17,64),(136,17,76),(20,18,1),(132,18,76),(21,19,21),(22,20,13),(23,20,16),(24,20,65),(134,20,76),(25,21,13),(26,21,18),(27,21,53),(131,21,76),(28,22,13),(29,22,21),(30,30,5),(31,30,20),(32,30,22),(33,30,53),(34,30,64),(118,30,76),(35,31,1),(36,32,1),(37,34,1),(38,34,13),(39,34,33),(40,35,1),(142,35,75),(129,35,76),(41,36,44),(42,36,47),(43,37,1),(139,37,74),(125,37,76),(44,38,37),(45,38,64),(126,38,76),(46,39,5),(47,39,21),(48,39,57),(115,39,76),(49,40,1),(50,40,49),(51,41,13),(52,41,35),(53,41,40),(135,41,76),(54,42,35),(55,42,49),(128,42,76),(56,43,13),(57,43,42),(58,44,1),(59,45,13),(60,45,44),(61,47,1),(62,48,13),(63,48,47),(64,49,36),(65,49,58),(66,50,13),(67,50,21),(68,50,35),(69,50,49),(70,50,57),(71,50,59),(133,50,76),(72,51,1),(140,51,74),(141,51,75),(73,52,13),(74,52,19),(75,52,35),(76,52,51),(137,52,76),(77,53,1),(78,54,1),(79,55,13),(80,55,54),(81,56,1),(82,57,13),(83,57,56),(138,57,76),(84,58,1),(85,59,13),(109,59,50),(87,60,5),(88,60,37),(89,60,50),(90,60,57),(130,60,76),(91,61,13),(92,61,36),(93,65,19),(94,65,35),(95,65,50),(117,65,76),(122,66,76),(96,66,100),(97,67,5),(98,67,37),(99,69,35),(100,69,47),(101,70,11),(102,71,1),(103,71,58),(104,72,13),(105,72,18),(106,73,5),(108,73,19),(107,73,64);
 /*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -81,7 +78,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `roleRole` WRITE;
 /*!40000 ALTER TABLE `roleRole` DISABLE KEYS */;
-INSERT INTO `roleRole` VALUES (29114,1,1),(29115,1,2),(29116,1,3),(29119,1,6),(29118,1,11),(29117,1,70),(29035,2,2),(29037,2,6),(29036,2,11),(28939,3,3),(28941,3,6),(28940,3,11),(28912,5,1),(28919,5,2),(28918,5,3),(28911,5,5),(28923,5,6),(28922,5,11),(28916,5,13),(28920,5,18),(28913,5,21),(28914,5,33),(28921,5,53),(28917,5,70),(28915,5,76),(29181,6,6),(29079,9,1),(29076,9,2),(29065,9,3),(29063,9,5),(29084,9,6),(29055,9,9),(29060,9,11),(29111,9,13),(29093,9,15),(29094,9,16),(29062,9,17),(29109,9,18),(29108,9,19),(29095,9,20),(29107,9,21),(29112,9,22),(29082,9,30),(29083,9,31),(29080,9,32),(29090,9,33),(29066,9,34),(29070,9,35),(29105,9,36),(29087,9,37),(29088,9,38),(29061,9,39),(29085,9,40),(29086,9,41),(29067,9,42),(29068,9,43),(29058,9,44),(29059,9,45),(29073,9,47),(29075,9,48),(29102,9,49),(29104,9,50),(29096,9,51),(29097,9,52),(29089,9,53),(29091,9,54),(29092,9,55),(29077,9,56),(29078,9,57),(29100,9,58),(29101,9,59),(29103,9,60),(29106,9,61),(29098,9,62),(29069,9,64),(29099,9,65),(29110,9,66),(29064,9,67),(29074,9,69),(29113,9,70),(29071,9,71),(29072,9,72),(29081,9,73),(29056,9,76),(29057,9,100),(28862,11,6),(28861,11,11),(29604,13,1),(29605,13,2),(29606,13,3),(29609,13,6),(29608,13,11),(29603,13,13),(29607,13,70),(29258,15,1),(29261,15,2),(29260,15,3),(29263,15,6),(29262,15,11),(29257,15,13),(29252,15,15),(29253,15,35),(29256,15,56),(29254,15,57),(29259,15,70),(29255,15,76),(29270,16,1),(29273,16,2),(29272,16,3),(29276,16,6),(29275,16,11),(29265,16,13),(29266,16,15),(29264,16,16),(29269,16,35),(29274,16,56),(29268,16,57),(29271,16,70),(29267,16,76),(28886,17,1),(28894,17,2),(28893,17,3),(28885,17,5),(28906,17,6),(28903,17,11),(28889,17,13),(28898,17,15),(28888,17,16),(28879,17,17),(28900,17,18),(28897,17,19),(28880,17,20),(28890,17,21),(28899,17,33),(28896,17,35),(28908,17,36),(28881,17,37),(28882,17,39),(28910,17,44),(28909,17,47),(28905,17,49),(28895,17,50),(28901,17,53),(28902,17,56),(28891,17,57),(28907,17,58),(28904,17,59),(28883,17,64),(28887,17,65),(28892,17,70),(28884,17,76),(29537,18,1),(29540,18,2),(29539,18,3),(29543,18,6),(29542,18,11),(29536,18,18),(29541,18,70),(29538,18,76),(29530,19,1),(29533,19,2),(29532,19,3),(29535,19,6),(29534,19,11),(29526,19,13),(29527,19,18),(29524,19,19),(29525,19,21),(29528,19,53),(29531,19,70),(29529,19,76),(29285,20,1),(29291,20,2),(29290,20,3),(29302,20,6),(29299,20,11),(29278,20,13),(29284,20,15),(29279,20,16),(29297,20,18),(29283,20,19),(29277,20,20),(29287,20,21),(29282,20,35),(29295,20,36),(29301,20,44),(29300,20,47),(29292,20,49),(29286,20,50),(29296,20,53),(29298,20,56),(29288,20,57),(29294,20,58),(29293,20,59),(29280,20,65),(29289,20,70),(29281,20,76),(29518,21,1),(29521,21,2),(29520,21,3),(29523,21,6),(29522,21,11),(29514,21,13),(29515,21,18),(29513,21,21),(29516,21,53),(29519,21,70),(29517,21,76),(29614,22,1),(29619,22,2),(29618,22,3),(29621,22,6),(29620,22,11),(29611,22,13),(29613,22,18),(29612,22,21),(29610,22,22),(29615,22,53),(29617,22,70),(29616,22,76),(29155,30,1),(29161,30,2),(29160,30,3),(29144,30,5),(29171,30,6),(29167,30,11),(29152,30,13),(29157,30,15),(29151,30,16),(29158,30,18),(29156,30,19),(29145,30,20),(29154,30,21),(29146,30,22),(29143,30,30),(29153,30,33),(29162,30,35),(29169,30,36),(29173,30,44),(29172,30,47),(29165,30,49),(29163,30,50),(29147,30,53),(29170,30,56),(29166,30,57),(29168,30,58),(29164,30,59),(29148,30,64),(29150,30,65),(29159,30,70),(29149,30,76),(29175,31,1),(29176,31,2),(29177,31,3),(29180,31,6),(29179,31,11),(29174,31,31),(29178,31,70),(29121,32,1),(29122,32,2),(29123,32,3),(29126,32,6),(29125,32,11),(29120,32,32),(29124,32,70),(29235,33,33),(28943,34,1),(28948,34,2),(28947,34,3),(28950,34,6),(28949,34,11),(28944,34,13),(28945,34,33),(28942,34,34),(28946,34,70),(28983,35,1),(28986,35,2),(28985,35,3),(28989,35,6),(28988,35,11),(28982,35,35),(28987,35,70),(28984,35,76),(29437,36,1),(29439,36,2),(29438,36,3),(29442,36,6),(29441,36,11),(29434,36,36),(29435,36,44),(29436,36,47),(29440,36,70),(29211,37,1),(29214,37,2),(29213,37,3),(29217,37,6),(29216,37,11),(29210,37,37),(29215,37,70),(29212,37,76),(29222,38,1),(29225,38,2),(29224,38,3),(29227,38,6),(29226,38,11),(29219,38,37),(29218,38,38),(29220,38,64),(29223,38,70),(29221,38,76),(28871,39,1),(28876,39,2),(28875,39,3),(28864,39,5),(28878,39,6),(28877,39,11),(28869,39,13),(28868,39,18),(28865,39,21),(28870,39,33),(28863,39,39),(28872,39,53),(28873,39,56),(28866,39,57),(28874,39,70),(28867,39,76),(29183,40,1),(29186,40,2),(29185,40,3),(29193,40,6),(29192,40,11),(29188,40,36),(29182,40,40),(29191,40,44),(29190,40,47),(29184,40,49),(29189,40,58),(29187,40,70),(29200,41,1),(29204,41,2),(29203,41,3),(29209,41,6),(29208,41,11),(29195,41,13),(29196,41,35),(29201,41,36),(29197,41,40),(29194,41,41),(29207,41,44),(29206,41,47),(29199,41,49),(29205,41,58),(29202,41,70),(29198,41,76),(28957,42,1),(28960,42,2),(28959,42,3),(28964,42,6),(28963,42,11),(28952,42,35),(28956,42,36),(28951,42,42),(28961,42,44),(28962,42,47),(28953,42,49),(28955,42,58),(28958,42,70),(28954,42,76),(28969,43,1),(28975,43,2),(28974,43,3),(28980,43,6),(28979,43,11),(28966,43,13),(28968,43,35),(28972,43,36),(28967,43,42),(28965,43,43),(28978,43,44),(28977,43,47),(28970,43,49),(28976,43,58),(28973,43,70),(28971,43,76),(28846,44,1),(28847,44,2),(28848,44,3),(28851,44,6),(28850,44,11),(28845,44,44),(28849,44,70),(28855,45,1),(28857,45,2),(28856,45,3),(28860,45,6),(28859,45,11),(28853,45,13),(28854,45,44),(28852,45,45),(28858,45,70),(29010,47,1),(29011,47,2),(29012,47,3),(29015,47,6),(29014,47,11),(29009,47,47),(29013,47,70),(29029,48,1),(29031,48,2),(29030,48,3),(29034,48,6),(29033,48,11),(29027,48,13),(29028,48,47),(29026,48,48),(29032,48,70),(29382,49,1),(29385,49,2),(29384,49,3),(29387,49,6),(29386,49,11),(29378,49,36),(29381,49,44),(29380,49,47),(29377,49,49),(29379,49,58),(29383,49,70),(29426,50,1),(29431,50,2),(29430,50,3),(29433,50,6),(29432,50,11),(29414,50,13),(29425,50,18),(29415,50,21),(29416,50,35),(29423,50,36),(29428,50,44),(29427,50,47),(29417,50,49),(29413,50,50),(29424,50,53),(29421,50,56),(29418,50,57),(29422,50,58),(29419,50,59),(29429,50,70),(29420,50,76),(29304,51,1),(29305,51,2),(29306,51,3),(29309,51,6),(29308,51,11),(29303,51,51),(29307,51,70),(29317,52,1),(29322,52,2),(29321,52,3),(29324,52,6),(29323,52,11),(29311,52,13),(29319,52,18),(29312,52,19),(29316,52,21),(29313,52,35),(29314,52,51),(29310,52,52),(29318,52,53),(29320,52,70),(29315,52,76),(29229,53,1),(29230,53,2),(29231,53,3),(29234,53,6),(29233,53,11),(29228,53,53),(29232,53,70),(29237,54,1),(29238,54,2),(29239,54,3),(29242,54,6),(29241,54,11),(29236,54,54),(29240,54,70),(29246,55,1),(29248,55,2),(29247,55,3),(29251,55,6),(29250,55,11),(29244,55,13),(29245,55,54),(29243,55,55),(29249,55,70),(29039,56,1),(29040,56,2),(29041,56,3),(29044,56,6),(29043,56,11),(29038,56,56),(29042,56,70),(29049,57,1),(29052,57,2),(29051,57,3),(29054,57,6),(29053,57,11),(29046,57,13),(29047,57,56),(29045,57,57),(29050,57,70),(29048,57,76),(29350,58,1),(29351,58,2),(29352,58,3),(29355,58,6),(29354,58,11),(29349,58,58),(29353,58,70),(29360,59,1),(29370,59,2),(29369,59,3),(29376,59,6),(29375,59,11),(29357,59,13),(29367,59,18),(29359,59,21),(29361,59,35),(29365,59,36),(29374,59,44),(29373,59,47),(29362,59,49),(29358,59,50),(29366,59,53),(29372,59,56),(29363,59,57),(29371,59,58),(29356,59,59),(29368,59,70),(29364,59,76),(29398,60,1),(29408,60,2),(29407,60,3),(29389,60,5),(29412,60,6),(29411,60,11),(29395,60,13),(29405,60,18),(29397,60,21),(29396,60,33),(29394,60,35),(29403,60,36),(29390,60,37),(29410,60,44),(29409,60,47),(29399,60,49),(29391,60,50),(29404,60,53),(29401,60,56),(29392,60,57),(29402,60,58),(29400,60,59),(29388,60,60),(29406,60,70),(29393,60,76),(29447,61,1),(29451,61,2),(29450,61,3),(29453,61,6),(29452,61,11),(29444,61,13),(29445,61,36),(29446,61,44),(29448,61,47),(29443,61,61),(29449,61,70),(29325,62,62),(28981,64,64),(29333,65,1),(29340,65,2),(29339,65,3),(29348,65,6),(29347,65,11),(29332,65,13),(29342,65,18),(29327,65,19),(29334,65,21),(29328,65,35),(29337,65,36),(29346,65,44),(29345,65,47),(29331,65,49),(29329,65,50),(29341,65,53),(29344,65,56),(29335,65,57),(29343,65,58),(29336,65,59),(29326,65,65),(29338,65,70),(29330,65,76),(29569,66,1),(29565,66,2),(29554,66,3),(29552,66,5),(29574,66,6),(29568,66,9),(29549,66,11),(29600,66,13),(29583,66,15),(29584,66,16),(29551,66,17),(29599,66,18),(29598,66,19),(29585,66,20),(29597,66,21),(29601,66,22),(29572,66,30),(29573,66,31),(29570,66,32),(29580,66,33),(29555,66,34),(29559,66,35),(29595,66,36),(29577,66,37),(29578,66,38),(29550,66,39),(29575,66,40),(29576,66,41),(29556,66,42),(29557,66,43),(29547,66,44),(29548,66,45),(29562,66,47),(29564,66,48),(29592,66,49),(29594,66,50),(29586,66,51),(29587,66,52),(29579,66,53),(29581,66,54),(29582,66,55),(29566,66,56),(29567,66,57),(29590,66,58),(29591,66,59),(29593,66,60),(29596,66,61),(29588,66,62),(29558,66,64),(29589,66,65),(29544,66,66),(29553,66,67),(29563,66,69),(29602,66,70),(29560,66,71),(29561,66,72),(29571,66,73),(29545,66,76),(29546,66,100),(28928,67,1),(28934,67,2),(28933,67,3),(28925,67,5),(28938,67,6),(28937,67,11),(28931,67,13),(28935,67,18),(28927,67,21),(28929,67,33),(28926,67,37),(28936,67,53),(28924,67,67),(28932,67,70),(28930,67,76),(29020,69,1),(29022,69,2),(29021,69,3),(29025,69,6),(29024,69,11),(29017,69,35),(29018,69,47),(29016,69,69),(29023,69,70),(29019,69,76),(29624,70,6),(29623,70,11),(29622,70,70),(28992,71,1),(28995,71,2),(28994,71,3),(28998,71,6),(28997,71,11),(28993,71,58),(28996,71,70),(28991,71,71),(29003,72,1),(29005,72,2),(29004,72,3),(29008,72,6),(29007,72,11),(29000,72,13),(29001,72,18),(29006,72,70),(28999,72,72),(29002,72,76),(29133,73,1),(29138,73,2),(29137,73,3),(29128,73,5),(29142,73,6),(29141,73,11),(29135,73,13),(29139,73,18),(29129,73,19),(29132,73,21),(29131,73,33),(29140,73,53),(29130,73,64),(29136,73,70),(29127,73,73),(29134,73,76),(28990,76,76),(29478,100,1),(29474,100,2),(29462,100,3),(29460,100,5),(29483,100,6),(29477,100,9),(29457,100,11),(29510,100,13),(29492,100,15),(29493,100,16),(29459,100,17),(29508,100,18),(29507,100,19),(29494,100,20),(29506,100,21),(29511,100,22),(29481,100,30),(29482,100,31),(29479,100,32),(29489,100,33),(29463,100,34),(29467,100,35),(29504,100,36),(29486,100,37),(29487,100,38),(29458,100,39),(29484,100,40),(29485,100,41),(29464,100,42),(29465,100,43),(29455,100,44),(29456,100,45),(29471,100,47),(29473,100,48),(29501,100,49),(29503,100,50),(29495,100,51),(29496,100,52),(29488,100,53),(29490,100,54),(29491,100,55),(29475,100,56),(29476,100,57),(29499,100,58),(29500,100,59),(29502,100,60),(29505,100,61),(29497,100,62),(29466,100,64),(29498,100,65),(29509,100,66),(29461,100,67),(29472,100,69),(29512,100,70),(29469,100,71),(29470,100,72),(29480,100,73),(29468,100,76),(29454,100,100);
+INSERT INTO `roleRole` VALUES (30147,1,1),(30148,1,2),(30149,1,3),(30152,1,6),(30151,1,11),(30150,1,70),(30066,2,2),(30068,2,6),(30067,2,11),(29965,3,3),(29967,3,6),(29966,3,11),(29937,5,1),(29944,5,2),(29943,5,3),(29936,5,5),(29948,5,6),(29947,5,11),(29941,5,13),(29945,5,18),(29938,5,21),(29939,5,33),(29946,5,53),(29942,5,70),(29940,5,76),(30215,6,6),(30111,9,1),(30108,9,2),(30096,9,3),(30094,9,5),(30116,9,6),(30086,9,9),(30091,9,11),(30143,9,13),(30125,9,15),(30126,9,16),(30093,9,17),(30141,9,18),(30140,9,19),(30127,9,20),(30139,9,21),(30144,9,22),(30114,9,30),(30115,9,31),(30112,9,32),(30122,9,33),(30097,9,34),(30101,9,35),(30137,9,36),(30119,9,37),(30120,9,38),(30092,9,39),(30117,9,40),(30118,9,41),(30098,9,42),(30099,9,43),(30089,9,44),(30090,9,45),(30105,9,47),(30107,9,48),(30134,9,49),(30136,9,50),(30128,9,51),(30129,9,52),(30121,9,53),(30123,9,54),(30124,9,55),(30109,9,56),(30110,9,57),(30132,9,58),(30133,9,59),(30135,9,60),(30138,9,61),(30130,9,62),(30100,9,64),(30131,9,65),(30142,9,66),(30095,9,67),(30106,9,69),(30145,9,70),(30103,9,71),(30104,9,72),(30113,9,73),(30146,9,74),(30102,9,75),(30087,9,76),(30088,9,100),(29885,11,6),(29884,11,11),(30657,13,1),(30658,13,2),(30659,13,3),(30662,13,6),(30661,13,11),(30656,13,13),(30660,13,70),(30295,15,1),(30299,15,2),(30298,15,3),(30301,15,6),(30300,15,11),(30293,15,13),(30289,15,15),(30290,15,35),(30296,15,56),(30291,15,57),(30297,15,70),(30294,15,75),(30292,15,76),(30308,16,1),(30311,16,2),(30310,16,3),(30315,16,6),(30314,16,11),(30303,16,13),(30304,16,15),(30302,16,16),(30307,16,35),(30313,16,56),(30306,16,57),(30309,16,70),(30312,16,75),(30305,16,76),(29909,17,1),(29919,17,2),(29918,17,3),(29913,17,5),(29931,17,6),(29927,17,11),(29912,17,13),(29923,17,15),(29911,17,16),(29902,17,17),(29924,17,18),(29922,17,19),(29903,17,20),(29914,17,21),(29916,17,33),(29921,17,35),(29933,17,36),(29904,17,37),(29905,17,39),(29935,17,44),(29934,17,47),(29929,17,49),(29920,17,50),(29925,17,53),(29926,17,56),(29915,17,57),(29932,17,58),(29928,17,59),(29906,17,64),(29910,17,65),(29917,17,70),(29908,17,74),(29930,17,75),(29907,17,76),(30588,18,1),(30591,18,2),(30590,18,3),(30594,18,6),(30593,18,11),(30587,18,18),(30592,18,70),(30589,18,76),(30581,19,1),(30584,19,2),(30583,19,3),(30586,19,6),(30585,19,11),(30577,19,13),(30578,19,18),(30575,19,19),(30576,19,21),(30579,19,53),(30582,19,70),(30580,19,76),(30324,20,1),(30330,20,2),(30329,20,3),(30342,20,6),(30339,20,11),(30317,20,13),(30323,20,15),(30318,20,16),(30337,20,18),(30322,20,19),(30316,20,20),(30326,20,21),(30321,20,35),(30335,20,36),(30341,20,44),(30340,20,47),(30332,20,49),(30325,20,50),(30336,20,53),(30338,20,56),(30327,20,57),(30334,20,58),(30333,20,59),(30319,20,65),(30328,20,70),(30331,20,75),(30320,20,76),(30569,21,1),(30572,21,2),(30571,21,3),(30574,21,6),(30573,21,11),(30565,21,13),(30566,21,18),(30564,21,21),(30567,21,53),(30570,21,70),(30568,21,76),(30667,22,1),(30672,22,2),(30671,22,3),(30674,22,6),(30673,22,11),(30664,22,13),(30666,22,18),(30665,22,21),(30663,22,22),(30668,22,53),(30670,22,70),(30669,22,76),(30188,30,1),(30194,30,2),(30193,30,3),(30177,30,5),(30205,30,6),(30201,30,11),(30185,30,13),(30190,30,15),(30184,30,16),(30191,30,18),(30189,30,19),(30178,30,20),(30187,30,21),(30179,30,22),(30176,30,30),(30186,30,33),(30195,30,35),(30203,30,36),(30207,30,44),(30206,30,47),(30198,30,49),(30196,30,50),(30180,30,53),(30204,30,56),(30200,30,57),(30202,30,58),(30197,30,59),(30181,30,64),(30183,30,65),(30192,30,70),(30199,30,75),(30182,30,76),(30209,31,1),(30210,31,2),(30211,31,3),(30214,31,6),(30213,31,11),(30208,31,31),(30212,31,70),(30154,32,1),(30155,32,2),(30156,32,3),(30159,32,6),(30158,32,11),(30153,32,32),(30157,32,70),(30272,33,33),(29969,34,1),(29974,34,2),(29973,34,3),(29976,34,6),(29975,34,11),(29970,34,13),(29971,34,33),(29968,34,34),(29972,34,70),(30011,35,1),(30016,35,2),(30015,35,3),(30018,35,6),(30017,35,11),(30010,35,35),(30014,35,70),(30012,35,75),(30013,35,76),(30486,36,1),(30488,36,2),(30487,36,3),(30491,36,6),(30490,36,11),(30483,36,36),(30484,36,44),(30485,36,47),(30489,36,70),(30246,37,1),(30251,37,2),(30250,37,3),(30253,37,6),(30252,37,11),(30245,37,37),(30249,37,70),(30247,37,74),(30248,37,76),(30259,38,1),(30262,38,2),(30261,38,3),(30264,38,6),(30263,38,11),(30255,38,37),(30254,38,38),(30256,38,64),(30260,38,70),(30258,38,74),(30257,38,76),(29894,39,1),(29899,39,2),(29898,39,3),(29887,39,5),(29901,39,6),(29900,39,11),(29892,39,13),(29891,39,18),(29888,39,21),(29893,39,33),(29886,39,39),(29895,39,53),(29896,39,56),(29889,39,57),(29897,39,70),(29890,39,76),(30217,40,1),(30220,40,2),(30219,40,3),(30227,40,6),(30226,40,11),(30222,40,36),(30216,40,40),(30225,40,44),(30224,40,47),(30218,40,49),(30223,40,58),(30221,40,70),(30235,41,1),(30239,41,2),(30238,41,3),(30244,41,6),(30243,41,11),(30229,41,13),(30230,41,35),(30236,41,36),(30231,41,40),(30228,41,41),(30242,41,44),(30241,41,47),(30233,41,49),(30240,41,58),(30237,41,70),(30234,41,75),(30232,41,76),(29983,42,1),(29988,42,2),(29987,42,3),(29991,42,6),(29990,42,11),(29978,42,35),(29981,42,36),(29977,42,42),(29985,42,44),(29989,42,47),(29979,42,49),(29984,42,58),(29986,42,70),(29982,42,75),(29980,42,76),(29996,43,1),(30002,43,2),(30001,43,3),(30008,43,6),(30007,43,11),(29993,43,13),(29995,43,35),(30003,43,36),(29994,43,42),(29992,43,43),(30006,43,44),(30005,43,47),(29997,43,49),(30004,43,58),(30000,43,70),(29999,43,75),(29998,43,76),(29869,44,1),(29870,44,2),(29871,44,3),(29874,44,6),(29873,44,11),(29868,44,44),(29872,44,70),(29878,45,1),(29880,45,2),(29879,45,3),(29883,45,6),(29882,45,11),(29876,45,13),(29877,45,44),(29875,45,45),(29881,45,70),(30040,47,1),(30041,47,2),(30042,47,3),(30045,47,6),(30044,47,11),(30039,47,47),(30043,47,70),(30060,48,1),(30062,48,2),(30061,48,3),(30065,48,6),(30064,48,11),(30058,48,13),(30059,48,47),(30057,48,48),(30063,48,70),(30428,49,1),(30431,49,2),(30430,49,3),(30433,49,6),(30432,49,11),(30424,49,36),(30427,49,44),(30426,49,47),(30423,49,49),(30425,49,58),(30429,49,70),(30475,50,1),(30480,50,2),(30479,50,3),(30482,50,6),(30481,50,11),(30462,50,13),(30474,50,18),(30463,50,21),(30464,50,35),(30471,50,36),(30477,50,44),(30476,50,47),(30465,50,49),(30461,50,50),(30473,50,53),(30469,50,56),(30466,50,57),(30470,50,58),(30467,50,59),(30478,50,70),(30472,50,75),(30468,50,76),(30344,51,1),(30349,51,2),(30348,51,3),(30351,51,6),(30350,51,11),(30343,51,51),(30347,51,70),(30345,51,74),(30346,51,75),(30361,52,1),(30366,52,2),(30365,52,3),(30368,52,6),(30367,52,11),(30353,52,13),(30363,52,18),(30354,52,19),(30360,52,21),(30355,52,35),(30356,52,51),(30352,52,52),(30362,52,53),(30364,52,70),(30358,52,74),(30359,52,75),(30357,52,76),(30266,53,1),(30267,53,2),(30268,53,3),(30271,53,6),(30270,53,11),(30265,53,53),(30269,53,70),(30274,54,1),(30275,54,2),(30276,54,3),(30279,54,6),(30278,54,11),(30273,54,54),(30277,54,70),(30283,55,1),(30285,55,2),(30284,55,3),(30288,55,6),(30287,55,11),(30281,55,13),(30282,55,54),(30280,55,55),(30286,55,70),(30070,56,1),(30071,56,2),(30072,56,3),(30075,56,6),(30074,56,11),(30069,56,56),(30073,56,70),(30080,57,1),(30083,57,2),(30082,57,3),(30085,57,6),(30084,57,11),(30077,57,13),(30078,57,56),(30076,57,57),(30081,57,70),(30079,57,76),(30395,58,1),(30396,58,2),(30397,58,3),(30400,58,6),(30399,58,11),(30394,58,58),(30398,58,70),(30405,59,1),(30415,59,2),(30414,59,3),(30422,59,6),(30421,59,11),(30402,59,13),(30412,59,18),(30404,59,21),(30406,59,35),(30416,59,36),(30420,59,44),(30419,59,47),(30407,59,49),(30403,59,50),(30411,59,53),(30418,59,56),(30408,59,57),(30417,59,58),(30401,59,59),(30413,59,70),(30410,59,75),(30409,59,76),(30444,60,1),(30456,60,2),(30455,60,3),(30435,60,5),(30460,60,6),(30459,60,11),(30440,60,13),(30453,60,18),(30443,60,21),(30442,60,33),(30445,60,35),(30450,60,36),(30436,60,37),(30458,60,44),(30457,60,47),(30446,60,49),(30437,60,50),(30452,60,53),(30448,60,56),(30438,60,57),(30449,60,58),(30447,60,59),(30434,60,60),(30454,60,70),(30441,60,74),(30451,60,75),(30439,60,76),(30496,61,1),(30500,61,2),(30499,61,3),(30502,61,6),(30501,61,11),(30493,61,13),(30494,61,36),(30495,61,44),(30497,61,47),(30492,61,61),(30498,61,70),(30369,62,62),(30009,64,64),(30377,65,1),(30386,65,2),(30385,65,3),(30393,65,6),(30392,65,11),(30375,65,13),(30388,65,18),(30371,65,19),(30378,65,21),(30372,65,35),(30383,65,36),(30391,65,44),(30390,65,47),(30379,65,49),(30373,65,50),(30387,65,53),(30389,65,56),(30380,65,57),(30382,65,58),(30381,65,59),(30370,65,65),(30384,65,70),(30376,65,75),(30374,65,76),(30621,66,1),(30617,66,2),(30605,66,3),(30603,66,5),(30626,66,6),(30620,66,9),(30600,66,11),(30652,66,13),(30635,66,15),(30636,66,16),(30602,66,17),(30651,66,18),(30650,66,19),(30637,66,20),(30649,66,21),(30653,66,22),(30624,66,30),(30625,66,31),(30622,66,32),(30632,66,33),(30606,66,34),(30610,66,35),(30647,66,36),(30629,66,37),(30630,66,38),(30601,66,39),(30627,66,40),(30628,66,41),(30607,66,42),(30608,66,43),(30598,66,44),(30599,66,45),(30614,66,47),(30616,66,48),(30644,66,49),(30646,66,50),(30638,66,51),(30639,66,52),(30631,66,53),(30633,66,54),(30634,66,55),(30618,66,56),(30619,66,57),(30642,66,58),(30643,66,59),(30645,66,60),(30648,66,61),(30640,66,62),(30609,66,64),(30641,66,65),(30595,66,66),(30604,66,67),(30615,66,69),(30654,66,70),(30612,66,71),(30613,66,72),(30623,66,73),(30655,66,74),(30611,66,75),(30596,66,76),(30597,66,100),(29953,67,1),(29961,67,2),(29960,67,3),(29950,67,5),(29964,67,6),(29963,67,11),(29958,67,13),(29957,67,18),(29952,67,21),(29954,67,33),(29951,67,37),(29962,67,53),(29949,67,67),(29959,67,70),(29956,67,74),(29955,67,76),(30050,69,1),(30054,69,2),(30053,69,3),(30056,69,6),(30055,69,11),(30047,69,35),(30048,69,47),(30046,69,69),(30052,69,70),(30049,69,75),(30051,69,76),(30677,70,6),(30676,70,11),(30675,70,70),(30022,71,1),(30025,71,2),(30024,71,3),(30028,71,6),(30027,71,11),(30023,71,58),(30026,71,70),(30021,71,71),(30033,72,1),(30035,72,2),(30034,72,3),(30038,72,6),(30037,72,11),(30030,72,13),(30031,72,18),(30036,72,70),(30029,72,72),(30032,72,76),(30166,73,1),(30171,73,2),(30170,73,3),(30161,73,5),(30175,73,6),(30174,73,11),(30168,73,13),(30172,73,18),(30162,73,19),(30165,73,21),(30164,73,33),(30173,73,53),(30163,73,64),(30169,73,70),(30160,73,73),(30167,73,76),(30678,74,74),(30019,75,75),(30020,76,76),(30528,100,1),(30524,100,2),(30511,100,3),(30509,100,5),(30533,100,6),(30527,100,9),(30506,100,11),(30560,100,13),(30542,100,15),(30543,100,16),(30508,100,17),(30558,100,18),(30557,100,19),(30544,100,20),(30556,100,21),(30561,100,22),(30531,100,30),(30532,100,31),(30529,100,32),(30539,100,33),(30512,100,34),(30516,100,35),(30554,100,36),(30536,100,37),(30537,100,38),(30507,100,39),(30534,100,40),(30535,100,41),(30513,100,42),(30514,100,43),(30504,100,44),(30505,100,45),(30521,100,47),(30523,100,48),(30551,100,49),(30553,100,50),(30545,100,51),(30546,100,52),(30538,100,53),(30540,100,54),(30541,100,55),(30525,100,56),(30526,100,57),(30549,100,58),(30550,100,59),(30552,100,60),(30555,100,61),(30547,100,62),(30515,100,64),(30548,100,65),(30559,100,66),(30510,100,67),(30522,100,69),(30562,100,70),(30519,100,71),(30520,100,72),(30530,100,73),(30563,100,74),(30517,100,75),(30518,100,76),(30503,100,100);
 /*!40000 ALTER TABLE `roleRole` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -118,19 +115,18 @@ UNLOCK TABLES;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:34:39
+-- Dump completed on 2021-02-09 12:15:12
 USE `salix`;
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: salix
+-- Host: test-db.verdnatura.es    Database: salix
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -138,7 +134,6 @@ USE `salix`;
 /*!40101 SET NAMES utf8 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -149,7 +144,7 @@ USE `salix`;
 
 LOCK TABLES `ACL` WRITE;
 /*!40000 ALTER TABLE `ACL` DISABLE KEYS */;
-INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','claimManager'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(107,'ItemNiche','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(164,'InvoiceOut','regenerate','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','READ','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(188,'TicketDms','removeFile','WRITE','ALLOW','ROLE','employee'),(189,'TicketDms','*','READ','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(219,'Account','acl','READ','ALLOW','ROLE','account'),(220,'Account','getCurrentUserData','READ','ALLOW','ROLE','account'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','*','READ','ALLOW','ROLE','salesAssistant'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(242,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(243,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(244,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(245,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','claimManager'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(107,'ItemNiche','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(164,'InvoiceOut','regenerate','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','READ','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(188,'TicketDms','removeFile','WRITE','ALLOW','ROLE','employee'),(189,'TicketDms','*','READ','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(219,'Account','acl','READ','ALLOW','ROLE','account'),(220,'Account','getCurrentUserData','READ','ALLOW','ROLE','account'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','*','READ','ALLOW','ROLE','salesAssistant'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(242,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(243,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(244,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(245,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(246,'Account','changePassword','*','ALLOW','ROLE','account'),(247,'UserAccount','exists','*','ALLOW','ROLE','account'),(248,'RoleMapping','*','READ','ALLOW','ROLE','account'),(249,'UserPassword','*','READ','ALLOW','ROLE','account'),(250,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(251,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(252,'Supplier','*','READ','ALLOW','ROLE','employee'),(253,'Supplier','*','WRITE','ALLOW','ROLE','administrative'),(254,'SupplierLog','*','READ','ALLOW','ROLE','employee'),(255,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(256,'Image','*','WRITE','ALLOW','ROLE','employee'),(257,'FixedPrice','*','*','ALLOW','ROLE','buyer'),(258,'PayDem','*','READ','ALLOW','ROLE','employee'),(259,'Client','createReceipt','*','ALLOW','ROLE','administrative'),(260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee');
 /*!40000 ALTER TABLE `ACL` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -166,19 +161,18 @@ UNLOCK TABLES;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:34:40
+-- Dump completed on 2021-02-09 12:15:13
 USE `vn`;
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: vn
+-- Host: test-db.verdnatura.es    Database: vn
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -186,7 +180,6 @@ USE `vn`;
 /*!40101 SET NAMES utf8 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -211,6 +204,16 @@ INSERT INTO `bookingPlanner` VALUES (5,'2017-06-30 22:00:00','4770000002','WORLD
 /*!40000 ALTER TABLE `bookingPlanner` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Dumping data for table `cplusInvoiceType472`
+--
+
+LOCK TABLES `cplusInvoiceType472` WRITE;
+/*!40000 ALTER TABLE `cplusInvoiceType472` DISABLE KEYS */;
+INSERT INTO `cplusInvoiceType472` VALUES (1,'F1 - Factura'),(2,'F2 - Factura simplificada (ticket)'),(3,'F3 - Factura emitida en sustitución de facturas  simplificadas facturadas y declaradas'),(4,'F4 - Asiento resumen de facturas'),(5,'F5 - Importaciones (DUA)'),(6,'F6 - Otros justificantes contables'),(7,'R1 - Factura rectificativa (Art. 80.1, 80.2  y error fundado en derecho)'),(8,'R2 - Factura rectificativa (Art. 80.3)'),(9,'R3 - Factura rectificativa (Art. 80.4)'),(10,'R4 - Factura rectificativa (Resto)'),(11,'R5 - Factura rectificativa en facturas  simplificadas');
+/*!40000 ALTER TABLE `cplusInvoiceType472` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Dumping data for table `cplusInvoiceType477`
 --
@@ -221,6 +224,16 @@ INSERT INTO `cplusInvoiceType477` VALUES (1,'F1 - Factura'),(2,'F2 - Factura sim
 /*!40000 ALTER TABLE `cplusInvoiceType477` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Dumping data for table `cplusRectificationType`
+--
+
+LOCK TABLES `cplusRectificationType` WRITE;
+/*!40000 ALTER TABLE `cplusRectificationType` DISABLE KEYS */;
+INSERT INTO `cplusRectificationType` VALUES (1,'Campo vacio'),(2,'I – Por diferencias'),(3,'S – Por sustitución');
+/*!40000 ALTER TABLE `cplusRectificationType` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Dumping data for table `cplusSubjectOp`
 --
@@ -241,6 +254,16 @@ INSERT INTO `cplusTaxBreak` VALUES (1,'Campo vacio'),(2,'E1 - Exenta por el art
 /*!40000 ALTER TABLE `cplusTaxBreak` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Dumping data for table `cplusTrascendency472`
+--
+
+LOCK TABLES `cplusTrascendency472` WRITE;
+/*!40000 ALTER TABLE `cplusTrascendency472` DISABLE KEYS */;
+INSERT INTO `cplusTrascendency472` VALUES (1,'01 - Operación de régimen general'),(2,'02 - Operaciones por las que los empresarios  satisfacen compensaciones REAGYP'),(3,'03 - Operaciones a las que se aplique el régimen  especial de bienes usados, objetos de arte,  antigüedades y objetos de colección  (135 - 139 de LIVA)'),(4,'04 - Régimen especial oro de inversión'),(5,'05 - Régimen especial agencias de viajes'),(6,'06 - Régimen especial grupo de entidades en IVA  (Nivel Avanzado)'),(7,'07 - Régimen especial criterio de caja'),(8,'08 - Operaciones sujetas al IPSI / IGIC'),(9,'09 - Adquisiciones intracomunitarias de bienes  y prestaciones de servicios'),(10,'12 - Operaciones de arrendamiento de local  de negocio'),(11,'13 - Factura correspondiente a una importación  (informada sin asociar a un DUA)'),(12,'14 - Primer semestre 2017');
+/*!40000 ALTER TABLE `cplusTrascendency472` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Dumping data for table `pgc`
 --
@@ -337,7 +360,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `department` WRITE;
 /*!40000 ALTER TABLE `department` DISABLE KEYS */;
-INSERT INTO `department` VALUES (1,'VERDNATURA',1,2,763,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(22,'COMPRAS',3,4,NULL,72,596,2,5,0,0,0,0,NULL,'/',NULL,1,NULL),(23,'CAMARA',14,19,NULL,72,604,2,6,1,0,1,2,37,'/37/',NULL,0,NULL),(31,'INFORMATICA',5,6,NULL,72,127,3,9,0,0,0,0,NULL,'/',NULL,1,NULL),(34,'CONTABILIDAD',7,8,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(35,'FINANZAS',9,10,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(36,'LABORAL',11,12,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(37,'PRODUCCION',13,52,NULL,72,230,3,11,1,0,0,17,NULL,'/',NULL,0,NULL),(38,'SACADO',20,21,NULL,72,230,4,14,1,0,1,0,37,'/37/',NULL,0,NULL),(39,'ENCAJADO',22,23,NULL,72,230,4,12,1,0,1,0,37,'/37/',NULL,0,NULL),(41,'ADMINISTRACION',53,54,NULL,72,599,3,8,0,0,0,0,NULL,'/',NULL,1,NULL),(43,'VENTAS',55,76,NULL,0,NULL,NULL,NULL,0,0,0,10,NULL,'/',NULL,1,'direccioncomercial@verdnatura.es'),(44,'GERENCIA',77,78,NULL,72,300,2,7,0,0,0,0,NULL,'/',NULL,0,NULL),(45,'LOGISTICA',79,80,NULL,72,596,3,19,0,0,0,0,NULL,'/',NULL,1,NULL),(46,'REPARTO',81,84,NULL,72,659,3,10,0,0,0,1,NULL,'/',NULL,0,NULL),(48,'ALMACENAJE',85,86,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL),(49,'PROPIEDAD',87,88,NULL,72,1008,1,1,0,0,0,0,NULL,'/',NULL,0,NULL),(52,'CARGA AEREA',89,90,NULL,72,163,4,28,0,0,0,0,NULL,'/',NULL,0,NULL),(53,'MARKETING Y COMUNICACIÓN',91,92,NULL,72,1238,0,0,0,0,0,0,NULL,'/',NULL,1,NULL),(54,'ORNAMENTALES',93,94,NULL,72,433,3,21,0,0,0,0,NULL,'/',NULL,0,NULL),(55,'TALLER NATURAL',95,96,NULL,72,695,2,23,0,0,0,0,NULL,'/',NULL,0,NULL),(56,'TALLER ARTIFICIAL',97,98,NULL,72,1780,2,24,0,0,0,0,NULL,'/',NULL,0,NULL),(58,'CAMPOS',99,100,NULL,72,225,2,2,0,0,0,0,NULL,'/',NULL,0,NULL),(59,'MANTENIMIENTO',101,102,NULL,72,1907,4,16,0,0,0,0,NULL,'/',NULL,0,NULL),(60,'RECLAMACIONES',103,104,NULL,72,563,3,20,0,0,0,0,NULL,'/',NULL,1,NULL),(61,'VNH',105,106,NULL,73,1297,3,17,0,0,0,0,NULL,'/',NULL,0,NULL),(63,'VENTAS FRANCIA',56,57,NULL,72,277,2,27,0,0,1,0,43,'/43/',NULL,0,NULL),(66,'VERDNAMADRID',107,108,NULL,72,163,3,18,0,0,0,0,NULL,'/',NULL,0,NULL),(68,'COMPLEMENTOS',24,25,NULL,72,617,3,26,1,0,1,0,37,'/37/',NULL,0,NULL),(69,'VERDNABARNA',109,110,NULL,74,432,3,22,0,0,0,0,NULL,'/',NULL,0,NULL),(77,'PALETIZADO',82,83,NULL,72,230,4,15,1,0,1,0,46,'/46/',NULL,0,NULL),(80,'EQUIPO J VALLES',58,59,NULL,72,693,3,4,0,0,1,0,43,'/43/','jvp_equipo',1,NULL),(86,'LIMPIEZA',111,112,NULL,72,599,0,0,0,0,0,0,NULL,'/',NULL,0,NULL),(89,'COORDINACION',113,114,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL),(90,'TRAILER',115,116,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(91,'ARTIFICIAL',26,27,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(92,'EQUIPO SILVERIO',60,61,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','sdc_equipo',1,NULL),(93,'CONFECCION',117,118,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(94,'EQUIPO J BROCAL',62,63,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jes_equipo',1,NULL),(95,'EQUIPO C ZAMBRANO',64,65,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','czg_equipo',1,NULL),(96,'EQUIPO C LOPEZ',66,67,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','cla_equipo',1,NULL),(98,'EQUIPO RODRIGO',68,69,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','rhr_equipo',1,NULL),(101,'EQUIPO J IBAÑEZ',70,71,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jmi_equipo',1,NULL),(102,'EQ ROJO FV RUBEN C',28,29,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(103,'EQ AZUL FV A FOLQUES',30,31,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(104,'EQ AMARILLO FV NORMAN G',32,33,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(105,'EQ MORADO FV MATOU',34,35,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(106,'EQ VERDE PCA KEVIN GIMENEZ',36,37,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(107,'EQ NARANJA PCA RUBEN ZANON',38,39,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(110,'EQ ROSA PCA J BONDIA',40,41,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(111,'EQ REPONEDOR CAJAS',42,43,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(112,'CAMARA EQ EDGAR LLEO',15,16,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL),(113,'CAMARA EQ MARC ROCA',17,18,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL),(114,'EQ MARRON PCA JL NUEVO',44,45,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(115,'EQUIPO CLAUDI',72,73,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','csr_equipo',1,NULL),(120,'PCA PRODUCCION',46,47,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(121,'FV PRODUCCION',48,49,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(122,'PCA ALMACEN',50,51,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(123,'EQUIPO ELENA BASCUÑANA',74,75,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','ebt_equipo',1,NULL),(124,'CONTROL INTERNO',119,120,NULL,72,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL);
+INSERT INTO `department` VALUES (1,NULL,'VERDNATURA',1,2,763,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(22,NULL,'COMPRAS',3,4,NULL,72,596,2,5,0,0,0,0,NULL,'/',NULL,1,NULL),(23,NULL,'CAMARA',14,19,NULL,72,604,2,6,1,0,1,2,37,'/37/',NULL,0,NULL),(31,'IT','INFORMATICA',5,6,NULL,72,127,3,9,0,0,0,0,NULL,'/','informatica-cau',1,NULL),(34,NULL,'CONTABILIDAD',7,8,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(35,NULL,'FINANZAS',9,10,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(36,NULL,'LABORAL',11,12,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL),(37,NULL,'PRODUCCION',13,52,NULL,72,230,3,11,1,0,0,17,NULL,'/',NULL,0,NULL),(38,NULL,'SACADO',20,21,NULL,72,230,4,14,1,0,1,0,37,'/37/',NULL,0,NULL),(39,NULL,'ENCAJADO',22,23,NULL,72,230,4,12,1,0,1,0,37,'/37/',NULL,0,NULL),(41,NULL,'ADMINISTRACION',53,54,NULL,72,599,3,8,0,0,0,0,NULL,'/',NULL,1,NULL),(43,NULL,'VENTAS',55,76,NULL,0,NULL,NULL,NULL,0,0,0,10,NULL,'/',NULL,1,'direccioncomercial@verdnatura.es'),(44,NULL,'GERENCIA',77,78,NULL,72,300,2,7,0,0,0,0,NULL,'/',NULL,0,NULL),(45,NULL,'LOGISTICA',79,80,NULL,72,596,3,19,0,0,0,0,NULL,'/',NULL,1,NULL),(46,NULL,'REPARTO',81,84,NULL,72,659,3,10,0,0,0,1,NULL,'/',NULL,0,NULL),(48,NULL,'ALMACENAJE',85,86,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL),(49,NULL,'PROPIEDAD',87,88,NULL,72,1008,1,1,0,0,0,0,NULL,'/',NULL,0,NULL),(52,NULL,'CARGA AEREA',89,90,NULL,72,163,4,28,0,0,0,0,NULL,'/',NULL,0,NULL),(53,NULL,'MARKETING Y COMUNICACIÓN',91,92,NULL,72,1238,0,0,0,0,0,0,NULL,'/',NULL,1,NULL),(54,NULL,'ORNAMENTALES',93,94,NULL,72,433,3,21,0,0,0,0,NULL,'/',NULL,0,NULL),(55,NULL,'TALLER NATURAL',95,96,NULL,72,695,2,23,0,0,0,0,NULL,'/',NULL,0,NULL),(56,NULL,'TALLER ARTIFICIAL',97,98,NULL,72,1780,2,24,0,0,0,0,NULL,'/',NULL,0,NULL),(58,NULL,'CAMPOS',99,100,NULL,72,225,2,2,0,0,0,0,NULL,'/',NULL,0,NULL),(59,NULL,'MANTENIMIENTO',101,102,NULL,72,1907,4,16,0,0,0,0,NULL,'/',NULL,0,NULL),(60,NULL,'RECLAMACIONES',103,104,NULL,72,563,3,20,0,0,0,0,NULL,'/',NULL,1,NULL),(61,NULL,'VNH',105,106,NULL,73,1297,3,17,0,0,0,0,NULL,'/',NULL,0,NULL),(63,NULL,'VENTAS FRANCIA',56,57,NULL,72,277,2,27,0,0,1,0,43,'/43/',NULL,0,NULL),(66,NULL,'VERDNAMADRID',107,108,NULL,72,163,3,18,0,0,0,0,NULL,'/',NULL,0,NULL),(68,NULL,'COMPLEMENTOS',24,25,NULL,72,617,3,26,1,0,1,0,37,'/37/',NULL,0,NULL),(69,NULL,'VERDNABARNA',109,110,NULL,74,432,3,22,0,0,0,0,NULL,'/',NULL,0,NULL),(77,NULL,'PALETIZADO',82,83,NULL,72,230,4,15,1,0,1,0,46,'/46/',NULL,0,NULL),(80,NULL,'EQUIPO J VALLES',58,59,NULL,72,693,3,4,0,0,1,0,43,'/43/','jvp_equipo',1,NULL),(86,NULL,'LIMPIEZA',111,112,NULL,72,599,0,0,0,0,0,0,NULL,'/',NULL,0,NULL),(89,NULL,'COORDINACION',113,114,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL,0,NULL),(90,NULL,'TRAILER',115,116,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(91,NULL,'ARTIFICIAL',26,27,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(92,NULL,'EQUIPO SILVERIO',60,61,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','sdc_equipo',1,NULL),(93,NULL,'CONFECCION',117,118,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,0,NULL),(94,NULL,'EQUIPO J BROCAL',62,63,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jes_equipo',1,NULL),(95,NULL,'EQUIPO C ZAMBRANO',64,65,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','czg_equipo',1,NULL),(96,NULL,'EQUIPO C LOPEZ',66,67,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','cla_equipo',1,NULL),(98,NULL,'EQUIPO RODRIGO',68,69,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','rhr_equipo',1,NULL),(101,NULL,'EQUIPO J IBAÑEZ',70,71,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jmi_equipo',1,NULL),(102,NULL,'EQ ROJO FV RUBEN C',28,29,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(103,NULL,'EQ AZUL FV A FOLQUES',30,31,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(104,NULL,'EQ AMARILLO FV NORMAN G',32,33,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(105,NULL,'EQ MORADO FV MATOU',34,35,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(106,NULL,'EQ VERDE PCA KEVIN GIMENEZ',36,37,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(107,NULL,'EQ NARANJA PCA RUBEN ZANON',38,39,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(110,NULL,'EQ ROSA PCA J BONDIA',40,41,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(111,NULL,'EQ REPONEDOR CAJAS',42,43,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(112,NULL,'CAMARA EQ EDGAR LLEO',15,16,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL),(113,NULL,'CAMARA EQ MARC ROCA',17,18,NULL,0,NULL,NULL,NULL,1,0,2,0,23,'/37/23/',NULL,0,NULL),(114,NULL,'EQ MARRON PCA JL NUEVO',44,45,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(115,NULL,'EQUIPO CLAUDI',72,73,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','csr_equipo',1,NULL),(120,NULL,'PCA PRODUCCION',46,47,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(121,NULL,'FV PRODUCCION',48,49,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(122,NULL,'PCA ALMACEN',50,51,NULL,0,NULL,NULL,NULL,1,0,1,0,37,'/37/',NULL,0,NULL),(123,NULL,'EQUIPO ELENA BASCUÑANA',74,75,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','ebt_equipo',1,NULL),(124,NULL,'CONTROL INTERNO',119,120,NULL,72,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL,1,NULL);
 /*!40000 ALTER TABLE `department` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -347,7 +370,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `component` WRITE;
 /*!40000 ALTER TABLE `component` DISABLE KEYS */;
-INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices'),(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay'),(15,'reparto',6,NULL,NULL,1,'delivery'),(17,'recobro',5,NULL,NULL,1,'debtCollection'),(21,'ajuste',11,NULL,NULL,1,'adjustment'),(22,'venta por paquete',9,1,NULL,0,'salePerPackage'),(23,'venta por caja',9,2,NULL,0,'salePerBox'),(28,'valor de compra',1,NULL,NULL,1,'purchaseValue'),(29,'margen',4,NULL,NULL,1,'margin'),(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount'),(33,'venta por caja',9,1,NULL,0,'salePerBox'),(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount'),(35,'cartera comprador',10,NULL,NULL,1,NULL),(36,'descuadre',12,NULL,NULL,1,'imbalance'),(37,'maná',7,4,NULL,0,'mana'),(38,'embolsado',9,NULL,NULL,1,'bagged'),(39,'maná auto',7,NULL,NULL,1,'autoMana'),(40,'cambios Santos 2016',4,NULL,NULL,1,NULL),(41,'bonificacion porte',4,NULL,NULL,1,'freightCharge'),(42,'promocion Francia',4,NULL,NULL,1,'frenchOffer'),(43,'promocion Floramondo',4,NULL,NULL,1,'floramondoPromo');
+INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices'),(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay'),(15,'reparto',6,NULL,NULL,1,'delivery'),(17,'recobro',5,NULL,NULL,1,'debtCollection'),(21,'ajuste',11,NULL,NULL,1,'adjustment'),(22,'venta por paquete',9,1,NULL,0,'salePerPackage'),(23,'venta por caja',9,2,NULL,0,'salePerBox'),(28,'valor de compra',1,NULL,NULL,1,'purchaseValue'),(29,'margen',4,NULL,NULL,1,'margin'),(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount'),(33,'venta por caja',9,1,NULL,0,'salePerBox'),(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount'),(35,'cartera comprador',10,NULL,NULL,1,NULL),(36,'descuadre',12,NULL,NULL,1,'imbalance'),(37,'maná',7,4,NULL,0,'mana'),(38,'embolsado',9,NULL,NULL,1,'bagged'),(39,'maná auto',7,NULL,NULL,1,'autoMana'),(40,'cambios Santos 2016',4,NULL,NULL,1,NULL),(41,'bonificacion porte',4,NULL,NULL,1,'freightCharge'),(42,'promocion Francia',4,NULL,NULL,1,'frenchOffer'),(43,'promocion Floramondo',4,NULL,NULL,1,'floramondoPromo'),(44,'rappel cadena',5,NULL,NULL,1,'rappel');
 /*!40000 ALTER TABLE `component` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -360,23 +383,32 @@ LOCK TABLES `componentType` WRITE;
 INSERT INTO `componentType` VALUES (1,'coste',1,0),(2,'com ventas',1,1),(3,'com compras',1,1),(4,'empresa',1,1),(5,'cliente',0,0),(6,'agencia',0,0),(7,'cartera_comercial',0,0),(8,'cartera_producto',0,1),(9,'maniobra',1,1),(10,'cartera_comprador',0,1),(11,'errores',0,1),(12,'otros',0,1);
 /*!40000 ALTER TABLE `componentType` ENABLE KEYS */;
 UNLOCK TABLES;
+
+--
+-- Dumping data for table `continent`
+--
+
+LOCK TABLES `continent` WRITE;
+/*!40000 ALTER TABLE `continent` DISABLE KEYS */;
+INSERT INTO `continent` VALUES (1,'Asia','AS'),(2,'América','AM'),(3,'África','AF'),(4,'Europa','EU'),(5,'Oceanía','OC');
+/*!40000 ALTER TABLE `continent` ENABLE KEYS */;
+UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:34:47
+-- Dump completed on 2021-02-09 12:15:15
 USE `cache`;
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: cache
+-- Host: test-db.verdnatura.es    Database: cache
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -384,7 +416,6 @@ USE `cache`;
 /*!40101 SET NAMES utf8 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -395,26 +426,25 @@ USE `cache`;
 
 LOCK TABLES `cache` WRITE;
 /*!40000 ALTER TABLE `cache` DISABLE KEYS */;
-INSERT INTO `cache` VALUES (1,'equalizator','00:19:00'),(2,'available','00:06:00'),(3,'stock','00:30:00'),(4,'last_buy','00:30:00'),(5,'weekly_sales','12:00:00'),(6,'bionic','00:06:00'),(7,'sales','00:04:00'),(8,'visible','00:04:00'),(9,'item_range','00:03:00'),(10,'barcodes','01:00:00'),(11,'prod_graphic','00:17:00'),(12,'ticketShipping','00:01:00');
+INSERT INTO `cache` VALUES (1,'equalizator','00:19:00'),(2,'available','00:06:00'),(3,'stock','00:30:00'),(4,'last_buy','00:30:00'),(5,'weekly_sales','12:00:00'),(6,'bionic','00:06:00'),(7,'sales','00:04:00'),(8,'visible','00:04:00'),(9,'item_range','00:03:00'),(10,'barcodes','01:00:00'),(11,'prod_graphic','00:17:00'),(12,'ticketShipping','00:01:00'),(13,'availableNoRaids','00:06:00');
 /*!40000 ALTER TABLE `cache` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:34:48
+-- Dump completed on 2021-02-09 12:15:15
 USE `hedera`;
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: hedera
+-- Host: test-db.verdnatura.es    Database: hedera
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -422,7 +452,6 @@ USE `hedera`;
 /*!40101 SET NAMES utf8 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -433,7 +462,7 @@ USE `hedera`;
 
 LOCK TABLES `imageCollection` WRITE;
 /*!40000 ALTER TABLE `imageCollection` DISABLE KEYS */;
-INSERT INTO `imageCollection` VALUES (1,'catalog','Artículo',3840,2160,'Item','image','vn','item','image'),(4,'link','Enlace',200,200,'Link','image','hedera','link','image'),(5,'news','Noticias',800,1200,'New','image','hedera','news','image'),(6,'user','Usuario',800,1200,'Account','image','account','user','image');
+INSERT INTO `imageCollection` VALUES (1,'catalog','Artículo',3840,2160,'Item','image','vn','item','image',1,75),(4,'link','Enlace',200,200,'Link','image','hedera','link','image',1,9),(5,'news','Noticias',800,1200,'New','image','hedera','news','image',1,9),(6,'user','Usuario',800,1200,'Account','image','account','user','image',1,74);
 /*!40000 ALTER TABLE `imageCollection` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -470,19 +499,18 @@ UNLOCK TABLES;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:34:49
+-- Dump completed on 2021-02-09 12:15:16
 USE `postgresql`;
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: postgresql
+-- Host: test-db.verdnatura.es    Database: postgresql
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -490,7 +518,6 @@ USE `postgresql`;
 /*!40101 SET NAMES utf8 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -551,26 +578,25 @@ UNLOCK TABLES;
 
 LOCK TABLES `workcenter` WRITE;
 /*!40000 ALTER TABLE `workcenter` DISABLE KEYS */;
-INSERT INTO `workcenter` VALUES (1,'Silla',20,1092,1,'Av espioca 100',552703),(2,'Mercaflor',19,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL),(4,'VNH',NULL,NULL,3,NULL,NULL),(5,'Madrid',28,2858,5,'Av constitución 3',554145),(6,'Vilassar',88,88031,2,'Cami del Crist, 33',556412),(7,'Tenerife',NULL,NULL,10,NULL,NULL);
+INSERT INTO `workcenter` VALUES (1,'Silla',20,1101,1,'Av espioca 100',552703),(2,'Mercaflor',19,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL),(4,'VNH',NULL,NULL,3,NULL,NULL),(5,'Madrid',28,2858,5,'Av constitución 3',554145),(6,'Vilassar',88,88031,2,'Cami del Crist, 33',556412),(7,'Tenerife',NULL,NULL,10,NULL,NULL);
 /*!40000 ALTER TABLE `workcenter` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:34:51
+-- Dump completed on 2021-02-09 12:15:17
 USE `sage`;
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: sage
+-- Host: test-db.verdnatura.es    Database: sage
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -578,7 +604,6 @@ USE `sage`;
 /*!40101 SET NAMES utf8 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -616,10 +641,9 @@ UNLOCK TABLES;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:34:53
+-- Dump completed on 2021-02-09 12:15:17
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index d821c7bfc..90aae8932 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -1246,11 +1246,6 @@ INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email
         (3, 2,    321654987, NULL,          'supplier2@email.es',   NULL,               NULL),
         (4, 442,  321654987, NULL,          NULL,                   'observation442',   NULL);
 
-INSERT INTO `vn`.`supplierFreighter` (`supplierFk`) 
-    VALUES
-        (1), 
-        (2);
-
 INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_refresh`, `expires`, `created`, `connection_id`)
     VALUES
         (1, 2, 'available', CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL),
@@ -2174,4 +2169,70 @@ INSERT INTO `hedera`.`image`(`collectionFk`, `name`)
 
 INSERT INTO `hedera`.`imageCollectionSize`(`id`, `collectionFk`,`width`, `height`)
     VALUES
-        (1, 4, 160, 160);
\ No newline at end of file
+        (1, 4, 160, 160);
+
+INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk) 
+    VALUES 
+        (1,     '07546501420', 67,  671,    CURDATE(),  1761, 1, 1),
+        (2,     '07546491421', 252, 2769,   CURDATE(),  5231, 1, 1),
+        (3,     '07546500823', 102, 1495,   CURDATE(),  3221, 1, 1),
+        (4,     '99610288821', 252, 2777,   CURDATE(),  3641, 1, 1),
+        (5,     '07546500834', 229, 3292,   CURDATE(),  6601, 2, 1),
+        (6,     '22101929561', 37,  458,    CURDATE(),  441,  2, 1),
+        (7,     '07546491432', 258, 3034,   CURDATE(),  6441, 2, 1),
+        (8,     '99610288644', 476, 4461,   CURDATE(),  5751, 442, 1),
+        (9,     '99610289193', 302, 2972,   CURDATE(),  3871, 442, 1),
+        (10,    '07546500856', 185, 2364,   CURDATE(),  5321, 442, 1);
+
+REPLACE INTO vn.dua (id, code, awbFk, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk) 
+    VALUES 
+        (1,  '19ES0028013A481523', 1,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 1, 11276.95,   442),
+        (2,  '21ES00280136115760', 2,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 2, 1376.20,    442),
+        (3,  '19ES00280131956004', 3,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 3, 14268.50,   442),
+        (4,  '19ES00280131955995', 4,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 1, 8242.50,    442),
+        (5,  '19ES00280132022070', 5,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 2, 10012.49,   442),
+        (6,  '19ES00280132032308', 6,  CURDATE(), CURDATE(), CURDATE(), CURDATE(), 2, 19914.25,   442),
+        (7,  '19ES00280132025489', 7,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH), CURDATE(), CURDATE(), CURDATE(), 2, 1934.06,    442),
+        (8,  '19ES00280132025489', 8,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH), CURDATE(), CURDATE(), CURDATE(), 2, 3618.52,    442),
+        (9,  '19ES00280132025489', 9,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH), CURDATE(), CURDATE(), CURDATE(), 2, 7126.23,    442),
+        (10, '19ES00280132025489', 10, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), CURDATE(), CURDATE(), CURDATE(), 2, 4631.45,    442);
+
+REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`)
+    VALUES
+        (1,  1001,  'R', 1, CURDATE(), CURDATE(), 1234, 0, 442, 1),
+        (2,  1002,  'R', 1, CURDATE(), CURDATE(), 1235, 1, 442, 1),
+        (3,  1003,  'R', 1, CURDATE(), CURDATE(), 1236, 0, 442, 1),
+        (4,  1004,  'R', 1, CURDATE(), CURDATE(), 1237, 0, 442, 1),
+        (5,  1005,  'R', 1, CURDATE(), CURDATE(), 1238, 1, 442, 1),
+        (6,  1006,  'R', 2, CURDATE(), CURDATE(), 1239, 0, 442, 1),
+        (7,  1007,  'R', 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1240, 1, 442, 1),
+        (8,  1008,  'R', 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1241, 1, 442, 1),
+        (9,  1009,  'R', 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1242, 1, 442, 1),
+        (10, 1010,  'R', 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1243, 1, 442, 1);
+
+INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`)
+    VALUES
+        (1, CURDATE(), 1, 237),
+        (1, CURDATE(), 1, 15.25),
+        (2, CURDATE(), 1, 168),
+        (2, CURDATE(), 1, 55.17),
+        (3, CURDATE(), 1, 87.95),
+        (3, CURDATE(), 1, 7.65),
+        (4, CURDATE(), 1, 373.27),
+        (4, CURDATE(), 1, 73.36),
+        (5, CURDATE(), 1, 64.23),
+        (6, CURDATE(), 1, 32.95),
+        (7, 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);
\ No newline at end of file
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 399cc9f61..a57473241 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
+-- MariaDB dump 10.18  Distrib 10.5.8-MariaDB, for Linux (x86_64)
 --
--- Host: db.verdnatura.es    Database: account
+-- Host: test-db.verdnatura.es    Database: account
 -- ------------------------------------------------------
--- Server version	5.6.25-4-log
+-- Server version	10.4.17-MariaDB-1:10.4.17+maria~buster-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -105,9 +105,10 @@ DROP TABLE IF EXISTS `accountDovecot`;
 /*!50001 DROP VIEW IF EXISTS `accountDovecot`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `accountDovecot` AS SELECT 
- 1 AS `name`,
- 1 AS `password`*/;
+/*!50001 CREATE TABLE `accountDovecot` (
+  `name` tinyint NOT NULL,
+  `password` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -137,9 +138,10 @@ DROP TABLE IF EXISTS `emailUser`;
 /*!50001 DROP VIEW IF EXISTS `emailUser`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `emailUser` AS SELECT 
- 1 AS `userFk`,
- 1 AS `email`*/;
+/*!50001 CREATE TABLE `emailUser` (
+  `userFk` tinyint NOT NULL,
+  `email` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -171,7 +173,7 @@ CREATE TABLE `mailAlias` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `alias` varchar(50) CHARACTER SET utf8 NOT NULL,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isPublic` tinyint(4) NOT NULL DEFAULT '1',
+  `isPublic` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `alias` (`alias`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Mail aliases';
@@ -233,8 +235,9 @@ DROP TABLE IF EXISTS `myRole`;
 /*!50001 DROP VIEW IF EXISTS `myRole`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myRole` AS SELECT 
- 1 AS `id`*/;
+/*!50001 CREATE TABLE `myRole` (
+  `id` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -245,15 +248,16 @@ DROP TABLE IF EXISTS `myUser`;
 /*!50001 DROP VIEW IF EXISTS `myUser`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myUser` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `active`,
- 1 AS `email`,
- 1 AS `nickname`,
- 1 AS `lang`,
- 1 AS `role`,
- 1 AS `recoverPass`*/;
+/*!50001 CREATE TABLE `myUser` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `active` tinyint NOT NULL,
+  `email` tinyint NOT NULL,
+  `nickname` tinyint NOT NULL,
+  `lang` tinyint NOT NULL,
+  `role` tinyint NOT NULL,
+  `recoverPass` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -267,9 +271,9 @@ CREATE TABLE `role` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(14) COLLATE utf8_unicode_ci NOT NULL COMMENT 'MySQL doesn''t support more than 14 chars for proxied user names',
   `description` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `hasLogin` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `hasLogin` tinyint(3) unsigned NOT NULL DEFAULT 1,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `modified` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Roles';
@@ -377,7 +381,7 @@ CREATE TABLE `sambaConfig` (
   `adController` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The hosname of domain controller',
   `adUser` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Active directory user',
   `adPassword` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Active directory password',
-  `verifyCert` tinyint(3) unsigned NOT NULL DEFAULT '1' COMMENT 'Whether to verify server certificate',
+  `verifyCert` tinyint(3) unsigned NOT NULL DEFAULT 1 COMMENT 'Whether to verify server certificate',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global configuration parameters for accounts';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -395,18 +399,19 @@ CREATE TABLE `user` (
   `name` varchar(30) CHARACTER SET utf8 NOT NULL,
   `nickname` varchar(127) COLLATE utf8_unicode_ci NOT NULL,
   `bcryptPassword` varchar(512) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `role` int(10) unsigned NOT NULL DEFAULT '2',
-  `active` tinyint(1) NOT NULL DEFAULT '1',
+  `role` int(10) unsigned NOT NULL DEFAULT 2,
+  `active` tinyint(1) NOT NULL DEFAULT 1,
   `email` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
   `emailVerified` tinyint(1) DEFAULT NULL,
   `verificationToken` varchar(512) CHARACTER SET utf8 DEFAULT NULL,
   `lang` char(2) CHARACTER SET utf8 DEFAULT NULL,
-  `recoverPass` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `recoverPass` tinyint(3) unsigned NOT NULL DEFAULT 1,
   `lastPassChange` datetime DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `updated` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `password` char(64) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Deprecated',
-  `sync` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Deprecated',
+  `image` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `sync` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'Deprecated',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`),
   KEY `role` (`role`),
@@ -881,52 +886,52 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `passwordGenerate`() RETURNS text CHARSET utf8 COLLATE utf8_unicode_ci
     READS SQL DATA
-BEGIN
-/**
-	* Generates a random password that meets the minimum requirements.
-	*
-	* @return Generated password
-	*/
-	DECLARE vMinLength TINYINT;
-	DECLARE vMinAlpha TINYINT;
-	DECLARE vMinUpper TINYINT;
-	DECLARE vMinDigits TINYINT;
-	DECLARE vMinPunct TINYINT;
-	DECLARE vAlpha TINYINT DEFAULT 0;
-	DECLARE vUpper TINYINT DEFAULT 0;
-	DECLARE vDigits TINYINT DEFAULT 0;
-	DECLARE vPunct TINYINT DEFAULT 0;
-	DECLARE vRandIndex INT;
-	DECLARE vPwd TEXT DEFAULT '';
-
-	DECLARE vAlphaChars TEXT DEFAULT 'abcdefghijklmnopqrstuvwxyz';
-	DECLARE vUpperChars TEXT DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-	DECLARE vDigitChars TEXT DEFAULT '1234567890';
-	DECLARE vPunctChars TEXT DEFAULT '!$%&()=.';
-
-	SELECT length, nAlpha, nUpper, nDigits, nPunct 
-		INTO vMinLength, vMinAlpha, vMinUpper, vMinDigits, vMinPunct FROM userPassword;
-
-	WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha 
-	OR vUpper < vMinUpper OR vDigits < vMinDigits OR vPunct < vMinPunct DO
-		SET vRandIndex = FLOOR((RAND() * 4) + 1);
-
-		CASE
-			WHEN vRandIndex = 1 THEN
-				SET vPwd = CONCAT(vPwd, SUBSTRING(vAlphaChars, FLOOR((RAND() * 26) + 1), 1));
-				SET vAlpha = vAlpha + 1;
-			WHEN vRandIndex = 2 THEN
-				SET vPwd = CONCAT(vPwd, SUBSTRING(vUpperChars, FLOOR((RAND() * 26) + 1), 1));
-				SET vUpper = vUpper + 1;
-			WHEN vRandIndex = 3 THEN
-				SET vPwd = CONCAT(vPwd, SUBSTRING(vDigitChars, FLOOR((RAND() * 10) + 1), 1));
-				SET vDigits = vDigits + 1;
-			WHEN vRandIndex = 4 THEN
-				SET vPwd = CONCAT(vPwd, SUBSTRING(vPunctChars, FLOOR((RAND() * LENGTH(vPunctChars)) + 1), 1));
-				SET vPunct = vPunct + 1;
-		END CASE;
-	END WHILE;
-	RETURN vPwd;
+BEGIN
+/**
+	* Generates a random password that meets the minimum requirements.
+	*
+	* @return Generated password
+	*/
+	DECLARE vMinLength TINYINT;
+	DECLARE vMinAlpha TINYINT;
+	DECLARE vMinUpper TINYINT;
+	DECLARE vMinDigits TINYINT;
+	DECLARE vMinPunct TINYINT;
+	DECLARE vAlpha TINYINT DEFAULT 0;
+	DECLARE vUpper TINYINT DEFAULT 0;
+	DECLARE vDigits TINYINT DEFAULT 0;
+	DECLARE vPunct TINYINT DEFAULT 0;
+	DECLARE vRandIndex INT;
+	DECLARE vPwd TEXT DEFAULT '';
+
+	DECLARE vAlphaChars TEXT DEFAULT 'abcdefghijklmnopqrstuvwxyz';
+	DECLARE vUpperChars TEXT DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+	DECLARE vDigitChars TEXT DEFAULT '1234567890';
+	DECLARE vPunctChars TEXT DEFAULT '!$%&()=.';
+
+	SELECT length, nAlpha, nUpper, nDigits, nPunct 
+		INTO vMinLength, vMinAlpha, vMinUpper, vMinDigits, vMinPunct FROM userPassword;
+
+	WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha 
+	OR vUpper < vMinUpper OR vDigits < vMinDigits OR vPunct < vMinPunct DO
+		SET vRandIndex = FLOOR((RAND() * 4) + 1);
+
+		CASE
+			WHEN vRandIndex = 1 THEN
+				SET vPwd = CONCAT(vPwd, SUBSTRING(vAlphaChars, FLOOR((RAND() * 26) + 1), 1));
+				SET vAlpha = vAlpha + 1;
+			WHEN vRandIndex = 2 THEN
+				SET vPwd = CONCAT(vPwd, SUBSTRING(vUpperChars, FLOOR((RAND() * 26) + 1), 1));
+				SET vUpper = vUpper + 1;
+			WHEN vRandIndex = 3 THEN
+				SET vPwd = CONCAT(vPwd, SUBSTRING(vDigitChars, FLOOR((RAND() * 10) + 1), 1));
+				SET vDigits = vDigits + 1;
+			WHEN vRandIndex = 4 THEN
+				SET vPwd = CONCAT(vPwd, SUBSTRING(vPunctChars, FLOOR((RAND() * LENGTH(vPunctChars)) + 1), 1));
+				SET vPunct = vPunct + 1;
+		END CASE;
+	END WHILE;
+	RETURN vPwd;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -1019,11 +1024,11 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `userGetNameFromId__`(vSelf INT) RETURNS varchar(30) CHARSET utf8 COLLATE utf8_unicode_ci
     DETERMINISTIC
-BEGIN
-/**
- * @deprecated Use user_getNameFromId();
- */
-	RETURN user_getNameFromId(vSelf);
+BEGIN
+/**
+ * @deprecated Use user_getNameFromId();
+ */
+	RETURN user_getNameFromId(vSelf);
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -1088,22 +1093,22 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `user_getMysqlRole`(vUserName VARCHAR(255)) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
     DETERMINISTIC
-BEGIN
-/**
- * From a username, it returns the associated MySQL wich should be used when
- * using external authentication systems.
- *
- * @param vUserName The user name
- * @return The associated MySQL role
- */
-	DECLARE vRole VARCHAR(255);
-
-	SELECT CONCAT(IF(r.hasLogin, 'z-', ''), r.name) INTO vRole
-		FROM role r 
-			JOIN user u ON u.role = r.id
-		WHERE u.name = vUserName;
-	
-	RETURN vRole;
+BEGIN
+/**
+ * From a username, it returns the associated MySQL wich should be used when
+ * using external authentication systems.
+ *
+ * @param vUserName The user name
+ * @return The associated MySQL role
+ */
+	DECLARE vRole VARCHAR(255);
+
+	SELECT CONCAT(IF(r.hasLogin, 'z-', ''), r.name) INTO vRole
+		FROM role r 
+			JOIN user u ON u.role = r.id
+		WHERE u.name = vUserName;
+	
+	RETURN vRole;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -1122,20 +1127,20 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `user_getNameFromId`(vSelf INT) RETURNS varchar(30) CHARSET utf8 COLLATE utf8_unicode_ci
     DETERMINISTIC
-BEGIN
-/**
- * Gets user name from it's id.
- * 
- * @param vSelf The user id
- * @return The user name
- */
-	DECLARE vName VARCHAR(30);
-	
-	SELECT `name` INTO vName 
-		FROM user 
-		WHERE id = vSelf;
-	
-	RETURN vName;
+BEGIN
+/**
+ * Gets user name from it's id.
+ * 
+ * @param vSelf The user id
+ * @return The user name
+ */
+	DECLARE vName VARCHAR(30);
+	
+	SELECT `name` INTO vName 
+		FROM user 
+		WHERE id = vSelf;
+	
+	RETURN vName;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -2382,15 +2387,16 @@ DROP TABLE IF EXISTS `bajasLaborales`;
 /*!50001 DROP VIEW IF EXISTS `bajasLaborales`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `bajasLaborales` AS SELECT 
- 1 AS `firstname`,
- 1 AS `name`,
- 1 AS `business_id`,
- 1 AS `lastDate`,
- 1 AS `endContract`,
- 1 AS `type`,
- 1 AS `dias`,
- 1 AS `userFk`*/;
+/*!50001 CREATE TABLE `bajasLaborales` (
+  `firstname` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `business_id` tinyint NOT NULL,
+  `lastDate` tinyint NOT NULL,
+  `endContract` tinyint NOT NULL,
+  `type` tinyint NOT NULL,
+  `dias` tinyint NOT NULL,
+  `userFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2403,12 +2409,12 @@ DROP TABLE IF EXISTS `bancos_evolution`;
 CREATE TABLE `bancos_evolution` (
   `Fecha` date NOT NULL,
   `Id_Banco` int(11) NOT NULL,
-  `saldo` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `quilla` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `deuda` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `liquidez` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `disponibilidad ajena` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `saldo_aux` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT 'Saldo auxiliar para el calculo de lo dispuesto en las polizas',
+  `saldo` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `quilla` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `deuda` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `liquidez` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `disponibilidad ajena` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `saldo_aux` decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT 'Saldo auxiliar para el calculo de lo dispuesto en las polizas',
   PRIMARY KEY (`Fecha`,`Id_Banco`),
   KEY `fk_banco_evolution_idx` (`Id_Banco`),
   CONSTRAINT `fk_banco_evolution` FOREIGN KEY (`Id_Banco`) REFERENCES `vn`.`bank` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@@ -2454,7 +2460,7 @@ DROP TABLE IF EXISTS `clientDied`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `clientDied` (
-  `id` int(11) NOT NULL DEFAULT '0',
+  `id` int(11) NOT NULL DEFAULT 0,
   `clientName` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `lastInvoiced` date DEFAULT NULL,
   `workerCode` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
@@ -2475,7 +2481,7 @@ CREATE TABLE `clientNewBorn` (
   `clientFk` int(11) NOT NULL,
   `firstShipped` date NOT NULL COMMENT 'Primer pedido o de la relacion comercial, o después de un año de inactividad',
   `lastShipped` date NOT NULL COMMENT 'último pedido del cliente',
-  `isModified` tinyint(4) DEFAULT '0',
+  `isModified` tinyint(4) DEFAULT 0,
   PRIMARY KEY (`clientFk`),
   CONSTRAINT `clientNewBorn_fk1` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Listado de clientes que se consideran nuevos a efectos de cobrar la comision adicional del comercial';
@@ -2590,7 +2596,7 @@ DROP TABLE IF EXISTS `defaulter`;
 CREATE TABLE `defaulter` (
   `clientFk` int(11) NOT NULL,
   `created` date NOT NULL,
-  `amount` double NOT NULL DEFAULT '0',
+  `amount` double NOT NULL DEFAULT 0,
   `defaulterSinced` date DEFAULT NULL,
   `hasChanged` tinyint(1) DEFAULT NULL,
   `frozened` date DEFAULT NULL,
@@ -2609,7 +2615,7 @@ DROP TABLE IF EXISTS `experienceIberflora2016`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `experienceIberflora2016` (
   `Id_Cliente` int(11) NOT NULL,
-  `isVisitor` tinyint(4) NOT NULL DEFAULT '0',
+  `isVisitor` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`Id_Cliente`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Lista de clientes que participan en el estudio sobre la mejora del consumo tras la visita a las instalaciones de Silla';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2674,38 +2680,39 @@ DROP TABLE IF EXISTS `lastIndicators`;
 /*!50001 DROP VIEW IF EXISTS `lastIndicators`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `lastIndicators` AS SELECT 
- 1 AS `updated`,
- 1 AS `lastYearSales`,
- 1 AS `incLastYearSales`,
- 1 AS `totalGreuge`,
- 1 AS `incTotalGreuge`,
- 1 AS `latePaymentRate`,
- 1 AS `incLatePaymentRate`,
- 1 AS `countEmployee`,
- 1 AS `incCountEmployee`,
- 1 AS `averageMana`,
- 1 AS `incAverageMana`,
- 1 AS `bankingPool`,
- 1 AS `incbankingPool`,
- 1 AS `lastMonthActiveClients`,
- 1 AS `incLastMonthActiveClients`,
- 1 AS `lastMonthLostClients`,
- 1 AS `incLastMonthLostClients`,
- 1 AS `lastMonthNewClients`,
- 1 AS `incLastMonthNewClients`,
- 1 AS `lastMonthWebBuyingRate`,
- 1 AS `incLastMonthWebBuyingRate`,
- 1 AS `productionHours`,
- 1 AS `dailyWorkersCost`,
- 1 AS `volumeM3`,
- 1 AS `salesValue`,
- 1 AS `valueM3`,
- 1 AS `hoursM3`,
- 1 AS `workerCostM3`,
- 1 AS `salesWorkersCostRate`,
- 1 AS `thisWeekSales`,
- 1 AS `lastYearWeekSales`*/;
+/*!50001 CREATE TABLE `lastIndicators` (
+  `updated` tinyint NOT NULL,
+  `lastYearSales` tinyint NOT NULL,
+  `incLastYearSales` tinyint NOT NULL,
+  `totalGreuge` tinyint NOT NULL,
+  `incTotalGreuge` tinyint NOT NULL,
+  `latePaymentRate` tinyint NOT NULL,
+  `incLatePaymentRate` tinyint NOT NULL,
+  `countEmployee` tinyint NOT NULL,
+  `incCountEmployee` tinyint NOT NULL,
+  `averageMana` tinyint NOT NULL,
+  `incAverageMana` tinyint NOT NULL,
+  `bankingPool` tinyint NOT NULL,
+  `incbankingPool` tinyint NOT NULL,
+  `lastMonthActiveClients` tinyint NOT NULL,
+  `incLastMonthActiveClients` tinyint NOT NULL,
+  `lastMonthLostClients` tinyint NOT NULL,
+  `incLastMonthLostClients` tinyint NOT NULL,
+  `lastMonthNewClients` tinyint NOT NULL,
+  `incLastMonthNewClients` tinyint NOT NULL,
+  `lastMonthWebBuyingRate` tinyint NOT NULL,
+  `incLastMonthWebBuyingRate` tinyint NOT NULL,
+  `productionHours` tinyint NOT NULL,
+  `dailyWorkersCost` tinyint NOT NULL,
+  `volumeM3` tinyint NOT NULL,
+  `salesValue` tinyint NOT NULL,
+  `valueM3` tinyint NOT NULL,
+  `hoursM3` tinyint NOT NULL,
+  `workerCostM3` tinyint NOT NULL,
+  `salesWorkersCostRate` tinyint NOT NULL,
+  `thisWeekSales` tinyint NOT NULL,
+  `lastYearWeekSales` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2719,14 +2726,14 @@ CREATE TABLE `m3` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `fecha` date NOT NULL,
   `provinceFk` smallint(5) unsigned DEFAULT NULL,
-  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '0',
+  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 0,
   `m3` decimal(10,2) DEFAULT NULL,
   `year` int(11) DEFAULT NULL,
   `month` int(11) DEFAULT NULL,
   `week` int(11) DEFAULT NULL,
   `day` int(11) DEFAULT NULL,
   `dayName` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `euros` decimal(10,2) DEFAULT '0.00',
+  `euros` decimal(10,2) DEFAULT 0.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2739,15 +2746,16 @@ DROP TABLE IF EXISTS `m3Silla`;
 /*!50001 DROP VIEW IF EXISTS `m3Silla`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `m3Silla` AS SELECT 
- 1 AS `fecha`,
- 1 AS `year`,
- 1 AS `month`,
- 1 AS `week`,
- 1 AS `day`,
- 1 AS `dayName`,
- 1 AS `Volumen`,
- 1 AS `Euros`*/;
+/*!50001 CREATE TABLE `m3Silla` (
+  `fecha` tinyint NOT NULL,
+  `year` tinyint NOT NULL,
+  `month` tinyint NOT NULL,
+  `week` tinyint NOT NULL,
+  `day` tinyint NOT NULL,
+  `dayName` tinyint NOT NULL,
+  `Volumen` tinyint NOT NULL,
+  `Euros` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2758,23 +2766,24 @@ DROP TABLE IF EXISTS `m3analisis`;
 /*!50001 DROP VIEW IF EXISTS `m3analisis`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `m3analisis` AS SELECT 
- 1 AS `fecha`,
- 1 AS `year`,
- 1 AS `month`,
- 1 AS `week`,
- 1 AS `day`,
- 1 AS `dayName`,
- 1 AS `Volumen`,
- 1 AS `Euros`,
- 1 AS `Departamento`,
- 1 AS `Horas`,
- 1 AS `Salarios`,
- 1 AS `tiempoM3`,
- 1 AS `valorM3`,
- 1 AS `costeLaboralM3`,
- 1 AS `costeEuros`,
- 1 AS `precioHora`*/;
+/*!50001 CREATE TABLE `m3analisis` (
+  `fecha` tinyint NOT NULL,
+  `year` tinyint NOT NULL,
+  `month` tinyint NOT NULL,
+  `week` tinyint NOT NULL,
+  `day` tinyint NOT NULL,
+  `dayName` tinyint NOT NULL,
+  `Volumen` tinyint NOT NULL,
+  `Euros` tinyint NOT NULL,
+  `Departamento` tinyint NOT NULL,
+  `Horas` tinyint NOT NULL,
+  `Salarios` tinyint NOT NULL,
+  `tiempoM3` tinyint NOT NULL,
+  `valorM3` tinyint NOT NULL,
+  `costeLaboralM3` tinyint NOT NULL,
+  `costeEuros` tinyint NOT NULL,
+  `precioHora` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2785,10 +2794,11 @@ DROP TABLE IF EXISTS `manaCustomer`;
 /*!50001 DROP VIEW IF EXISTS `manaCustomer`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `manaCustomer` AS SELECT 
- 1 AS `Id_Cliente`,
- 1 AS `Mana`,
- 1 AS `dated`*/;
+/*!50001 CREATE TABLE `manaCustomer` (
+  `Id_Cliente` tinyint NOT NULL,
+  `Mana` tinyint NOT NULL,
+  `dated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2799,8 +2809,9 @@ DROP TABLE IF EXISTS `manaSpellersExcluded`;
 /*!50001 DROP VIEW IF EXISTS `manaSpellersExcluded`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `manaSpellersExcluded` AS SELECT 
- 1 AS `workerFk`*/;
+/*!50001 CREATE TABLE `manaSpellersExcluded` (
+  `workerFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2811,14 +2822,15 @@ DROP TABLE IF EXISTS `mana_spellers`;
 /*!50001 DROP VIEW IF EXISTS `mana_spellers`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `mana_spellers` AS SELECT 
- 1 AS `Id_Trabajador`,
- 1 AS `size`,
- 1 AS `used`,
- 1 AS `prices_modifier_rate`,
- 1 AS `prices_modifier_activated`,
- 1 AS `minRate`,
- 1 AS `maxRate`*/;
+/*!50001 CREATE TABLE `mana_spellers` (
+  `Id_Trabajador` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `used` tinyint NOT NULL,
+  `prices_modifier_rate` tinyint NOT NULL,
+  `prices_modifier_activated` tinyint NOT NULL,
+  `minRate` tinyint NOT NULL,
+  `maxRate` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2829,8 +2841,9 @@ DROP TABLE IF EXISTS `mana_spellers_excluded`;
 /*!50001 DROP VIEW IF EXISTS `mana_spellers_excluded`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `mana_spellers_excluded` AS SELECT 
- 1 AS `Id_Trabajador`*/;
+/*!50001 CREATE TABLE `mana_spellers_excluded` (
+  `Id_Trabajador` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2858,17 +2871,18 @@ DROP TABLE IF EXISTS `mermas__`;
 /*!50001 DROP VIEW IF EXISTS `mermas__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `mermas__` AS SELECT 
- 1 AS `Comprador`,
- 1 AS `Familia`,
- 1 AS `Referencia`,
- 1 AS `Item`,
- 1 AS `Cantidad`,
- 1 AS `Coste_Unitario`,
- 1 AS `Importe`,
- 1 AS `Cliente`,
- 1 AS `ticketFk`,
- 1 AS `Fecha`*/;
+/*!50001 CREATE TABLE `mermas__` (
+  `Comprador` tinyint NOT NULL,
+  `Familia` tinyint NOT NULL,
+  `Referencia` tinyint NOT NULL,
+  `Item` tinyint NOT NULL,
+  `Cantidad` tinyint NOT NULL,
+  `Coste_Unitario` tinyint NOT NULL,
+  `Importe` tinyint NOT NULL,
+  `Cliente` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL,
+  `Fecha` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -2964,8 +2978,8 @@ DROP TABLE IF EXISTS `payMethodClient`;
 CREATE TABLE `payMethodClient` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `dated` date NOT NULL,
-  `payMethodFk` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `clientFk` int(11) NOT NULL DEFAULT '0',
+  `payMethodFk` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `clientFk` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `FkPayMethod_idx` (`payMethodFk`),
   KEY `FkClientPayMethod_idx` (`clientFk`),
@@ -3002,9 +3016,9 @@ DROP TABLE IF EXISTS `produccion`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `produccion` (
   `dated` date NOT NULL,
-  `m3` int(11) NOT NULL DEFAULT '0',
-  `cost` int(11) NOT NULL DEFAULT '0',
-  `eurosM3` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `m3` int(11) NOT NULL DEFAULT 0,
+  `cost` int(11) NOT NULL DEFAULT 0,
+  `eurosM3` decimal(10,2) NOT NULL DEFAULT 0.00,
   PRIMARY KEY (`dated`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3017,7 +3031,7 @@ DROP TABLE IF EXISTS `salaries2018`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `salaries2018` (
-  `person_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
   `sex` enum('M','F') CHARACTER SET utf8 NOT NULL DEFAULT 'F' COMMENT 'M Masculino  F Femenino',
   `edad` int(6) DEFAULT NULL,
   `antiguedad` int(6) DEFAULT NULL,
@@ -3044,9 +3058,9 @@ DROP TABLE IF EXISTS `salePersonEvolution__`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `salePersonEvolution__` (
   `dated` date NOT NULL DEFAULT '0000-00-00',
-  `amount` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `equalizationTax` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `salesPersonFk` int(11) NOT NULL DEFAULT '0',
+  `amount` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `equalizationTax` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `salesPersonFk` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`dated`,`salesPersonFk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3066,6 +3080,29 @@ CREATE TABLE `salesByWeek` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `salesByclientSalesPerson`
+--
+
+DROP TABLE IF EXISTS `salesByclientSalesPerson`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `salesByclientSalesPerson` (
+  `dated` date NOT NULL DEFAULT '0000-00-00',
+  `salesPersonFk` int(11) DEFAULT NULL,
+  `clientFk` int(11) NOT NULL,
+  `amount` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `equalizationTax` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `amountNewBorn` decimal(10,3) NOT NULL DEFAULT 0.000,
+  PRIMARY KEY (`dated`,`clientFk`),
+  KEY `clientSalePersonEvolution_clientFk` (`clientFk`),
+  KEY `salesByclientSalesPerson_salesPerson` (`salesPersonFk`),
+  KEY `salesByclientSalesPerson_dated` (`dated`,`clientFk`,`amount`),
+  CONSTRAINT `clientSalePersonEvolution_clientFk` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `salesByclientSalesPerson_salesPerson` FOREIGN KEY (`salesPersonFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Ventas diarias por cliente y comercial';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `salesMonthlySnapshot`
 --
@@ -3079,9 +3116,21 @@ CREATE TABLE `salesMonthlySnapshot` (
   `year` int(4) NOT NULL,
   `month` int(2) NOT NULL,
   `departmentFk` int(11) NOT NULL,
-  `amount` decimal(10,2) DEFAULT '0.00',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='cada trimestre se guardan aqui los datos de forma estática, para consulta en grafana.';
+  `ownSalesAmount` decimal(10,2) DEFAULT 0.00,
+  `ownSalesPosition` int(11) DEFAULT NULL,
+  `ownSalesBonus` int(11) DEFAULT NULL,
+  `ownSalesScore` int(11) DEFAULT NULL,
+  `newClientsSalesAmount` decimal(10,2) DEFAULT NULL,
+  `newClientsSalesPosition` int(11) DEFAULT NULL,
+  `newClientsSalesBonus` int(11) DEFAULT NULL,
+  `newClientsScore` int(11) DEFAULT NULL,
+  `teamSalesAmount` decimal(10,2) DEFAULT NULL,
+  `teamSalesPosition` int(11) DEFAULT NULL,
+  `teamSalesBonus` int(11) DEFAULT NULL,
+  `teamSalesScore` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `workerFk_UNIQUE` (`workerFk`,`year`,`month`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='cada mes se guardan aqui los datos de forma estática, para consulta en grafana.';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3107,6 +3156,26 @@ CREATE TABLE `salesPersonClient` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Ventas por comercial por cliente';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `salesPersonEvolution`
+--
+
+DROP TABLE IF EXISTS `salesPersonEvolution`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `salesPersonEvolution` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `dated` date NOT NULL DEFAULT '0000-00-00',
+  `salesPersonFk` int(11) DEFAULT NULL,
+  `amount` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `equalizationTax` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `amountNewBorn` decimal(10,3) NOT NULL DEFAULT 0.000,
+  PRIMARY KEY (`id`),
+  KEY `salesPersonEvolution_salesPerson` (`salesPersonFk`),
+  CONSTRAINT `salesPersonEvolution_salesPerson` FOREIGN KEY (`salesPersonFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Evolución Comerciales';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `v_ventas__`
 --
@@ -3115,13 +3184,14 @@ DROP TABLE IF EXISTS `v_ventas__`;
 /*!50001 DROP VIEW IF EXISTS `v_ventas__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `v_ventas__` AS SELECT 
- 1 AS `importe`,
- 1 AS `recargo`,
- 1 AS `year`,
- 1 AS `month`,
- 1 AS `week`,
- 1 AS `day`*/;
+/*!50001 CREATE TABLE `v_ventas__` (
+  `importe` tinyint NOT NULL,
+  `recargo` tinyint NOT NULL,
+  `year` tinyint NOT NULL,
+  `month` tinyint NOT NULL,
+  `week` tinyint NOT NULL,
+  `day` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -3143,7 +3213,7 @@ CREATE TABLE `vendedores` (
   `sustitucionArrendada` decimal(10,2) DEFAULT NULL,
   `itemTypeBorrowed` decimal(10,2) DEFAULT NULL,
   `portfolioWeight` decimal(10,2) DEFAULT NULL COMMENT 'Pero de la cartera del comercial a fecha vendedores.updated',
-  `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated` timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`Id_Trabajador`,`año`,`mes`),
   CONSTRAINT `trabajador_trabajador` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -3175,12 +3245,13 @@ DROP TABLE IF EXISTS `ventas`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ventas` (
   `Id_Movimiento` int(11) NOT NULL,
-  `importe` decimal(10,3) NOT NULL DEFAULT '0.000',
-  `recargo` decimal(10,3) NOT NULL DEFAULT '0.000',
+  `importe` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `recargo` decimal(10,3) NOT NULL DEFAULT 0.000,
   `fecha` date NOT NULL,
   `tipo_id` smallint(5) unsigned NOT NULL,
-  `Id_Cliente` int(11) NOT NULL DEFAULT '1',
-  `empresa_id` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `Id_Cliente` int(11) NOT NULL DEFAULT 1,
+  `empresa_id` smallint(5) unsigned NOT NULL DEFAULT 442,
+  `margen` decimal(10,3) NOT NULL DEFAULT 0.000,
   PRIMARY KEY (`Id_Movimiento`),
   KEY `tip_to_tip_idx` (`tipo_id`),
   KEY `clientes_bs_ventas_idx` (`Id_Cliente`),
@@ -3240,11 +3311,52 @@ DROP TABLE IF EXISTS `workerMana`;
 /*!50001 DROP VIEW IF EXISTS `workerMana`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerMana` AS SELECT 
- 1 AS `workerFk`,
- 1 AS `amount`*/;
+/*!50001 CREATE TABLE `workerMana` (
+  `workerFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `workerProductivity`
+--
+
+DROP TABLE IF EXISTS `workerProductivity`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `workerProductivity` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `dated` date NOT NULL,
+  `warehouseFk` smallint(6) unsigned NOT NULL,
+  `workerFk` int(11) NOT NULL,
+  `volume` decimal(10,6) NOT NULL,
+  `seconds` int(11) NOT NULL,
+  `roleFk` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `workerProductivity_warehouseFk_idx` (`warehouseFk`),
+  KEY `workerProductivity_workerFk_idx` (`workerFk`),
+  KEY `workerProductivity_roleFk_idx` (`roleFk`),
+  CONSTRAINT `workerProductivity_roleFk` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `workerProductivity_warehouseFk` FOREIGN KEY (`warehouseFk`) REFERENCES `vn`.`warehouse` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `workerProductivity_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `workerProductivityConfig`
+--
+
+DROP TABLE IF EXISTS `workerProductivityConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `workerProductivityConfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `minSeconsPackager` int(11) DEFAULT NULL,
+  `minSeconsItemPicker` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `workerSpeed__`
 --
@@ -3255,7 +3367,7 @@ DROP TABLE IF EXISTS `workerSpeed__`;
 CREATE TABLE `workerSpeed__` (
   `workerCode` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
   `accion` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
-  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '1',
+  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 1,
   `LitrosMinuto` decimal(10,1) DEFAULT NULL,
   `LitrosMinutoLastHour` decimal(10,1) DEFAULT NULL,
   `lastUpdated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -4632,6 +4744,60 @@ BEGIN
         
     END WHILE;
 
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `kk` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`z-developer`@`%` PROCEDURE `kk`()
+BEGIN
+
+
+	DECLARE vDated DATE;
+    DECLARE vDateEnd DATETIME;
+    
+    SET vDated = '2020-2-15';
+    
+    SET vDateEnd = util.dayend(vDated);
+    
+    WHILE vDated > '2020-01-01' DO
+    
+		UPDATE bs.ventas v
+			JOIN (
+				SELECT s.id, sum(s.quantity * sc.value ) AS margen, s.quantity * s.price * (100 - s.discount ) / 100 AS pvp
+				FROM vn.sale s
+				JOIN vn.ticket t ON t.id = s.ticketFk 
+				JOIN vn.saleComponent sc ON sc.saleFk = s.id
+				JOIN vn.component c ON c.id = sc.componentFk 
+				JOIN vn.componentType ct ON ct.id = c.typeFk 
+				WHERE t.shipped BETWEEN vDated AND vDateEnd
+					AND ct.isMargin = TRUE
+				GROUP BY s.id) sub ON sub.id = v.Id_Movimiento 
+			SET v.margen = sub.margen + v.importe + v.recargo - sub.pvp;
+		
+        
+        SET vDated = TIMESTAMPADD(DAY,-1,vDated);
+		SET vDateEnd = util.dayend(vDated);
+        
+        IF DAY(vDated) MOD 5 = 0 THEN
+        
+			SELECT vDated;
+        
+        END IF;
+    
+    END WHILE;
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -4802,16 +4968,16 @@ BEGIN
     *	La tabla mana_spellers es una caché
     *
     */
-
-	UPDATE mana_spellers me
-		JOIN
-			(SELECT Id_Trabajador, FLOOR(SUM(importe)/12) as pesoCarteraMensual
-				FROM bs.vendedores
-				WHERE año * 100 + mes >= (YEAR(CURDATE()) -1) * 100 + MONTH(CURDATE())
-				GROUP BY Id_Trabajador
-			) lastYearSales USING(Id_Trabajador)
-		SET me.prices_modifier_rate =  GREATEST(me.minRate,LEAST(me.maxRate,ROUND(- me.used/lastYearSales.pesoCarteraMensual,3))) ;
-	
+
+	UPDATE mana_spellers me
+		JOIN
+			(SELECT Id_Trabajador, FLOOR(SUM(importe)/12) as pesoCarteraMensual
+				FROM bs.vendedores
+				WHERE año * 100 + mes >= (YEAR(CURDATE()) -1) * 100 + MONTH(CURDATE())
+				GROUP BY Id_Trabajador
+			) lastYearSales USING(Id_Trabajador)
+		SET me.prices_modifier_rate =  GREATEST(me.minRate,LEAST(me.maxRate,ROUND(- me.used/lastYearSales.pesoCarteraMensual,3))) ;
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5228,46 +5394,46 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`z-developer`@`%` PROCEDURE `saleGraphic`(vItemFk INT, 
-								vTypeFk INT, 
-								vCategoryFk INT,
-								vFromDate DATE,
-								vToDate DATE,
+CREATE DEFINER=`z-developer`@`%` PROCEDURE `saleGraphic`(vItemFk INT, 
+								vTypeFk INT, 
+								vCategoryFk INT,
+								vFromDate DATE,
+								vToDate DATE,
 								vProducerFk INT)
-BEGIN
-	
-	DECLARE vFromDateLastYear DATE;
-	DECLARE vToDateLastYear DATE;
-	DECLARE	vFromDateTwoYearsAgo DATE;
-	DECLARE vToDateTwoYearsAgo DATE;
-	
-	SET vItemFk = IFNULL(vItemFk,0);
-	SET vTypeFk = IFNULL(vTypeFk, 0);
-	SET vCategoryFk = IFNULL(vCategoryFk,0);
-	SET vFromDate = IFNULL(vFromDate,CURDATE());
-	SET vToDate = IFNULL(vToDate,CURDATE());
-	SET vProducerFk = IFNULL(vProducerFk,0);
-
-	SET vFromDateLastYear = TIMESTAMPADD(YEAR,-1,vFromDate);
-	SET vToDateLastYear = TIMESTAMPADD(YEAR,-1,vToDate);
-	SET vFromDateTwoYearsAgo = TIMESTAMPADD(YEAR,-2,vFromDate);
-	SET vToDateTwoYearsAgo = TIMESTAMPADD(YEAR,-2,vToDate);
-
-	SELECT s.quantity, CAST(v.importe AS DECIMAL(10,0)) importe, v.fecha
-		FROM bs.ventas v
-			JOIN vn.sale s ON s.id = v.Id_Movimiento 
-			JOIN vn.item i ON i.id = s.itemFk 
-			JOIN vn.itemType it ON it.id = i.typeFk 
-			JOIN vn.itemCategory ic ON ic.id = it.categoryFk 
-		WHERE vItemFk IN (i.id, 0)
-			AND vTypeFk IN (i.typeFk, 0)
-			AND vCategoryFk IN (it.categoryFk, 0)
-			AND vProducerFk IN (i.producerFk, 0)
-			AND (v.fecha BETWEEN vFromDate AND vToDate
-				OR v.fecha BETWEEN vFromDateLastYear AND vToDateLastYear
-				OR v.fecha BETWEEN vFromDateTwoYearsAgo AND vToDateTwoYearsAgo	
-				);
-			
+BEGIN
+	
+	DECLARE vFromDateLastYear DATE;
+	DECLARE vToDateLastYear DATE;
+	DECLARE	vFromDateTwoYearsAgo DATE;
+	DECLARE vToDateTwoYearsAgo DATE;
+	
+	SET vItemFk = IFNULL(vItemFk,0);
+	SET vTypeFk = IFNULL(vTypeFk, 0);
+	SET vCategoryFk = IFNULL(vCategoryFk,0);
+	SET vFromDate = IFNULL(vFromDate,CURDATE());
+	SET vToDate = IFNULL(vToDate,CURDATE());
+	SET vProducerFk = IFNULL(vProducerFk,0);
+
+	SET vFromDateLastYear = TIMESTAMPADD(YEAR,-1,vFromDate);
+	SET vToDateLastYear = TIMESTAMPADD(YEAR,-1,vToDate);
+	SET vFromDateTwoYearsAgo = TIMESTAMPADD(YEAR,-2,vFromDate);
+	SET vToDateTwoYearsAgo = TIMESTAMPADD(YEAR,-2,vToDate);
+
+	SELECT s.quantity, CAST(v.importe AS DECIMAL(10,0)) importe, v.fecha
+		FROM bs.ventas v
+			JOIN vn.sale s ON s.id = v.Id_Movimiento 
+			JOIN vn.item i ON i.id = s.itemFk 
+			JOIN vn.itemType it ON it.id = i.typeFk 
+			JOIN vn.itemCategory ic ON ic.id = it.categoryFk 
+		WHERE vItemFk IN (i.id, 0)
+			AND vTypeFk IN (i.typeFk, 0)
+			AND vCategoryFk IN (it.categoryFk, 0)
+			AND vProducerFk IN (i.producerFk, 0)
+			AND (v.fecha BETWEEN vFromDate AND vToDate
+				OR v.fecha BETWEEN vFromDateLastYear AND vToDateLastYear
+				OR v.fecha BETWEEN vFromDateTwoYearsAgo AND vToDateTwoYearsAgo	
+				);
+			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -5307,6 +5473,47 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `salesByclientSalesPerson_add` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `salesByclientSalesPerson_add`(vDatedFrom DATE)
+BEGIN
+
+	IF vDatedFrom IS NULL THEN
+		SELECT CURDATE() - INTERVAL DAY(CURDATE())-1 DAY - INTERVAL 1 MONTH INTO vDatedFrom;
+	END IF;
+    
+	INSERT INTO salesByclientSalesPerson( dated, salesPersonFk, clientFk, amount, equalizationTax)
+		SELECT v.fecha,
+				c.salesPersonFk,
+				v.Id_Cliente,
+				SUM(v.importe) amount,
+				SUM(v.recargo) equalizationTax
+			FROM ventas v
+				JOIN vn.client c on v.Id_Cliente = c.id
+			WHERE v.fecha >= vDatedFrom
+			GROUP BY v.fecha,c.salesPersonFk,v.Id_Cliente
+		ON DUPLICATE KEY UPDATE amount= VALUES(amount), equalizationTax= VALUES(equalizationTax);
+     
+	UPDATE salesByclientSalesPerson s
+		JOIN vn.newBornSales n ON n.dated = s.dated AND
+			n.clientFk = s.clientFk
+		SET s.amountNewBorn = n.amount
+		WHERE n.dated >= vDatedFrom; 
+            
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `salesPersonClient_add` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -5467,6 +5674,63 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `salesPersonEvolution_add` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `salesPersonEvolution_add`()
+BEGIN
+	DECLARE vDated DATE;
+	DECLARE vCont INT DEFAULT 1;
+
+	SELECT TIMESTAMPADD(DAY,1,MAX(dated)) INTO vDated 
+		FROM bs.salesPersonEvolution;
+
+	IF ISNULL(vDated) THEN
+
+		SELECT MIN(dated) INTO vDated 
+			FROM salesByclientSalesPerson;
+		
+		INSERT INTO bs.salesPersonEvolution( salesPersonFk, dated, amount, equalizationTax, amountNewBorn )
+			SELECT salesPersonFk, dated, amount, equalizationTax, amountNewBorn
+				FROM salesByclientSalesPerson 
+				WHERE dated = vDated
+				GROUP BY salesPersonFk;
+                            
+		SET vDated = TIMESTAMPADD(DAY, 1, vDated);
+	END IF;
+ 
+	WHILE vDated < CURDATE() DO
+		
+        SET vCont = vCont + 1;
+		
+        REPLACE bs.salesPersonEvolution( salesPersonFk, dated, amount)
+			SELECT salesPersonFk, vDated, SUM(amount) 
+				FROM(SELECT salesPersonFk, amount
+						FROM salesPersonEvolution 
+						WHERE dated = TIMESTAMPADD(DAY,-1,vDated)  -- amount acumulado día anterior
+					UNION ALL
+					SELECT salesPersonFk, amount * IF(dated < vDated,-1,1)  -- suma amount año actual/ resta amount año anterior
+						FROM salesByclientSalesPerson 
+						WHERE dated IN (vDated, TIMESTAMPADD(DAY,-365,vDated))
+					)sub
+				GROUP BY salesPersonFk;
+            
+		SET vDated = TIMESTAMPADD(DAY,1,vDated);
+        
+	END WHILE;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `userSundayRole__` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -5587,6 +5851,32 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add_launcher`()
+BEGIN
+	DECLARE vDatedFrom DATE;
+	
+	CALL bs.vendedores_add(YEAR(CURDATE()),QUARTER(CURDATE()));
+	CALL bs.vendedores_evolution_add;
+	CALL bs.salesPersonClient_add(YEAR(CURDATE()), QUARTER(CURDATE()));
+	SELECT util.firstDayOfMonth(CURDATE())- INTERVAL 1 MONTH INTO vDatedFrom;
+	CALL bs.salesByclientSalesPerson_add(vDatedFrom);
+	
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `vendedores_add_launcher__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add_launcher__`()
 BEGIN
 
 	CALL bs.vendedores_add(YEAR(CURDATE()),QUARTER(CURDATE()));
@@ -5959,7 +6249,7 @@ BEGIN
 	DELETE 
 		FROM ventas 
 		WHERE fecha between vStartingDate and datEND;
-        
+       
 	WHILE vEndingDate <= datEND DO
 												
 		REPLACE ventas(Id_Movimiento, importe, recargo, fecha, tipo_id, Id_Cliente, empresa_id)
@@ -5989,8 +6279,23 @@ BEGIN
 			GROUP BY mc.Id_Movimiento
 			HAVING IFNULL(importe,0) <> 0 OR IFNULL(recargo,0) <> 0;
 
+		
+		UPDATE bs.ventas v
+			JOIN (
+				SELECT s.id, sum(s.quantity * sc.value ) AS margen, s.quantity * s.price * (100 - s.discount ) / 100 AS pvp
+				FROM vn.sale s
+				JOIN vn.ticket t ON t.id = s.ticketFk 
+				JOIN vn.saleComponent sc ON sc.saleFk = s.id
+				JOIN vn.component c ON c.id = sc.componentFk 
+				JOIN vn.componentType ct ON ct.id = c.typeFk 
+				WHERE t.shipped BETWEEN vStartingDate AND vEndingDate
+					AND ct.isMargin = TRUE
+				GROUP BY s.id) sub ON sub.id = v.Id_Movimiento 
+			SET v.margen = sub.margen + v.importe + v.recargo - sub.pvp;
+		
 		SET vStartingDate = TIMESTAMPADD(DAY,1, vStartingDate);
 		SET vEndingDate = util.dayEnd(vStartingDate);
+	
 
 	END WHILE;
 
@@ -6466,6 +6771,92 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `workerProductivity_add` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `workerProductivity_add`()
+BEGIN
+	DECLARE vDateFrom DATE;
+	SELECT DATE_SUB(CURDATE(),INTERVAL 30 DAY) INTO vDateFrom;
+	
+	DELETE FROM workerProductivity 
+		WHERE dated >= vDateFrom;
+	
+	-- SACADORES
+	INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, roleFk)
+		SELECT sub.dated,
+				sub.warehouseFk,
+				sub.workerFk,
+				SUM(sub.volume),
+				SUM(sub.seconds) ,
+				r.id
+			FROM( SELECT t.warehouseFk AS warehouseFk,
+						st.workerFk,
+						DATE(t.shipped) dated,
+						SUM((ic.cm3delivery * s.quantity)/1000000) volume,
+						TIME_TO_SEC(TIMEDIFF( MAX(st.created),MIN(st.created))) + w.minSeconsItemPicker seconds
+					FROM vn.saleTracking st
+						LEFT JOIN vn.salesPreviousPreparated sp ON sp.saleFk = st.saleFk
+						JOIN vn.sale s ON s.id = st.saleFk
+						JOIN vn.ticket t ON t.id = s.ticketFk
+						JOIN vn.itemCost ic ON ic.warehouseFk = t.warehouseFk AND 
+							ic.itemFk = s.itemFk
+						JOIN vn.worker w ON w.id = st.workerFk
+						JOIN vn.state e ON e.id = st.stateFk
+						JOIN vncontrol.accion a ON a.accion_id = st.actionFk
+						LEFT JOIN vn.workerDepartment wd ON wd.workerFk = st.workerFk
+						LEFT JOIN vn.department d ON d.id = wd.departmentFk
+                        JOIN workerProductivityConfig w ON TRUE
+					WHERE t.shipped  >= vDateFrom AND 
+						ISNULL(sp.saleFk)AND 
+						NOT IFNULL(d.name,'') LIKE 'EQUIPO%' AND 
+						a.accion='SACAR' 
+					GROUP BY t.id, t.warehouseFk, st.workerFk
+				) sub
+				JOIN account.role r ON r.name='itemPicker' 
+			GROUP BY sub.warehouseFk, sub.workerFk, sub.dated;
+			
+	-- ENCAJADORES
+	INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, roleFk)
+		SELECT  sub2.shipped,
+				sub2.warehouseFk,
+				sub2.workerFK, 
+				SUM(sub2.volume), 
+				SUM(sub2.seconds),
+				r.id
+			FROM (SELECT t.warehouseFk,      
+						SUM(s.volume) volume,      
+						sub.workerFk,  
+						DATE(t.shipped) shipped,
+						sub.seconds + w.minSeconsPackager seconds
+					FROM vn.saleVolume s      
+						JOIN vn.ticket t ON t.id = s.ticketFk     
+						JOIN(SELECT e.workerFk, e.ticketFk,TIME_TO_SEC(TIMEDIFF( MAX(e.created), MIN(e.created))) seconds   
+								FROM vn.expedition e
+									JOIN vn.ticket t ON t.id = e.ticketFk
+								WHERE e.workerFk IS NOT NULL AND
+									t.shipped >= vDateFrom 
+								GROUP BY e.ticketFk
+							)sub ON sub.ticketFk = t.id
+						JOIN workerProductivityConfig w ON TRUE
+					WHERE t.shipped >= vDateFrom 
+					GROUP BY s.ticketFk, t.warehouseFk   
+				 )sub2
+					JOIN account.role r ON r.name='packager'
+			GROUP BY sub2.warehouseFk,sub2.workerFk, sub2.shipped;	        
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `workerSpeed_detail__` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -6649,9 +7040,9 @@ DROP TABLE IF EXISTS `addressFriendship`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `addressFriendship` (
-  `addressFk1` int(11) NOT NULL DEFAULT '0',
-  `addressFk2` int(11) NOT NULL DEFAULT '0',
-  `friendship` int(11) NOT NULL DEFAULT '0',
+  `addressFk1` int(11) NOT NULL DEFAULT 0,
+  `addressFk2` int(11) NOT NULL DEFAULT 0,
+  `friendship` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`addressFk1`,`addressFk2`),
   KEY `addressFriendship_fk2_idx` (`addressFk2`),
   CONSTRAINT `addressFriendship_fk1` FOREIGN KEY (`addressFk1`) REFERENCES `vn`.`address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -6675,6 +7066,22 @@ CREATE TABLE `available` (
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `availableNoRaids`
+--
+
+DROP TABLE IF EXISTS `availableNoRaids`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `availableNoRaids` (
+  `calc_id` int(10) unsigned NOT NULL,
+  `item_id` int(11) NOT NULL,
+  `available` int(11) NOT NULL,
+  UNIQUE KEY `calc_id` (`item_id`,`calc_id`),
+  KEY `calc_id_4` (`calc_id`) USING BTREE
+) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `cache`
 --
@@ -6705,14 +7112,14 @@ CREATE TABLE `cache_calc` (
   `params` varchar(100) CHARACTER SET utf8 NOT NULL DEFAULT '',
   `last_refresh` datetime DEFAULT NULL,
   `expires` datetime DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `connection_id` int(10) unsigned DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `cache_name` (`cache_id`,`params`),
   KEY `cache_id` (`cache_id`),
   KEY `cacheName` (`cacheName`),
   KEY `expires` (`expires`)
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6726,7 +7133,7 @@ CREATE TABLE `cache_valid` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `valid` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MEMORYDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6739,8 +7146,8 @@ DROP TABLE IF EXISTS `departure_limit`;
 CREATE TABLE `departure_limit` (
   `warehouse_id` smallint(6) unsigned NOT NULL,
   `fecha` date NOT NULL,
-  `hora` int(11) NOT NULL DEFAULT '0',
-  `minSpeed` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `hora` int(11) NOT NULL DEFAULT 0,
+  `minSpeed` decimal(10,2) NOT NULL DEFAULT 0.00,
   PRIMARY KEY (`warehouse_id`,`fecha`),
   CONSTRAINT `warehouse_departure` FOREIGN KEY (`warehouse_id`) REFERENCES `vn`.`warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -6773,11 +7180,11 @@ DROP TABLE IF EXISTS `prod_graphic_source`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `prod_graphic_source` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `m3` double NOT NULL DEFAULT '0',
+  `m3` double NOT NULL DEFAULT 0,
   `warehouse_id` int(11) NOT NULL,
   `hora` int(11) NOT NULL,
-  `order` int(11) NOT NULL DEFAULT '0',
-  `graphCategory` int(11) NOT NULL DEFAULT '0',
+  `order` int(11) NOT NULL DEFAULT 0,
+  `graphCategory` int(11) NOT NULL DEFAULT 0,
   `Agencia` varchar(45) CHARACTER SET utf8 NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -6825,7 +7232,7 @@ DROP TABLE IF EXISTS `zoneAgencyFriendship`;
 CREATE TABLE `zoneAgencyFriendship` (
   `agencyModeFk` int(11) NOT NULL,
   `zoneFk` int(11) NOT NULL,
-  `friendship` bigint(21) NOT NULL DEFAULT '0',
+  `friendship` bigint(21) NOT NULL DEFAULT 0,
   PRIMARY KEY (`agencyModeFk`,`zoneFk`),
   KEY `zoneAgencyFriendship_fk1_idx` (`zoneFk`),
   CONSTRAINT `zoneAgencyFriendship` FOREIGN KEY (`agencyModeFk`) REFERENCES `vn`.`agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -6919,6 +7326,163 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `availableNoRaids_refresh` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `availableNoRaids_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDate` DATE)
+proc: BEGIN
+	DECLARE vStartDate DATE;
+	DECLARE vEndDate DATETIME;
+	DECLARE vReserveDate DATETIME;
+	DECLARE vParams CHAR(100);
+	DECLARE vInventoryDate DATE;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		CALL cache_calc_unlock (vCalc);
+		RESIGNAL;
+	END;
+
+	IF vDate < CURDATE() THEN
+		LEAVE proc;
+	END IF;
+
+	CALL vn.itemStock (vWarehouse, vDate, NULL);
+
+	SET vParams = CONCAT_WS('/', vWarehouse, vDate);
+	CALL cache_calc_start (vCalc, vRefresh, 'availableNoRaids', vParams);
+
+	IF !vRefresh THEN
+		LEAVE proc;
+	END IF;
+	
+	-- Calcula algunos parámetros necesarios
+
+	SET vStartDate = TIMESTAMP(vDate, '00:00:00');
+	SET vEndDate = TIMESTAMP(TIMESTAMPADD(DAY, 4, vDate), '23:59:59');
+
+	SELECT inventoried INTO vInventoryDate FROM vn.config;
+
+	SELECT SUBTIME(NOW(), reserveTime) INTO vReserveDate
+		FROM hedera.orderConfig;
+
+	-- Calcula el ultimo dia de vida para cada producto
+
+	DROP TEMPORARY TABLE IF EXISTS item_range;
+	CREATE TEMPORARY TABLE item_range
+	(PRIMARY KEY (item_id))
+	ENGINE = MEMORY
+	SELECT c.item_id, IF(it.life IS NULL, NULL,
+		TIMESTAMP(TIMESTAMPADD(DAY, it.life, c.landing), '23:59:59')) AS date_end
+		FROM (
+			SELECT b.itemFk item_id, MAX(t.landed) landing
+				FROM vn.buy b
+					JOIN vn.entry e ON b.entryFk = e.id
+					JOIN vn.travel t ON t.id = e.travelFk
+					JOIN vn.warehouse w ON w.id = t.warehouseInFk
+				WHERE t.landed BETWEEN vInventoryDate AND vStartDate
+					AND t.warehouseInFk = vWarehouse
+					AND NOT e.isInventory
+					AND NOT e.isRaid
+				GROUP BY b.itemFk 
+		) c
+			JOIN vn.item i ON i.id = c.item_id
+			JOIN vn.itemType it ON it.id = i.typeFk
+		HAVING date_end >= vStartDate OR date_end IS NULL;
+
+	-- Replica la tabla item_range para poder usarla varias veces en la misma consulta
+
+	DROP TEMPORARY TABLE IF EXISTS item_range_copy1;
+	CREATE TEMPORARY TABLE item_range_copy1 LIKE item_range;
+	INSERT INTO item_range_copy1 
+		SELECT * FROM item_range;
+		
+	DROP TEMPORARY TABLE IF EXISTS item_range_copy2;
+	CREATE TEMPORARY TABLE item_range_copy2 LIKE item_range;
+	INSERT INTO item_range_copy2 
+		SELECT * FROM item_range;
+		
+	DROP TEMPORARY TABLE IF EXISTS item_range_copy3;
+	CREATE TEMPORARY TABLE item_range_copy3 LIKE item_range;
+	INSERT INTO item_range_copy3 
+		SELECT * FROM item_range;
+		
+	DROP TEMPORARY TABLE IF EXISTS item_range_copy4;
+	CREATE TEMPORARY TABLE item_range_copy4 LIKE item_range;
+	INSERT INTO item_range_copy4 
+		SELECT * FROM item_range;
+
+	-- Calcula el ATP
+
+	DELETE FROM availableNoRaids WHERE calc_id = vCalc;
+
+	INSERT INTO availableNoRaids (calc_id, item_id, available)
+	SELECT vCalc, t.item_id, SUM(stock) amount FROM (	
+		SELECT il.itemFk AS item_id, stock
+			FROM tmp.itemList il
+				JOIN item_range ir ON ir.item_id = il.itemFk 
+		UNION ALL
+		SELECT t.item_id, minacum(dt, amount, vDate) AS available FROM (
+			SELECT itemFk AS item_id, DATE(dat) dt, SUM(quantity) amount FROM (
+				SELECT i.itemFk, i.shipped AS dat, i.quantity
+					FROM vn.itemTicketOut i
+						JOIN item_range_copy1 ir ON ir.item_id = i.itemFk
+					WHERE i.shipped >= vStartDate
+						AND (ir.date_end IS NULL OR i.shipped <= ir.date_end)
+						AND i.warehouseFk = vWarehouse
+				UNION ALL
+				SELECT i.itemFk, i.landed AS dat, i.quantity
+					FROM vn.itemEntryIn i
+						JOIN item_range_copy2 ir ON ir.item_id = i.itemFk
+					WHERE i.landed >= vStartDate
+						AND (ir.date_end IS NULL OR i.landed <= ir.date_end)
+						AND i.warehouseInFk = vWarehouse
+						AND i.isVirtualStock = FALSE
+				UNION ALL
+				SELECT i.itemFk, i.shipped AS dat, i.quantity
+					FROM vn.itemEntryOut i
+						JOIN item_range_copy3 ir ON ir.item_id = i.itemFk 
+					WHERE i.shipped >= vStartDate 
+						AND (ir.date_end IS NULL OR i.shipped <= ir.date_end)
+						AND i.warehouseOutFk = vWarehouse
+				UNION ALL
+				SELECT r.item_id, r.shipment, -r.amount
+					FROM hedera.order_row r
+						JOIN hedera.`order` o ON o.id = r.order_id
+						JOIN item_range_copy4 ir ON ir.item_id = r.item_id
+					WHERE r.shipment >= vStartDate
+						AND (ir.date_end IS NULL OR r.shipment <= ir.date_end)
+						AND r.warehouse_id = vWarehouse
+						AND r.created >= vReserveDate
+						AND NOT o.confirmed
+			) t
+			GROUP BY item_id, dt
+		) t
+		GROUP BY t.item_id 
+	) t GROUP BY t.item_id;
+
+	DROP TEMPORARY TABLE IF EXISTS 
+		tmp.itemList
+		,item_range
+		,item_range_copy1
+		,item_range_copy2
+		,item_range_copy3
+		,item_range_copy4;
+
+	CALL cache_calc_end (vCalc);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `available_clean` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -6966,6 +7530,7 @@ proc: BEGIN
 	DECLARE vReserveDate DATETIME;
 	DECLARE vParams CHAR(100);
 	DECLARE vInventoryDate DATE;
+	DECLARE vIsLogifloraDay BOOLEAN;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -6987,13 +7552,14 @@ proc: BEGIN
 	END IF;
 
 	-- Invoca al procedimiento que genera el stock virtual de Logiflora, si coincide con la peticion de refresco del disponible
-	IF (SELECT TRUE 
-			FROM edi.warehouseFloramondo wf
-				JOIN vn.floramondoConfig fc 
-			WHERE wf.warehouseFk = vWarehouse
-				AND vDate = DATE(TIMESTAMPADD(DAY, wf.travellingDays, fc.nextLanded))) THEN
-    
-		CALL edi.floramondo_offerRefresh;
+	IF vn.isLogifloraDay(vDate, vWarehouse) THEN
+   
+		-- CALL edi.floramondo_offerRefresh;
+		SET vIsLogifloraDay = TRUE;
+	
+	ELSE
+	
+		SET vIsLogifloraDay = FALSE;
         
     END IF;
     
@@ -7024,7 +7590,6 @@ proc: BEGIN
 				WHERE t.landed BETWEEN vInventoryDate AND vStartDate
 					AND t.warehouseInFk = vWarehouse
 					AND NOT e.isInventory
-					/*AND NOT e.isRaid*/ -- JGF cau-13144	2019-10-14
 				GROUP BY b.itemFk 
 		) c
 			JOIN vn.item i ON i.id = c.item_id
@@ -7075,9 +7640,11 @@ proc: BEGIN
 				SELECT i.itemFk, i.landed AS dat, i.quantity
 					FROM vn.itemEntryIn i
 						JOIN item_range_copy2 ir ON ir.item_id = i.itemFk
+						LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk 
 					WHERE i.landed >= vStartDate
 						AND (ir.date_end IS NULL OR i.landed <= ir.date_end)
 						AND i.warehouseInFk = vWarehouse
+						AND (ISNULL(wf.entryFk) OR vIsLogifloraDay)
 				UNION ALL
 				SELECT i.itemFk, i.shipped AS dat, i.quantity
 					FROM vn.itemEntryOut i
@@ -7109,6 +7676,7 @@ proc: BEGIN
 		,item_range_copy3
 		,item_range_copy4;
 
+	
 	CALL cache_calc_end (vCalc);
 END ;;
 DELIMITER ;
@@ -7127,9 +7695,9 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `cacheCalc_clean`()
-BEGIN
-	DECLARE vCleanTime DATETIME DEFAULT TIMESTAMPADD(MINUTE, -5, NOW());
-	DELETE FROM cache_calc WHERE expires < vCleanTime;
+BEGIN
+	DECLARE vCleanTime DATETIME DEFAULT TIMESTAMPADD(MINUTE, -5, NOW());
+	DELETE FROM cache_calc WHERE expires < vCleanTime;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -7147,27 +7715,27 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `cache_calc_end`(IN `v_calc` INT)
-BEGIN
-	DECLARE v_cache_name VARCHAR(255);
-	DECLARE v_params VARCHAR(255);
-
-	-- Libera el bloqueo y actualiza la fecha de ultimo refresco.
-
-	UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id
-		SET
-			cc.last_refresh = NOW(),
-			cc.expires = ADDTIME(NOW(), c.lifetime),
-			cc.connection_id = NULL
-				WHERE cc.id = v_calc;
-
-	SELECT c.name, ca.params INTO v_cache_name, v_params
-		FROM cache c
-		JOIN cache_calc ca ON c.id = ca.cache_id
-			WHERE ca.id = v_calc;
-
-	IF v_cache_name IS NOT NULL THEN
-		DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
-	END IF;
+BEGIN
+	DECLARE v_cache_name VARCHAR(255);
+	DECLARE v_params VARCHAR(255);
+
+	-- Libera el bloqueo y actualiza la fecha de ultimo refresco.
+
+	UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id
+		SET
+			cc.last_refresh = NOW(),
+			cc.expires = ADDTIME(NOW(), c.lifetime),
+			cc.connection_id = NULL
+				WHERE cc.id = v_calc;
+
+	SELECT c.name, ca.params INTO v_cache_name, v_params
+		FROM cache c
+		JOIN cache_calc ca ON c.id = ca.cache_id
+			WHERE ca.id = v_calc;
+
+	IF v_cache_name IS NOT NULL THEN
+		DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
+	END IF;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -7185,91 +7753,91 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `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);
-	DECLARE v_cache_id INT;
-	DECLARE v_expires DATETIME;
-	DECLARE v_clean_time DATETIME;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		IF v_lock_id IS NOT NULL THEN
-			DO RELEASE_LOCK(v_lock_id);
-        END IF;
-
-		RESIGNAL;
-	END;
-
-	SET v_params = IFNULL(v_params, '');
-
-	-- Si el servidor se ha reiniciado invalida todos los calculos.
-
-	SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid;
-
-	IF !v_valid
-	THEN
-		DELETE FROM cache_calc;
-		INSERT INTO cache_valid (valid) VALUES (TRUE);
-	END IF;
-
-	-- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia.
-
-	SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params);
-
-	IF !GET_LOCK(v_lock_id, 30)
-	THEN
-		SET v_calc = NULL;
-		SET v_refresh = FALSE;
-		LEAVE proc;
-	END IF;
-
-	-- Comprueba si el calculo solicitado existe y esta actualizado.
-
-	SELECT c.id, ca.id, ca.expires
-		INTO v_cache_id, v_calc, v_expires
-		FROM cache c
-			LEFT JOIN cache_calc ca
-				ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci' 
-		WHERE c.name = v_cache_name COLLATE 'utf8_general_ci';
-				
-	-- Si existe una calculo valido libera el bloqueo y devuelve su identificador.
-
-	IF !v_refresh AND NOW() < v_expires
-	THEN
-		DO RELEASE_LOCK(v_lock_id);
-		SET v_refresh = FALSE;
-		LEAVE proc;
-	END IF;
-
-	-- Si el calculo no existe le crea una entrada en la tabla de calculos.
-
-	IF v_calc IS NULL
+proc: BEGIN
+	DECLARE v_valid BOOL;
+	DECLARE v_lock_id VARCHAR(100);
+	DECLARE v_cache_id INT;
+	DECLARE v_expires DATETIME;
+	DECLARE v_clean_time DATETIME;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		IF v_lock_id IS NOT NULL THEN
+			DO RELEASE_LOCK(v_lock_id);
+        END IF;
+
+		RESIGNAL;
+	END;
+
+	SET v_params = IFNULL(v_params, '');
+
+	-- Si el servidor se ha reiniciado invalida todos los calculos.
+
+	SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid;
+
+	IF !v_valid
 	THEN
-		-- call util.debugAdd(concat('if start ', v_lock_id) ,v_refresh);
-		INSERT INTO cache_calc SET
-			cache_id = v_cache_id,
-			cacheName = v_cache_name,
-			params = v_params,
-			last_refresh = NULL,
-			expires = NULL,
-			connection_id = CONNECTION_ID();
-		-- call util.debugAdd(concat('if end ', v_lock_id),v_refresh);	
-		SET v_calc = LAST_INSERT_ID();
+		DELETE FROM cache_calc;
+		INSERT INTO cache_valid (valid) VALUES (TRUE);
+	END IF;
+
+	-- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia.
+
+	SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params);
+
+	IF !GET_LOCK(v_lock_id, 30)
+	THEN
+		SET v_calc = NULL;
+		SET v_refresh = FALSE;
+		LEAVE proc;
+	END IF;
+
+	-- Comprueba si el calculo solicitado existe y esta actualizado.
+
+	SELECT c.id, ca.id, ca.expires
+		INTO v_cache_id, v_calc, v_expires
+		FROM cache c
+			LEFT JOIN cache_calc ca
+				ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci' 
+		WHERE c.name = v_cache_name COLLATE 'utf8_general_ci';
+				
+	-- Si existe una calculo valido libera el bloqueo y devuelve su identificador.
+
+	IF !v_refresh AND NOW() < v_expires
+	THEN
+		DO RELEASE_LOCK(v_lock_id);
+		SET v_refresh = FALSE;
+		LEAVE proc;
+	END IF;
+
+	-- Si el calculo no existe le crea una entrada en la tabla de calculos.
+
+	IF v_calc IS NULL
+	THEN
+		-- call util.debugAdd(concat('if start ', v_lock_id) ,v_refresh);
+		INSERT INTO cache_calc SET
+			cache_id = v_cache_id,
+			cacheName = v_cache_name,
+			params = v_params,
+			last_refresh = NULL,
+			expires = NULL,
+			connection_id = CONNECTION_ID();
+		-- call util.debugAdd(concat('if end ', v_lock_id),v_refresh);	
+		SET v_calc = LAST_INSERT_ID();
 	ELSE
-		-- call util.debugAdd(concat('else start ', v_lock_id) ,v_refresh);
-		UPDATE cache_calc
-			SET
-				last_refresh = NULL,
-				expires = NULL,
-				connection_id = CONNECTION_ID()
+		-- call util.debugAdd(concat('else start ', v_lock_id) ,v_refresh);
+		UPDATE cache_calc
+			SET
+				last_refresh = NULL,
+				expires = NULL,
+				connection_id = CONNECTION_ID()
 			WHERE id = v_calc;
-		-- call util.debugAdd(concat('else end ', v_lock_id) ,v_refresh);
-	END IF;
-
-	-- Si se debe recalcular mantiene el bloqueo y devuelve su identificador.
-
-	SET v_refresh = TRUE;
+		-- call util.debugAdd(concat('else end ', v_lock_id) ,v_refresh);
+	END IF;
+
+	-- Si se debe recalcular mantiene el bloqueo y devuelve su identificador.
+
+	SET v_refresh = TRUE;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -7287,24 +7855,24 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `cache_calc_unlock`(IN `v_calc` INT)
-proc: BEGIN
-	DECLARE v_cache_name VARCHAR(50);
-	DECLARE v_params VARCHAR(100);
-
-	IF v_calc IS NULL THEN
-		LEAVE proc;
-	END IF;
-
-	SELECT c.name, ca.params INTO v_cache_name, v_params
-		FROM cache c
-		JOIN cache_calc ca ON c.id = ca.cache_id
-			WHERE ca.id = v_calc;
-			
-	DELETE FROM cache_calc WHERE id = v_calc;
-
-	IF v_cache_name IS NOT NULL THEN
-		DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
-	END IF;
+proc: BEGIN
+	DECLARE v_cache_name VARCHAR(50);
+	DECLARE v_params VARCHAR(100);
+
+	IF v_calc IS NULL THEN
+		LEAVE proc;
+	END IF;
+
+	SELECT c.name, ca.params INTO v_cache_name, v_params
+		FROM cache c
+		JOIN cache_calc ca ON c.id = ca.cache_id
+			WHERE ca.id = v_calc;
+			
+	DELETE FROM cache_calc WHERE id = v_calc;
+
+	IF v_cache_name IS NOT NULL THEN
+		DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, '')));
+	END IF;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -7323,9 +7891,9 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `cache_clean`()
     NO SQL
-BEGIN
-	CALL available_clean;
-	CALL visible_clean;
+BEGIN
+	CALL available_clean;
+	CALL visible_clean;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -7343,13 +7911,13 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `clean`()
-BEGIN
-  
-    DECLARE vDateShort DATETIME; 
-
-    SET vDateShort = TIMESTAMPADD(MONTH, -1, CURDATE());
-
-    DELETE FROM cache.departure_limit WHERE Fecha < vDateShort;
+BEGIN
+  
+    DECLARE vDateShort DATETIME; 
+
+    SET vDateShort = TIMESTAMPADD(MONTH, -1, CURDATE());
+
+    DELETE FROM cache.departure_limit WHERE Fecha < vDateShort;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -8010,6 +8578,8 @@ DROP TABLE IF EXISTS `VMPSettings`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `VMPSettings` (
   `VMPID` int(11) NOT NULL,
+  `name` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `isEktSender` tinyint(4) NOT NULL DEFAULT 0,
   `MessageID` int(11) NOT NULL,
   `dateTimeTry` timestamp NULL DEFAULT NULL,
   `isVmpBA` tinyint(4) DEFAULT NULL COMMENT 'Basic authentication',
@@ -8025,6 +8595,7 @@ CREATE TABLE `VMPSettings` (
   `closedFrom` int(11) DEFAULT NULL,
   `closedTo` int(11) DEFAULT NULL,
   `totalRefreshHours` int(11) DEFAULT NULL COMMENT 'Numero > 4 para no saturar, no repetir para que no solapen las actualizaciones',
+  `UseSupplierEmbalageCode` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'vmp you want to see their embalage code',
   PRIMARY KEY (`VMPID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -8112,11 +8683,11 @@ CREATE TABLE `ekt` (
   `deliveryNumber` bigint(20) unsigned DEFAULT NULL,
   `fec` date DEFAULT NULL,
   `hor` time DEFAULT NULL,
-  `now` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `now` timestamp NULL DEFAULT current_timestamp(),
   `ptj` mediumint(8) unsigned DEFAULT NULL,
   `ref` int(11) NOT NULL,
   `item` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pac` int(11) DEFAULT '0',
+  `pac` int(11) DEFAULT 0,
   `qty` int(10) NOT NULL,
   `ori` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'NL',
   `cat` varchar(2) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -8139,10 +8710,10 @@ CREATE TABLE `ekt` (
   `s4` varchar(4) COLLATE utf8_unicode_ci DEFAULT NULL,
   `s5` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   `s6` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ok` tinyint(4) NOT NULL DEFAULT '0',
+  `ok` tinyint(4) NOT NULL DEFAULT 0,
   `trolleyFk` int(11) DEFAULT NULL,
   `putOrderFk` int(10) unsigned DEFAULT NULL,
-  `scanned` tinyint(1) NOT NULL DEFAULT '0',
+  `scanned` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `barcode_year` (`barcode`,`entryYear`),
   UNIQUE KEY `entry_year` (`deliveryNumber`,`entryYear`) USING BTREE,
@@ -8295,6 +8866,7 @@ CREATE TABLE `genus` (
   `entry_date` date DEFAULT NULL,
   `expiry_date` date DEFAULT NULL,
   `change_date_time` datetime DEFAULT NULL,
+  `isHazard` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`genus_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='/tmp/floricode/florecompc2/FG130916.txt';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -8355,6 +8927,21 @@ CREATE TABLE `item` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='/tmp/floricode/florecompc2/FP130916.txt';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `item_defaultType`
+--
+
+DROP TABLE IF EXISTS `item_defaultType`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_defaultType` (
+  `item_id` int(11) NOT NULL,
+  `itemTypeFk` int(11) NOT NULL,
+  `bucket_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`item_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='guarda las excepciones de los item holandeses para asignarles nuestros cubos y nuestros tipos';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `item_feature`
 --
@@ -8435,7 +9022,7 @@ CREATE TABLE `item_groupToOffer` (
   `group_code` int(11) unsigned NOT NULL,
   `itemTypeFk` smallint(5) unsigned NOT NULL,
   `intrastatFk` int(8) unsigned zerofill NOT NULL,
-  `originFk` tinyint(2) unsigned NOT NULL DEFAULT '17',
+  `originFk` tinyint(2) unsigned NOT NULL DEFAULT 17,
   `expenseFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT '7001000000',
   PRIMARY KEY (`group_code`),
   KEY `item_groupToOffer_fk2_idx` (`itemTypeFk`),
@@ -8456,24 +9043,41 @@ DROP TABLE IF EXISTS `item_track`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_track` (
   `item_id` int(10) unsigned NOT NULL,
-  `s1` tinyint(3) NOT NULL DEFAULT '0',
-  `s2` tinyint(3) NOT NULL DEFAULT '0',
-  `s3` tinyint(3) NOT NULL DEFAULT '0',
-  `s4` tinyint(3) NOT NULL DEFAULT '0',
-  `pac` tinyint(3) NOT NULL DEFAULT '0',
-  `cat` tinyint(3) NOT NULL DEFAULT '0',
-  `ori` tinyint(3) NOT NULL DEFAULT '0',
-  `pro` tinyint(3) NOT NULL DEFAULT '0',
-  `package` tinyint(3) NOT NULL DEFAULT '0',
-  `s5` tinyint(3) NOT NULL DEFAULT '0',
-  `s6` tinyint(3) NOT NULL DEFAULT '0',
-  `kop` tinyint(3) NOT NULL DEFAULT '0',
-  `sub` tinyint(3) NOT NULL DEFAULT '0',
-  `item` tinyint(3) NOT NULL DEFAULT '0',
+  `s1` tinyint(3) NOT NULL DEFAULT 0,
+  `s2` tinyint(3) NOT NULL DEFAULT 0,
+  `s3` tinyint(3) NOT NULL DEFAULT 0,
+  `s4` tinyint(3) NOT NULL DEFAULT 0,
+  `pac` tinyint(3) NOT NULL DEFAULT 0,
+  `cat` tinyint(3) NOT NULL DEFAULT 0,
+  `ori` tinyint(3) NOT NULL DEFAULT 0,
+  `pro` tinyint(3) NOT NULL DEFAULT 0,
+  `package` tinyint(3) NOT NULL DEFAULT 0,
+  `s5` tinyint(3) NOT NULL DEFAULT 0,
+  `s6` tinyint(3) NOT NULL DEFAULT 0,
+  `kop` tinyint(3) NOT NULL DEFAULT 0,
+  `sub` tinyint(3) NOT NULL DEFAULT 0,
+  `item` tinyint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`item_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `log`
+--
+
+DROP TABLE IF EXISTS `log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tableName` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  `fieldName` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fieldValue` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `mail`
 --
@@ -8488,7 +9092,7 @@ CREATE TABLE `mail` (
   `messageId` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `nExchanges` int(10) unsigned NOT NULL,
   `error` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   UNIQUE KEY `mail_id` (`messageId`),
   KEY `sender_id` (`senderFk`),
@@ -8522,10 +9126,11 @@ DROP TABLE IF EXISTS `marketPlace`;
 CREATE TABLE `marketPlace` (
   `id` varchar(13) COLLATE utf8_unicode_ci NOT NULL,
   `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
-  `supplierFk` int(11) NOT NULL DEFAULT '1433',
-  `isOffered` tinyint(2) NOT NULL DEFAULT '0',
+  `supplierFk` int(11) NOT NULL DEFAULT 1433,
+  `isOffered` tinyint(2) NOT NULL DEFAULT 0,
   `MaxLatestDeliveryHour` int(11) DEFAULT NULL COMMENT 'Maxima hora para tener en cuenta la oferta',
-  `isLatestOrderDateTimeRelevant` tinyint(2) DEFAULT '0' COMMENT 'Se tiene en cuenta para calcular el próximo travel posible',
+  `isLatestOrderDateTimeRelevant` tinyint(2) DEFAULT 0 COMMENT 'Se tiene en cuenta para calcular el próximo travel posible',
+  `isEarlyBird` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `marketPlaceisOfferedIdx` (`isOffered`),
   KEY `marketPlaceMaxLatestIdx` (`MaxLatestDeliveryHour`),
@@ -8545,9 +9150,9 @@ CREATE TABLE `param` (
   `code` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
   `name` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
   `subname` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `position` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `position` tinyint(3) unsigned NOT NULL DEFAULT 1,
   `type` enum('INTEGER','DOUBLE','STRING','DATE','TIME') COLLATE utf8_unicode_ci NOT NULL,
-  `required` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `required` tinyint(3) unsigned NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`,`subname`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Parameters to capture of every exchange';
@@ -8583,15 +9188,18 @@ CREATE TABLE `putOrder` (
   `deliveryInformationID` int(11) DEFAULT NULL,
   `supplyResponseID` int(11) DEFAULT NULL,
   `orderTradelineItemID` int(11) DEFAULT NULL COMMENT 'ticketFk or EntryFk?',
-  `OrderTradeLineDateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'fecha de creacion en la tabla',
+  `OrderTradeLineDateTime` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'fecha de creacion en la tabla',
   `quantity` int(11) DEFAULT NULL,
   `EndUserPartyID` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `EndUserPartyGLN` varchar(13) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'The grower can use this reference in his EKT in the NAD (MA) segment.',
-  `OrderStatus` int(11) DEFAULT '0' COMMENT '1 pending\n2 confirmed\n3 canceled',
+  `OrderStatus` int(11) DEFAULT 0 COMMENT '1 pending\n2 confirmed\n3 canceled',
   `isOrderProcessed` tinyint(4) DEFAULT NULL,
   `error` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `barcode` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `orderTradelineItemID_UNIQUE` (`orderTradelineItemID`)
+  UNIQUE KEY `orderTradelineItemID_UNIQUE` (`orderTradelineItemID`),
+  KEY `deliveryInformationID_idx` (`deliveryInformationID`),
+  KEY `supplyResponseID_idx` (`supplyResponseID`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -8607,7 +9215,7 @@ DELIMITER ;;
 BEGIN
 
 	DECLARE nextID INT;
-    
+	    
 	SELECT 1 + MAX(id) INTO nextID FROM putOrder ;
     
     SET NEW.orderTradelineItemID  = nextID;
@@ -8627,42 +9235,113 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `BEFORE UPDATE`
+BEFORE UPDATE
+ON putOrder FOR EACH ROW
+BEGIN
+	
+	DECLARE vError VARCHAR(100) DEFAULT 'Orderregel niet meer teruggevonden op basis van de orderps';
+    DECLARE vVmpIdError INT DEFAULT 7;
+    DECLARE vVmpFk INT;
+       
+   	SELECT sr.vmpID INTO vVmpFk 
+		FROM edi.supplyResponse sr 
+		WHERE sr.id = NEW.supplyResponseID;
+		
+		IF NEW.OrderStatus = 3 
+			AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) 
+			AND NEW.error = vError 
+			AND vVmpFk = vVmpIdError 
+		
+		THEN 
+		
+			SET NEW.OrderStatus = 2;
+		
+		END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `edi`.`putOrder_AFTER_UPDATE` AFTER UPDATE ON `putOrder` FOR EACH ROW
 BEGIN
 	DECLARE vSaleFk INT;
     DECLARE vOrderStatusDenied INT DEFAULT 3;
-    CALL util.debugAdd(NEW.OrderStatus, OLD.OrderStatus);
+    DECLARE vOrderStatusOK INT DEFAULT 2;
+    DECLARE vIsEktSender BOOLEAN;
+   
+   
+   -- CALL util.debugAdd(NEW.OrderStatus, OLD.OrderStatus);
     
+   
 	IF NEW.OrderStatus = vOrderStatusDenied AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN
-		SELECT s.id INTO vSaleFk
-			FROM vn.sale s 
-				JOIN vn.ticket t ON s.ticketFk = t.id
-				JOIN vn.item i ON i.id = s.itemFk
-				JOIN deliveryInformation di ON di.ID = NEW.deliveryInformationID
-			WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= CURDATE()
-				AND i.supplyResponseFk = NEW.supplyResponseID;
-                
-		UPDATE vn.sale s
-			SET s.quantity = 0
-			WHERE s.id = vSaleFk;
-                
-		INSERT INTO vn.mail (sender, `subject`, body)
-			SELECT IF(u.id IS NOT NULL AND c.email IS NOT NULL,
-						c.email,
-						CONCAT(account.user_getNameFromId(c.salesPersonFk), '@verdnatura.es')
-					 ),
-					'Producto no disponible en Floramondo',
-					CONCAT('El artículo ', s.concept, ' del ticket ', t.id , ' ha sido cancelado por Floramondo. ',
-							' Se ha actualizado la cantidad de ', OLD.quantity,' a 0. ',
-						IF (u.id IS NOT NULL AND c.email IS NOT NULL ,
-							CONCAT('https://verdnatura.es/#!form=ecomerce%2Fticket&ticket=', t.id ),
-							CONCAT('https://salix.verdnatura.es/#!/ticket/', t.id ,'/summary')))
-				  FROM vn.sale s 
-					   JOIN vn.ticket t ON t.id = s.ticketFk
-					   JOIN vn.`client` c ON c.id = t.clientFk
-					   LEFT JOIN account.user u ON u.id= c.salesPersonFk AND u.name = 'ruben' 
-				  WHERE s.id = vSaleFk;
+	
+			SELECT s.id INTO vSaleFk
+				FROM vn.sale s 
+					JOIN vn.ticket t ON s.ticketFk = t.id
+					JOIN vn.item i ON i.id = s.itemFk
+					JOIN deliveryInformation di ON di.ID = NEW.deliveryInformationID
+				WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= CURDATE()
+					AND i.supplyResponseFk = NEW.supplyResponseID;
+	                
+			UPDATE vn.sale s
+				SET s.quantity = 0
+				WHERE s.id = vSaleFk;
+	                
+			INSERT INTO vn.mail (sender, `subject`, body)
+				SELECT IF(u.id IS NOT NULL AND c.email IS NOT NULL,
+							c.email,
+							CONCAT(account.user_getNameFromId(c.salesPersonFk), '@verdnatura.es')
+						 ),
+						'Producto no disponible en Floramondo',
+						CONCAT('El artículo ', s.concept, ' del ticket ', t.id , ' ha sido cancelado por Floramondo. ',
+								' Se ha actualizado la cantidad de ', OLD.quantity,' a 0. ',
+							IF (u.id IS NOT NULL AND c.email IS NOT NULL ,
+								CONCAT('https://verdnatura.es/#!form=ecomerce%2Fticket&ticket=', t.id ),
+								CONCAT('https://salix.verdnatura.es/#!/ticket/', t.id ,'/summary')))
+					  FROM vn.sale s 
+						   JOIN vn.ticket t ON t.id = s.ticketFk
+						   JOIN vn.`client` c ON c.id = t.clientFk
+						   LEFT JOIN account.user u ON u.id= c.salesPersonFk AND u.name IN ('ruben', 'ismael')
+					  WHERE s.id = vSaleFk;
+			
 	END IF;
+
+
+	IF NEW.OrderStatus = vOrderStatusOK AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN
+   
+    	SELECT v.isEktSender INTO vIsEktSender 
+    		FROM edi.VMPSettings v
+    			JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID 
+    			WHERE sr.id = NEW.supplyResponseID;
+    	
+    	IF NOT vIsEktSender THEN
+    
+    		CALL edi.ekt_add(NEW.id);
+    	
+    	END IF;
+    
+    	IF NEW.barcode THEN
+    
+    		INSERT IGNORE INTO vn.itemBarcode(itemFk, code)
+    			SELECT i.id, NEW.barcode
+	    			FROM vn.item i
+	    			WHERE i.supplyResponseFk = NEW.supplyResponseID;
+    	
+    	END IF;
+    
+    END IF;
+   
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -8702,8 +9381,9 @@ CREATE TABLE `supplier` (
   `entry_date` date NOT NULL,
   `expiry_date` date NOT NULL,
   `change_date_time` datetime NOT NULL,
-  `isAllowedDirectSales` tinyint(1) NOT NULL DEFAULT '0',
+  `isAllowedDirectSales` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`supplier_id`),
+  UNIQUE KEY `supplier_UN` (`glnAddressCode`),
   KEY `glnaddressCodeidx` (`glnAddressCode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='/tmp/floricode/FEC010104/CC090916.txt';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -8766,6 +9446,11 @@ CREATE TABLE `supplyResponse` (
   `MarketFormCode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '"002" Standard Sales\n"005" Catalogue (optional)\n"001" Committed (optional)\n"003" Buffer (optional, Clock Pre Sales) ',
   `FlowerColor` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `vmpID` int(11) DEFAULT NULL,
+  `widthMeasure` int(11) DEFAULT NULL COMMENT 'mm Embalage Width',
+  `lengthMeasure` int(11) DEFAULT NULL COMMENT 'mm Embalage Length',
+  `heightMeasure` int(11) DEFAULT NULL COMMENT 'mm Embalage Height',
+  `created` datetime NOT NULL DEFAULT current_timestamp(),
+  `EmbalageCodeSupplier` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`ID`),
   KEY `IX_TransNumber` (`TransactionNumber`) COMMENT 'Agregado por Ernesto 11.6.2019\nSe ejecutaba 1 consulta por segundo desde MAIL y consumia un 20% de CPU de todo el servidor !!!!!\nCPU usada es mas estable que Indice en SendererID, cpu vs espacio que ocupa?\n',
   KEY `supplyResponse_Ix1` (`Item_ArticleCode`),
@@ -8847,9 +9532,10 @@ DROP TABLE IF EXISTS `warehouseFloramondo`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `warehouseFloramondo` (
   `warehouseFk` smallint(6) unsigned NOT NULL,
-  `travellingDays` int(11) NOT NULL DEFAULT '1',
+  `travellingDays` int(11) NOT NULL DEFAULT 1,
   `entryFk` int(11) DEFAULT NULL,
   `isFV` int(11) DEFAULT NULL COMMENT 'NULL indiferente\n0 no\n1 si\n',
+  `dayRange` int(11) NOT NULL DEFAULT 0 COMMENT 'dias de margen a futuro',
   PRIMARY KEY (`warehouseFk`),
   KEY `warehouseFloramondo_FK2_idx` (`entryFk`),
   CONSTRAINT `warehouseFloramondo_FK2` FOREIGN KEY (`entryFk`) REFERENCES `vn`.`entry` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
@@ -8866,14 +9552,14 @@ DELIMITER ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;;
-/*!50003 SET character_set_client  = utf8mb4 */ ;;
-/*!50003 SET character_set_results = utf8mb4 */ ;;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;;
+/*!50003 SET character_set_client  = utf8 */ ;;
+/*!50003 SET character_set_results = utf8 */ ;;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`z-sysadmin`@`%`*/ /*!50106 EVENT `floramondo` ON SCHEDULE EVERY 5 MINUTE STARTS '2020-07-29 01:58:29' ON COMPLETION NOT PRESERVE DISABLE DO CALL edi.floramondo_offerRefresh() */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`z-developer`@`%`*/ /*!50106 EVENT `floramondo` ON SCHEDULE EVERY 6 MINUTE STARTS '2020-07-29 01:58:29' ON COMPLETION NOT PRESERVE ENABLE DO CALL edi.floramondo_offerRefresh() */ ;;
 /*!50003 SET time_zone             = @saved_time_zone */ ;;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;;
@@ -8885,96 +9571,33 @@ DELIMITER ;
 --
 -- Dumping routines for database 'edi'
 --
-/*!50003 DROP FUNCTION IF EXISTS `floramondoTodayEntryGet__` */;
+/*!50003 DROP FUNCTION IF EXISTS `imageName` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `floramondoTodayEntryGet__`() RETURNS int(11)
-    READS SQL DATA
+CREATE DEFINER=`z-developer`@`%` FUNCTION `imageName`(vPictureReference VARCHAR(255)) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
+    DETERMINISTIC
 BEGIN
+	
+	SET vPictureReference = REPLACE(vPictureReference,'.','');
 
-	DECLARE vTravelFk INT;
-    DECLARE vEntryFk INT;
-    
-    SET vTravelFk = FloramondoTodayTravelGet();
-    
-    SELECT IFNULL(MAX(id),0) INTO vEntryFk 
-		FROM vn.entry
-		WHERE travelFk = vTravelFk;
-      
-    IF NOT vEntryFk THEN
-    
-		INSERT INTO vn.entry(travelFk, supplierFk, commission, companyFk, currencyFk, isRaid)
-			SELECT vTravelFk, s.id, 4, c.id, cu.id, TRUE
-				FROM vn.supplier s
-					JOIN vn.company c ON c.code = 'VNL'
-                    JOIN vn.currency cu ON cu.code = 'EUR'
-                WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN';
-                
-		SELECT IFNULL(MAX(id),0) INTO vEntryFk 
-			FROM vn.entry
-			WHERE travelFk = vTravelFk;
-            
-    END IF;
+	SET vPictureReference = REPLACE(vPictureReference,'/','');
 
-	RETURN vEntryFk;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP FUNCTION IF EXISTS `floramondoTodayTravelGet__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `floramondoTodayTravelGet__`() RETURNS int(11)
-    READS SQL DATA
-BEGIN
+	SET vPictureReference = REPLACE(vPictureReference,'%','');
 
-	DECLARE myTravel INT;
-    DECLARE vWarehouseOutName VARCHAR(50) DEFAULT 'Holanda';
-    DECLARE vWarehouseInName VARCHAR(50) DEFAULT 'VNH';
--- recuperar hora del delivery
-	SELECT IFNULL(MAX(tr.id),0) INTO myTravel 
-		FROM vn.travel tr
-        JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
-        JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
-		WHERE wIn.name = vWarehouseInName
-			AND wOut.name = vWarehouseOutName
-			AND landed = util.tomorrow();
+	SET vPictureReference = REPLACE(vPictureReference,':','');
 
-	IF NOT myTravel THEN
-    
-		INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
-			SELECT util.tomorrow(), curdate(), wIn.id, wOut.id, am.id 
-				FROM vn.warehouse wIn
-					JOIN vn.warehouse wOut ON wOut.name = vWarehouseOutName
-                    JOIN vn.agencyMode am ON am.name = 'HOLANDA DIRECTO'
-                WHERE wIn.name = vWarehouseInName;
-                
-		SELECT MAX(tr.id) INTO myTravel 
-			FROM vn.travel tr
-				JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
-				JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
-					WHERE wIn.name = vWarehouseInName
-						AND wOut.name = vWarehouseOutName
-						AND landed = util.tomorrow();
-    END IF;
+	SET vPictureReference = REPLACE(vPictureReference,'?','');
 
-	RETURN myTravel;
+	SET vPictureReference = REPLACE(vPictureReference,'=','');
+	
+	RETURN vPictureReference;
 
 END ;;
 DELIMITER ;
@@ -9010,6 +9633,83 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ekt_add` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `ekt_add`(vPutOrderFk INT)
+BEGIN
+	
+/**
+ *  Añade ekt para las ordenes de compra de proveedores que no envian el ekt por email
+ * 
+ * @param vPutOrderFk PutOrderId de donde coger los datos
+ **/
+	
+	INSERT INTO edi.ekt(entryYear, 
+						deliveryNumber, 
+						fec,
+						hor,
+						item,
+						pac,
+						qty,
+						ori,
+						cat,
+						pro,
+						pri,
+						package,
+						s1,
+						s2,
+						s3,
+						s4,
+						s5,
+						s6,
+						putOrderFk,
+						`ref`,
+						kop)
+		SELECT year(curdate()) entryYear,
+				p.id deliveryNumber ,
+				DATE(di.LatestDeliveryDateTime) fec,
+				HOUR(di.LatestDeliveryDateTime) hor,
+				i.longName item,
+				sr.NumberOfItemsPerCask pac,
+				p.quantity qty,
+				o.code ori,
+				i.category cat,
+				mp.supplierFk pro,
+				sr.Price pri,
+				sr.EmbalageCode package,
+				i.value5 s1,
+				i.value6 s2,
+				i.value7 s3,
+				i.value8 s4,
+				i.value9 s5,
+				i.value10 s6,
+				p.id putOrderFk,
+				sr.Item_ArticleCode,
+				sr.vmpID 
+			FROM edi.putOrder p
+				JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID 
+				JOIN edi.deliveryInformation di ON di.id = p.deliveryInformationID 
+				JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID 
+				JOIN vn.item i ON i.supplyResponseFk = sr.ID 
+				JOIN vn.origin o ON o.id = i.originFk 
+			WHERE p.id = vPutOrderFk;
+				
+	CALL edi.ekt_load(LAST_INSERT_ID());
+	
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ekt_load` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -9075,12 +9775,12 @@ BEGIN
 			WHERE po.id = vPutOrderFk
 			LIMIT 1;
 	END IF;
+
+	INSERT IGNORE INTO item_track SET
+			item_id = vRef;
 	
     IF IFNULL(vItem,0) = 0 THEN
 		-- Intenta obtener el artículo en base a los atributos holandeses
-
-		INSERT IGNORE INTO item_track SET
-			item_id = vRef;
 		
 		SELECT b.id, b.itemFk INTO vBuy, vItem
 			FROM edi.ekt e 
@@ -9205,154 +9905,154 @@ CREATE DEFINER=`root`@`%` PROCEDURE `exchange_new`(
     IN `vAuction` SMALLINT,
     IN `vPackage` INT,
     IN `vPutOrderFk` INT)
-BEGIN
+BEGIN
 /**
  * Adds a new exchange, generates it's barcode and
  * inserts/updates the transaction. When the referenced
  * transaction exists as provisional, updates it with
- * the new values.
- */
-	DECLARE vEkt INT;
-	DECLARE vRewriteKop INT DEFAULT NULL;
-	DECLARE vBarcode CHAR(15) DEFAULT NULL;
-	DECLARE vIsDuplicated BOOL;
+ * the new values.
+ */
+	DECLARE vEkt INT;
+	DECLARE vRewriteKop INT DEFAULT NULL;
+	DECLARE vBarcode CHAR(15) DEFAULT NULL;
+	DECLARE vIsDuplicated BOOL;
 	DECLARE vUpdateExistent BOOL DEFAULT FALSE;
-	DECLARE duplicateKey CONDITION FOR 1062;
-
-	DECLARE CONTINUE HANDLER FOR duplicateKey
-		SET vIsDuplicated = TRUE;
-
-	-- Generates the barcode
-
-	IF vAgj != 0 AND vAgj IS NOT NULL 
-	THEN
-		SET vBarcode = CONCAT(
-			LPAD(vAuction, 2, 0),
-			LPAD(IFNULL(vClock, 99), 2, 0),
-			LPAD(DAYOFYEAR(vDate), 3, 0),
-			IF(vClock IS NULL OR vClock = 99,
-				LPAD(vAgj, 7, 0),
-				CONCAT(LPAD(vAgj, 5, 0), '01')
-			),
-			'0'
-		);
-	END IF;
-
-	-- Rewrites the kop parameter
-
-	IF vKop IS NULL THEN
-		SELECT defaultKop INTO vKop FROM exchangeConfig;
-	END IF;
-
-	SELECT e.kop INTO vRewriteKop
-		FROM mailSender e
-			JOIN mail m ON m.senderFk = e.id
-		WHERE m.id = vMailFk;
-
-	SET vKop = IFNULL(vRewriteKop, vKop);
-
-	-- Inserts the new transaction
+	DECLARE duplicateKey CONDITION FOR 1062;
 
-	SET vIsDuplicated = FALSE;
-	INSERT INTO ekt SET
-		 barcode = IFNULL(vBarcode, barcode)
-		,deliveryNumber = vDeliveryNumber
-		,entryYear = YEAR(vDate)
-		,fec = vDate
-		,hor = vHour
-		,ref = vRef
-		,item = vItem
-		,agj = vAgj
-		,cat = vCat
-		,pac = vPac
-		,sub = vSub
-		,kop = vKop
-		,ptd = vPtd
-		,pro = vPro
-		,ori = vOrigin
-		,ptj = vPtj
-		,qty = vQuantiy
-		,pri = vPrice
-		,klo = vClock
-		,s1 = vS1
-		,s2 = vS2
-		,s3 = vS3
-		,s4 = vS4
-		,s5 = vS5
-		,s6 = vS6
-		,k1 = vK1
-		,k2 = vK2
-		,k3 = vP1
-		,k4 = vP2
-		,auction = vAuction
-		,package = vPackage
-        ,putOrderFk = vPutOrderFk;
-
-	-- If it exists duplicado updates it
-
-	IF NOT vIsDuplicated 
-	THEN
-		SET vEkt = LAST_INSERT_ID();
-		CALL ekt_load (vEkt);
-
-	ELSEIF vDeliveryNumber != 0
-	AND vDeliveryNumber IS NOT NULL
-	THEN
-		SELECT id INTO vEkt
-			FROM ekt
-			WHERE deliveryNumber = vDeliveryNumber;
-
-		SELECT COUNT(*) = 0 INTO vUpdateExistent
-			FROM ekt t
-				JOIN `exchange` b ON b.ektFk = t.id
-				JOIN exchangeConfig c
-			WHERE t.deliveryNumber = vDeliveryNumber
-				AND t.entryYear = YEAR(vDate)
-				AND b.typeFk != c.presaleFk;
-	END IF;
-
-	IF vUpdateExistent
-	THEN
-		UPDATE ekt SET
-			 barcode = IFNULL(vBarcode, barcode)
-			,fec = vDate
-			,hor = vHour
-			,ref = vRef
-			,item = vItem
-			,agj = vAgj
-			,cat = vCat
-			,pac = vPac
-			,sub = vSub
-			,kop = vKop
-			,ptd = vPtd
-			,pro = vPro
-			,ori = vOrigin
-			,ptj = vPtj
-			,qty = vQuantiy
-			,pri = vPrice
-			,klo = vClock
-			,s1 = vS1
-			,s2 = vS2
-			,s3 = vS3
-			,s4 = vS4
-			,s5 = vS5
-			,s6 = vS6
-			,k1 = vK1
-			,k2 = vK2
-			,k3 = vP1
-			,k4 = vP2
-			,auction = vAuction
-			,package = vPackage
-            ,putOrderFk = IFNULL(vPutOrderFk, putOrderFk)
-		WHERE id = vEkt;
-	END IF;
-
-	-- Registers the exchange
-
-	INSERT INTO `exchange` SET
-		 mailFk = vMailFk
-		,typeFk = vType
-		,ektFk = vEkt;
+	DECLARE CONTINUE HANDLER FOR duplicateKey
+		SET vIsDuplicated = TRUE;
+
+	-- Generates the barcode
+
+	IF vAgj != 0 AND vAgj IS NOT NULL 
+	THEN
+		SET vBarcode = CONCAT(
+			LPAD(vAuction, 2, 0),
+			LPAD(IFNULL(vClock, 99), 2, 0),
+			LPAD(DAYOFYEAR(vDate), 3, 0),
+			IF(vClock IS NULL OR vClock = 99,
+				LPAD(vAgj, 7, 0),
+				CONCAT(LPAD(vAgj, 5, 0), '01')
+			),
+			'0'
+		);
+	END IF;
+
+	-- Rewrites the kop parameter
+
+	IF vKop IS NULL THEN
+		SELECT defaultKop INTO vKop FROM exchangeConfig;
+	END IF;
+
+	SELECT e.kop INTO vRewriteKop
+		FROM mailSender e
+			JOIN mail m ON m.senderFk = e.id
+		WHERE m.id = vMailFk;
+
+	SET vKop = IFNULL(vRewriteKop, vKop);
+
+	-- Inserts the new transaction
+
+	SET vIsDuplicated = FALSE;
+	INSERT INTO ekt SET
+		 barcode = IFNULL(vBarcode, barcode)
+		,deliveryNumber = vDeliveryNumber
+		,entryYear = YEAR(vDate)
+		,fec = vDate
+		,hor = vHour
+		,ref = vRef
+		,item = vItem
+		,agj = vAgj
+		,cat = vCat
+		,pac = vPac
+		,sub = vSub
+		,kop = vKop
+		,ptd = vPtd
+		,pro = vPro
+		,ori = vOrigin
+		,ptj = vPtj
+		,qty = vQuantiy
+		,pri = vPrice
+		,klo = vClock
+		,s1 = vS1
+		,s2 = vS2
+		,s3 = vS3
+		,s4 = vS4
+		,s5 = vS5
+		,s6 = vS6
+		,k1 = vK1
+		,k2 = vK2
+		,k3 = vP1
+		,k4 = vP2
+		,auction = vAuction
+		,package = vPackage
+        ,putOrderFk = vPutOrderFk;
+
+	-- If it exists duplicado updates it
+
+	IF NOT vIsDuplicated 
+	THEN
+		SET vEkt = LAST_INSERT_ID();
+		CALL ekt_load (vEkt);
+
+	ELSEIF vDeliveryNumber != 0
+	AND vDeliveryNumber IS NOT NULL
+	THEN
+		SELECT id INTO vEkt
+			FROM ekt
+			WHERE deliveryNumber = vDeliveryNumber;
+
+		SELECT COUNT(*) = 0 INTO vUpdateExistent
+			FROM ekt t
+				JOIN `exchange` b ON b.ektFk = t.id
+				JOIN exchangeConfig c
+			WHERE t.deliveryNumber = vDeliveryNumber
+				AND t.entryYear = YEAR(vDate)
+				AND b.typeFk != c.presaleFk;
+	END IF;
+
+	IF vUpdateExistent
+	THEN
+		UPDATE ekt SET
+			 barcode = IFNULL(vBarcode, barcode)
+			,fec = vDate
+			,hor = vHour
+			,ref = vRef
+			,item = vItem
+			,agj = vAgj
+			,cat = vCat
+			,pac = vPac
+			,sub = vSub
+			,kop = vKop
+			,ptd = vPtd
+			,pro = vPro
+			,ori = vOrigin
+			,ptj = vPtj
+			,qty = vQuantiy
+			,pri = vPrice
+			,klo = vClock
+			,s1 = vS1
+			,s2 = vS2
+			,s3 = vS3
+			,s4 = vS4
+			,s5 = vS5
+			,s6 = vS6
+			,k1 = vK1
+			,k2 = vK2
+			,k3 = vP1
+			,k4 = vP2
+			,auction = vAuction
+			,package = vPackage
+            ,putOrderFk = IFNULL(vPutOrderFk, putOrderFk)
+		WHERE id = vEkt;
+	END IF;
+
+	-- Registers the exchange
+
+	INSERT INTO `exchange` SET
+		 mailFk = vMailFk
+		,typeFk = vType
+		,ektFk = vEkt;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -9363,270 +10063,298 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh`()
-proc: BEGIN
-
-	DECLARE vLanded DATETIME;
-	DECLARE done INT DEFAULT FALSE;
-	DECLARE vFreeId INT;
-	DECLARE vSupplyResponseFk INT;
+proc: BEGIN
+ 
+	DECLARE vLanded DATETIME;
+	DECLARE done INT DEFAULT FALSE;
+	DECLARE vFreeId INT;
+	DECLARE vSupplyResponseFk INT;
 	DECLARE vLastInserted DATETIME;
-    DECLARE vIsAuctionDay BOOLEAN;
-    
-	DECLARE cur1 CURSOR FOR 
-		SELECT id 
-			FROM edi.item_free;
-            
-	DECLARE cur2 CURSOR FOR 
-		SELECT srId 
-			FROM itemToInsert;
-            
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-	
-    CALL vn.clean_logiflora();
-    
-	START TRANSACTION;
-    																						 	-- select now(),'Antes de borrar';
-	DELETE itf.* 
-		FROM edi.item_free itf
-			JOIN vn.item i ON i.id = itf.id;
-   																						 	-- -- select now(),'Tras borrar';
- 	DROP TEMPORARY TABLE IF EXISTS tmp;
-	CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY
-		SELECT * FROM (
-			SELECT *
-				FROM edi.supplyOffer
-			ORDER BY NumberOfUnits DESC) t
-			JOIN edi.item_groupToOffer igo ON igo.group_code = t.group_id
-		GROUP BY Item_ArticleCode, s1, s2, s3, s4, s5, s6, company_name, Quality, NumberOfItemsPerCask, EmbalageCode, Price;
-        
-																							 	-- -- select now(),'Antes de crear edi.offer';
-	DROP TEMPORARY TABLE IF EXISTS edi.offer;
-	CREATE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`)) ENGINE = MEMORY
-		SELECT so.*, ev1.type_description s1Value, ev2.type_description s2Value, ev3.type_description s3Value, 
-				ev4.type_description s4Value, ev5.type_description s5Value, ev6.type_description s6Value,
-				eif1.feature ef1, eif2.feature ef2, eif3.feature ef3, eif4.feature ef4, eif5.feature ef5, eif6.feature ef6
-			FROM tmp so
-				LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
-					AND eif1.presentation_order = 1 AND eif1.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
-					AND eif2.presentation_order = 2 AND eif2.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
-					AND eif3.presentation_order = 3 AND eif3.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
-					AND eif4.presentation_order = 4 AND eif4.expiry_date IS NULL 
-				LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
-					AND eif5.presentation_order = 5 AND eif5.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
-					AND eif6.presentation_order = 6 AND eif6.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature AND so.s1 = ev1.type_value
-				LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature AND so.s2 = ev2.type_value
-				LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature AND so.s3 = ev3.type_value
-				LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature AND so.s4 = ev4.type_value
-				LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature AND so.s5 = ev5.type_value
-				LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value
-			ORDER BY Price;
-
-	DROP TEMPORARY TABLE tmp;	
-
-	-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
-	UPDATE IGNORE edi.offer o 
-			LEFT JOIN vn.item iExist ON iExist.supplyResponseFk = o.srID
-			JOIN vn.item i 
-				ON i.name = o.product_name 
-				AND i.subname <=> o.company_name 
-				AND i.value5 <=> o.s1Value 
-                AND i.value6 <=> o.s2Value 
-				AND i.value7 <=> o.s3Value 
-                AND i.value8 <=> o.s4Value
-				AND i.value9 <=> o.s5Value 
-                AND i.value10 <=> o.s6Value
-                AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
-                AND i.EmbalageCode <=> o.EmbalageCode
-                AND i.quality <=> o.Quality
-            LEFT JOIN deliveryInformation di ON di.supplyResponseID = i.supplyResponseFk
-            JOIN vn.itemType it ON it.id = i.typeFk
-		SET i.supplyResponseFk = o.srID
-		WHERE iExist.id IS NULL 
-			AND (di.LatestOrderDateTime < NOW() OR di.ID IS NULL)
-            AND it.isInventory
-        ;
-																					 	-- select now(),'Antes de crear ITO';
-	DROP TEMPORARY TABLE IF EXISTS itemToInsert;
-	CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY
-		SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk
-			FROM edi.offer o 
-				LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
-		WHERE i.id IS NULL;
-																							-- select now(),'Tras crear itemToInsert';
-	-- Reciclado de nº de item
-	OPEN cur1;
-	OPEN cur2;
-	
-	read_loop: LOOP
-	 
-		FETCH cur2 INTO vSupplyResponseFk;
-		FETCH cur1 INTO vFreeId;
-
-		IF done THEN
-		  LEAVE read_loop;
-		END IF;
-
-		UPDATE itemToInsert
-			SET itemFk = vFreeId
-			WHERE srId = vSupplyResponseFk;
-		
-	END LOOP;
-
-	CLOSE cur1;
-	CLOSE cur2;
-
-	-- Insertamos todos los items en Articles de la oferta
-	INSERT INTO vn.item(	id, 
-							`name`,
-							longName,  
-                            subName,
-							expenceFk, 
-							typeFk, 
-							intrastatFk,
-							originFk,
-							supplyResponseFk,
-                            numberOfItemsPerCask,
-                            embalageCode,
-                            quality,
-                            isFloramondo) 
-		SELECT 	itemFk,
-				product_name,
-				product_name,
-                company_name,
-				expenseFk,
-				itemTypeFk,
-				intrastatFk,
-				originFk,
-				`srId`,
-				NumberOfItemsPerCask,
-                EmbalageCode,
-                Quality,
-                TRUE
-		FROM itemToInsert;
-   
-	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
-		SELECT i.id, PictureReference
-			FROM itemToInsert ii
-				JOIN vn.item i ON i.supplyResponseFk = ii.srId;
-
-	-- Inserta si se añadiesen tags nuevos
-	INSERT IGNORE INTO vn.tag (name, ediTypeFk)
-		SELECT description, type_id FROM edi.type;
-
-	-- Inserta los tags sólo en los articulos nuevos
-
-	-- desabilita el trigger para recalcular los tags al final    
-	 SET @isTriggerDisabled = TRUE;
-	
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.product_name, 1	
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Producto'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-                
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.Quality, 3
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Calidad'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-				
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.company_name, 4
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Productor'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-                
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s1Value, 5	
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef1
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE s1Value != '';
-				
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s2Value, 6	
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef2
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE s2Value != '';
-				
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s3Value, 7	
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef3
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE s3Value != '';    
-				
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s4Value, 8	
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef4
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE s4Value != '';
-							
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s5Value, 9	
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef5
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE s5Value != '';
-            
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s6Value, 10	
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef6
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE s6Value != '';
-            
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id, ink.name, 11	
-			FROM itemToInsert ii
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-				JOIN vn.tag t ON t.`name` = 'Color'
-                JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
-                JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1'
-                JOIN vn.ink ON ink.dutchCode = f.feature_value;
-
-	UPDATE vn.item i
-			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`
-			JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations
-			JOIN vn.itemTag diameter ON diameter.itemFk = i.id
-			JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk
-			JOIN vn.itemTag size ON size.itemFk = i.id
-			JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk
-		SET i.`compression` = 
-					(PI() * POW(diameter.`value`/ 2, 2) * size.`value`) 
-						/ 
-					((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask);   
-                    
-	DROP TABLE IF EXISTS tmp.item;
-	CREATE TABLE tmp.item
-		(PRIMARY KEY (id))
-		SELECT i.id FROM vn.item i 
-			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
-			
-	CALL vn.item_refreshTags();
-	
+    DECLARE vIsAuctionDay BOOLEAN;
+    DECLARE vMaxNewItems INT DEFAULT 100000;
+   	DECLARE vStartingTime DATETIME;
+    
+	DECLARE cur1 CURSOR FOR 
+		SELECT id 
+			FROM edi.item_free;
+            
+	DECLARE cur2 CURSOR FOR 
+		SELECT srId 
+			FROM itemToInsert;
+            
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+	
+	SET vStartingTime = NOW();
+
+    -- CALL vn.clean_logiflora();
+    
+	-- Refresca las fotos de los items existentes, con prioridad baja (0.7 seg)
+    INSERT IGNORE INTO vn.itemImageQueue(itemFk, url,priority)
+		SELECT i.id, sr.PictureReference , 100
+			FROM edi.supplyResponse sr 
+				JOIN vn.item i ON i.supplyResponseFk = sr.ID 
+			WHERE i.image != edi.imageName(sr.PictureReference)
+			AND sr.NumberOfUnits > 0;
+    
+	-- Elimina de la lista de items libres aquellos que ya existen
+	DELETE itf.* 
+		FROM edi.item_free itf
+			JOIN vn.item i ON i.id = itf.id;
+	
+ 	DROP TEMPORARY TABLE IF EXISTS tmp;
+	CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY
+		SELECT 	t.*, 
+				IFNULL(idt.itemTypeFk, igo.itemTypeFk) itemTypeFk, 
+				igo.expenseFk , 
+				igo.intrastatFk , 
+				igo.originFk 
+			FROM (
+			SELECT *
+				FROM edi.supplyOffer 
+				ORDER BY NumberOfUnits DESC) t
+			JOIN edi.item_groupToOffer igo ON igo.group_code = t.group_id
+			LEFT JOIN edi.item_defaultType idt ON idt.item_id = t.Item_ArticleCode
+		GROUP BY Item_ArticleCode, s1, s2, s3, s4, s5, s6, company_name, Quality, NumberOfItemsPerCask, EmbalageCode, Price ;
+        
+																							 	-- -- select now(),'Antes de crear edi.offer';
+	DROP TEMPORARY TABLE IF EXISTS edi.offer;
+	CREATE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`)) ENGINE = MEMORY
+		SELECT so.*, ev1.type_description s1Value, ev2.type_description s2Value, ev3.type_description s3Value, 
+				ev4.type_description s4Value, ev5.type_description s5Value, ev6.type_description s6Value,
+				eif1.feature ef1, eif2.feature ef2, eif3.feature ef3, eif4.feature ef4, eif5.feature ef5, eif6.feature ef6
+			FROM tmp so
+				LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
+					AND eif1.presentation_order = 1 AND eif1.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
+					AND eif2.presentation_order = 2 AND eif2.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
+					AND eif3.presentation_order = 3 AND eif3.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
+					AND eif4.presentation_order = 4 AND eif4.expiry_date IS NULL 
+				LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
+					AND eif5.presentation_order = 5 AND eif5.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
+					AND eif6.presentation_order = 6 AND eif6.expiry_date IS NULL
+				LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature AND so.s1 = ev1.type_value
+				LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature AND so.s2 = ev2.type_value
+				LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature AND so.s3 = ev3.type_value
+				LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature AND so.s4 = ev4.type_value
+				LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature AND so.s5 = ev5.type_value
+				LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value
+			ORDER BY Price;
+
+	DROP TEMPORARY TABLE tmp;	
+
+		
+   	START TRANSACTION;	
+   
+	-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
+	UPDATE IGNORE edi.offer o 
+			JOIN vn.item i 
+				ON i.name = o.product_name 
+				AND i.subname <=> o.company_name 
+				AND i.value5 <=> o.s1Value 
+                AND i.value6 <=> o.s2Value 
+				AND i.value7 <=> o.s3Value 
+                AND i.value8 <=> o.s4Value
+				AND i.value9 <=> o.s5Value 
+                AND i.value10 <=> o.s6Value
+                AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
+                AND i.EmbalageCode <=> o.EmbalageCode
+                AND i.quality <=> o.Quality
+            JOIN vn.itemType it ON it.id = i.typeFk
+			LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk 
+            LEFT JOIN deliveryInformation di ON di.supplyResponseID = sr.ID    
+		SET i.supplyResponseFk = o.srID
+		WHERE (		sr.ID IS NULL 
+				OR 	sr.NumberOfUnits = 0 
+				OR 	di.LatestOrderDateTime < NOW() 
+				OR 	di.ID IS NULL)
+            AND it.isInventory
+        ;
+																					 	-- select now(),'Antes de crear ITO';
+	DROP TEMPORARY TABLE IF EXISTS itemToInsert;
+	CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY
+		SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk
+			FROM edi.offer o 
+				LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
+		WHERE i.id IS NULL
+	LIMIT vMaxNewItems;
+
+	-- Reciclado de nº de item
+	OPEN cur1;
+	OPEN cur2;
+	
+	read_loop: LOOP
+	 
+		FETCH cur2 INTO vSupplyResponseFk;
+		FETCH cur1 INTO vFreeId;
+
+		IF done THEN
+		  LEAVE read_loop;
+		END IF;
+
+		UPDATE itemToInsert
+			SET itemFk = vFreeId
+			WHERE srId = vSupplyResponseFk;
+		
+	END LOOP;
+
+	CLOSE cur1;
+	CLOSE cur2;
+
+	-- Insertamos todos los items en Articles de la oferta
+	INSERT INTO vn.item(	id, 
+							`name`,
+							longName,  
+                            subName,
+							expenceFk, 
+							typeFk, 
+							intrastatFk,
+							originFk,
+							supplyResponseFk,
+                            numberOfItemsPerCask,
+                            embalageCode,
+                            quality,
+                            isFloramondo) 
+		SELECT 	itemFk,
+				product_name,
+				product_name,
+                company_name,
+				expenseFk,
+				itemTypeFk,
+				intrastatFk,
+				originFk,
+				`srId`,
+				NumberOfItemsPerCask,
+                EmbalageCode,
+                Quality,
+                TRUE
+		FROM itemToInsert;
+   
+	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
+		SELECT i.id, PictureReference
+			FROM itemToInsert ii
+				JOIN vn.item i ON i.supplyResponseFk = ii.srId
+			WHERE PictureReference IS NOT NULL;
+
+	INSERT INTO edi.log(tableName, fieldName,fieldValue) 
+		SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*)
+			FROM vn.itemImageQueue 
+			WHERE attempts = 0;
+		
+	-- Inserta si se añadiesen tags nuevos
+	INSERT IGNORE INTO vn.tag (name, ediTypeFk)
+		SELECT description, type_id FROM edi.type;
+
+	-- Inserta los tags sólo en los articulos nuevos
+
+	-- desabilita el trigger para recalcular los tags al final    
+	 SET @isTriggerDisabled = TRUE;
+	
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.product_name, 1	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Producto'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+                
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.Quality, 3
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Calidad'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+				
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.company_name, 4
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Productor'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+                
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s1Value, 5	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef1
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s1Value != '';
+				
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s2Value, 6	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef2
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s2Value != '';
+				
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s3Value, 7	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef3
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s3Value != '';    
+				
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s4Value, 8	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef4
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s4Value != '';
+							
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s5Value, 9	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef5
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s5Value != '';
+            
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s6Value, 10	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef6
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s6Value != '';
+            
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id, ink.name, 11	
+			FROM itemToInsert ii
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+				JOIN vn.tag t ON t.`name` = 'Color'
+                JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
+                JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1'
+                JOIN vn.ink ON ink.dutchCode = f.feature_value;
+
+	UPDATE vn.item i
+			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`
+			JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations
+			JOIN vn.itemTag diameter ON diameter.itemFk = i.id
+			JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk
+			JOIN vn.itemTag size ON size.itemFk = i.id
+			JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk
+		SET i.`compression` = 
+					(PI() * POW(diameter.`value`/ 2, 2) * size.`value`) 
+						/ 
+					((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask);   
+                    
+	DROP TABLE IF EXISTS tmp.item;
+	CREATE TABLE tmp.item
+		(PRIMARY KEY (id))
+		SELECT i.id FROM vn.item i 
+			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
+	
+	CALL vn.item_refreshTags();
+	
 	SET @isTriggerDisabled = FALSE; 
     
-           
 	SELECT MIN(LatestDeliveryDateTime) INTO vLanded
 		FROM edi.supplyResponse sr 
 			JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
@@ -9634,121 +10362,122 @@ proc: BEGIN
             JOIN vn.floramondoConfig fc
 		WHERE mp.isLatestOrderDateTimeRelevant
 			AND di.LatestOrderDateTime > IF(fc.MaxLatestOrderHour > HOUR(NOW()), CURDATE(), TIMESTAMPADD(DAY,1,CURDATE()));
-            
-    /*
-    IF HOUR(NOW()) < ( SELECT MaxLatestOrderHour FROM vn.floramondoConfig ) AND vIsAuctionDay THEN 
+            
+    UPDATE vn.floramondoConfig 
+		SET nextLanded = vLanded
+		WHERE vLanded IS NOT NULL;
+   
     
-		SET vLanded = CURDATE();
-        
-    ELSE
-	
-		SELECT MIN(LatestOrderDateTime) INTO vLanded 
-			FROM edi.deliveryInformation di
-				JOIN edi.supplyResponse sr ON sr.ID = di.supplyResponseID
-                JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
-				WHERE mp.isLatestOrderDateTimeRelevant
-					AND LatestOrderDateTime >= TIMESTAMPADD(DAY,1,CURDATE());   
-    
-    END IF;
-    */
-    UPDATE vn.floramondoConfig 
-		SET nextLanded = vLanded
-		WHERE vLanded IS NOT NULL;
-   
-    
-	-- Elimina la oferta obsoleta
-	UPDATE vn.buy b
-			JOIN vn.entry e ON e.id = b.entryFk
-			JOIN vn.travel tr ON tr.id = e.travelFk 
-			JOIN vn.agencyMode am ON am.id = tr.agencyFk 
-			JOIN vn.item i ON i.id = b.itemFk
-			LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
-			LEFT JOIN edi.putOrder po ON b.deliveryFk = po.deliveryInformationID
-			LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
-		SET b.quantity = 0
-		WHERE  (po.id IS NULL OR di.LatestOrderDateTime < NOW())
-			AND o.`srId` IS NULL 
-			AND am.name = 'LOGIFLORA'
-			AND e.isRaid;
-		          
-	UPDATE vn.buy b
-		JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-		JOIN vn.item i ON i.id = b.itemFk
-		LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
-		SET b.quantity = 0
-		WHERE o.`srId` IS NULL;
-    	
+	-- Elimina la oferta obsoleta
+	UPDATE vn.buy b
+			JOIN vn.entry e ON e.id = b.entryFk
+			JOIN vn.travel tr ON tr.id = e.travelFk 
+			JOIN vn.agencyMode am ON am.id = tr.agencyFk 
+			JOIN vn.item i ON i.id = b.itemFk
+			JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
+			LEFT JOIN edi.putOrder po ON b.deliveryFk = po.deliveryInformationID
+			LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
+		SET b.quantity = 0
+		WHERE  (po.id IS NULL OR di.LatestOrderDateTime < NOW())
+			AND sr.ID IS NULL 
+			AND am.name = 'LOGIFLORA'
+			AND e.isRaid;
+	/*	          
+	UPDATE vn.buy b
+		JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+		JOIN vn.item i ON i.id = b.itemFk
+		LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
+		SET b.quantity = 0
+		WHERE sr.ID IS NULL;
+	*/
 	-- Localiza las entradas de cada almacen
 	UPDATE edi.warehouseFloramondo
 		SET entryFk = vn.floramondo_getEntry(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk);
 	
-    IF vLanded IS NOT NULL THEN		
-			-- actualiza la oferta existente	
-		UPDATE vn.buy b
-			JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-			JOIN vn.item i ON i.id = b.itemFk
-			JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
-			SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
-				b.buyingValue = o.price
-			WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
-
-		-- Se eliminan las ofertas ya incluidas en las entradas
-		DELETE o
-			FROM edi.offer o
-			JOIN vn.item i ON i.supplyResponseFk = o.srId
-			JOIN vn.buy b ON i.id = b.itemFk 
-			JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk;
-			
-		-- Se inserta el resto
+    IF vLanded IS NOT NULL THEN		
+			-- actualiza la oferta existente	
+		UPDATE vn.buy b
+			JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+			JOIN vn.item i ON i.id = b.itemFk
+			JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
+			SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
+				b.buyingValue = o.price
+			WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
+
+		-- Se eliminan las ofertas ya incluidas en las entradas
+		DELETE o
+			FROM edi.offer o
+			JOIN vn.item i ON i.supplyResponseFk = o.srId
+			JOIN vn.buy b ON i.id = b.itemFk 
+			JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk;
+			
+		-- Se inserta el resto
 		SET vLastInserted := NOW();
-		
-			-- Inserta la oferta   
-		INSERT INTO vn.buy(entryFk, 
-							itemFk,
-							quantity, 
-							buyingValue, 
-							stickers, 
-							packing, 
-							`grouping`, 
-							groupingMode, 
-							packageFk,
-							deliveryFk)
-
-		SELECT  wf.entryFk,
-				i.id,
-				o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
-				o.Price,
-				o.NumberOfUnits as etiquetas,
-				o.NumberOfItemsPerCask as packing,
-				GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask as `grouping`,
-				2, -- Obliga al Packing
-				o.embalageCode,
-				o.diId
-			FROM edi.offer o
-				JOIN vn.item i ON i.supplyResponseFk = o.srId
-				JOIN vn.itemType it ON it.id = i.typeFk
-				JOIN edi.warehouseFloramondo wf ON wf.isFV = it.isFV OR wf.isFV IS NULL
-				JOIN vn.packaging p ON p.id LIKE o.embalageCode; -- llevar esta linea i mirar de crear els packages a temps real
-						
-			DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
-			
-			CREATE TEMPORARY TABLE tmp.buyRecalc
-			SELECT b.id 
-				FROM vn.buy b
-					JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-				WHERE b.created >= vLastInserted;
-				
-			CALL vn.buy_recalcPrices();
+		
+		-- Inserta la oferta   
+		INSERT INTO vn.buy(entryFk, 
+							itemFk,
+							quantity, 
+							buyingValue, 
+							stickers, 
+							packing, 
+							`grouping`, 
+							groupingMode, 
+							packageFk,
+							deliveryFk)
+
+		SELECT  wf.entryFk,
+				i.id,
+				o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
+				o.Price,
+				o.NumberOfUnits as etiquetas,
+				o.NumberOfItemsPerCask as packing,
+				GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask as `grouping`,
+				2, -- Obliga al Packing
+				o.embalageCode,
+				o.diId
+			FROM edi.offer o
+				JOIN vn.item i ON i.supplyResponseFk = o.srId
+				JOIN vn.itemType it ON it.id = i.typeFk
+				JOIN edi.warehouseFloramondo wf ON wf.isFV = it.isFV OR wf.isFV IS NULL
+				JOIN vn.packaging p ON p.id LIKE o.embalageCode; -- llevar esta linea i mirar de crear els packages a temps real
+						
+			DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
+			
+			CREATE TEMPORARY TABLE tmp.buyRecalc
+			SELECT b.id 
+				FROM vn.buy b
+					JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+				WHERE b.created >= vLastInserted;
+				
+			CALL vn.buy_recalcPrices();
 	
     END IF;
-    
-	DROP TEMPORARY TABLE 
-		edi.offer, 
-        itemToInsert;
-        
-	DROP TABLE tmp.item; 
-																							 	-- select now(),'FINAL';
-	COMMIT;
+    
+	DROP TEMPORARY TABLE 
+		edi.offer, 
+        itemToInsert;
+        
+	DROP TABLE tmp.item; 
+
+	COMMIT;		
+
+	-- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias
+	UPDATE vn.item i
+		SET typeFk = 121
+		WHERE i.longName LIKE 'Rosa Garden %'
+			AND typeFk = 17;
+		
+	UPDATE vn.item i
+		SET typeFk = 156
+		WHERE i.longName LIKE 'Rosa ec %'
+			AND typeFk = 17;
+
+	INSERT INTO edi.log(tableName, fieldName,fieldValue) 
+		VALUES('floramondo_offerRefresh','Tiempo de proceso',TIMEDIFF(NOW(),vStartingTime));
+
+	
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -9916,7 +10645,7 @@ CREATE TABLE `image` (
   `collectionFk` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `updated` int(11) DEFAULT NULL,
-  `nRefs` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Number of references, don''t modify this column manually',
+  `nRefs` int(10) unsigned NOT NULL DEFAULT 0 COMMENT 'Number of references, don''t modify this column manually',
   PRIMARY KEY (`id`),
   UNIQUE KEY `collection` (`collectionFk`,`name`),
   CONSTRAINT `image_ibfk_1` FOREIGN KEY (`collectionFk`) REFERENCES `imageCollection` (`name`) ON UPDATE CASCADE
@@ -9941,8 +10670,14 @@ CREATE TABLE `imageCollection` (
   `schema` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Deprecated',
   `table` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Deprecated',
   `column` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Deprecated',
+  `readRoleFk` int(10) unsigned DEFAULT 1,
+  `writeRoleFk` int(10) unsigned DEFAULT 1,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
+  UNIQUE KEY `name` (`name`),
+  KEY `role_id_writeRoleFk` (`writeRoleFk`),
+  KEY `role_id_readRoleFk` (`readRoleFk`),
+  CONSTRAINT `role_id_readRoleFk` FOREIGN KEY (`readRoleFk`) REFERENCES `account`.`role` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `role_id_writeRoleFk` FOREIGN KEY (`writeRoleFk`) REFERENCES `account`.`role` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -9958,7 +10693,7 @@ CREATE TABLE `imageCollectionSize` (
   `collectionFk` int(10) unsigned NOT NULL,
   `width` int(10) unsigned NOT NULL,
   `height` int(10) unsigned NOT NULL,
-  `crop` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `crop` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `image_schema_id` (`collectionFk`),
   CONSTRAINT `imageCollectionSize_ibfk_1` FOREIGN KEY (`collectionFk`) REFERENCES `imageCollection` (`id`) ON UPDATE CASCADE
@@ -9992,7 +10727,7 @@ CREATE TABLE `language` (
   `code` varchar(10) CHARACTER SET utf8 NOT NULL,
   `name` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
   `orgName` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `isActive` tinyint(1) NOT NULL DEFAULT '0',
+  `isActive` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -10109,8 +10844,8 @@ DROP TABLE IF EXISTS `mailConfig`;
 CREATE TABLE `mailConfig` (
   `id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Identifier',
   `host` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'localhost' COMMENT 'SMTP host',
-  `port` smallint(6) NOT NULL DEFAULT '465' COMMENT 'SMTP port',
-  `secure` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'Wether to use a secure connection',
+  `port` smallint(6) NOT NULL DEFAULT 465 COMMENT 'SMTP port',
+  `secure` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Wether to use a secure connection',
   `sender` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'The sender mail address',
   `senderName` varchar(75) CHARACTER SET utf8 NOT NULL COMMENT 'The sender name',
   `user` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'SMTP user',
@@ -10140,9 +10875,10 @@ DROP TABLE IF EXISTS `mainAccountBank`;
 /*!50001 DROP VIEW IF EXISTS `mainAccountBank`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `mainAccountBank` AS SELECT 
- 1 AS `name`,
- 1 AS `iban`*/;
+/*!50001 CREATE TABLE `mainAccountBank` (
+  `name` tinyint NOT NULL,
+  `iban` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10158,7 +10894,7 @@ CREATE TABLE `menu` (
   `path` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `roleFk` int(10) unsigned NOT NULL,
   `parentFk` int(10) unsigned DEFAULT NULL,
-  `displayOrder` tinyint(4) unsigned NOT NULL DEFAULT '1',
+  `displayOrder` tinyint(4) unsigned NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   KEY `group_id` (`roleFk`),
   KEY `parent` (`parentFk`),
@@ -10206,20 +10942,21 @@ DROP TABLE IF EXISTS `myAddress`;
 /*!50001 DROP VIEW IF EXISTS `myAddress`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myAddress` AS SELECT 
- 1 AS `id`,
- 1 AS `clientFk`,
- 1 AS `street`,
- 1 AS `city`,
- 1 AS `postalCode`,
- 1 AS `provinceFk`,
- 1 AS `nickname`,
- 1 AS `isDefaultAddress`,
- 1 AS `isActive`,
- 1 AS `longitude`,
- 1 AS `latitude`,
- 1 AS `warehouseFk`,
- 1 AS `agencyModeFk`*/;
+/*!50001 CREATE TABLE `myAddress` (
+  `id` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `street` tinyint NOT NULL,
+  `city` tinyint NOT NULL,
+  `postalCode` tinyint NOT NULL,
+  `provinceFk` tinyint NOT NULL,
+  `nickname` tinyint NOT NULL,
+  `isDefaultAddress` tinyint NOT NULL,
+  `isActive` tinyint NOT NULL,
+  `longitude` tinyint NOT NULL,
+  `latitude` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `agencyModeFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10230,16 +10967,17 @@ DROP TABLE IF EXISTS `myBasket`;
 /*!50001 DROP VIEW IF EXISTS `myBasket`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myBasket` AS SELECT 
- 1 AS `id`,
- 1 AS `made`,
- 1 AS `sent`,
- 1 AS `clientFk`,
- 1 AS `deliveryMethodFk`,
- 1 AS `agencyModeFk`,
- 1 AS `addressFk`,
- 1 AS `companyFk`,
- 1 AS `notes`*/;
+/*!50001 CREATE TABLE `myBasket` (
+  `id` tinyint NOT NULL,
+  `made` tinyint NOT NULL,
+  `sent` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `deliveryMethodFk` tinyint NOT NULL,
+  `agencyModeFk` tinyint NOT NULL,
+  `addressFk` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL,
+  `notes` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10250,11 +10988,12 @@ DROP TABLE IF EXISTS `myBasketDefaults`;
 /*!50001 DROP VIEW IF EXISTS `myBasketDefaults`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myBasketDefaults` AS SELECT 
- 1 AS `deliveryMethod`,
- 1 AS `agencyModeFk`,
- 1 AS `addressFk`,
- 1 AS `defaultAgencyFk`*/;
+/*!50001 CREATE TABLE `myBasketDefaults` (
+  `deliveryMethod` tinyint NOT NULL,
+  `agencyModeFk` tinyint NOT NULL,
+  `addressFk` tinyint NOT NULL,
+  `defaultAgencyFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10265,13 +11004,14 @@ DROP TABLE IF EXISTS `myBasketItem`;
 /*!50001 DROP VIEW IF EXISTS `myBasketItem`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myBasketItem` AS SELECT 
- 1 AS `id`,
- 1 AS `orderFk`,
- 1 AS `warehouseFk`,
- 1 AS `itemFk`,
- 1 AS `amount`,
- 1 AS `price`*/;
+/*!50001 CREATE TABLE `myBasketItem` (
+  `id` tinyint NOT NULL,
+  `orderFk` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `price` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10282,11 +11022,12 @@ DROP TABLE IF EXISTS `myClient`;
 /*!50001 DROP VIEW IF EXISTS `myClient`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myClient` AS SELECT 
- 1 AS `id`,
- 1 AS `isToBeMailed`,
- 1 AS `defaultAddressFk`,
- 1 AS `credit`*/;
+/*!50001 CREATE TABLE `myClient` (
+  `id` tinyint NOT NULL,
+  `isToBeMailed` tinyint NOT NULL,
+  `defaultAddressFk` tinyint NOT NULL,
+  `credit` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10297,12 +11038,13 @@ DROP TABLE IF EXISTS `myInvoice`;
 /*!50001 DROP VIEW IF EXISTS `myInvoice`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myInvoice` AS SELECT 
- 1 AS `id`,
- 1 AS `ref`,
- 1 AS `issued`,
- 1 AS `amount`,
- 1 AS `hasPdf`*/;
+/*!50001 CREATE TABLE `myInvoice` (
+  `id` tinyint NOT NULL,
+  `ref` tinyint NOT NULL,
+  `issued` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `hasPdf` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10313,11 +11055,12 @@ DROP TABLE IF EXISTS `myMenu`;
 /*!50001 DROP VIEW IF EXISTS `myMenu`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myMenu` AS SELECT 
- 1 AS `id`,
- 1 AS `path`,
- 1 AS `description`,
- 1 AS `parentFk`*/;
+/*!50001 CREATE TABLE `myMenu` (
+  `id` tinyint NOT NULL,
+  `path` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `parentFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10328,20 +11071,21 @@ DROP TABLE IF EXISTS `myOrder`;
 /*!50001 DROP VIEW IF EXISTS `myOrder`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myOrder` AS SELECT 
- 1 AS `id`,
- 1 AS `landed`,
- 1 AS `clientFk`,
- 1 AS `deliveryMethodFk`,
- 1 AS `agencyModeFk`,
- 1 AS `addressFk`,
- 1 AS `companyFk`,
- 1 AS `note`,
- 1 AS `sourceApp`,
- 1 AS `isConfirmed`,
- 1 AS `created`,
- 1 AS `firstRowStamp`,
- 1 AS `confirmed`*/;
+/*!50001 CREATE TABLE `myOrder` (
+  `id` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `deliveryMethodFk` tinyint NOT NULL,
+  `agencyModeFk` tinyint NOT NULL,
+  `addressFk` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL,
+  `note` tinyint NOT NULL,
+  `sourceApp` tinyint NOT NULL,
+  `isConfirmed` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `firstRowStamp` tinyint NOT NULL,
+  `confirmed` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10352,17 +11096,18 @@ DROP TABLE IF EXISTS `myOrderRow`;
 /*!50001 DROP VIEW IF EXISTS `myOrderRow`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myOrderRow` AS SELECT 
- 1 AS `id`,
- 1 AS `Fk`,
- 1 AS `itemFk`,
- 1 AS `warehouseFk`,
- 1 AS `shipped`,
- 1 AS `amount`,
- 1 AS `price`,
- 1 AS `rate`,
- 1 AS `created`,
- 1 AS `saleFk`*/;
+/*!50001 CREATE TABLE `myOrderRow` (
+  `id` tinyint NOT NULL,
+  `Fk` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `price` tinyint NOT NULL,
+  `rate` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10373,9 +11118,10 @@ DROP TABLE IF EXISTS `myOrderTicket`;
 /*!50001 DROP VIEW IF EXISTS `myOrderTicket`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myOrderTicket` AS SELECT 
- 1 AS `orderFk`,
- 1 AS `ticketFk`*/;
+/*!50001 CREATE TABLE `myOrderTicket` (
+  `orderFk` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10386,18 +11132,19 @@ DROP TABLE IF EXISTS `myTicket`;
 /*!50001 DROP VIEW IF EXISTS `myTicket`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myTicket` AS SELECT 
- 1 AS `id`,
- 1 AS `clientFk`,
- 1 AS `warehouseFk`,
- 1 AS `shipped`,
- 1 AS `landed`,
- 1 AS `nickname`,
- 1 AS `agencyModeFk`,
- 1 AS `refFk`,
- 1 AS `addressFk`,
- 1 AS `location`,
- 1 AS `companyFk`*/;
+/*!50001 CREATE TABLE `myTicket` (
+  `id` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `nickname` tinyint NOT NULL,
+  `agencyModeFk` tinyint NOT NULL,
+  `refFk` tinyint NOT NULL,
+  `addressFk` tinyint NOT NULL,
+  `location` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10408,16 +11155,17 @@ DROP TABLE IF EXISTS `myTicketRow`;
 /*!50001 DROP VIEW IF EXISTS `myTicketRow`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myTicketRow` AS SELECT 
- 1 AS `id`,
- 1 AS `itemFk`,
- 1 AS `ticketFk`,
- 1 AS `concept`,
- 1 AS `quantity`,
- 1 AS `price`,
- 1 AS `discount`,
- 1 AS `reserved`,
- 1 AS `isPicked`*/;
+/*!50001 CREATE TABLE `myTicketRow` (
+  `id` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL,
+  `concept` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `price` tinyint NOT NULL,
+  `discount` tinyint NOT NULL,
+  `reserved` tinyint NOT NULL,
+  `isPicked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10428,14 +11176,15 @@ DROP TABLE IF EXISTS `myTicketService`;
 /*!50001 DROP VIEW IF EXISTS `myTicketService`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myTicketService` AS SELECT 
- 1 AS `id`,
- 1 AS `description`,
- 1 AS `quantity`,
- 1 AS `price`,
- 1 AS `taxClassFk`,
- 1 AS `ticketFk`,
- 1 AS `ticketServiceTypeFk`*/;
+/*!50001 CREATE TABLE `myTicketService` (
+  `id` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `price` tinyint NOT NULL,
+  `taxClassFk` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL,
+  `ticketServiceTypeFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10446,20 +11195,21 @@ DROP TABLE IF EXISTS `myTicketState`;
 /*!50001 DROP VIEW IF EXISTS `myTicketState`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myTicketState` AS SELECT 
- 1 AS `id`,
- 1 AS `clientFk`,
- 1 AS `warehouseFk`,
- 1 AS `shipped`,
- 1 AS `landed`,
- 1 AS `nickname`,
- 1 AS `agencyModeFk`,
- 1 AS `refFk`,
- 1 AS `addressFk`,
- 1 AS `location`,
- 1 AS `companyFk`,
- 1 AS `alertLevel`,
- 1 AS `code`*/;
+/*!50001 CREATE TABLE `myTicketState` (
+  `id` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `nickname` tinyint NOT NULL,
+  `agencyModeFk` tinyint NOT NULL,
+  `refFk` tinyint NOT NULL,
+  `addressFk` tinyint NOT NULL,
+  `location` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL,
+  `alertLevel` tinyint NOT NULL,
+  `code` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10470,15 +11220,16 @@ DROP TABLE IF EXISTS `myTpvTransaction`;
 /*!50001 DROP VIEW IF EXISTS `myTpvTransaction`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `myTpvTransaction` AS SELECT 
- 1 AS `id`,
- 1 AS `merchantFk`,
- 1 AS `clientFk`,
- 1 AS `receiptFk`,
- 1 AS `amount`,
- 1 AS `response`,
- 1 AS `status`,
- 1 AS `created`*/;
+/*!50001 CREATE TABLE `myTpvTransaction` (
+  `id` tinyint NOT NULL,
+  `merchantFk` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `receiptFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `response` tinyint NOT NULL,
+  `status` tinyint NOT NULL,
+  `created` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10494,8 +11245,8 @@ CREATE TABLE `news` (
   `text` text COLLATE utf8_unicode_ci NOT NULL,
   `image` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `userFk` int(10) unsigned NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `priority` tinyint(3) unsigned NOT NULL DEFAULT '3',
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `priority` tinyint(3) unsigned NOT NULL DEFAULT 3,
   `tag` varchar(15) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'new',
   PRIMARY KEY (`id`),
   KEY `user` (`userFk`),
@@ -10593,15 +11344,15 @@ CREATE TABLE `order` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `date_send` date NOT NULL DEFAULT '0000-00-00',
   `customer_id` int(11) NOT NULL,
-  `delivery_method_id` int(11) DEFAULT '3',
-  `agency_id` int(11) DEFAULT '2',
+  `delivery_method_id` int(11) DEFAULT 3,
+  `agency_id` int(11) DEFAULT 2,
   `address_id` int(11) DEFAULT NULL,
-  `company_id` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `company_id` smallint(5) unsigned NOT NULL DEFAULT 442,
   `note` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `source_app` set('WEB','ANDROID','IOS','SALIX','TPV','TABLET_VN','') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'TPV',
-  `is_bionic` tinyint(1) NOT NULL DEFAULT '1',
-  `confirmed` tinyint(1) NOT NULL DEFAULT '0',
-  `date_make` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `is_bionic` tinyint(1) NOT NULL DEFAULT 1,
+  `confirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `date_make` timestamp NOT NULL DEFAULT current_timestamp(),
   `first_row_stamp` datetime DEFAULT NULL,
   `confirm_date` datetime DEFAULT NULL,
   `taxableBase` decimal(10,2) NOT NULL,
@@ -10722,14 +11473,14 @@ DROP TABLE IF EXISTS `orderRow`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `orderRow` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `orderFk` int(10) unsigned NOT NULL DEFAULT '0',
-  `itemFk` int(11) NOT NULL DEFAULT '0',
+  `orderFk` int(10) unsigned NOT NULL DEFAULT 0,
+  `itemFk` int(11) NOT NULL DEFAULT 0,
   `warehouseFk` int(11) DEFAULT NULL,
   `shipment` date DEFAULT NULL,
-  `amount` smallint(6) unsigned NOT NULL DEFAULT '0',
+  `amount` smallint(6) unsigned NOT NULL DEFAULT 0,
   `price` decimal(10,2) DEFAULT NULL,
   `rate` smallint(5) unsigned DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `saleFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `item` (`itemFk`),
@@ -10859,9 +11610,10 @@ DROP TABLE IF EXISTS `orderTicket`;
 /*!50001 DROP VIEW IF EXISTS `orderTicket`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `orderTicket` AS SELECT 
- 1 AS `orderFk`,
- 1 AS `ticketFk`*/;
+/*!50001 CREATE TABLE `orderTicket` (
+  `orderFk` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10872,10 +11624,11 @@ DROP TABLE IF EXISTS `order_component`;
 /*!50001 DROP VIEW IF EXISTS `order_component`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `order_component` AS SELECT 
- 1 AS `order_row_id`,
- 1 AS `component_id`,
- 1 AS `price`*/;
+/*!50001 CREATE TABLE `order_component` (
+  `order_row_id` tinyint NOT NULL,
+  `component_id` tinyint NOT NULL,
+  `price` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10886,17 +11639,18 @@ DROP TABLE IF EXISTS `order_row`;
 /*!50001 DROP VIEW IF EXISTS `order_row`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `order_row` AS SELECT 
- 1 AS `id`,
- 1 AS `order_id`,
- 1 AS `item_id`,
- 1 AS `warehouse_id`,
- 1 AS `shipment`,
- 1 AS `amount`,
- 1 AS `price`,
- 1 AS `rate`,
- 1 AS `created`,
- 1 AS `Id_Movimiento`*/;
+/*!50001 CREATE TABLE `order_row` (
+  `id` tinyint NOT NULL,
+  `order_id` tinyint NOT NULL,
+  `item_id` tinyint NOT NULL,
+  `warehouse_id` tinyint NOT NULL,
+  `shipment` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `price` tinyint NOT NULL,
+  `rate` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `Id_Movimiento` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -10951,7 +11705,7 @@ CREATE TABLE `shelfConfig` (
   `shelf` int(10) unsigned NOT NULL,
   `maxAmount` smallint(5) unsigned DEFAULT NULL,
   `showPacking` tinyint(4) NOT NULL,
-  `stack` tinyint(4) NOT NULL DEFAULT '0',
+  `stack` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `shelf_id` (`shelf`),
   KEY `family_id` (`family`),
@@ -11005,7 +11759,7 @@ CREATE TABLE `surveyAnswer` (
   `id` int(10) unsigned NOT NULL,
   `surveyFk` int(10) unsigned NOT NULL,
   `answer` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `votes` int(10) unsigned NOT NULL DEFAULT '0',
+  `votes` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `survey` (`surveyFk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -11043,7 +11797,7 @@ CREATE TABLE `tpvConfig` (
   `maxAmount` int(10) unsigned DEFAULT NULL,
   `employeeFk` int(10) NOT NULL,
   `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'The bank web service URL for production environment',
-  `testMode` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Whether test mode is enabled',
+  `testMode` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Whether test mode is enabled',
   `testUrl` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT 'The bank web service URL for test environment',
   `testKey` varchar(50) CHARACTER SET utf8 DEFAULT NULL COMMENT 'The bank secret key for test environment',
   `merchantUrl` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
@@ -11114,7 +11868,7 @@ DROP TABLE IF EXISTS `tpvMerchantEnable`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `tpvMerchantEnable` (
-  `merchantFk` int(10) unsigned NOT NULL DEFAULT '0',
+  `merchantFk` int(10) unsigned NOT NULL DEFAULT 0,
   `companyFk` smallint(6) unsigned NOT NULL,
   PRIMARY KEY (`merchantFk`,`companyFk`),
   UNIQUE KEY `company_id` (`companyFk`),
@@ -11152,7 +11906,7 @@ CREATE TABLE `tpvTransaction` (
   `response` smallint(5) unsigned DEFAULT NULL COMMENT 'Status notified by bank: NULL if no notification, 0 if success, error otherwise',
   `errorCode` char(7) COLLATE utf8_unicode_ci DEFAULT NULL,
   `status` enum('started','ok','ko') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'started',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `merchant_id` (`merchantFk`),
   KEY `receipt_id` (`receiptFk`),
@@ -11173,10 +11927,10 @@ DROP TABLE IF EXISTS `userSession`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `userSession` (
-  `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `lastUpdate` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created` datetime NOT NULL DEFAULT current_timestamp(),
+  `lastUpdate` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `ssid` char(64) COLLATE utf8_unicode_ci NOT NULL,
-  `data` text COLLATE utf8_unicode_ci,
+  `data` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `userVisitFk` int(10) unsigned DEFAULT NULL,
   UNIQUE KEY `ssid` (`ssid`),
   KEY `userVisit` (`userVisitFk`),
@@ -11210,7 +11964,7 @@ DROP TABLE IF EXISTS `visitAccess`;
 CREATE TABLE `visitAccess` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `agentFk` int(10) unsigned NOT NULL,
-  `stamp` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `stamp` datetime NOT NULL DEFAULT current_timestamp(),
   `ip` int(10) unsigned DEFAULT NULL,
   `referer` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -11256,7 +12010,7 @@ CREATE TABLE `visitUser` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `accessFk` int(10) unsigned NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
-  `stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `stamp` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `access_id` (`accessFk`),
   KEY `date_time` (`stamp`),
@@ -11843,30 +12597,30 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `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
- * type at specified date.
- *
- * @param vWh The warehouse id
- * @param vDate The visible date
- * @param vType The type id
- * @param vPrefix The article prefix to filter or %NULL for all
- * @param vUseIds Whether to order the result by item id
- * @select List of visible items with it's box sizes
- */
-	CALL item_getVisible(vWh, vDate, vType, vPrefix);
-
-	IF vUseIds
-	THEN
-		SELECT * FROM tmp.itemVisible
-			ORDER BY Id_Article;
-	ELSE
-		SELECT * FROM tmp.itemVisible
-			ORDER BY Article, packing;
-	END IF;
-
-	DROP TEMPORARY TABLE tmp.itemVisible;
+BEGIN
+/**
+ * Lists visible items and it's box sizes of the specified
+ * type at specified date.
+ *
+ * @param vWh The warehouse id
+ * @param vDate The visible date
+ * @param vType The type id
+ * @param vPrefix The article prefix to filter or %NULL for all
+ * @param vUseIds Whether to order the result by item id
+ * @select List of visible items with it's box sizes
+ */
+	CALL item_getVisible(vWh, vDate, vType, vPrefix);
+
+	IF vUseIds
+	THEN
+		SELECT * FROM tmp.itemVisible
+			ORDER BY Id_Article;
+	ELSE
+		SELECT * FROM tmp.itemVisible
+			ORDER BY Article, packing;
+	END IF;
+
+	DROP TEMPORARY TABLE tmp.itemVisible;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -12013,82 +12767,82 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_configure`(
-	vDelivery DATE,
-    vDeliveryMethod VARCHAR(45),
-    vAgency INT,
+CREATE DEFINER=`root`@`%` PROCEDURE `myBasket_configure`(
+	vDelivery DATE,
+    vDeliveryMethod VARCHAR(45),
+    vAgency INT,
     vAddress INT)
-BEGIN
-/**
- * Configura la cesta de la compra utilizando los parámetros 
- * pasados. Si los parámetros no son válidos devuelve un error.
- *
- * @param vDelivery Fecha de recogida
- * @param vAgency Id de la agencia
- * @param vAddress Id de dirección de envío, @NULL si es recogida
- */
-	DECLARE vSelf INT;
-    DECLARE vCompany INT;
-	DECLARE vDeliveryMethodId INT;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
-	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	START TRANSACTION;
-
-	SELECT id INTO vDeliveryMethodId
-		FROM vn.deliveryMethod
-			WHERE code = vDeliveryMethod;
-
-	IF vDeliveryMethod = 'PICKUP' AND vAddress IS NULL
-	THEN
-		SELECT defaultAddressFk INTO vAddress
-			FROM myClient;
-	END IF;
-        
-	SET vSelf = myBasket_getId();
-
-	IF vSelf IS NULL
-	THEN
-	
-		SELECT defaultCompanyFk INTO vCompany
-			FROM orderConfig;
-
-		INSERT INTO `order`
-			SET
-				customer_id = account.userGetId(),
-				date_send = vDelivery,
-				delivery_method_id = vDeliveryMethodId,
-				agency_id = vAgency,
-				address_id = vAddress,
-                source_app = 'WEB',
-                company_id = vCompany;
-
-		SET vSelf = LAST_INSERT_ID();
-        
-        INSERT INTO basketOrder SET
-			clientFk = account.userGetId(),
-            orderFk = vSelf;
-	ELSE
-		UPDATE `order`
-			SET
-				date_send = vDelivery,
-				delivery_method_id = vDeliveryMethodId,
-				agency_id = vAgency,
-				address_id = vAddress
-			WHERE
-				id = vSelf;
-                
-		CALL order_update(vSelf);
-	END IF;
-
-	CALL order_checkConfig(vSelf);
-
-	COMMIT;
+BEGIN
+/**
+ * Configura la cesta de la compra utilizando los parámetros 
+ * pasados. Si los parámetros no son válidos devuelve un error.
+ *
+ * @param vDelivery Fecha de recogida
+ * @param vAgency Id de la agencia
+ * @param vAddress Id de dirección de envío, @NULL si es recogida
+ */
+	DECLARE vSelf INT;
+    DECLARE vCompany INT;
+	DECLARE vDeliveryMethodId INT;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
+	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	START TRANSACTION;
+
+	SELECT id INTO vDeliveryMethodId
+		FROM vn.deliveryMethod
+			WHERE code = vDeliveryMethod;
+
+	IF vDeliveryMethod = 'PICKUP' AND vAddress IS NULL
+	THEN
+		SELECT defaultAddressFk INTO vAddress
+			FROM myClient;
+	END IF;
+        
+	SET vSelf = myBasket_getId();
+
+	IF vSelf IS NULL
+	THEN
+	
+		SELECT defaultCompanyFk INTO vCompany
+			FROM orderConfig;
+
+		INSERT INTO `order`
+			SET
+				customer_id = account.userGetId(),
+				date_send = vDelivery,
+				delivery_method_id = vDeliveryMethodId,
+				agency_id = vAgency,
+				address_id = vAddress,
+                source_app = 'WEB',
+                company_id = vCompany;
+
+		SET vSelf = LAST_INSERT_ID();
+        
+        INSERT INTO basketOrder SET
+			clientFk = account.userGetId(),
+            orderFk = vSelf;
+	ELSE
+		UPDATE `order`
+			SET
+				date_send = vDelivery,
+				delivery_method_id = vDeliveryMethodId,
+				agency_id = vAgency,
+				address_id = vAddress
+			WHERE
+				id = vSelf;
+                
+		CALL order_update(vSelf);
+	END IF;
+
+	CALL order_checkConfig(vSelf);
+
+	COMMIT;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -12313,62 +13067,62 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_newWithAddress`(
-	OUT vSelf INT,
-    vLandingDate DATE,
+CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_newWithAddress`(
+	OUT vSelf INT,
+    vLandingDate DATE,
     vAddressFk INT)
-BEGIN
-/**
- * Crea una nueva orden para el usuario actual especificando
- * una fecha de entrega.
- *
- * @param vSelf Id de la nueva orden
- * @param vLandingDate Fecha de entrega
- */
-	DECLARE vCompany INT;
-	DECLARE vDeliveryMethodId INT;
-	DECLARE vAgencyMode INT;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
-	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
-	BEGIN
-		ROLLBACK;
-		SET vSelf = NULL;
-		RESIGNAL;
-	END;
-
-	START TRANSACTION;
-
-	SELECT a.agencyModeFk, a.id 
-			INTO vAgencyMode, vAddressFk
-		FROM vn.address a 
-		WHERE a.id = vAddressFk;
-				
-	SELECT deliveryMethodFk INTO vDeliveryMethodId
-		FROM vn.agencyMode am
-		WHERE am.id = vAgencyMode;
-		
-	IF vCompany IS NULL
-	THEN
-		SELECT defaultCompanyFk INTO vCompany
-			FROM orderConfig;
-	END IF;
-
-	INSERT INTO `order`
-		SET
-			customer_id = account.userGetId(),
-			date_send = vLandingDate,
-			delivery_method_id = vDeliveryMethodId,
-			agency_id = vAgencyMode,
-			address_id = vAddressFk,
-			source_app = 'WEB',
-			company_id = vCompany;
-
-	SET vSelf = LAST_INSERT_ID();
-	 
-	CALL order_checkConfig(vSelf);
-
-	COMMIT;
+BEGIN
+/**
+ * Crea una nueva orden para el usuario actual especificando
+ * una fecha de entrega.
+ *
+ * @param vSelf Id de la nueva orden
+ * @param vLandingDate Fecha de entrega
+ */
+	DECLARE vCompany INT;
+	DECLARE vDeliveryMethodId INT;
+	DECLARE vAgencyMode INT;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
+	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+	BEGIN
+		ROLLBACK;
+		SET vSelf = NULL;
+		RESIGNAL;
+	END;
+
+	START TRANSACTION;
+
+	SELECT a.agencyModeFk, a.id 
+			INTO vAgencyMode, vAddressFk
+		FROM vn.address a 
+		WHERE a.id = vAddressFk;
+				
+	SELECT deliveryMethodFk INTO vDeliveryMethodId
+		FROM vn.agencyMode am
+		WHERE am.id = vAgencyMode;
+		
+	IF vCompany IS NULL
+	THEN
+		SELECT defaultCompanyFk INTO vCompany
+			FROM orderConfig;
+	END IF;
+
+	INSERT INTO `order`
+		SET
+			customer_id = account.userGetId(),
+			date_send = vLandingDate,
+			delivery_method_id = vDeliveryMethodId,
+			agency_id = vAgencyMode,
+			address_id = vAddressFk,
+			source_app = 'WEB',
+			company_id = vCompany;
+
+	SET vSelf = LAST_INSERT_ID();
+	 
+	CALL order_checkConfig(vSelf);
+
+	COMMIT;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -12385,62 +13139,62 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_newWithDate`(
-	OUT vSelf INT,
+CREATE DEFINER=`root`@`%` PROCEDURE `myOrder_newWithDate`(
+	OUT vSelf INT,
     vLandingDate DATE)
-BEGIN
-/**
- * Crea una nueva orden para el usuario actual especificando
- * una fecha de entrega.
- *
- * @param vSelf Id de la nueva orden
- * @param vLandingDate Fecha de entrega
- */
-	DECLARE vCompany INT;
-	DECLARE vDeliveryMethodId INT;
-	DECLARE vAgencyMode INT;
-	DECLARE vAddress INT;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
-	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
-	BEGIN
-		ROLLBACK;
-		SET vSelf = NULL;
-		RESIGNAL;
-	END;
-
-	START TRANSACTION;
-
-	SELECT a.agencyModeFk, a.id 
-			INTO vAgencyMode, vAddress
-		FROM myClient c
-			JOIN vn.address a ON a.id = c.defaultAddressFk;
-				
-	SELECT deliveryMethodFk INTO vDeliveryMethodId
-		FROM vn.agencyMode am
-		WHERE am.id = vAgencyMode;
-		
-	IF vCompany IS NULL
-	THEN
-		SELECT defaultCompanyFk INTO vCompany
-			FROM orderConfig;
-	END IF;
-
-	INSERT INTO `order`
-		SET
-			customer_id = account.userGetId(),
-			date_send = vLandingDate,
-			delivery_method_id = vDeliveryMethodId,
-			agency_id = vAgencyMode,
-			address_id = vAddress,
-			source_app = 'WEB',
-			company_id = vCompany;
-
-	SET vSelf = LAST_INSERT_ID();
-	 
-	CALL order_checkConfig(vSelf);
-
-	COMMIT;
+BEGIN
+/**
+ * Crea una nueva orden para el usuario actual especificando
+ * una fecha de entrega.
+ *
+ * @param vSelf Id de la nueva orden
+ * @param vLandingDate Fecha de entrega
+ */
+	DECLARE vCompany INT;
+	DECLARE vDeliveryMethodId INT;
+	DECLARE vAgencyMode INT;
+	DECLARE vAddress INT;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vSelf = NULL;
+	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+	BEGIN
+		ROLLBACK;
+		SET vSelf = NULL;
+		RESIGNAL;
+	END;
+
+	START TRANSACTION;
+
+	SELECT a.agencyModeFk, a.id 
+			INTO vAgencyMode, vAddress
+		FROM myClient c
+			JOIN vn.address a ON a.id = c.defaultAddressFk;
+				
+	SELECT deliveryMethodFk INTO vDeliveryMethodId
+		FROM vn.agencyMode am
+		WHERE am.id = vAgencyMode;
+		
+	IF vCompany IS NULL
+	THEN
+		SELECT defaultCompanyFk INTO vCompany
+			FROM orderConfig;
+	END IF;
+
+	INSERT INTO `order`
+		SET
+			customer_id = account.userGetId(),
+			date_send = vLandingDate,
+			delivery_method_id = vDeliveryMethodId,
+			agency_id = vAgencyMode,
+			address_id = vAddress,
+			source_app = 'WEB',
+			company_id = vCompany;
+
+	SET vSelf = LAST_INSERT_ID();
+	 
+	CALL order_checkConfig(vSelf);
+
+	COMMIT;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -13127,14 +13881,333 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `order_confirmWithUser`(IN `vOrder` INT, IN `vUserId` INT)
 BEGIN
+
+/**
+ * Confirms an order, creating each of its tickets on the corresponding
+ * date, store and user.
+ *
+ * @param vOrder The order identifier
+ * @param vUser The user identifier
+ */
+	DECLARE vOk BOOL;
+	DECLARE vDone BOOL DEFAULT FALSE;
+	DECLARE vWarehouse INT;
+	DECLARE vShipment DATE;
+	DECLARE vTicket INT;
+	DECLARE vNotes VARCHAR(255);
+	DECLARE vItem INT;
+	DECLARE vConcept VARCHAR(30);
+	DECLARE vAmount INT;
+	DECLARE vPrice DECIMAL(10,2);
+	DECLARE vSale INT;
+	DECLARE vRate INT;
+	DECLARE vRowId INT;
+	DECLARE vDelivery DATE;
+	DECLARE vAddress INT;
+	DECLARE vIsConfirmed BOOL;
+	DECLARE vClientId INT;
+	DECLARE vCompanyId INT;
+	DECLARE vAgencyModeId INT;
+	DECLARE TICKET_FREE INT DEFAULT 2;
+    DECLARE vIsFloramondoWarehouse BOOL;
+    DECLARE vCalc INT;
+
+	DECLARE cDates CURSOR FOR
+		SELECT zgs.shipped, r.warehouse_id
+			FROM `order` o
+				JOIN order_row r ON r.order_id = o.id
+				LEFT JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = r.warehouse_id
+			WHERE o.id = vOrder AND r.amount != 0
+			GROUP BY r.warehouse_id;
+
+	DECLARE cRows CURSOR FOR 
+		SELECT r.id, r.item_id, i.name, r.amount, r.price, r.rate
+			FROM order_row r
+				JOIN vn.item i ON i.id = r.item_id
+			WHERE r.amount != 0
+				AND r.warehouse_id = vWarehouse
+				AND r.order_id = vOrder
+			ORDER BY r.rate DESC;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET vDone = TRUE;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	-- Carga los datos del pedido
+
+	SELECT o.date_send, o.address_id, o.note,
+			o.confirmed, a.clientFk, o.company_id, o.agency_id
+		INTO vDelivery, vAddress, vNotes, 
+			vIsConfirmed, vClientId, vCompanyId, vAgencyModeId
+		FROM hedera.`order` o
+			JOIN vn.address a ON a.id = o.address_id
+		WHERE o.id = vOrder;
+			
+	-- Comprueba que el pedido no está confirmado
+
+	IF vIsConfirmed THEN
+		CALL util.throw ('ORDER_ALREADY_CONFIRMED');
+	END IF;
+
+	-- Comprueba que el pedido no está vacío
+
+	SELECT COUNT(*) > 0 INTO vOk
+		FROM order_row WHERE order_id = vOrder AND amount > 0;
+
+	IF NOT vOk THEN
+		CALL util.throw ('ORDER_EMPTY');
+	END IF;
+
+	-- Carga las fechas de salida de cada almacén
+
+	CALL vn.zone_getShipped (vDelivery, vAddress, vAgencyModeId, FALSE);
+
+	-- Trabajador que realiza la acción
+
+	IF vUserId IS NULL THEN
+		SELECT employeeFk INTO vUserId FROM orderConfig;
+	END IF;
+
+	-- Crea los tickets del pedido
+
+	START TRANSACTION;
+
+	OPEN cDates;
+
+	lDates:
+	LOOP
+		SET vTicket = NULL;
+		SET vDone = FALSE;
+		FETCH cDates INTO vShipment, vWarehouse;
+		
+		IF vDone THEN
+			LEAVE lDates;
+		END IF;
+
+		-- Busca un ticket existente que coincida con los parametros
+
+		SELECT t.id INTO vTicket
+			FROM vn.ticket t
+				LEFT JOIN vn.ticketState tls on tls.ticket = t.id
+				JOIN `order` o
+					ON o.address_id = t.addressFk
+						AND vWarehouse = t.warehouseFk
+						AND o.agency_id = t.agencyModeFk
+						AND o.date_send = t.landed 
+						AND vShipment = DATE(t.shipped)
+			WHERE o.id = vOrder
+				AND t.invoiceOutFk IS NULL
+				AND IFNULL(tls.alertLevel,0) = 0
+                AND t.clientFk <> 1118
+			LIMIT 1;
+		
+		-- Crea el ticket en el caso de no existir uno adecuado
+
+		IF vTicket IS NULL
+		THEN
+		
+			SET vShipment = IFNULL(vShipment, CURDATE());
+		
+			CALL vn.ticketCreateWithUser(
+				vClientId,
+				vShipment,
+				vWarehouse,
+				vCompanyId,
+				vAddress,
+				vAgencyModeId,
+				NULL,
+				vDelivery,
+				vUserId,
+				vTicket
+			);
+		ELSE
+			INSERT INTO vncontrol.inter
+				SET Id_Ticket = vTicket,
+					Id_Trabajador = vUserId,
+					state_id = TICKET_FREE;
+		END IF;
+		
+		INSERT IGNORE INTO vn.orderTicket
+			SET orderFk = vOrder,
+				ticketFk = vTicket;
+
+		-- Añade las notas
+
+		IF vNotes IS NOT NULL AND vNotes != ''
+		THEN
+			INSERT INTO vn.ticketObservation SET
+					ticketFk = vTicket,
+					observationTypeFk = 4 /* salesperson */ ,
+					`description` = vNotes
+				ON DUPLICATE KEY UPDATE
+					`description` = CONCAT(VALUES(`description`),'. ', `description`);
+		END IF;
+
+		-- Añade los movimientos y sus componentes
+
+		OPEN cRows;
+
+		lRows:
+		LOOP
+			SET vDone = FALSE;
+			FETCH cRows INTO vRowId, vItem, vConcept, vAmount, vPrice, vRate;
+
+			IF vDone THEN
+				LEAVE lRows;
+			END IF;
+			SET vSale = NULL;
+			SELECT s.id INTO vSale
+				FROM vn.sale s
+				WHERE ticketFk = vTicket
+					AND price = vPrice
+					AND itemFk = vItem
+                    AND discount = 0
+				LIMIT 1;
+			IF vSale THEN
+				UPDATE vn.sale
+					SET quantity = quantity + vAmount
+					WHERE id = vSale;
+			ELSE
+				INSERT INTO vn.sale 
+				SET
+					itemFk = vItem,
+					ticketFk = vTicket,
+					concept = vConcept,
+					quantity = vAmount,
+					price = vPrice,
+					priceFixed = FALSE,
+					isPriceFixed = TRUE;
+
+				SET vSale = LAST_INSERT_ID();
+
+				INSERT INTO vn.saleComponent
+					(saleFk, componentFk, `value`)
+					SELECT vSale, cm.component_id, cm.price
+						FROM order_component cm
+							JOIN vn.component c ON c.id = cm.component_id
+						WHERE cm.order_row_id = vRowId
+						GROUP BY vSale, cm.component_id;
+			END IF;
+			UPDATE order_row SET Id_Movimiento = vSale 
+				WHERE id = vRowId;
+		
+       		-- Inserta en putOrder si la compra es de Floramondo			
+			IF vn.isLogifloraDay(vShipment, vWarehouse) THEN
+     
+				CALL cache.availableNoRaids_refresh(vCalc,FALSE,vWarehouse,vShipment);
+		 
+				SET @available := 0;
+			
+				SELECT GREATEST(0,available) INTO @available
+					FROM cache.availableNoRaids
+					WHERE calc_id = vCalc
+						AND item_id = vItem;
+					
+				UPDATE cache.availableNoRaids 
+					SET available = GREATEST(0,available - vAmount)
+					WHERE item_id = vItem
+						AND calc_id = vCalc;
+			/*
+				CALL util.debugAdd('vShipment vWarehouse vOrder vClient vAmount vItem availableNoRaids', 
+					CONCAT(	vShipment,' ',
+							vWarehouse,' ',
+							vOrder,' ',
+							vClientId,' ',
+							vAmount,' ',
+							vItem, ' ',
+							@available));
+			*/		
+				INSERT INTO edi.putOrder (deliveryInformationID, 
+						supplyResponseId, 
+						quantity , 
+						EndUserPartyId, 
+						EndUserPartyGLN)
+					SELECT di.ID, 
+							i.supplyResponseFk, 
+							CEIL((vAmount - @available)/ sr.NumberOfItemsPerCask ), 
+							FALSE, 
+							vClientId
+						FROM edi.deliveryInformation di
+							JOIN vn.item i ON i.supplyResponseFk = di.supplyResponseID
+							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
+						WHERE i.id = vItem 
+							AND di.LatestOrderDateTime > NOW()
+							AND vAmount > @available
+						LIMIT 1;
+			  
+			END IF;
+        
+			-- Actualiza la caché
+			CALL cache.available_refresh(vCalc,FALSE,vWarehouse,vShipment);
+		 
+			UPDATE cache.available 
+				SET available = GREATEST(0,available - vAmount)
+				WHERE item_id = vItem
+					AND calc_id = vCalc;
+	
+		END LOOP;
+
+		
+		CLOSE cRows;
+
+		-- Fija el coste
+		DROP TEMPORARY TABLE IF EXISTS tComponents;
+		CREATE TEMPORARY TABLE tComponents
+			(INDEX (saleFk))
+			ENGINE = MEMORY
+			SELECT SUM(sc.`value`) valueSum, sc.saleFk
+				FROM vn.saleComponent sc
+					JOIN vn.component c ON c.id = sc.componentFk
+					JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.isBase
+					JOIN vn.sale s ON s.id = sc.saleFk
+				WHERE s.ticketFk = vTicket
+				GROUP BY sc.saleFk;
+
+		UPDATE vn.sale s
+			JOIN tComponents mc ON mc.saleFk = s.id
+			SET s.priceFixed = valueSum;
+
+		DROP TEMPORARY TABLE tComponents;
+	END LOOP;
+
+	CLOSE cDates;
+
+	DELETE FROM basketOrder WHERE orderFk = vOrder;
+	UPDATE `order` SET confirmed = TRUE, confirm_date = NOW() 
+		WHERE id = vOrder;
+
+	COMMIT;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `order_confirmWithUser__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `order_confirmWithUser__`(IN `vOrder` INT, IN `vUserId` INT)
+BEGIN
 /**
  * Confirms an order, creating each of its tickets on the corresponding
  * date, store and user.
@@ -13403,277 +14476,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `order_confirmWithUser__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `order_confirmWithUser__`(IN `vOrder` INT, IN `vUserId` INT)
-BEGIN
-/**
- * Confirms an order, creating each of its tickets on the corresponding
- * date, store and user.
- *
- * @param vOrder The order identifier
- * @param vUser The user identifier
- */
-	DECLARE vOk BOOL;
-	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vWarehouse INT;
-	DECLARE vShipment DATETIME;
-	DECLARE vTicket INT;
-	DECLARE vNotes VARCHAR(255);
-	DECLARE vItem INT;
-	DECLARE vConcept VARCHAR(30);
-	DECLARE vAmount INT;
-	DECLARE vPrice DECIMAL(10,2);
-	DECLARE vSale INT;
-	DECLARE vRate INT;
-	DECLARE vRowId INT;
-	DECLARE vDelivery DATE;
-	DECLARE vAddress INT;
-	DECLARE vIsConfirmed BOOL;
-	DECLARE vClientId INT;
-	DECLARE vCompanyId INT;
-	DECLARE vAgencyModeId INT;
-	DECLARE TICKET_FREE INT DEFAULT 2;
-
-	DECLARE cDates CURSOR FOR
-		SELECT zgs.shipped, r.warehouse_id
-			FROM `order` o
-				JOIN order_row r ON r.order_id = o.id
-				LEFT JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = r.warehouse_id
-			WHERE o.id = vOrder AND r.amount != 0
-			GROUP BY r.warehouse_id;
-
-	DECLARE cRows CURSOR FOR 
-		SELECT r.id, r.item_id, i.name, r.amount, r.price, r.rate
-			FROM order_row r
-				JOIN vn.item i ON i.id = r.item_id
-			WHERE r.amount != 0
-				AND r.warehouse_id = vWarehouse
-				AND r.order_id = vOrder
-			ORDER BY r.rate DESC;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET vDone = TRUE;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	-- Carga los datos del pedido
-
-	SELECT o.date_send, o.address_id, o.note,
-			o.confirmed, a.clientFk, o.company_id, o.agency_id
-		INTO vDelivery, vAddress, vNotes, 
-			vIsConfirmed, vClientId, vCompanyId, vAgencyModeId
-		FROM hedera.`order` o
-			JOIN vn.address a ON a.id = o.address_id
-		WHERE o.id = vOrder;
-			
-	-- Comprueba que el pedido no está confirmado
-
-	IF vIsConfirmed THEN
-		CALL util.throw ('ORDER_ALREADY_CONFIRMED');
-	END IF;
-
-	-- Comprueba que el pedido no está vacío
-
-	SELECT COUNT(*) > 0 INTO vOk
-		FROM order_row WHERE order_id = vOrder AND amount > 0;
-
-	IF NOT vOk THEN
-		CALL util.throw ('ORDER_EMPTY');
-	END IF;
-
-	-- Carga las fechas de salida de cada almacén
-
-	CALL vn.zone_getShipped (vDelivery, vAddress, vAgencyModeId, FALSE);
-
-	-- Trabajador que realiza la acción
-
-	IF vUserId IS NULL THEN
-		SELECT employeeFk INTO vUserId FROM orderConfig;
-	END IF;
-
-	-- Crea los tickets del pedido
-
-	START TRANSACTION;
-
-	OPEN cDates;
-
-	lDates:
-	LOOP
-		SET vTicket = NULL;
-		SET vDone = FALSE;
-		FETCH cDates INTO vShipment, vWarehouse;
-		
-		IF vDone THEN
-			LEAVE lDates;
-		END IF;
-
-		-- Busca un ticket existente que coincida con los parametros
-
-		SELECT t.id INTO vTicket
-			FROM vn.ticket t
-				LEFT JOIN vn.ticketState tls on tls.ticket = t.id
-				JOIN `order` o
-					ON o.address_id = t.addressFk
-						AND vWarehouse = t.warehouseFk
-						AND o.agency_id = t.agencyModeFk
-						AND o.date_send = t.landed 
-						AND vShipment = DATE(t.shipped)
-			WHERE o.id = vOrder
-				AND t.invoiceOutFk IS NULL
-				AND IFNULL(tls.alertLevel,0) = 0
-                AND t.clientFk <> 1118
-			LIMIT 1;
-		
-		-- Crea el ticket en el caso de no existir uno adecuado
-
-		IF vTicket IS NULL
-		THEN
-			CALL vn.ticketCreateWithUser(
-				vClientId,
-				IFNULL(vShipment, CURDATE()),
-				vWarehouse,
-				vCompanyId,
-				vAddress,
-				vAgencyModeId,
-				NULL,
-				vDelivery,
-				vUserId,
-				vTicket
-			);
-		ELSE
-			INSERT INTO vncontrol.inter
-				SET Id_Ticket = vTicket,
-					Id_Trabajador = vUserId,
-					state_id = TICKET_FREE;
-		END IF;
-		
-		INSERT IGNORE INTO vn.orderTicket
-			SET orderFk = vOrder,
-				ticketFk = vTicket;
-
-		-- Añade las notas
-
-		IF vNotes IS NOT NULL AND vNotes != ''
-		THEN
-			INSERT INTO vn.ticketObservation SET
-					ticketFk = vTicket,
-					observationTypeFk = 4 /* salesperson */ ,
-					`description` = vNotes
-				ON DUPLICATE KEY UPDATE
-					`description` = CONCAT(VALUES(`description`),'. ', `description`);
-		END IF;
-
-		-- Añade los movimientos y sus componentes
-
-		OPEN cRows;
-
-		lRows:
-		LOOP
-			SET vDone = FALSE;
-			FETCH cRows INTO vRowId, vItem, vConcept, vAmount, vPrice, vRate;
-
-			IF vDone THEN
-				LEAVE lRows;
-			END IF;
-			SET vSale = NULL;
-			SELECT s.id INTO vSale
-				FROM vn.sale s
-				WHERE ticketFk = vTicket
-					AND price = vPrice
-					AND itemFk = vItem
-                    AND discount = 0
-				LIMIT 1;
-			IF vSale THEN
-				UPDATE vn.sale
-					SET quantity = quantity + vAmount
-					WHERE id = vSale;
-			ELSE
-				INSERT INTO vn.sale 
-				SET
-					itemFk = vItem,
-					ticketFk = vTicket,
-					concept = vConcept,
-					quantity = vAmount,
-					price = vPrice,
-					priceFixed = FALSE,
-					isPriceFixed = TRUE;
-
-				SET vSale = LAST_INSERT_ID();
-
-				INSERT INTO vn.saleComponent
-					(saleFk, componentFk, `value`)
-					SELECT vSale, cm.component_id, cm.price
-						FROM order_component cm
-							JOIN vn.component c ON c.id = cm.component_id
-						WHERE cm.order_row_id = vRowId
-						GROUP BY vSale, cm.component_id;
-			END IF;
-			UPDATE order_row SET Id_Movimiento = vSale 
-				WHERE id = vRowId;
-                
-			INSERT INTO edi.putOrder (deliveryInformationID, 
-					supplyResponseId, 
-					quantity, 
-                    EndUserPartyId, 
-                    EndUserPartyGLN)
-				SELECT di.ID, i.supplyResponseFk, vAmount / sr.NumberOfItemsPerCask, FALSE, vClientId
-					FROM edi.deliveryInformation di
-						JOIN vn.item i ON i.supplyResponseFk = di.supplyResponseID
-                        JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-                    WHERE i.id = vItem AND di.LatestDeliveryDateTime > NOW()
-						AND vAmount / sr.NumberOfItemsPerCask
-                    LIMIT 1;
-		END LOOP;
-
-		CLOSE cRows;
-
-		-- Fija el coste
-
-		DROP TEMPORARY TABLE IF EXISTS tComponents;
-		CREATE TEMPORARY TABLE tComponents
-			(INDEX (saleFk))
-			ENGINE = MEMORY
-			SELECT SUM(sc.`value`) valueSum, sc.saleFk
-				FROM vn.saleComponent sc
-					JOIN vn.component c ON c.id = sc.componentFk
-					JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.isBase
-					JOIN vn.sale s ON s.id = sc.saleFk
-				WHERE s.ticketFk = vTicket
-				GROUP BY sc.saleFk;
-
-		UPDATE vn.sale s
-			JOIN tComponents mc ON mc.saleFk = s.id
-			SET s.priceFixed = valueSum;
-
-		DROP TEMPORARY TABLE tComponents;
-	END LOOP;
-
-	CLOSE cDates;
-
-	DELETE FROM basketOrder WHERE orderFk = vOrder;
-	UPDATE `order` SET confirmed = TRUE, confirm_date = NOW() 
-		WHERE id = vOrder;
-
-	COMMIT;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `order_doRecalc` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -14612,8 +15414,8 @@ CREATE TABLE `labourTree` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `lft` int(11) NOT NULL,
   `rgt` int(11) NOT NULL,
-  `depth` int(11) NOT NULL DEFAULT '0',
-  `sons` int(11) NOT NULL DEFAULT '0',
+  `depth` int(11) NOT NULL DEFAULT 0,
+  `sons` int(11) NOT NULL DEFAULT 0,
   `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -15034,7 +15836,7 @@ DROP TABLE IF EXISTS `cdr`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `cdr` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `call_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `call_date` datetime NOT NULL DEFAULT current_timestamp(),
   `clid` varchar(80) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `src` varchar(80) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `dst` varchar(80) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
@@ -15043,10 +15845,10 @@ CREATE TABLE `cdr` (
   `dst_channel` varchar(80) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `last_app` varchar(80) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `last_data` varchar(80) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
-  `duration` int(11) NOT NULL DEFAULT '0',
-  `billsec` int(11) NOT NULL DEFAULT '0',
+  `duration` int(11) NOT NULL DEFAULT 0,
+  `billsec` int(11) NOT NULL DEFAULT 0,
   `disposition` varchar(45) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
-  `ama_flags` int(11) NOT NULL DEFAULT '0',
+  `ama_flags` int(11) NOT NULL DEFAULT 0,
   `account_code` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `unique_id` varchar(32) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `user_field` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
@@ -15068,23 +15870,24 @@ DROP TABLE IF EXISTS `cdrConf`;
 /*!50001 DROP VIEW IF EXISTS `cdrConf`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `cdrConf` AS SELECT 
- 1 AS `calldate`,
- 1 AS `clid`,
- 1 AS `src`,
- 1 AS `dst`,
- 1 AS `dcontext`,
- 1 AS `channel`,
- 1 AS `dstchannel`,
- 1 AS `lastapp`,
- 1 AS `lastdata`,
- 1 AS `duration`,
- 1 AS `billsec`,
- 1 AS `disposition`,
- 1 AS `amaflags`,
- 1 AS `accountcode`,
- 1 AS `uniqueid`,
- 1 AS `userfield`*/;
+/*!50001 CREATE TABLE `cdrConf` (
+  `calldate` tinyint NOT NULL,
+  `clid` tinyint NOT NULL,
+  `src` tinyint NOT NULL,
+  `dst` tinyint NOT NULL,
+  `dcontext` tinyint NOT NULL,
+  `channel` tinyint NOT NULL,
+  `dstchannel` tinyint NOT NULL,
+  `lastapp` tinyint NOT NULL,
+  `lastdata` tinyint NOT NULL,
+  `duration` tinyint NOT NULL,
+  `billsec` tinyint NOT NULL,
+  `disposition` tinyint NOT NULL,
+  `amaflags` tinyint NOT NULL,
+  `accountcode` tinyint NOT NULL,
+  `uniqueid` tinyint NOT NULL,
+  `userfield` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -15165,12 +15968,13 @@ DROP TABLE IF EXISTS `followmeConf`;
 /*!50001 DROP VIEW IF EXISTS `followmeConf`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `followmeConf` AS SELECT 
- 1 AS `name`,
- 1 AS `music`,
- 1 AS `context`,
- 1 AS `takecall`,
- 1 AS `declinecall`*/;
+/*!50001 CREATE TABLE `followmeConf` (
+  `name` tinyint NOT NULL,
+  `music` tinyint NOT NULL,
+  `context` tinyint NOT NULL,
+  `takecall` tinyint NOT NULL,
+  `declinecall` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -15199,11 +16003,12 @@ DROP TABLE IF EXISTS `followmeNumberConf`;
 /*!50001 DROP VIEW IF EXISTS `followmeNumberConf`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `followmeNumberConf` AS SELECT 
- 1 AS `name`,
- 1 AS `ordinal`,
- 1 AS `phonenumber`,
- 1 AS `timeout`*/;
+/*!50001 CREATE TABLE `followmeNumberConf` (
+  `name` tinyint NOT NULL,
+  `ordinal` tinyint NOT NULL,
+  `phonenumber` tinyint NOT NULL,
+  `timeout` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -15274,14 +16079,15 @@ DROP TABLE IF EXISTS `queueConf`;
 /*!50001 DROP VIEW IF EXISTS `queueConf`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `queueConf` AS SELECT 
- 1 AS `name`,
- 1 AS `strategy`,
- 1 AS `timeout`,
- 1 AS `retry`,
- 1 AS `weight`,
- 1 AS `maxlen`,
- 1 AS `ringinuse`*/;
+/*!50001 CREATE TABLE `queueConf` (
+  `name` tinyint NOT NULL,
+  `strategy` tinyint NOT NULL,
+  `timeout` tinyint NOT NULL,
+  `retry` tinyint NOT NULL,
+  `weight` tinyint NOT NULL,
+  `maxlen` tinyint NOT NULL,
+  `ringinuse` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -15330,11 +16136,12 @@ DROP TABLE IF EXISTS `queueMemberConf`;
 /*!50001 DROP VIEW IF EXISTS `queueMemberConf`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `queueMemberConf` AS SELECT 
- 1 AS `uniqueid`,
- 1 AS `queue_name`,
- 1 AS `interface`,
- 1 AS `paused`*/;
+/*!50001 CREATE TABLE `queueMemberConf` (
+  `uniqueid` tinyint NOT NULL,
+  `queue_name` tinyint NOT NULL,
+  `interface` tinyint NOT NULL,
+  `paused` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -15421,7 +16228,7 @@ DROP TABLE IF EXISTS `sip`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `sip` (
-  `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'The user id',
+  `user_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT 'The user id',
   `extension` varchar(128) CHARACTER SET utf8 NOT NULL COMMENT 'The softphone extension',
   `md5Secret` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'MD5 hash of extension and password',
   `secret` varchar(80) CHARACTER SET utf8 DEFAULT NULL COMMENT 'Deprecated',
@@ -15530,31 +16337,32 @@ DROP TABLE IF EXISTS `sipConf`;
 /*!50001 DROP VIEW IF EXISTS `sipConf`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `sipConf` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `callbackextension`,
- 1 AS `md5secret`,
- 1 AS `callerid`,
- 1 AS `host`,
- 1 AS `deny`,
- 1 AS `permit`,
- 1 AS `type`,
- 1 AS `context`,
- 1 AS `incominglimit`,
- 1 AS `pickupgroup`,
- 1 AS `careinvite`,
- 1 AS `insecure`,
- 1 AS `transport`,
- 1 AS `nat`,
- 1 AS `ipaddr`,
- 1 AS `regseconds`,
- 1 AS `port`,
- 1 AS `defaultuser`,
- 1 AS `useragent`,
- 1 AS `lastms`,
- 1 AS `fullcontact`,
- 1 AS `regserver`*/;
+/*!50001 CREATE TABLE `sipConf` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `callbackextension` tinyint NOT NULL,
+  `md5secret` tinyint NOT NULL,
+  `callerid` tinyint NOT NULL,
+  `host` tinyint NOT NULL,
+  `deny` tinyint NOT NULL,
+  `permit` tinyint NOT NULL,
+  `type` tinyint NOT NULL,
+  `context` tinyint NOT NULL,
+  `incominglimit` tinyint NOT NULL,
+  `pickupgroup` tinyint NOT NULL,
+  `careinvite` tinyint NOT NULL,
+  `insecure` tinyint NOT NULL,
+  `transport` tinyint NOT NULL,
+  `nat` tinyint NOT NULL,
+  `ipaddr` tinyint NOT NULL,
+  `regseconds` tinyint NOT NULL,
+  `port` tinyint NOT NULL,
+  `defaultuser` tinyint NOT NULL,
+  `useragent` tinyint NOT NULL,
+  `lastms` tinyint NOT NULL,
+  `fullcontact` tinyint NOT NULL,
+  `regserver` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -15876,22 +16684,21 @@ CREATE TABLE `bank_account` (
   `account` char(50) DEFAULT NULL,
   `bic` char(20) DEFAULT NULL,
   `bank_account_type_id` int(11) DEFAULT NULL,
-  `nation_id` int(11) DEFAULT NULL,
+  `nation_id` mediumint(8) unsigned DEFAULT NULL,
   `sortcode` char(50) DEFAULT NULL,
   `bank_name` char(30) DEFAULT NULL,
   `bank_adress` char(125) DEFAULT NULL,
   `bank_city` char(50) DEFAULT NULL,
   `bank_account_link_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`bank_account_id`),
-  KEY `fki_bank_account_client_pk` (`client_id`),
   KEY `fki_bank_profile` (`client_id`),
   KEY `fki_business_account_fk` (`client_id`),
   KEY `fki_person_account_fk` (`client_id`),
-  KEY `bank_account_bank_account_type_id_fkey` (`bank_account_type_id`),
-  KEY `bank_account_nation_id_fkey` (`nation_id`),
-  CONSTRAINT `bank_account_bank_account_type_id_fkey` FOREIGN KEY (`bank_account_type_id`) REFERENCES `bank_account_type` (`bank_account_type_id`) ON UPDATE CASCADE,
-  CONSTRAINT `bank_account_nation_id_fkey` FOREIGN KEY (`nation_id`) REFERENCES `nation__` (`nation_id`) ON UPDATE CASCADE,
-  CONSTRAINT `bank_profile` FOREIGN KEY (`client_id`) REFERENCES `profile` (`profile_id`) ON UPDATE CASCADE
+  KEY `bank_account_bank_account_type` (`bank_account_type_id`),
+  KEY `bank_account_nation_id` (`nation_id`),
+  CONSTRAINT `bank_account_bank_account_type` FOREIGN KEY (`bank_account_type_id`) REFERENCES `bank_account_type` (`bank_account_type_id`) ON UPDATE CASCADE,
+  CONSTRAINT `bank_account_client_id` FOREIGN KEY (`client_id`) REFERENCES `profile` (`profile_id`) ON UPDATE CASCADE,
+  CONSTRAINT `bank_account_nation_id` FOREIGN KEY (`nation_id`) REFERENCES `vn`.`country` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -15940,7 +16747,7 @@ CREATE TABLE `business` (
   `provider_id` int(11) DEFAULT NULL,
   `date_start` date DEFAULT NULL,
   `date_end` date DEFAULT NULL,
-  `workerBusiness` longtext,
+  `workerBusiness` longtext DEFAULT NULL,
   `reasonEndFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`business_id`),
   KEY `business_client` (`client_id`),
@@ -15959,12 +16766,12 @@ DROP TABLE IF EXISTS `business_labour`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `business_labour` (
   `business_id` int(11) NOT NULL,
-  `notes` longtext,
-  `department_id` int(11) DEFAULT '2',
-  `professional_category_id` int(11) DEFAULT '0',
-  `incentivo` double DEFAULT '0',
-  `calendar_labour_type_id` int(11) DEFAULT '1',
-  `porhoras` smallint(6) NOT NULL DEFAULT '0',
+  `notes` longtext DEFAULT NULL,
+  `department_id` int(11) DEFAULT 2,
+  `professional_category_id` int(11) DEFAULT 0,
+  `incentivo` double DEFAULT 0,
+  `calendar_labour_type_id` int(11) DEFAULT 1,
+  `porhoras` smallint(6) NOT NULL DEFAULT 0,
   `labour_agreement_id` int(11) DEFAULT NULL,
   `workcenter_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`business_id`),
@@ -15992,7 +16799,7 @@ CREATE TABLE `business_labour_payroll` (
   `cod_tarifa` int(11) DEFAULT NULL,
   `cod_categoria` int(11) DEFAULT NULL,
   `cod_contrato` int(11) DEFAULT NULL,
-  `importepactado` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `importepactado` decimal(10,2) NOT NULL DEFAULT 0.00,
   PRIMARY KEY (`business_id`),
   KEY `business_labour_payroll_cod_categoria_idx` (`cod_categoria`),
   KEY `business_labour_payroll_cod_contrato` (`cod_contrato`),
@@ -16010,11 +16817,12 @@ DROP TABLE IF EXISTS `calendar_employee`;
 /*!50001 DROP VIEW IF EXISTS `calendar_employee`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `calendar_employee` AS SELECT 
- 1 AS `id`,
- 1 AS `business_id`,
- 1 AS `calendar_state_id`,
- 1 AS `date`*/;
+/*!50001 CREATE TABLE `calendar_employee` (
+  `id` tinyint NOT NULL,
+  `business_id` tinyint NOT NULL,
+  `calendar_state_id` tinyint NOT NULL,
+  `date` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -16067,7 +16875,7 @@ DROP TABLE IF EXISTS `calendar_labour_legend__`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `calendar_labour_legend__` (
   `calendar_labour_legend_id` int(11) NOT NULL AUTO_INCREMENT,
-  `descripcion` longtext,
+  `descripcion` longtext DEFAULT NULL,
   PRIMARY KEY (`calendar_labour_legend_id`),
   UNIQUE KEY `calendar_labour_legend_calendar_labour_legend_id_key` (`calendar_labour_legend_id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8;
@@ -16085,7 +16893,7 @@ CREATE TABLE `calendar_labour_type` (
   `descripcion` varchar(50) DEFAULT NULL,
   `pausa_remunerada` time DEFAULT NULL,
   `hours_week` smallint(6) DEFAULT NULL,
-  `isPartial` tinyint(1) NOT NULL DEFAULT '0',
+  `isPartial` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`calendar_labour_type_id`),
   UNIQUE KEY `hours_labour_hours_labour_id_key` (`calendar_labour_type_id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8;
@@ -16102,13 +16910,13 @@ CREATE TABLE `calendar_state` (
   `calendar_state_id` int(11) NOT NULL AUTO_INCREMENT,
   `type` varchar(30) NOT NULL,
   `rgb` varchar(7) NOT NULL,
-  `color` bigint(20) DEFAULT '0',
+  `color` bigint(20) DEFAULT 0,
   `permissionRate` decimal(3,2) DEFAULT NULL,
   `code` varchar(45) DEFAULT NULL,
-  `isAllowedToWork` tinyint(4) NOT NULL DEFAULT '0',
-  `isPrintable` tinyint(1) NOT NULL DEFAULT '0',
+  `isAllowedToWork` tinyint(4) NOT NULL DEFAULT 0,
+  `isPrintable` tinyint(1) NOT NULL DEFAULT 0,
   `discountRate` decimal(3,2) DEFAULT NULL,
-  `holidayEntitlementRate` decimal(3,2) DEFAULT '1.00',
+  `holidayEntitlementRate` decimal(3,2) DEFAULT 1.00,
   PRIMARY KEY (`calendar_state_id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -16152,11 +16960,11 @@ DROP TABLE IF EXISTS `income_employee`;
 CREATE TABLE `income_employee` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `debe` decimal(10,2) DEFAULT NULL,
-  `haber` decimal(10,2) DEFAULT '0.00',
+  `haber` decimal(10,2) DEFAULT 0.00,
   `id_incomeType` int(11) DEFAULT NULL,
   `odbc_date` date DEFAULT NULL,
   `person_id` int(11) DEFAULT NULL,
-  `concepto` longtext,
+  `concepto` longtext DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fincometype_id` (`id_incomeType`),
   KEY `fperson_id` (`person_id`),
@@ -16175,8 +16983,8 @@ DROP TABLE IF EXISTS `incometype_employee`;
 CREATE TABLE `incometype_employee` (
   `id_incometype` int(11) NOT NULL,
   `descripcion` varchar(255) DEFAULT NULL,
-  `nomina` smallint(6) DEFAULT '0',
-  `isExtraSalarial` tinyint(4) NOT NULL DEFAULT '0',
+  `nomina` smallint(6) DEFAULT 0,
+  `isExtraSalarial` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id_incometype`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -16190,7 +16998,7 @@ DROP TABLE IF EXISTS `journey`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `journey` (
   `journey_id` int(11) NOT NULL AUTO_INCREMENT,
-  `day_id` smallint(6) NOT NULL DEFAULT '1' COMMENT 'Lunes = 1 \nDomingo = 7',
+  `day_id` smallint(6) NOT NULL DEFAULT 1 COMMENT 'Lunes = 1 \nDomingo = 7',
   `start` time DEFAULT NULL,
   `end` time DEFAULT NULL,
   `business_id` int(11) NOT NULL,
@@ -16260,10 +17068,10 @@ DROP TABLE IF EXISTS `nation__`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `nation__` (
   `nation_id` int(11) NOT NULL AUTO_INCREMENT,
-  `currency_id` int(11) NOT NULL DEFAULT '1',
+  `currency_id` int(11) NOT NULL DEFAULT 1,
   `name` varchar(20) NOT NULL,
   `brief` char(3) NOT NULL,
-  `flag` longblob,
+  `flag` longblob DEFAULT NULL,
   PRIMARY KEY (`nation_id`),
   UNIQUE KEY `nation_name_key` (`name`),
   KEY `nation_currency_id_idx` (`currency_id`),
@@ -16299,12 +17107,12 @@ CREATE TABLE `person` (
   `nif` varchar(15) DEFAULT NULL,
   `birth` date DEFAULT NULL,
   `firstname` varchar(20) DEFAULT NULL,
-  `p2` longtext,
+  `p2` longtext DEFAULT NULL,
   `nis` int(11) DEFAULT NULL,
   `id_trabajador` int(11) DEFAULT NULL,
-  `isDisable` smallint(6) NOT NULL DEFAULT '0',
-  `isFreelance` smallint(6) NOT NULL DEFAULT '0' COMMENT 'M Male\nF Female',
-  `isSsDiscounted` smallint(6) NOT NULL DEFAULT '0',
+  `isDisable` smallint(6) NOT NULL DEFAULT 0,
+  `isFreelance` smallint(6) NOT NULL DEFAULT 0 COMMENT 'M Male\nF Female',
+  `isSsDiscounted` smallint(6) NOT NULL DEFAULT 0,
   `sex` enum('M','F') NOT NULL DEFAULT 'F' COMMENT 'M Masculino  F Femenino',
   PRIMARY KEY (`person_id`),
   UNIQUE KEY `person_nis` (`person_id`),
@@ -16328,7 +17136,7 @@ CREATE TABLE `professional_category` (
   `professional_category_id` int(11) NOT NULL AUTO_INCREMENT,
   `category_name` varchar(50) NOT NULL,
   `professional_levels_id` int(11) DEFAULT NULL,
-  `fichajes` tinyint(4) NOT NULL DEFAULT '1',
+  `fichajes` tinyint(4) NOT NULL DEFAULT 1,
   `holiday_days` decimal(3,1) DEFAULT NULL,
   `dayBreak` int(11) DEFAULT NULL,
   PRIMARY KEY (`professional_category_id`),
@@ -16361,7 +17169,7 @@ DROP TABLE IF EXISTS `profile`;
 CREATE TABLE `profile` (
   `profile_id` int(11) NOT NULL AUTO_INCREMENT,
   `person_id` int(11) NOT NULL,
-  `profile_type_id` int(11) NOT NULL DEFAULT '1',
+  `profile_type_id` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`profile_id`),
   KEY `profile_person_id_idx` (`person_id`),
   KEY `profile_profile_type_id_idx` (`profile_type_id`),
@@ -16464,7 +17272,7 @@ DROP TABLE IF EXISTS `workcenter`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workcenter` (
   `workcenter_id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` longtext,
+  `name` longtext DEFAULT NULL,
   `center_id` int(11) DEFAULT NULL,
   `counter` bigint(20) DEFAULT NULL,
   `warehouseFk` smallint(6) DEFAULT NULL,
@@ -16501,7 +17309,7 @@ DROP TABLE IF EXISTS `workers20190711_FichadasAbril`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workers20190711_FichadasAbril` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `person_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
   `nif` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
   `Apellidos` varchar(60) CHARACTER SET utf8 NOT NULL,
   `Nombre` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
@@ -16509,7 +17317,7 @@ CREATE TABLE `workers20190711_FichadasAbril` (
   `Hora` int(2) DEFAULT NULL,
   `Minuto` int(2) DEFAULT NULL,
   `sumable` double DEFAULT NULL,
-  `jornada` decimal(5,2) NOT NULL DEFAULT '8.00',
+  `jornada` decimal(5,2) NOT NULL DEFAULT 8.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -16559,16 +17367,16 @@ DROP TABLE IF EXISTS `Naciones`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `Naciones` (
   `countryFk` mediumint(8) NOT NULL,
-  `CodigoNacion` smallint(6) NOT NULL DEFAULT '108',
-  `CodigoNacion347` smallint(6) NOT NULL DEFAULT '108',
+  `CodigoNacion` smallint(6) NOT NULL DEFAULT 108,
+  `CodigoNacion347` smallint(6) NOT NULL DEFAULT 108,
   `Nacion` varchar(25) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `SiglaNacion` varchar(2) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'ES',
   `TipoCodigo` varchar(1) CHARACTER SET utf8 NOT NULL DEFAULT 'A',
-  `Longitud1` tinyint(4) NOT NULL DEFAULT '0',
-  `Longitud2` tinyint(4) NOT NULL DEFAULT '0',
-  `Longitud3` tinyint(4) NOT NULL DEFAULT '0',
-  `Longitud4` tinyint(4) NOT NULL DEFAULT '0',
-  `NacionCEE` smallint(6) NOT NULL DEFAULT '0',
+  `Longitud1` tinyint(4) NOT NULL DEFAULT 0,
+  `Longitud2` tinyint(4) NOT NULL DEFAULT 0,
+  `Longitud3` tinyint(4) NOT NULL DEFAULT 0,
+  `Longitud4` tinyint(4) NOT NULL DEFAULT 0,
+  `NacionCEE` smallint(6) NOT NULL DEFAULT 0,
   `FechaCEE` datetime DEFAULT NULL,
   `NacionISO` varchar(3) CHARACTER SET utf8 NOT NULL DEFAULT '',
   PRIMARY KEY (`countryFk`,`CodigoNacion`)
@@ -16587,7 +17395,7 @@ CREATE TABLE `Provincias` (
   `CodigoProvincia` varchar(5) NOT NULL DEFAULT '',
   `CodigoMatricula` varchar(2) NOT NULL DEFAULT '',
   `Provincia` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
-  `RecargoProvincial` decimal(28,10) NOT NULL DEFAULT '0.0000000000',
+  `RecargoProvincial` decimal(28,10) NOT NULL DEFAULT 0.0000000000,
   PRIMARY KEY (`CodigoProvincia`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -16600,12 +17408,12 @@ DROP TABLE IF EXISTS `TiposIva`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `TiposIva` (
-  `CodigoIva` smallint(6) NOT NULL DEFAULT '0',
-  `CodigoTerritorio` smallint(6) NOT NULL DEFAULT '0',
+  `CodigoIva` smallint(6) NOT NULL DEFAULT 0,
+  `CodigoTerritorio` smallint(6) NOT NULL DEFAULT 0,
   `Iva` varchar(30) NOT NULL DEFAULT '',
-  `BaseCorrectora` decimal(28,10) NOT NULL DEFAULT '0.0000000000',
-  `PorcentajeIva` decimal(28,10) NOT NULL DEFAULT '0.0000000000',
-  `RecargoEquivalencia` decimal(28,10) NOT NULL DEFAULT '0.0000000000',
+  `BaseCorrectora` decimal(28,10) NOT NULL DEFAULT 0.0000000000,
+  `PorcentajeIva` decimal(28,10) NOT NULL DEFAULT 0.0000000000,
+  `RecargoEquivalencia` decimal(28,10) NOT NULL DEFAULT 0.0000000000,
   `CuentaIvaSoportado` varchar(15) NOT NULL DEFAULT '',
   `CuentaIvaRepercutido` varchar(15) NOT NULL DEFAULT '',
   `CuentaRecargo` varchar(15) NOT NULL DEFAULT '',
@@ -16624,8 +17432,8 @@ CREATE TABLE `TiposIva` (
   `CuentaIVARecCaja` varchar(15) NOT NULL DEFAULT '',
   `CuentaIVARecCajaPu` varchar(15) NOT NULL DEFAULT '',
   `CuentaIVARecCajaVen` varchar(15) NOT NULL DEFAULT '',
-  `IGICImplicito` smallint(6) NOT NULL DEFAULT '0',
-  `isIntracommunity` tinyint(2) NOT NULL DEFAULT '0',
+  `IGICImplicito` smallint(6) NOT NULL DEFAULT 0,
+  `isIntracommunity` tinyint(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`CodigoIva`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -16638,9 +17446,9 @@ DROP TABLE IF EXISTS `TiposRetencion`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `TiposRetencion` (
-  `CodigoRetencion` smallint(6) NOT NULL DEFAULT '0',
+  `CodigoRetencion` smallint(6) NOT NULL DEFAULT 0,
   `Retencion` varchar(50) NOT NULL DEFAULT '',
-  `PorcentajeRetencion` decimal(28,10) NOT NULL DEFAULT '0.0000000000',
+  `PorcentajeRetencion` decimal(28,10) NOT NULL DEFAULT 0.0000000000,
   `CuentaCargo` varchar(15) DEFAULT NULL,
   `CuentaAbono` varchar(15) DEFAULT NULL,
   `ClaveIrpf` varchar(2) DEFAULT NULL,
@@ -16659,10 +17467,10 @@ DROP TABLE IF EXISTS `TiposTransacciones`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `TiposTransacciones` (
-  `CodigoTransaccion` tinyint(4) NOT NULL DEFAULT '0',
+  `CodigoTransaccion` tinyint(4) NOT NULL DEFAULT 0,
   `Transaccion` varchar(50) NOT NULL DEFAULT '',
   `TipoFactura` varchar(1) NOT NULL DEFAULT '',
-  `Autofactura` smallint(6) NOT NULL DEFAULT '0',
+  `Autofactura` smallint(6) NOT NULL DEFAULT 0,
   `ClaveOperacionDefecto` varchar(1) NOT NULL DEFAULT '',
   PRIMARY KEY (`CodigoTransaccion`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -16684,7 +17492,7 @@ CREATE TABLE `XDiario_movConta_IVA` (
   `CuotaIva1` double DEFAULT NULL,
   `PorRecargoEquivalencia1` double DEFAULT NULL,
   `RecargoEquivalencia1` double DEFAULT NULL,
-  `CodigoTransaccion1` double NOT NULL DEFAULT '0',
+  `CodigoTransaccion1` double NOT NULL DEFAULT 0,
   `CodigoIva1` smallint(6) NOT NULL,
   `BaseIva2` double DEFAULT NULL,
   `PorBaseCorrectora2` double DEFAULT NULL,
@@ -16692,7 +17500,7 @@ CREATE TABLE `XDiario_movConta_IVA` (
   `CuotaIva2` double DEFAULT NULL,
   `PorRecargoEquivalencia2` double DEFAULT NULL,
   `RecargoEquivalencia2` double DEFAULT NULL,
-  `CodigoTransaccion2` double NOT NULL DEFAULT '0',
+  `CodigoTransaccion2` double NOT NULL DEFAULT 0,
   `CodigoIva2` smallint(6) NOT NULL,
   `BaseIva3` double DEFAULT NULL,
   `PorBaseCorrectora3` double DEFAULT NULL,
@@ -16700,7 +17508,7 @@ CREATE TABLE `XDiario_movConta_IVA` (
   `CuotaIva3` double DEFAULT NULL,
   `PorRecargoEquivalencia3` double DEFAULT NULL,
   `RecargoEquivalencia3` double DEFAULT NULL,
-  `CodigoTransaccion3` double NOT NULL DEFAULT '0',
+  `CodigoTransaccion3` double NOT NULL DEFAULT 0,
   `CodigoIva3` smallint(6) NOT NULL,
   `BaseIva4` double DEFAULT NULL,
   `PorBaseCorrectora4` double DEFAULT NULL,
@@ -16708,7 +17516,7 @@ CREATE TABLE `XDiario_movConta_IVA` (
   `CuotaIva4` double DEFAULT NULL,
   `PorRecargoEquivalencia4` double DEFAULT NULL,
   `RecargoEquivalencia4` double DEFAULT NULL,
-  `CodigoTransaccion4` double NOT NULL DEFAULT '0',
+  `CodigoTransaccion4` double NOT NULL DEFAULT 0,
   `CodigoIva4` smallint(6) NOT NULL,
   `Año` int(11) DEFAULT NULL,
   `Serie` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -16728,7 +17536,7 @@ CREATE TABLE `XDiario_movConta_IVA` (
   `EjercicioFactura` int(2) DEFAULT NULL,
   `FechaOperacion` date DEFAULT NULL,
   `Exclusion347` int(2) DEFAULT NULL,
-  `MantenerAsiento` int(2) DEFAULT '-1',
+  `MantenerAsiento` int(2) DEFAULT -1,
   `Metalico347` int(2) DEFAULT NULL,
   `ClaveOperacionFactura` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
   `TipoRectificativa` int(2) DEFAULT NULL,
@@ -16738,13 +17546,13 @@ CREATE TABLE `XDiario_movConta_IVA` (
   `ClaseAbonoRectificativas` int(2) DEFAULT NULL,
   `RecargoEquivalenciaOriginal` double DEFAULT NULL,
   `LibreA1` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `IvaDeducible1` int(2) NOT NULL DEFAULT '-1',
-  `IvaDeducible2` int(2) NOT NULL DEFAULT '-1',
-  `IvaDeducible3` int(2) NOT NULL DEFAULT '-1',
-  `IvaDeducible4` int(2) NOT NULL DEFAULT '-1',
+  `IvaDeducible1` int(2) NOT NULL DEFAULT -1,
+  `IvaDeducible2` int(2) NOT NULL DEFAULT -1,
+  `IvaDeducible3` int(2) NOT NULL DEFAULT -1,
+  `IvaDeducible4` int(2) NOT NULL DEFAULT -1,
   `FechaGrabacion` date DEFAULT NULL,
-  `Intracomunitaria` tinyint(1) DEFAULT '0',
-  `moveData` tinyint(1) DEFAULT '1',
+  `Intracomunitaria` tinyint(1) DEFAULT 0,
+  `moveData` tinyint(1) DEFAULT 1,
   PRIMARY KEY (`id`),
   CONSTRAINT `XDiario_movConta_IVA_fk1` FOREIGN KEY (`id`) REFERENCES `vn`.`XDiario` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Informa del valor de los campos de IVA para enlazar en la tabla vn.movConta';
@@ -16796,9 +17604,9 @@ CREATE TABLE `clientesProveedores` (
   `CodigoRetencion` smallint(6) NOT NULL,
   `Deducible` smallint(6) NOT NULL,
   `CodigoIva` smallint(6) NOT NULL,
-  `Mediacion` smallint(6) NOT NULL DEFAULT '0',
-  `Exclusion347` smallint(6) NOT NULL DEFAULT '0',
-  `NumeroPlazos` tinyint(4) NOT NULL DEFAULT '1',
+  `Mediacion` smallint(6) NOT NULL DEFAULT 0,
+  `Exclusion347` smallint(6) NOT NULL DEFAULT 0,
+  `NumeroPlazos` tinyint(4) NOT NULL DEFAULT 1,
   `DiasPrimerPlazo` smallint(6) NOT NULL,
   `DiasEntrePlazos` smallint(6) NOT NULL,
   `DiasFijos1` tinyint(4) NOT NULL,
@@ -16825,8 +17633,8 @@ CREATE TABLE `clientesProveedores` (
   `IBAN` varchar(34) COLLATE utf8_unicode_ci NOT NULL,
   `CodigoCondiciones` smallint(6) NOT NULL,
   `StatusTraspasadoIME` tinyint(4) NOT NULL,
-  `TipoImportacionIME` tinyint(4) NOT NULL DEFAULT '2',
-  `TipoPlanCuentaIME` smallint(6) NOT NULL DEFAULT '2',
+  `TipoImportacionIME` tinyint(4) NOT NULL DEFAULT 2,
+  `TipoPlanCuentaIME` smallint(6) NOT NULL DEFAULT 2,
   `Contrapartida` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
   `CodigoCuentaImpagado` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
   `CodigoCuentaEfecto` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
@@ -16869,7 +17677,7 @@ CREATE TABLE `clientesProveedores` (
   `sysTick` int(11) NOT NULL,
   `RiesgoMaximo` decimal(28,10) NOT NULL,
   `PlazoMedioPCMA` smallint(6) NOT NULL,
-  `CriterioIvaIME` smallint(6) NOT NULL DEFAULT '0',
+  `CriterioIvaIME` smallint(6) NOT NULL DEFAULT 0,
   `ReferenciaMandato` varchar(35) COLLATE utf8_unicode_ci NOT NULL,
   `%Comision` decimal(28,10) NOT NULL,
   `CodigoZona` int(11) NOT NULL,
@@ -16890,14 +17698,15 @@ DROP TABLE IF EXISTS `invoiceInList`;
 /*!50001 DROP VIEW IF EXISTS `invoiceInList`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `invoiceInList` AS SELECT 
- 1 AS `id`,
- 1 AS `supplierRef`,
- 1 AS `serial`,
- 1 AS `supplierFk`,
- 1 AS `issued`,
- 1 AS `isVatDeductible`,
- 1 AS `serialNumber`*/;
+/*!50001 CREATE TABLE `invoiceInList` (
+  `id` tinyint NOT NULL,
+  `supplierRef` tinyint NOT NULL,
+  `serial` tinyint NOT NULL,
+  `supplierFk` tinyint NOT NULL,
+  `issued` tinyint NOT NULL,
+  `isVatDeductible` tinyint NOT NULL,
+  `serialNumber` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -17057,10 +17866,10 @@ CREATE TABLE `movConta` (
   `NumFacturasExternoAgrupacion` int(11) NOT NULL,
   `CodigoMedioCobro` varchar(1) COLLATE utf8_unicode_ci NOT NULL,
   `MedioCobro` varchar(31) COLLATE utf8_unicode_ci NOT NULL,
-  `IvaDeducible1` smallint(6) NOT NULL DEFAULT '1',
-  `IvaDeducible2` smallint(6) NOT NULL DEFAULT '1',
-  `IvaDeducible3` smallint(6) NOT NULL DEFAULT '1',
-  `IvaDeducible4` smallint(6) NOT NULL DEFAULT '1',
+  `IvaDeducible1` smallint(6) NOT NULL DEFAULT 1,
+  `IvaDeducible2` smallint(6) NOT NULL DEFAULT 1,
+  `IvaDeducible3` smallint(6) NOT NULL DEFAULT 1,
+  `IvaDeducible4` smallint(6) NOT NULL DEFAULT 1,
   `TipoRectificativa` smallint(6) NOT NULL,
   `FechaFacturaOriginal` datetime NOT NULL,
   `BaseImponibleOriginal` decimal(28,10) NOT NULL,
@@ -17068,7 +17877,7 @@ CREATE TABLE `movConta` (
   `ClaseAbonoRectificativas` smallint(6) NOT NULL,
   `RecargoEquivalenciaOriginal` decimal(28,10) NOT NULL,
   `ObjetoFactura` varchar(500) COLLATE utf8_unicode_ci NOT NULL,
-  `enlazadoSage` tinyint(1) NOT NULL DEFAULT '0',
+  `enlazadoSage` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`OrdenMovimientos`,`LibreN1`),
   KEY `ix_movconta` (`enlazadoSage`),
   KEY `ix_movconta2` (`IdProcesoIME`),
@@ -17105,7 +17914,7 @@ DROP TABLE IF EXISTS `movContaCopia`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `movContaCopia` (
-  `OrdenMovimientos` int(11) NOT NULL DEFAULT '0',
+  `OrdenMovimientos` int(11) NOT NULL DEFAULT 0,
   `MovPosicion` varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
   `Ejercicio` smallint(6) NOT NULL,
   `CodigoEmpresa` smallint(6) NOT NULL,
@@ -17254,10 +18063,10 @@ CREATE TABLE `movContaCopia` (
   `NumFacturasExternoAgrupacion` int(11) NOT NULL,
   `CodigoMedioCobro` varchar(1) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
   `MedioCobro` varchar(31) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
-  `IvaDeducible1` smallint(6) NOT NULL DEFAULT '1',
-  `IvaDeducible2` smallint(6) NOT NULL DEFAULT '1',
-  `IvaDeducible3` smallint(6) NOT NULL DEFAULT '1',
-  `IvaDeducible4` smallint(6) NOT NULL DEFAULT '1',
+  `IvaDeducible1` smallint(6) NOT NULL DEFAULT 1,
+  `IvaDeducible2` smallint(6) NOT NULL DEFAULT 1,
+  `IvaDeducible3` smallint(6) NOT NULL DEFAULT 1,
+  `IvaDeducible4` smallint(6) NOT NULL DEFAULT 1,
   `TipoRectificativa` smallint(6) NOT NULL,
   `FechaFacturaOriginal` datetime NOT NULL,
   `BaseImponibleOriginal` decimal(28,10) NOT NULL,
@@ -17265,7 +18074,7 @@ CREATE TABLE `movContaCopia` (
   `ClaseAbonoRectificativas` smallint(6) NOT NULL,
   `RecargoEquivalenciaOriginal` decimal(28,10) NOT NULL,
   `ObjetoFactura` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
-  `enlazado` tinyint(1) NOT NULL DEFAULT '0',
+  `enlazado` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`OrdenMovimientos`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -17301,15 +18110,15 @@ CREATE TABLE `planCuentasPGC` (
   `ClienteOProveedor` varchar(1) COLLATE utf8_unicode_ci NOT NULL,
   `CodigoDivisa` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
   `IndicadorProrrata` smallint(6) NOT NULL,
-  `TipoPlanCuentaIME` smallint(6) NOT NULL DEFAULT '2',
+  `TipoPlanCuentaIME` smallint(6) NOT NULL DEFAULT 2,
   `StatusAnalitica` smallint(6) NOT NULL,
   `AnaCodigoCuenta` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
-  `StatusTraspasadoIME` tinyint(4) NOT NULL DEFAULT '0',
-  `TipoImportacionIME` tinyint(4) NOT NULL DEFAULT '0',
-  `CierrePatrimonio_` smallint(6) NOT NULL DEFAULT '0',
+  `StatusTraspasadoIME` tinyint(4) NOT NULL DEFAULT 0,
+  `TipoImportacionIME` tinyint(4) NOT NULL DEFAULT 0,
+  `CierrePatrimonio_` smallint(6) NOT NULL DEFAULT 0,
   `CuentaPatrimonio_` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
-  `CuentaVarios` smallint(6) NOT NULL DEFAULT '0',
-  `TodasLasActividades` smallint(6) NOT NULL DEFAULT '0',
+  `CuentaVarios` smallint(6) NOT NULL DEFAULT 0,
+  `TodasLasActividades` smallint(6) NOT NULL DEFAULT 0,
   `ValorDelegacion` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
   `ValorDepartamento` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
   `ValorProyecto` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
@@ -17665,6 +18474,545 @@ BEGIN
 				c.companyCode AND
                 x.FECHA >= vDated;
  
+-- Prepara Metálicos
+  	UPDATE sage.movConta m
+		JOIN (SELECT Asiento,  SUBSTR(c.socialName,1,35) Nombre, c.fi, n.SiglaNacion
+				FROM sage.movConta m 
+					JOIN vn.client c ON c.id = IF(m.CargoAbono = "H",  m.CodigoCuenta-4300000000,  m.Contrapartida-4300000000 )
+					LEFT JOIN Naciones n ON n.countryFk = c.countryFk 
+				WHERE m.Metalico347 = TRUE AND 
+					  m.enlazadoSage = FALSE 
+			 ) AS sub ON m.Asiento = sub.Asiento 
+		SET m.Metalico347 = TRUE,
+			m.TipoFactura = "I",
+			m.CifDni = sub.fi ,
+			m.Nombre = sub.Nombre,
+			m.SiglaNacion = sub.SiglaNacion 
+		WHERE m.enlazadoSage = FALSE;  
+	 
+	UPDATE  sage.movConta m
+		SET Metalico347 = FALSE,
+            m.TipoFactura = "",
+            m.Metalico347 = FALSE
+		WHERE CargoAbono = "D" AND 
+			m.enlazadoSage = FALSE;     
+
+-- Elimina cuentas de cliente/proveedor que no se utilizarán en la importación
+	DELETE cp 
+		FROM clientesProveedores cp
+			JOIN (SELECT cp.codigoCuenta
+						FROM clientesProveedores cp
+								LEFT JOIN movConta mc ON mc.codigoCuenta = cp.codigoCuenta  AND mc.enlazadoSage = FALSE
+							WHERE mc.codigoCuenta IS NULL
+						GROUP BY cp.codigoCuenta
+				  ) sub ON sub.codigoCuenta = cp.codigoCuenta ;
+
+-- Elimina cuentas contables que no se utilizarán en la importación
+	DELETE pc
+		FROM planCuentasPGC pc
+			JOIN ( SELECT pc.codigoCuenta 
+						FROM  planCuentasPGC pc 
+							LEFT JOIN movConta mc ON mc.codigoCuenta = pc.codigoCuenta  AND mc.enlazadoSage = FALSE
+						WHERE mc.codigoCuenta IS NULL
+						GROUP BY pc.codigoCuenta
+				 ) sub ON sub.codigoCuenta = pc.codigoCuenta ;
+
+-- DUAS
+ UPDATE movConta m
+        JOIN vn.XDiario x ON x.ASIEN = m.Asiento AND x.SUBCTA =m.CodigoCuenta  
+		JOIN (SELECT ASIEN     
+				FROM vn.invoiceIn ii      
+					JOIN vn.XDiario x ON x.CLAVE = ii.id     
+				WHERE enlazadoSage = 0 AND         
+					  SUBCTA = '4700000999'     
+			  )sub ON sub.ASIEN = x.Asien  
+		SET m.BaseIva1 = x.BASEEURO ,
+			m.PorIva1 = x.IVA,
+			m.CuotaIva1 = (x.IVA/100) * x.BASEEURO ,
+			m.CodigoTransaccion1 = 56 ,
+			m.CodigoIva1 =  IF(x.IVA = 10, 22, 90),
+            m.IvaDeducible1 = TRUE,
+			m.Serie = x.SERIE,
+			m.Factura = x.FACTURA,
+			m.TipoFactura = "R",
+			m.FechaFacturaOriginal = x.FECHA_EX,
+			m.SuFacturaNo = x.FACTURAEX,
+			m.FechaOperacion = x.FECHA_OP
+		WHERE x.SERIE  = 'D' AND 
+			m.enlazadoSage = FALSE; 
+
+-- Rectificativas
+UPDATE  movConta m 
+	JOIN (SELECT  x.ASIEN, x.FECHA_RT, x.SERIE_RT,	x.FACTU_RT 
+			FROM movConta m 
+				JOIN vn.XDiario x ON x.ASIEN = m.Asiento
+			WHERE m.TipoRectificativa>0 AND 
+				  m.enlazadoSage = FALSE AND
+				  x.FACTU_RT IS NOT NULL
+			GROUP BY x.ASIEN
+		) sub ON sub.ASIEN = m.Asiento
+	SET m.EjercicioFacturaOriginal = YEAR(sub.FECHA_RT), 
+	    m.SerieFacturaOriginal = sub.SERIE_RT,	
+	    m.NumeroFacturaOriginal = sub.FACTU_RT	
+	WHERE m.TipoRectificativa > 0 AND 
+	      m.enlazadoSage = FALSE ;
+
+-- Exportaciones Andorras y Canarias cambia TT (la cuenta de taxCode es compartida, id:125)
+UPDATE sage.movConta  m
+    SET CodigoTransaccion1 = 15,
+		CodigoTransaccion2 = IF(CodigoTransaccion2 = 0, 0, 15),
+        CodigoTransaccion3 = IF(CodigoTransaccion3 = 0, 0, 15),
+        CodigoTransaccion4 = IF(CodigoTransaccion4 = 0, 0, 15)
+    WHERE enlazadoSage = FALSE AND 
+		 (CodigoTransaccion1 = 14 OR CodigoTransaccion2 = 14 OR CodigoTransaccion3 = 14 OR CodigoTransaccion4 = 14) AND 
+         SiglaNAcion IN ('XC','XB');
+
+
+
+-- Divisas 
+	UPDATE sage.movConta 
+		SET CodigoDivisa = IF(ImporteCambio<>0, "USD", "")                                              
+		WHERE enlazadoSage = FALSE AND
+			ImporteCambio<>0 AND 
+            ImporteDivisa<>0;
+    
+    
+/*-- Actualiza las facturas DUA para excluirlas del 347 y marcarlas como intracomunitarias
+/*UPDATE sage.movConta mc 
+	SET 
+		mc.Intracomunitaria = 1,
+		mc.Exclusion347 = 1
+WHERE
+    mc.CodigoCuenta = '4700000999';  */
+
+    
+-- MARCAR EN CASO DE SER INTRACOMUNITARIA
+/*                
+UPDATE sage.movConta mc 
+	SET 
+		mc.Intracomunitaria = 1
+WHERE
+    mc.CodigoTransaccion1  IN (20,29);    
+*/
+
+    
+ -- LAS FACTURAS RTECTIFICATIVAS QUE TIENEN CUENTA DE IVA 477.2 SALE CON T.T. 1, TODAS ESTAS FACTURAS DEBEN DE TENER T.T. 15
+  
+ /*UPDATE sage.movConta mc
+        JOIN
+    (SELECT 
+        Asiento
+    FROM
+        sage.movConta
+    WHERE
+        CodigoCuenta = 4770000002) sub ON sub.Asiento = mc.Asiento 
+SET 
+    CodigoTransaccion1 = CASE
+        WHEN CodigoTransaccion1 = 1 THEN 15
+        ELSE CodigoTransaccion1
+    END,
+    CodigoTransaccion2 = CASE
+        WHEN CodigoTransaccion2 = 1 THEN 15
+        ELSE CodigoTransaccion2
+    END,
+    CodigoTransaccion3 = CASE
+        WHEN CodigoTransaccion3 = 1 THEN 15
+        ELSE CodigoTransaccion3
+    END,
+    CodigoTransaccion4 = CASE
+        WHEN CodigoTransaccion4 = 1 THEN 15
+        ELSE CodigoTransaccion4
+    END
+WHERE
+    serie = 'R';
+
+*/
+
+/*
+Nombre	Tipo	Longitud	Descripción campo / Valor por defecto
+MovPosicion	Guid contador	16	Automático, no informar
+Ejercicio	Entero	2	 -1 -- Al informar este valor se calcula automát. A partir de la fecha de asiento
+CodigoEmpresa	Entero	2	Empresa de Sage 200c donde va destinado el asiento
+Asiento	Entero Largo	4	Número de asiento
+CargoAbono	Texto	1	"D" - Debe / "H" - Haber
+CodigoCuenta	Texto	15	Cuenta contable del movimiento
+Contrapartida	Texto	15	Es informativo, no es necesario informarlo
+FechaAsiento	Fecha	8	Fecha del asiento
+TipoDocumento	Texto	6	
+DocumentoConta	Texto	9	
+Comentario	Texto	40	Comentario del asiento
+ImporteAsiento	Doble	19	Importe del movimiento
+CodigoDiario	Entero	2	
+CodigoCanal	Texto	10	Centro coste analítico (no necesario informar)
+CodigoActividad	Texto	1	
+FechaVencimiento	Fecha	8	Si se tienen que generar efectos, será la fecha de vto. Del efecto. No informar
+NumeroPeriodo	Entero	2	 -1   -- Al informar este valor se calcula automát. A partir de la fecha de asiento
+CodigoUsuario	Entero	2	
+FechaGrabacion	Fecha	8	
+TipoEntrada	Texto	2	
+CodigoDepartamento	Texto	10	Centro coste analítico (no necesario informar)
+CodigoSeccion	Texto	10	Centro coste analítico (no necesario informar)
+CodigoDivisa	Texto	3	
+ImporteCambio	Doble	19	
+ImporteDivisa	Doble	19	
+FactorCambio	Doble	19	
+CodigoProyecto	Texto	10	Centro coste analítico (no necesario informar)
+LibreN1	Entero Largo	4	Campo libre numérico
+LibreN2	Entero Largo	4	Campo libre numérico
+LibreA1	Texto	15	Campo libre alfanumérico
+LibreA2	Texto	15	Campo libre alfanumérico
+IdDelegacion	Texto	10	Centro coste analítico (no necesario informar)
+OrdenMovimientos	Contador	4	Número de orden de cada movimiento dentro de un mismo asiento, autonumerar para cada asiento
+MovCartera	Guid	16	
+IdProcesoIME	Guid	16	guid igual para todos los registros que correspondan a una misma importación.
+TipoCarteraIME	Entero	2	0   - Para que no genere cartera
+TipoAnaliticaIME	Entero	2	
+StatusTraspasadoIME	Byte	1	0  - Para que quede marcado el movimiento como no importado todavía.
+TipoImportacionIME	Byte	1	0  - Alta
+BaseIva1	Doble	19	Base para el IVA 1 (idéntico para cada posible IVA hasta el 4) (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+PorBaseCorrectora1	Doble	19	Base correctora (en caso de que la haya) para el IVA 1 (idéntico para cada posible IVA hasta el 4) (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+PorIva1	Doble	19	Porcentaje IVA 1 (idéntico para cada posible IVA hasta el 4) (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+CuotaIva1	Doble	19	Cuota IVA 1 (idéntico para cada posible IVA hasta el 4) (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+PorRecargoEquivalencia1	Doble	19	Si hay recargo - Porcentaje de recargo para el IVA 1 (idéntico para cada posible IVA hasta el 4) (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+RecargoEquivalencia1	Doble	19	Si hay recargo - Importe de Recargo para el IVA 1 (idéntico para cada posible IVA hasta el 4) (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+CodigoTransaccion1	Byte	1	Ver con dpto. de contabilidad - Depende de la naturaleza del asiento (Nacional, Intracoumunitario, etc…) (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+BaseIva2	Doble	19	0
+PorBaseCorrectora2	Doble	19	0
+PorIva2	Doble	19	0
+CuotaIva2	Doble	19	0
+PorRecargoEquivalencia2	Doble	19	0
+RecargoEquivalencia2	Doble	19	0
+CodigoTransaccion2	Byte	1	0
+BaseIva3	Doble	19	0
+PorBaseCorrectora3	Doble	19	0
+PorIva3	Doble	19	0
+CuotaIva3	Doble	19	0
+PorRecargoEquivalencia3	Doble	19	0
+RecargoEquivalencia3	Doble	19	0
+CodigoTransaccion3	Byte	1	0
+BaseIva4	Doble	19	0
+PorBaseCorrectora4	Doble	19	0
+PorIva4	Doble	19	0
+CuotaIva4	Doble	19	0
+PorRecargoEquivalencia4	Doble	19	0
+RecargoEquivalencia4	Doble	19	0
+CodigoTransaccion4	Byte	1	0
+Año	Entero	2	Ejercicio de la factura en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+Serie	Texto	10	Serie de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+Factura	Entero Largo	4	Número de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+SuFacturaNo	Texto	40	Número de la factura del proveedor para factura recibidas, en el caso de que el asiento sea de una factura. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+FechaFactura	Fecha	8	Fecha de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+ImporteFactura	Doble	19	Importe de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+TipoFactura	Texto	1	"E" - Factura emitida / "R" - Factura Recibida -  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+CodigoCuentaFactura	Texto	15	Cuenta contable del cliente / proveedor en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+CifDni	Texto	13	CIF del cliente / proveedor en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+Nombre	Texto	35	Nombre del cliente / proveedor en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+CodigoRetencion	Entero	2	Código de retención de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+BaseRetencion	Doble	19	Base de retención de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+PorRetencion	Doble	19	Porcentaje de retención de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+ImporteRetencion	Doble	19	Importe de retención de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+AbonoIva	Entero	2	0
+CodigoActividadF	Texto	1	('')
+Intracomunitaria	Entero	2	0
+CodigoTerritorio	Entero	2	0
+SiglaNacion	Texto	2	Sigla de la nación de la factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+RetencionInformativa	Entero	2	0
+EjercicioFacturaOriginal	Entero	2	0
+SerieFacturaOriginal	Texto	10	('')
+NumeroFacturaOriginal	Entero Largo	4	0
+EjercicioFactura	Entero	2	Ejercicio de la factura en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+CobroPagoRetencion	Texto	1	('')
+FechaOperacion	Fecha	8	Normalmente Fecha Factura  en el caso de que sea un asiento de facturas. (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+Exclusion347	Entero	2	0
+MovIdentificadorIME	Guid contador	16	(newid())
+Previsiones	Texto	1	('')
+MantenerAsiento	Byte	1	 -1 si se quiere mantener el número de asiento que se informa en la importación o "0" si se quiere que se asigne automáticamente el asiento en Sage 200c
+OrdenMovIME	Entero	2	0
+Metalico347	Entero	2	0
+ClaveOperacionFactura_	Texto	1	Ver con dpto. de contabilidad - Depende de la naturaleza del asiento (Nacional, Intracoumunitario, etc…) (Solamente se informa en el movimiento de la factura - cuenta cliente / proveedor)
+SerieAgrupacion_	Texto	10	('')
+NumeroFacturaInicial_	Entero Largo	4	0
+NumeroFacturaFinal_	Entero Largo	4	0
+IdAsientoExterno	Texto	50	('')
+IdDiarioExterno	Texto	10	('')
+IdFacturaExterno	Texto	50	('')
+IdMovimiento	Texto	40	('')
+IdCuadre	Entero	2	((0))
+FechaCuadre	Fecha	8	(getdate())
+TipoCuadre	Texto	4	('')
+AgrupacionCuadre	Entero Largo	4	((0))
+StatusSaldo	Entero	2	((0))
+StatusConciliacion	Entero	2	((0))
+CodigoConciliacion	Entero Largo	4	((0))
+FechaConciliacion	Fecha	8	
+TipoConciliacion	Entero	2	((0))
+IndicadorContaBanco	Texto	1	('')
+Descripcion3	Texto	40	('')
+Descripcion4	Texto	40	('')
+Descripcion5	Texto	40	('')
+Descripcion6	Texto	40	('')
+Descripcion7	Texto	40	('')
+Descripcion8	Texto	50	('')
+Descripcion9	Texto	50	('')
+Descripcion2	Texto	250	('')
+Descripcion1	Texto	250	('')
+Punteo1	Entero	2	((0))
+Punteo9	Entero	2	((0))
+Punteo8	Entero	2	((0))
+Punteo7	Entero	2	((0))
+Punteo6	Entero	2	((0))
+Punteo5	Entero	2	((0))
+Punteo4	Entero	2	((0))
+Punteo3	Entero	2	((0))
+Punteo2	Entero	2	((0))
+CodigoIva1	Entero	2	((0))
+CodigoIva2	Entero	2	((0))
+CodigoIva3	Entero	2	((0))
+CodigoIva4	Entero	2	((0))
+CriterioIva	Byte	1	((0))
+FechaMaxVencimiento	Fecha	8	
+TipoCriterioCaja	Byte	1	((0))
+MovFacturaOrigenIME	Texto	50	('')
+IdFacturaExternoFinal	Texto	50	('')
+IdFacturaExternoInicial	Texto	50	('')
+IdFacturaExternoOriginal	Texto	50	('')
+NumFacturasExternoAgrupacion	Entero Largo	4	((0))
+CodigoMedioCobro	Texto	1	('')
+MedioCobro	Texto	31	('')
+IvaDeducible1	Entero	2	((-1))
+IvaDeducible2	Entero	2	((-1))
+IvaDeducible3	Entero	2	((-1))
+IvaDeducible4	Entero	2	((-1))
+TipoRectificativa	Entero	2	((0))
+FechaFacturaOriginal	Fecha	8	
+BaseImponibleOriginal	Doble	19	((0))
+CuotaIvaOriginal	Doble	19	((0))
+ClaseAbonoRectificativas	Entero	2	((0))
+RecargoEquivalenciaOriginal	Doble	19	((0))
+ObjetoFactura	Texto	500	('')
+*/
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `movContaAdd_` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `movContaAdd_`()
+BEGIN
+	/*  Copia en movConta los asientos de XDiario para que luego los importe el proceso automático que hay en SQL Server
+    */
+	DECLARE vDated DATE;
+    SELECT CONCAT(YEAR(CURDATE()), "-01-01") INTO vDated;
+	TRUNCATE XDiario_movConta_IVA;
+	DELETE FROM  movConta WHERE enlazadoSage = FALSE AND Asiento <> 1 ;
+    CALL clientesProveedoresAdd;
+    CALL planCuentasPgcAdd;
+    CALL XDiario_movConta_IVA_InvoiceOutAdd_Manager;
+    CALL XDiario_movConta_IVA_InvoiceInAdd_Manager;
+	INSERT INTO movConta(
+						TipoEntrada,            -- VARCHAR(2)
+						Ejercicio,              -- Año
+                        CodigoEmpresa,          -- ENT(2)
+                        Asiento,                -- LONG(4), nº ASIENTO
+                        CargoAbono,             -- VARCHAR(1) "D" debe ó  "H" haber
+                        CodigoCuenta,           -- VARCHAR(15) partida contable
+                        Contrapartida,          -- VARCHAR(15) partida contable
+                        FechaAsiento,           -- FECHA(8)
+                        Comentario,             -- VARCHAR(40)
+                        ImporteAsiento,         -- DOBLE(19)
+                        NumeroPeriodo,          -- ENT(2)  "-1"  Al informar este valor se calcula automát. A partir de la fecha de asiento
+                        FechaGrabacion,         -- FECHA(8)
+                        CodigoDivisa,           -- VARCHAR(3)
+                        ImporteCambio,          -- DOBLE(19)
+                        ImporteDivisa,          -- DOBLE(19)
+                        FactorCambio,           -- DOBLE(19)
+                        IdProcesoIME,           -- GUID(16)
+                        TipoCarteraIME,         -- ENT(2)  "0" para que no genere cartera
+                        TipoAnaliticaIME,       -- ENT(2)
+                        StatusTraspasadoIME,    -- BYTE "0" para dejar como no importado aún
+                        TipoImportacionIME,     -- BYTE "0" Alta "1" Baja
+                        Metalico347,            -- ENT(2)
+                        /* ESTOS CAMPOS SOLO SE INFORMAN EN EL CASO DE SER FACTURA */
+                        BaseIva1,               -- DOBLE(19)
+                        PorBaseCorrectora1,     -- DOBLE(19)
+                        PorIva1,                -- DOBLE(19)
+                        CuotaIva1,              -- DOBLE(19)
+                        PorRecargoEquivalencia1,-- DOBLE(19)
+                        RecargoEquivalencia1,   -- DOBLE(19)
+                        CodigoTransaccion1,     -- BYTE "0" Nacional "1" Intracomunitario "2" Extracomunitario
+                        BaseIva2,
+                        PorBaseCorrectora2,
+                        PorIva2,
+                        CuotaIva2,
+                        PorRecargoEquivalencia2,
+                        RecargoEquivalencia2,
+                        CodigoTransaccion2,
+                        BaseIva3,
+                        PorBaseCorrectora3,
+                        PorIva3,
+                        CuotaIva3,
+                        PorRecargoEquivalencia3,
+                        RecargoEquivalencia3,
+                        CodigoTransaccion3,
+                        BaseIva4,
+                        PorBaseCorrectora4,
+                        PorIva4,
+                        CuotaIva4,
+                        PorRecargoEquivalencia4,
+                        RecargoEquivalencia4,
+                        CodigoTransaccion4,
+                        Año,                    -- ENT(2)
+                        Serie,                  -- VARCHAR(10)
+                        Factura,                -- LONG(4)
+                        SuFacturaNo,            -- VARCHAR(40)
+                        FechaFactura,           -- FECHA(8)
+                        ImporteFactura,         -- DOBLE(19)
+                        TipoFactura,            -- VARCHAR(1)   "E"  /  "R" / "I"
+                        CodigoCuentaFactura,    -- VARCHAR(15) cuenta del cliente/proveedor
+                        CifDni,                 -- VARCHAR(13)
+                        Nombre,                 -- VARCHAR(35)
+                        CodigoRetencion,        -- ENT(2)
+                        BaseRetencion,          -- DOBLE(19)
+                        PorRetencion,           -- DOBLE(19)
+                        ImporteRetencion,       -- DOBLE(19)
+                        SiglaNacion,            -- VARCHAR(2)  "ES" por defecto
+                        EjercicioFactura,       -- ENT(2)
+                        FechaOperacion,         -- FECHA(8)
+                        Exclusion347,           -- ENT(2)
+                        MantenerAsiento,        -- BYTE  "-1" mantener  "0" Sage asigna nuevo
+                        ClaveOperacionFactura_, -- VARCHAR(1) P(4721000011,4721000021)-I(4721000015-4720000005-4720000006)-D (Rectificativas)
+                        TipoRectificativa,      -- ENT(2)
+                        FechaFacturaOriginal,   -- FECHA(8)
+                        BaseImponibleOriginal,  -- DOBLE(19)
+                        CuotaIvaOriginal,       -- DOBLE(19)
+                        ClaseAbonoRectificativas,-- ENT(2)
+                        RecargoEquivalenciaOriginal, -- DOBLE(19) */
+                        LibreA1,
+                        CodigoIva1,				-- ENT(6)
+                        CodigoIva2,				-- ENT(6)
+                        CodigoIva3,				-- ENT(6)
+                        CodigoIva4,				-- ENT(6)
+						IvaDeducible1,			-- Entero	2	((-1))
+						IvaDeducible2,			-- Entero	2	((-1))
+						IvaDeducible3,			-- Entero	2	((-1))
+						IvaDeducible4,			-- Entero	2	((-1))-- ENT(6)
+						Intracomunitaria	    -- INT(2)  
+                    )
+    SELECT              'EN' as TipoEntrada,
+						YEAR(x.FECHA) AS Ejercicio, 
+						IF (@@hostname = 'db', c.companyCode, companyCodeTest)  AS CodigoEmpresa,                         -- ENT(2)  c.companyCode AS CodigoEmpresa,  
+                        x.ASIEN AS Asiento,                                       -- LONG(4), nº ASIENTO
+                        IF(EURODEBE<>0 OR (EURODEBE=0 AND EUROHABER IS NULL),'D','H')AS CargoAbono, -- IF(EURODEBE IS NULL,"H","D") AS CargoAbono,  VARCHAR(1) "D" debe ó  "H" haber
+                        x.SUBCTA AS CodigoCuenta,                                 -- VARCHAR(15) partida contable
+                        x.CONTRA AS Contrapartida,                                -- VARCHAR(15) partida contable
+                        x.FECHA AS FechaAsiento,                                  -- FECHA(8)
+                        SUBSTRING(x.CONCEPTO, 1, 40) AS Comentario,                                 -- VARCHAR(40)
+                        IF(x.EURODEBE,x.EURODEBE,x.EUROHABER) AS ImporteAsiento,      -- DOBLE(19)
+                        MONTH(x.FECHA) AS NumeroPeriodo,                           -- ENT(2)  "-1"  Al informar este valor se calcula automát. A partir de la fecha de asiento
+                        IF( sub2.FECREGCON IS NULL, sub2.FECHA_EX, sub2.FECREGCON) FechaGrabacion,                                     -- FECHA(8)
+                        IF(x.CAMBIO,IFNULL(xmi.CodigoDivisa, sub3.code),'') CodigoDivisa,                                           -- VARCHAR(3)
+                        x.CAMBIO AS ImporteCambio,          -- DOBLE(19)
+                        IFNULL(x.DEBEME,x.HABERME) AS ImporteDivisa,          -- DOBLE(19)
+                        IF(x.CAMBIO,1,0) AS FactorCambio,           -- DOBLE(19)
+                        NULL AS IdProcesoIME,           -- GUID(16)
+                        0 AS TipoCarteraIME,         -- ENT(2)  "0" para que no genere cartera
+                        0 AS TipoAnaliticaIME,       -- ENT(2)
+                        0 AS StatusTraspasadoIME,    -- BYTE "0" para dejar como no importado aún
+                        0 AS TipoImportacionIME,     -- BYTE "0" Alta "1" Baja
+                        x.METAL as Metalico347,
+                        /* ESTOS CAMPOS SOLO SE INFORMAN EN EL CASO DE SER FACTURA */
+                        xmi.BaseIva1,               -- DOBLE(19)
+                        xmi.PorBaseCorrectora1,     -- DOBLE(19)
+                        xmi.PorIva1,                -- DOBLE(19)
+                        xmi.CuotaIva1,              -- DOBLE(19)
+                        xmi.PorRecargoEquivalencia1,-- DOBLE(19)
+                        xmi.RecargoEquivalencia1,   -- DOBLE(19)
+                        xmi.CodigoTransaccion1,     -- BYTE "0" Nacional "1" Intracomunitario "2" Extracomunitario
+                        xmi.BaseIva2,
+                        xmi.PorBaseCorrectora2,
+                        xmi.PorIva2,
+                        xmi.CuotaIva2,
+                        xmi.PorRecargoEquivalencia2,
+                        xmi.RecargoEquivalencia2,
+                        xmi.CodigoTransaccion2,
+                        xmi.BaseIva3,
+                        xmi.PorBaseCorrectora3,
+                        xmi.PorIva3,
+                        xmi.CuotaIva3,
+                        xmi.PorRecargoEquivalencia3,
+                        xmi.RecargoEquivalencia3,
+                        xmi.CodigoTransaccion3,
+                        xmi.BaseIva4,
+                        xmi.PorBaseCorrectora4,
+                        xmi.PorIva4,
+                        xmi.CuotaIva4,
+                        xmi.PorRecargoEquivalencia4,
+                        xmi.RecargoEquivalencia4,
+                        xmi.CodigoTransaccion4,
+                        xmi.Año,                    -- ENT(2)
+                        xmi.Serie,                  -- VARCHAR(10)
+                        xmi.Factura,                -- LONG(4)
+                        xmi.SuFacturaNo,            -- VARCHAR(40)
+                        xmi.FechaFactura,           -- FECHA(8)
+                        xmi.ImporteFactura,         -- DOBLE(19)
+                        xmi.TipoFactura,  -- VARCHAR(1)   "E"  /  "R"
+                        xmi.CodigoCuentaFactura,    -- VARCHAR(15) cuenta del cliente/proveedor
+                        xmi.CifDni,                 -- VARCHAR(13)
+                        xmi.Nombre,                 -- VARCHAR(35)
+                        xmi.CodigoRetencion,        -- ENT(2)
+                        xmi.BaseRetencion,          -- DOBLE(19)
+                        xmi.PorRetencion,           -- DOBLE(19)
+                        xmi.ImporteRetencion,       -- DOBLE(19)
+                        xmi.SiglaNacion,            -- VARCHAR(2)  "ES" por defecto
+                        xmi.EjercicioFactura,       -- ENT(2)
+                        xmi.FechaOperacion,         -- FECHA(8)
+                        xmi.Exclusion347,           -- ENT(2)
+                        1,        --  xmi.MantenerAsiento BYTE  "-1" mantener  "0" Sage asigna nuevo
+                        xmi.ClaveOperacionFactura, -- VARCHAR(1)
+                        xmi.TipoRectificativa,      -- ENT(2)
+                        xmi.FechaFacturaOriginal,   -- FECHA(8)
+                        xmi.BaseImponibleOriginal,  -- DOBLE(19)
+                        xmi.CuotaIvaOriginal,       -- DOBLE(19)
+                        xmi.ClaseAbonoRectificativas,-- ENT(2)
+                        xmi.RecargoEquivalenciaOriginal,-- DOBLE(19)  */
+                        xmi.LibreA1,
+                        xmi.CodigoIva1,				-- ENT(6)
+                        xmi.CodigoIva2,				-- ENT(6)
+                        xmi.CodigoIva3,				-- ENT(6)
+                        xmi.CodigoIva4,				-- ENT(6)
+						xmi.IvaDeducible1,			-- Entero	2	((-1))
+						xmi.IvaDeducible2,			-- Entero	2	((-1))
+						xmi.IvaDeducible3,			-- Entero	2	((-1))
+						xmi.IvaDeducible4,			-- Entero	2	((-1))-- ENT(6)
+                        xmi.Intracomunitaria        -- TINYINT(1)
+            FROM vn2008.XDiario x 
+                JOIN vn.company c ON c.id = x.empresa_id
+                LEFT JOIN XDiario_movConta_IVA xmi ON xmi.id = x.id AND xmi.moveData > 0
+                LEFT JOIN (SELECT ASIEN, FECREGCON, FECHA_EX 
+								FROM (SELECT ASIEN, FECREGCON, FECHA_EX
+										FROM vn2008.XDiario
+										ORDER BY ASIEN, FECREGCON DESC, FECHA_EX DESC
+									  ) sub GROUP BY  ASIEN
+						  )sub2 ON sub2.ASIEN = x.ASIEN 
+                 LEFT JOIN ( SELECT DISTINCT(account),cu.code
+								FROM vn.bank b
+									JOIN vn.currency cu ON cu.id = b.currencyFk
+                                WHERE cu.code <> "EUR"  -- no se informa cuando la divisa en EUR   
+						  )sub3 ON sub3.account = x.SUBCTA             
+			WHERE x.enlazadoSage = 0 AND 
+				c.companyCode AND
+                x.FECHA >= vDated;
+ 
 -- Prepara Metálicos
   	UPDATE sage.movConta m
 		JOIN (SELECT Asiento,  SUBSTR(c.socialName,1,35) Nombre, c.fi, n.SiglaNacion
@@ -19130,6 +20478,262 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `XDiario_movConta_IVA_InvoiceInAdd_Manager`()
+BEGIN
+	DECLARE done BOOL DEFAULT FALSE;
+	DECLARE vInvoiceFk INT;
+    DECLARE vXDiarioFk INT;
+    DECLARE vDated DATE;
+	DECLARE rs CURSOR FOR
+		SELECT IFNULL(ii.id,x.FACTURA) invoiceInFk, x.id XDiarioFk 
+			FROM  vn2008.XDiario x 
+				JOIN(SELECT DISTINCT (x.ASIEN)
+						FROM vn2008.XDiario x 
+							LEFT JOIN vn.invoiceIn ii ON x.CLAVE = ii.id
+							LEFT JOIN vn.invoiceInTax it ON it.invoiceInFk = ii.id
+						WHERE it.taxTypeSageFk IS NOT NULL AND 
+							x.enlazadoSage = FALSE AND
+							x.FECHA >= vDated
+					) sub ON sub.ASIEN =x.ASIEN   -- Elimina las Facturas con IVA 0 (-) no se trasladan a sage
+				LEFT JOIN vn.invoiceIn ii ON x.CLAVE = ii.id
+			WHERE x.enlazadoSage = FALSE AND
+				x.FECHA >= vDated AND
+				((SUBCTA<>"4700000999" AND ii.id IS NOT NULL) 
+					OR (SUBCTA LIKE '472%' AND  CONTRA ='4330002067' AND ii.id IS NULL)) ;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+    SELECT CONCAT(YEAR(CURDATE()), "-01-01") INTO vDated;
+    DROP  TEMPORARY TABLE IF EXISTS tmp.invoiceDua;
+	CREATE TEMPORARY TABLE tmp.invoiceDua
+			SELECT id 
+			FROM vn2008.XDiario x
+			WHERE ASIEN IN (SELECT ASIEN
+								FROM vn.invoiceIn ii
+									JOIN vn2008.XDiario x ON x.CLAVE = ii.id
+								WHERE x.enlazadoSage = FALSE AND 
+									x.SUBCTA = '4700000999' AND
+                                    x.FECHA >= vDated
+						   ) AND
+				NOT CONTRA <=> "4330002067";
+
+	DROP  TEMPORARY TABLE IF EXISTS tmp.invoiceInList;
+	CREATE TEMPORARY TABLE tmp.invoiceInList
+		SELECT i.id id,
+				i.supplierRef supplierRef,
+				i.serial serial,
+				i.supplierFk supplierFk,
+				i.issued issued,
+				i.isVatDeductible isVatDeductible,
+				i.serialNumber serialNumber,
+				IF(c.code = "EUR", '',c.code)  currencyFk
+			FROM vn.invoiceIn i
+				JOIN vn.currency c ON c.id = i.currencyFk
+			WHERE i.bookEntried >= vDated
+			UNION ALL 
+			  SELECT d.id ,
+					d.code ,
+					'D' ,
+					d.companyFk ,
+					d.issued ,
+					FALSE,
+					d.id,
+					'' -- EUROS
+					FROM vn.dua d 
+					WHERE d.issued IS NOT NULL AND 
+						code IS NOT NULL;
+
+	OPEN rs;
+	FETCH rs INTO vInvoiceFk, vXDiarioFk;
+	WHILE NOT done DO
+		 CALL XDiario_movConta_IVA_InvoiceInAdd(vInvoiceFk, vXDiarioFk);
+		 FETCH rs INTO vInvoiceFk, vXDiarioFk;
+	END WHILE;
+	CLOSE rs;
+         
+	DROP  TEMPORARY TABLE tmp.invoiceDua;
+	DROP  TEMPORARY TABLE tmp.invoiceInList;
+    
+    -- ASIENTOS CON IVA SOPORTADO 472. y 477. hay que informar 2 líneas la info de facturas una como tipo de factura emitida y otra como recibida  
+	DROP TEMPORARY TABLE IF EXISTS tmp.XDiario_movConta_IVA;
+	CREATE TEMPORARY TABLE tmp.XDiario_movConta_IVA
+		SELECT
+			sub3.id,
+			mc.CodigoDivisa,
+			mc.BaseIva1,
+			mc.PorBaseCorrectora1,
+			mc.PorIva1,
+			mc.CuotaIva1,
+			mc.PorRecargoEquivalencia1,
+			mc.RecargoEquivalencia1,
+			mc.CodigoTransaccion1,
+			mc.CodigoIva1,
+			mc.BaseIva2,
+			mc.PorBaseCorrectora2,
+			mc.PorIva2,
+			mc.CuotaIva2,
+			mc.PorRecargoEquivalencia2,
+			mc.RecargoEquivalencia2,
+			mc.CodigoTransaccion2,
+			mc.CodigoIva2,
+			mc.BaseIva3,
+			mc.PorBaseCorrectora3,
+			mc.PorIva3,
+			mc.CuotaIva3,
+			mc.PorRecargoEquivalencia3,
+			mc.RecargoEquivalencia3,
+			mc.CodigoTransaccion3,
+			mc.CodigoIva3,
+			mc.BaseIva4,
+			mc.PorBaseCorrectora4,
+			mc.PorIva4,
+			mc.CuotaIva4,
+			mc.PorRecargoEquivalencia4,
+			mc.RecargoEquivalencia4,
+			mc.CodigoTransaccion4,
+			mc.CodigoIva4,
+			mc.Año,
+			mc.Serie,
+			mc.Factura,
+			mc.SuFacturaNo,
+			mc.FechaFactura,
+			mc.ImporteFactura,
+			'E',
+			mc.CodigoCuentaFactura,
+			mc.CifDni,
+			mc.Nombre,
+			mc.CodigoRetencion,
+			mc.BaseRetencion,
+			mc.PorRetencion,
+			mc.ImporteRetencion,
+			mc.SiglaNacion,
+			mc.EjercicioFactura,
+			mc.FechaOperacion,
+			mc.Exclusion347,
+			mc.MantenerAsiento,
+			mc.Metalico347,
+			mc.ClaveOperacionFactura,
+			mc.TipoRectificativa,
+			mc.FechaFacturaOriginal,
+			mc.CuotaIvaOriginal,
+			mc.BaseImponibleOriginal,
+			mc.ClaseAbonoRectificativas,
+			mc.RecargoEquivalenciaOriginal,
+			mc.LibreA1,
+			mc.IvaDeducible1,
+			mc.IvaDeducible2,
+			mc.IvaDeducible3,
+			mc.IvaDeducible4,
+			mc.FechaGrabacion,
+			mc.Intracomunitaria,
+			mc.moveData
+		FROM sage.XDiario_movConta_IVA mc
+			JOIN vn.XDiario x ON x.id = mc.id
+			JOIN (SELECT x.ASIEN, x.id
+					FROM vn.XDiario x
+						JOIN(SELECT DISTINCT(x.ASIEN) ASIEN
+								FROM (SELECT DISTINCT(ASIEN)
+											FROM vn.XDiario x
+											WHERE SUBCTA LIKE '472%' AND 
+												x.enlazadoSage = FALSE AND
+                                                x.FECHA >= vDated
+									  ) sub JOIN vn.XDiario x ON x.ASIEN = sub.ASIEN
+								WHERE x.SUBCTA LIKE '477%'
+							)sub2 ON sub2.ASIEN = x.ASIEN
+					WHERE x.CONTRA IS NOT NULL AND x.SUBCTA LIKE '477%'                               
+					GROUP BY x.ASIEN
+				 )sub3 ON sub3.ASIEN = x.ASIEN;
+	 
+	 INSERT INTO sage.XDiario_movConta_IVA
+			(`id`,
+			`CodigoDivisa`,
+			`BaseIva1`,
+			`PorBaseCorrectora1`,
+			`PorIva1`,
+			`CuotaIva1`,
+			`PorRecargoEquivalencia1`,
+			`RecargoEquivalencia1`,
+			`CodigoTransaccion1`,
+			`CodigoIva1`,
+			`BaseIva2`,
+			`PorBaseCorrectora2`,
+			`PorIva2`,
+			`CuotaIva2`,
+			`PorRecargoEquivalencia2`,
+			`RecargoEquivalencia2`,
+			`CodigoTransaccion2`,
+			`CodigoIva2`,
+			`BaseIva3`,
+			`PorBaseCorrectora3`,
+			`PorIva3`,
+			`CuotaIva3`,
+			`PorRecargoEquivalencia3`,
+			`RecargoEquivalencia3`,
+			`CodigoTransaccion3`,
+			`CodigoIva3`,
+			`BaseIva4`,
+			`PorBaseCorrectora4`,
+			`PorIva4`,
+			`CuotaIva4`,
+			`PorRecargoEquivalencia4`,
+			`RecargoEquivalencia4`,
+			`CodigoTransaccion4`,
+			`CodigoIva4`,
+			`Año`,
+			`Serie`,
+			`Factura`,
+			`SuFacturaNo`,
+			`FechaFactura`,
+			`ImporteFactura`,
+			`TipoFactura`,
+			`CodigoCuentaFactura`,
+			`CifDni`,
+			`Nombre`,
+			`CodigoRetencion`,
+			`BaseRetencion`,
+			`PorRetencion`,
+			`ImporteRetencion`,
+			`SiglaNacion`,
+			`EjercicioFactura`,
+			`FechaOperacion`,
+			`Exclusion347`,
+			`MantenerAsiento`,
+			`Metalico347`,
+			`ClaveOperacionFactura`,
+			`TipoRectificativa`,
+			`FechaFacturaOriginal`,
+			`CuotaIvaOriginal`,
+			`BaseImponibleOriginal`,
+			`ClaseAbonoRectificativas`,
+			`RecargoEquivalenciaOriginal`,
+			`LibreA1`,
+			`IvaDeducible1`,
+			`IvaDeducible2`,
+			`IvaDeducible3`,
+			`IvaDeducible4`,
+			`FechaGrabacion`,
+			`Intracomunitaria`,
+			`moveData`)
+		SELECT * 
+			FROM tmp.XDiario_movConta_IVA;
+	  DROP TEMPORARY TABLE tmp.XDiario_movConta_IVA;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `XDiario_movConta_IVA_InvoiceInAdd_Manager_` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `XDiario_movConta_IVA_InvoiceInAdd_Manager_`()
 BEGIN
 	DECLARE done BOOL DEFAULT FALSE;
 	DECLARE vInvoiceFk INT;
@@ -20065,15 +21669,16 @@ DROP TABLE IF EXISTS `Account`;
 /*!50001 DROP VIEW IF EXISTS `Account`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `Account` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `password`,
- 1 AS `roleFk`,
- 1 AS `active`,
- 1 AS `email`,
- 1 AS `created`,
- 1 AS `updated`*/;
+/*!50001 CREATE TABLE `Account` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `password` tinyint NOT NULL,
+  `roleFk` tinyint NOT NULL,
+  `active` tinyint NOT NULL,
+  `email` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `updated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -20084,12 +21689,13 @@ DROP TABLE IF EXISTS `Role`;
 /*!50001 DROP VIEW IF EXISTS `Role`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `Role` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `description`,
- 1 AS `created`,
- 1 AS `modified`*/;
+/*!50001 CREATE TABLE `Role` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `modified` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -20100,11 +21706,12 @@ DROP TABLE IF EXISTS `RoleMapping`;
 /*!50001 DROP VIEW IF EXISTS `RoleMapping`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `RoleMapping` AS SELECT 
- 1 AS `id`,
- 1 AS `principalType`,
- 1 AS `principalId`,
- 1 AS `roleId`*/;
+/*!50001 CREATE TABLE `RoleMapping` (
+  `id` tinyint NOT NULL,
+  `principalType` tinyint NOT NULL,
+  `principalId` tinyint NOT NULL,
+  `roleId` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -20115,14 +21722,15 @@ DROP TABLE IF EXISTS `User`;
 /*!50001 DROP VIEW IF EXISTS `User`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `User` AS SELECT 
- 1 AS `id`,
- 1 AS `realm`,
- 1 AS `username`,
- 1 AS `password`,
- 1 AS `email`,
- 1 AS `emailVerified`,
- 1 AS `verificationToken`*/;
+/*!50001 CREATE TABLE `User` (
+  `id` tinyint NOT NULL,
+  `realm` tinyint NOT NULL,
+  `username` tinyint NOT NULL,
+  `password` tinyint NOT NULL,
+  `email` tinyint NOT NULL,
+  `emailVerified` tinyint NOT NULL,
+  `verificationToken` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -20153,7 +21761,7 @@ CREATE TABLE `userConfigView` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `userFk` int(10) unsigned NOT NULL,
   `tableCode` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `configuration` text COLLATE utf8_unicode_ci,
+  `configuration` text COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uniqueUser_TableCode` (`userFk`,`tableCode`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -20242,7 +21850,7 @@ CREATE TABLE `inbound` (
   `tableName` set('buy','sale') NOT NULL,
   `tableId` int(10) unsigned NOT NULL,
   `isSync` tinyint(4) NOT NULL,
-  `isPicked` tinyint(4) NOT NULL DEFAULT '0',
+  `isPicked` tinyint(4) NOT NULL DEFAULT 0,
   `warehouseFk` int(10) unsigned NOT NULL,
   `itemFk` int(10) unsigned NOT NULL,
   `dated` datetime NOT NULL,
@@ -20365,7 +21973,7 @@ CREATE TABLE `outbound` (
   `tableName` set('sale','buy','orderRow') NOT NULL,
   `tableId` int(10) unsigned NOT NULL,
   `isSync` tinyint(3) unsigned NOT NULL,
-  `isPicked` tinyint(4) NOT NULL DEFAULT '0',
+  `isPicked` tinyint(4) NOT NULL DEFAULT 0,
   `warehouseFk` int(10) unsigned NOT NULL,
   `itemFk` int(10) unsigned NOT NULL,
   `dated` datetime NOT NULL,
@@ -20784,8 +22392,8 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `log_add_beta__`(IN `vTableName` VARCHAR(255), IN `vNewId` VARCHAR(255), IN `vOldId` VARCHAR(255))
-proc: BEGIN
-	-- XXX: Disabled while testing
+proc: BEGIN
+	-- XXX: Disabled while testing
 	DECLARE vLanded DATE;
     DECLARE vWarehouseFk INT;
     DECLARE vBuyerFk INT;
@@ -20793,20 +22401,20 @@ proc: BEGIN
     DECLARE vItemFk INT;
     DECLARE vItemName VARCHAR(50);
     
-    -- LEAVE proc;
+    -- LEAVE proc;
 	
-    IF vOldId IS NOT NULL AND !(vOldId <=> vNewId) THEN
-		INSERT IGNORE INTO `log` SET
-			tableName = vTableName,
-			tableId = vOldId,
-			operation = 'delete';
-	END IF;
-
-	IF vNewId IS NOT NULL THEN
-		INSERT IGNORE INTO `log` SET
-			tableName = vTableName,
-			tableId = vNewId,
-			operation = 'insert';
+    IF vOldId IS NOT NULL AND !(vOldId <=> vNewId) THEN
+		INSERT IGNORE INTO `log` SET
+			tableName = vTableName,
+			tableId = vOldId,
+			operation = 'delete';
+	END IF;
+
+	IF vNewId IS NOT NULL THEN
+		INSERT IGNORE INTO `log` SET
+			tableName = vTableName,
+			tableId = vNewId,
+			operation = 'insert';
 	END IF;
     
     IF vTableName = 'buy' THEN
@@ -20836,7 +22444,7 @@ proc: BEGIN
            
         END IF;
     END IF;
-    
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -21104,29 +22712,29 @@ CREATE DEFINER=`root`@`%` PROCEDURE `log_refreshSale`(
 BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tValues;
     CREATE TEMPORARY TABLE tValues
-		ENGINE = MEMORY
-		SELECT
-				m.id saleFk,
-				m.ticketFk,
-				m.itemFk,
-				t.warehouseFk,
-				t.shipped,
+		ENGINE = MEMORY
+		SELECT
+				m.id saleFk,
+				m.ticketFk,
+				m.itemFk,
+				t.warehouseFk,
+				t.shipped,
 				ABS(m.quantity) quantity,
 				m.created,
                 TIMESTAMPADD(DAY, tp.life, t.shipped) expired,
 				m.quantity < 0 isIn,
-				m.isPicked OR s.alertLevel > 1 isPicked
-			FROM vn.sale m
-				JOIN vn.ticket t ON t.id = m.ticketFk
+				m.isPicked OR s.alertLevel > 1 isPicked
+			FROM vn.sale m
+				JOIN vn.ticket t ON t.id = m.ticketFk
 				JOIN vn.ticketState s ON s.ticketFk = t.id
 				JOIN vn.item i ON i.id = m.itemFk
-				JOIN vn.itemType tp ON tp.id = i.typeFk
+				JOIN vn.itemType tp ON tp.id = i.typeFk
 			WHERE (
-					vTableId IS NULL
-					OR (vTableName = 'ticket' AND t.id = vTableId)
-					OR (vTableName = 'sale' AND m.id = vTableId)
-				)
-				AND t.shipped >= vn.getInventoryDate()
+					vTableId IS NULL
+					OR (vTableName = 'ticket' AND t.id = vTableId)
+					OR (vTableName = 'sale' AND m.id = vTableId)
+				)
+				AND t.shipped >= vn.getInventoryDate()
 				AND m.quantity != 0;
 
 	REPLACE INTO inbound (
@@ -21159,7 +22767,7 @@ BEGIN
             FROM tValues
             WHERE !isIn;
 
-	DROP TEMPORARY TABLE tValues;
+	DROP TEMPORARY TABLE tValues;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -21550,7 +23158,7 @@ DROP TABLE IF EXISTS `config`;
 CREATE TABLE `config` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `dbVersion` char(11) CHARACTER SET utf8 DEFAULT NULL COMMENT 'The current database version',
-  `hasTriggersDisabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Defines if triggers are disabled',
+  `hasTriggersDisabled` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Defines if triggers are disabled',
   `environment` varchar(45) CHARACTER SET utf8 DEFAULT NULL COMMENT 'The current Database environment',
   `lastDump` datetime DEFAULT NULL COMMENT 'Timestamp of the last data dump',
   PRIMARY KEY (`id`)
@@ -21566,7 +23174,7 @@ DROP TABLE IF EXISTS `debug`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `debug` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `connectionId` int(10) unsigned DEFAULT NULL,
   `user` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
   `host` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
@@ -21588,7 +23196,7 @@ CREATE TABLE `version` (
   `code` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `number` char(11) COLLATE utf8_unicode_ci NOT NULL,
   `gitCommit` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -21605,7 +23213,7 @@ CREATE TABLE `versionUser` (
   `user` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `number` char(11) COLLATE utf8_unicode_ci NOT NULL,
   `gitCommit` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`code`,`user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -22660,33 +24268,6 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `vn` /*!40100 DEFAULT CHARACTER SET utf
 
 USE `vn`;
 
---
--- Table structure for table `WorkerLog__`
---
-
-DROP TABLE IF EXISTS `WorkerLog__`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `WorkerLog__` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `originFk` int(11) NOT NULL,
-  `userFk` int(10) unsigned DEFAULT NULL,
-  `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
-  `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
-  `changedModelId` int(11) DEFAULT NULL,
-  `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `originFk` (`originFk`),
-  KEY `userFk` (`userFk`),
-  CONSTRAINT `workerLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `workerLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `XDiario`
 --
@@ -22708,7 +24289,7 @@ CREATE TABLE `XDiario` (
   `FACTURA` varchar(8) COLLATE utf8_unicode_ci DEFAULT '0',
   `BASEIMPO` decimal(10,2) DEFAULT NULL,
   `IVA` decimal(10,2) DEFAULT NULL,
-  `RECEQUIV` decimal(10,2) DEFAULT '0.00',
+  `RECEQUIV` decimal(10,2) DEFAULT 0.00,
   `DOCUMENTO` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
   `DEPARTA` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   `CLAVE` int(11) DEFAULT NULL,
@@ -22726,24 +24307,24 @@ CREATE TABLE `XDiario` (
   `CODDIVISA` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
   `IMPAUXME` decimal(10,2) DEFAULT NULL,
   `MONEDAUSO` varchar(1) COLLATE utf8_unicode_ci DEFAULT '2',
-  `NOCONV` tinyint(1) NOT NULL DEFAULT '0',
+  `NOCONV` tinyint(1) NOT NULL DEFAULT 0,
   `NUMEROINV` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
   `TIPOOPE` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `NFACTICK` tinyint(1) NOT NULL DEFAULT '1',
-  `TERIDNIF` tinyint(1) NOT NULL DEFAULT '2',
+  `NFACTICK` tinyint(1) NOT NULL DEFAULT 1,
+  `TERIDNIF` tinyint(1) NOT NULL DEFAULT 2,
   `TERNIF` varchar(20) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'I.F.',
   `TERNOM` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'Nombre Importador',
-  `OPBIENES` tinyint(1) NOT NULL DEFAULT '1',
+  `OPBIENES` tinyint(1) NOT NULL DEFAULT 1,
   `TIPOFAC` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
   `TIPOIVA` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `L340` tinyint(2) NOT NULL DEFAULT '0',
-  `enlazado` tinyint(1) NOT NULL DEFAULT '0',
+  `L340` tinyint(2) NOT NULL DEFAULT 0,
+  `enlazado` tinyint(1) NOT NULL DEFAULT 0,
   `FECHA_EX` date DEFAULT NULL COMMENT 'FEcha de expedicion de la factura',
-  `LRECT349` tinyint(1) NOT NULL DEFAULT '0',
-  `empresa_id` smallint(5) unsigned NOT NULL DEFAULT '442',
-  `LDIFADUAN` tinyint(4) NOT NULL DEFAULT '0',
-  `METAL` tinyint(1) NOT NULL DEFAULT '0',
-  `METALIMP` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `LRECT349` tinyint(1) NOT NULL DEFAULT 0,
+  `empresa_id` smallint(5) unsigned NOT NULL DEFAULT 442,
+  `LDIFADUAN` tinyint(4) NOT NULL DEFAULT 0,
+  `METAL` tinyint(1) NOT NULL DEFAULT 0,
+  `METALIMP` decimal(10,2) NOT NULL DEFAULT 0.00,
   `CLIENTE` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
   `METALEJE` varchar(4) COLLATE utf8_unicode_ci DEFAULT NULL,
   `FECHA_OP` date DEFAULT NULL COMMENT 'FEcha de operacion',
@@ -22757,12 +24338,12 @@ CREATE TABLE `XDiario` (
   `FACTU_RT` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
   `BASEIMP_RT` decimal(10,2) DEFAULT NULL,
   `BASEIMP_RF` decimal(10,2) DEFAULT NULL,
-  `RECTIFICA` int(1) NOT NULL DEFAULT '0',
+  `RECTIFICA` int(1) NOT NULL DEFAULT 0,
   `FECHA_RT` date DEFAULT NULL,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  `updated` timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `FECREGCON` date DEFAULT NULL,
-  `enlazadoSage` tinyint(1) NOT NULL DEFAULT '0',
+  `enlazadoSage` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `empresa_id` (`empresa_id`),
   KEY `ASIENidx` (`id`,`ASIEN`),
@@ -22825,10 +24406,11 @@ DROP TABLE IF EXISTS `__coolerPathDetail`;
 /*!50001 DROP VIEW IF EXISTS `__coolerPathDetail`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `__coolerPathDetail` AS SELECT 
- 1 AS `id`,
- 1 AS `coolerPathFk`,
- 1 AS `hallway`*/;
+/*!50001 CREATE TABLE `__coolerPathDetail` (
+  `id` tinyint NOT NULL,
+  `coolerPathFk` tinyint NOT NULL,
+  `hallway` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -22839,12 +24421,13 @@ DROP TABLE IF EXISTS `absenceType`;
 /*!50001 DROP VIEW IF EXISTS `absenceType`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `absenceType` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `rgb`,
- 1 AS `code`,
- 1 AS `holidayEntitlementRate`*/;
+/*!50001 CREATE TABLE `absenceType` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `rgb` tinyint NOT NULL,
+  `code` tinyint NOT NULL,
+  `holidayEntitlementRate` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -22855,13 +24438,14 @@ DROP TABLE IF EXISTS `accounting`;
 /*!50001 DROP VIEW IF EXISTS `accounting`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `accounting` AS SELECT 
- 1 AS `id`,
- 1 AS `bank`,
- 1 AS `account`,
- 1 AS `accountingTypeFk`,
- 1 AS `entityFk`,
- 1 AS `isActive`*/;
+/*!50001 CREATE TABLE `accounting` (
+  `id` tinyint NOT NULL,
+  `bank` tinyint NOT NULL,
+  `account` tinyint NOT NULL,
+  `accountingTypeFk` tinyint NOT NULL,
+  `entityFk` tinyint NOT NULL,
+  `isActive` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -22872,11 +24456,11 @@ DROP TABLE IF EXISTS `accountingType`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `accountingType` (
-  `id` smallint(6) NOT NULL DEFAULT '0',
+  `id` smallint(6) NOT NULL DEFAULT 0,
   `description` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
   `receiptDescription` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Descripción por defecto al crear nuevo recibo',
   `code` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isAutoConciliated` tinyint(1) DEFAULT '1' COMMENT 'Si hay que marcar como conciliado el recibo al usar este tipo',
+  `isAutoConciliated` tinyint(1) DEFAULT 1 COMMENT 'Si hay que marcar como conciliado el recibo al usar este tipo',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='descripcio dels valors de la columna "cash" de la taula vn2008.Bancios';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -22904,9 +24488,9 @@ DROP TABLE IF EXISTS `activityTaxDismissed`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `activityTaxDismissed` (
   `clientFk` int(11) NOT NULL,
-  `isNotified` tinyint(1) DEFAULT '0',
-  `isDismissed` tinyint(1) DEFAULT '0',
-  `notified` int(11) DEFAULT '0',
+  `isNotified` tinyint(1) DEFAULT 0,
+  `isDismissed` tinyint(1) DEFAULT 0,
+  `notified` int(11) DEFAULT 0,
   PRIMARY KEY (`clientFk`),
   CONSTRAINT `clientFk` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -22921,8 +24505,8 @@ DROP TABLE IF EXISTS `address`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `address` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `clientFk` int(11) NOT NULL DEFAULT '0',
-  `warehouseFk` smallint(6) unsigned DEFAULT '1',
+  `clientFk` int(11) NOT NULL DEFAULT 0,
+  `warehouseFk` smallint(6) unsigned DEFAULT 1,
   `street` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `city` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `provinceFk` smallint(5) unsigned DEFAULT NULL,
@@ -22930,12 +24514,12 @@ CREATE TABLE `address` (
   `phone` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `mobile` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `nickname` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isDefaultAddress` tinyint(1) NOT NULL DEFAULT '0',
-  `agencyModeFk` int(11) NOT NULL DEFAULT '2',
+  `isDefaultAddress` tinyint(1) NOT NULL DEFAULT 0,
+  `agencyModeFk` int(11) NOT NULL DEFAULT 2,
   `notes__` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `hasInsurance__` tinyint(1) NOT NULL DEFAULT '0',
+  `hasInsurance__` tinyint(1) NOT NULL DEFAULT 0,
   `porte__` double DEFAULT NULL,
-  `isActive` tinyint(4) NOT NULL DEFAULT '1',
+  `isActive` tinyint(4) NOT NULL DEFAULT 1,
   `postcodeOLD__` int(11) unsigned DEFAULT NULL,
   `longitude` decimal(11,7) DEFAULT NULL,
   `latitude` decimal(11,7) DEFAULT NULL,
@@ -22943,8 +24527,8 @@ CREATE TABLE `address` (
   `isEqualizated` tinyint(1) DEFAULT NULL,
   `customsAgentFk` int(11) DEFAULT NULL,
   `incotermsFk` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isVilassarBuyer` tinyint(4) NOT NULL DEFAULT '0',
-  `isLogifloraAllowed` tinyint(4) NOT NULL DEFAULT '0',
+  `isVilassarBuyer__` tinyint(4) NOT NULL DEFAULT 0,
+  `isLogifloraAllowed` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `Id_Agencia` (`agencyModeFk`),
   KEY `Id_cliente` (`clientFk`),
@@ -23017,9 +24601,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -23045,6 +24629,13 @@ BEGIN
     IF NEW.isDefaultAddress AND NEW.isActive = FALSE THEN
 		CALL util.throw ('Cannot desactivate the default address');
     END IF;
+   
+	IF NOT (NEW.isEqualizated <=> OLD.isEqualizated) THEN
+   		INSERT IGNORE INTO ticketRecalc (ticketFk)
+   			SELECT id FROM ticket t 
+   				WHERE t.addressFk = NEW.id
+   					AND t.refFk IS NULL;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -23061,7 +24652,7 @@ DROP TABLE IF EXISTS `addressForPackaging`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `addressForPackaging` (
   `addressFk` int(11) NOT NULL,
-  `packagingValue` decimal(10,2) NOT NULL DEFAULT '0.04',
+  `packagingValue` decimal(10,2) NOT NULL DEFAULT 0.04,
   PRIMARY KEY (`addressFk`),
   CONSTRAINT `addresForPackaging_fk1` FOREIGN KEY (`addressFk`) REFERENCES `address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -23098,11 +24689,11 @@ CREATE TABLE `agency` (
   `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(25) COLLATE utf8_unicode_ci NOT NULL,
   `warehouseFk` smallint(5) unsigned DEFAULT NULL COMMENT 'A nulo si se puede enrutar desde todos los almacenes',
-  `isVolumetric` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Si el calculo del porte se hacer por volumen',
-  `bankFk` int(11) NOT NULL DEFAULT '8' COMMENT 'para realizar los reembolsos',
+  `isVolumetric` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'Si el calculo del porte se hacer por volumen',
+  `bankFk` int(11) NOT NULL DEFAULT 8 COMMENT 'para realizar los reembolsos',
   `warehouseAliasFk` smallint(5) unsigned DEFAULT NULL,
-  `isOwn` tinyint(1) NOT NULL DEFAULT '0',
-  `labelZone` tinyint(4) NOT NULL DEFAULT '0',
+  `isOwn` tinyint(1) NOT NULL DEFAULT 0,
+  `labelZone` tinyint(4) NOT NULL DEFAULT 0,
   `workCenterFk` int(11) DEFAULT NULL,
   `supplierFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -23168,19 +24759,19 @@ CREATE TABLE `agencyMode` (
   `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `description` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `deliveryMethodFk` int(11) DEFAULT NULL,
-  `m3` double DEFAULT '0',
-  `cod71__` tinyint(3) unsigned DEFAULT '0',
-  `web` smallint(1) unsigned zerofill NOT NULL DEFAULT '0',
+  `m3` double DEFAULT 0,
+  `cod71__` tinyint(3) unsigned DEFAULT 0,
+  `web` smallint(1) unsigned zerofill NOT NULL DEFAULT 0,
   `agencyFk` smallint(5) unsigned NOT NULL,
-  `inflation` decimal(5,2) NOT NULL DEFAULT '0.00' COMMENT 'Este valor se utiliza para aumentar el valor del componente porte.',
-  `isVolumetric` tinyint(1) NOT NULL DEFAULT '0',
+  `inflation` decimal(5,2) NOT NULL DEFAULT 0.00 COMMENT 'Este valor se utiliza para aumentar el valor del componente porte.',
+  `isVolumetric` tinyint(1) NOT NULL DEFAULT 0,
   `reportMail` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `showAgencyName` tinyint(1) DEFAULT '1' COMMENT 'obsoleta',
-  `isActive` tinyint(1) NOT NULL DEFAULT '1',
-  `isExternalAgency` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'obsoleta',
-  `flag` blob COMMENT 'obsoleta',
+  `showAgencyName` tinyint(1) DEFAULT 1 COMMENT 'obsoleta',
+  `isActive` tinyint(1) NOT NULL DEFAULT 1,
+  `isExternalAgency` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'obsoleta',
+  `flag` blob DEFAULT NULL COMMENT 'obsoleta',
   `code` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isRiskFree` tinyint(1) NOT NULL DEFAULT '0',
+  `isRiskFree` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `Agencias` (`name`),
   KEY `Vista` (`deliveryMethodFk`),
@@ -23198,12 +24789,13 @@ DROP TABLE IF EXISTS `agencyProvince__`;
 /*!50001 DROP VIEW IF EXISTS `agencyProvince__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `agencyProvince__` AS SELECT 
- 1 AS `provinceFk`,
- 1 AS `agencyFk`,
- 1 AS `zone`,
- 1 AS `warehouseFk`,
- 1 AS `isVolumetric`*/;
+/*!50001 CREATE TABLE `agencyProvince__` (
+  `provinceFk` tinyint NOT NULL,
+  `agencyFk` tinyint NOT NULL,
+  `zone` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `isVolumetric` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -23215,11 +24807,11 @@ DROP TABLE IF EXISTS `agencyTerm`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `agencyTerm` (
   `agencyFk` smallint(5) unsigned NOT NULL,
-  `minimumPackages` int(11) NOT NULL DEFAULT '0' COMMENT 'numero minimo de bultos',
-  `kmPrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT 'precio extra por km',
-  `packagePrice` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT 'precio extra por bulto',
+  `minimumPackages` int(11) NOT NULL DEFAULT 0 COMMENT 'numero minimo de bultos',
+  `kmPrice` decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT 'precio extra por km',
+  `packagePrice` decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT 'precio extra por bulto',
   `routePrice` decimal(10,2) DEFAULT NULL COMMENT 'precio fijo por ruta',
-  `minimumKm` int(11) NOT NULL DEFAULT '0',
+  `minimumKm` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`agencyFk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -23261,9 +24853,10 @@ DROP TABLE IF EXISTS `annualAverageInvoiced`;
 /*!50001 DROP VIEW IF EXISTS `annualAverageInvoiced`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `annualAverageInvoiced` AS SELECT 
- 1 AS `clientFk`,
- 1 AS `invoiced`*/;
+/*!50001 CREATE TABLE `annualAverageInvoiced` (
+  `clientFk` tinyint NOT NULL,
+  `invoiced` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -23313,7 +24906,7 @@ DROP TABLE IF EXISTS `autoRadioLogCall`;
 CREATE TABLE `autoRadioLogCall` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `ticketFk` int(11) NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `response` longtext COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`),
   KEY `ticket_idx` (`ticketFk`),
@@ -23339,6 +24932,169 @@ CREATE TABLE `autonomousRegion` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `awb`
+--
+
+DROP TABLE IF EXISTS `awb`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `awb` (
+  `id` smallint(11) unsigned NOT NULL AUTO_INCREMENT,
+  `code` varchar(18) COLLATE utf8_unicode_ci NOT NULL,
+  `package` float unsigned NOT NULL,
+  `weight` float unsigned DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `transitoryFk` int(11) NOT NULL DEFAULT 582,
+  `taxFk` int(10) unsigned DEFAULT 62,
+  `duakk` varchar(18) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `docFk` int(11) DEFAULT NULL,
+  `amount` double NOT NULL DEFAULT 0,
+  `freightFk` int(11) DEFAULT NULL,
+  `m3` double unsigned DEFAULT NULL,
+  `stems` int(10) unsigned DEFAULT NULL,
+  `flightFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `volumeWeight` float unsigned DEFAULT NULL,
+  `hb` decimal(10,1) unsigned DEFAULT NULL,
+  `rate` decimal(10,2) unsigned DEFAULT NULL,
+  `booked` datetime DEFAULT NULL,
+  `issued` datetime DEFAULT NULL,
+  `operated` datetime DEFAULT NULL,
+  `bookEntried` date DEFAULT NULL,
+  `invoiceInFk` mediumint(8) unsigned DEFAULT NULL,
+  `isChecked` tinyint(3) DEFAULT 0,
+  `isTransitoryChecked` tinyint(3) DEFAULT 0,
+  `year` int(4) DEFAULT NULL,
+  `observation` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `hasFreightPrepaid` tinyint(3) DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `codigo_UNIQUE` (`code`,`year`),
+  KEY `proveedor_id` (`transitoryFk`),
+  KEY `iva_id` (`taxFk`),
+  KEY `carguera_id` (`freightFk`),
+  KEY `flight_id` (`flightFk`),
+  KEY `awbInvoiceIn` (`invoiceInFk`),
+  CONSTRAINT `awbInvoiceIn` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `awbTransitoryFk` FOREIGN KEY (`transitoryFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `awb_ibfk_1` FOREIGN KEY (`taxFk`) REFERENCES `taxCode` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`awb_bi` BEFORE INSERT ON `awb` FOR EACH ROW
+BEGIN
+	
+	SET NEW.year= year(CURDATE());
+
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `awb_ai` AFTER INSERT ON `awb` FOR EACH ROW
+BEGIN
+
+	DECLARE invoiceInFk INT;
+	
+    -- Eliminar cuando funcione el sistema DUA
+    INSERT INTO invoiceIn(supplierFk,issued,companyFk)
+		VALUES(NEW.transitoryFk,CURDATE(),442);
+
+	SELECT last_insert_id() INTO invoiceInFk;
+/*
+	INSERT INTO awb_recibida(awb_id,recibida_id)
+		VALUES(NEW.id,invoiceInFk);
+  */      
+	-- Sistema DUA
+	INSERT INTO vn.dua(awbFk)
+		VALUES(NEW.id);
+	
+    INSERT INTO vn.duaInvoiceIn(duaFk, invoiceInFk)
+		VALUES(LAST_INSERT_ID(), invoiceInFk);
+        
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`awb_au` AFTER UPDATE ON `awb` FOR EACH ROW
+begin	
+
+IF NEW.amount <> OLD.amount THEN 
+
+	CALL vn2008.buy_tarifas_awb(NEW.code);  
+  
+END IF;
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+
+--
+-- Temporary table structure for view `awb__`
+--
+
+DROP TABLE IF EXISTS `awb__`;
+/*!50001 DROP VIEW IF EXISTS `awb__`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `awb__` (
+  `id` tinyint NOT NULL,
+  `code` tinyint NOT NULL,
+  `package` tinyint NOT NULL,
+  `weight` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `transitoryFk` tinyint NOT NULL,
+  `taxFk` tinyint NOT NULL,
+  `docFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `freightFk` tinyint NOT NULL,
+  `m3` tinyint NOT NULL,
+  `stems` tinyint NOT NULL,
+  `flightFk` tinyint NOT NULL,
+  `volumeWeight` tinyint NOT NULL,
+  `hb` tinyint NOT NULL,
+  `rate` tinyint NOT NULL,
+  `booked` tinyint NOT NULL,
+  `issued` tinyint NOT NULL,
+  `operated` tinyint NOT NULL,
+  `bookEntried` tinyint NOT NULL,
+  `invoiceInFk` tinyint NOT NULL,
+  `isChecked` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
 --
 -- Table structure for table `bank`
 --
@@ -23347,13 +25103,13 @@ DROP TABLE IF EXISTS `bank`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `bank` (
-  `id` int(11) NOT NULL DEFAULT '0',
+  `id` int(11) NOT NULL DEFAULT 0,
   `bank` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `account` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
-  `cash` smallint(6) NOT NULL DEFAULT '0',
+  `cash` smallint(6) NOT NULL DEFAULT 0,
   `entityFk` int(10) unsigned NOT NULL,
-  `isActive` tinyint(4) NOT NULL DEFAULT '1',
-  `currencyFk` tinyint(3) unsigned DEFAULT '1',
+  `isActive` tinyint(4) NOT NULL DEFAULT 1,
+  `currencyFk` tinyint(3) unsigned DEFAULT 1,
   `code` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `BancosBanco` (`bank`),
@@ -23373,7 +25129,7 @@ DROP TABLE IF EXISTS `bankEntity`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `bankEntity` (
-  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT '1',
+  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT 1,
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   `bic` varchar(11) CHARACTER SET utf8 DEFAULT NULL,
@@ -23427,12 +25183,12 @@ DROP TABLE IF EXISTS `bookingPlanner`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `bookingPlanner` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
-  `effectived` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `effectived` timestamp NOT NULL DEFAULT current_timestamp(),
   `pgcFk` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
   `taxAreaFk` varchar(15) CHARACTER SET utf8 NOT NULL DEFAULT 'SPAIN',
   `priority` int(2) unsigned DEFAULT NULL,
-  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT '1',
+  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT 1,
+  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   KEY `pgcFk_bookingPlanner_idx` (`pgcFk`),
   KEY `taxClassFk` (`taxClassFk`),
@@ -23459,7 +25215,7 @@ CREATE TABLE `botanicExport` (
   `countryFk` mediumint(8) unsigned DEFAULT NULL,
   `restriction` enum('Sin restriccion','Importacion Prohibida','pasaporte fitosanitario','pasaporte individual','declaracion origen') CHARACTER SET utf8 NOT NULL,
   `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isProtectedZone` tinyint(1) NOT NULL DEFAULT '0',
+  `isProtectedZone` tinyint(1) NOT NULL DEFAULT 0,
   `code` enum('importProhibited','phytosanitaryPassport','individualPassport') COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `Id_Paises` (`countryFk`),
@@ -23497,11 +25253,12 @@ DROP TABLE IF EXISTS `businessCalendar`;
 /*!50001 DROP VIEW IF EXISTS `businessCalendar`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `businessCalendar` AS SELECT 
- 1 AS `id`,
- 1 AS `businessFk`,
- 1 AS `absenceTypeFk`,
- 1 AS `dated`*/;
+/*!50001 CREATE TABLE `businessCalendar` (
+  `id` tinyint NOT NULL,
+  `businessFk` tinyint NOT NULL,
+  `absenceTypeFk` tinyint NOT NULL,
+  `dated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -23527,33 +25284,33 @@ DROP TABLE IF EXISTS `buy`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `buy` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `entryFk` int(11) NOT NULL DEFAULT '0',
-  `itemFk` int(11) NOT NULL DEFAULT '90',
-  `quantity` int(11) DEFAULT '0',
-  `dispatched` int(11) NOT NULL DEFAULT '0',
-  `buyingValue` decimal(10,3) DEFAULT '0.000',
-  `freightValue` decimal(10,3) DEFAULT '0.000',
-  `isIgnored` tinyint(1) NOT NULL DEFAULT '0',
-  `stickers` int(11) DEFAULT '0',
-  `packing` int(11) DEFAULT '0',
-  `grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
-  `groupingMode` tinyint(4) NOT NULL DEFAULT '0' COMMENT '0=sin obligar 1=groping 2=packing',
+  `entryFk` int(11) NOT NULL DEFAULT 0,
+  `itemFk` int(11) NOT NULL DEFAULT 90,
+  `quantity` int(11) DEFAULT 0,
+  `dispatched` int(11) NOT NULL DEFAULT 0,
+  `buyingValue` decimal(10,3) DEFAULT 0.000,
+  `freightValue` decimal(10,3) DEFAULT 0.000,
+  `isIgnored` tinyint(1) NOT NULL DEFAULT 0,
+  `stickers` int(11) DEFAULT 0,
+  `packing` int(11) DEFAULT 0,
+  `grouping` smallint(5) unsigned NOT NULL DEFAULT 1,
+  `groupingMode` tinyint(4) NOT NULL DEFAULT 0 COMMENT '0=sin obligar 1=groping 2=packing',
   `containerFk` smallint(5) unsigned DEFAULT NULL,
-  `comissionValue` decimal(10,3) DEFAULT '0.000',
-  `packageValue` decimal(10,3) DEFAULT '0.000',
+  `comissionValue` decimal(10,3) DEFAULT 0.000,
+  `packageValue` decimal(10,3) DEFAULT 0.000,
   `location` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
   `packageFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
-  `price1` decimal(10,2) DEFAULT '0.00',
-  `price2` decimal(10,2) DEFAULT '0.00',
-  `price3` decimal(10,2) DEFAULT '0.00',
-  `minPrice` decimal(10,2) DEFAULT '0.00',
+  `price1` decimal(10,2) DEFAULT 0.00,
+  `price2` decimal(10,2) DEFAULT 0.00,
+  `price3` decimal(10,2) DEFAULT 0.00,
+  `minPrice` decimal(10,2) DEFAULT 0.00,
   `producer` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `printedStickers` int(11) DEFAULT '0',
-  `workerFk` int(11) DEFAULT '0',
-  `isChecked` tinyint(1) NOT NULL DEFAULT '0',
-  `isPickedOff` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Esta mercancia no va a la zona de picking.',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `__cm2` int(10) unsigned NOT NULL DEFAULT '0',
+  `printedStickers` int(11) DEFAULT 0,
+  `workerFk` int(11) DEFAULT 0,
+  `isChecked` tinyint(1) NOT NULL DEFAULT 0,
+  `isPickedOff` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Esta mercancia no va a la zona de picking.',
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `__cm2` int(10) unsigned NOT NULL DEFAULT 0,
   `ektFk` int(11) DEFAULT NULL,
   `weight` decimal(10,2) unsigned DEFAULT NULL,
   `deliveryFk` int(11) DEFAULT NULL,
@@ -23800,7 +25557,7 @@ CREATE TABLE `buyMark` (
   `id` int(11) NOT NULL,
   `comment` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `mark` tinyint(1) DEFAULT NULL,
-  `odbcDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `odbcDate` timestamp NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   CONSTRAINT `Compres_mark_ibfk_1` FOREIGN KEY (`id`) REFERENCES `buy` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -23814,9 +25571,10 @@ DROP TABLE IF EXISTS `buyer`;
 /*!50001 DROP VIEW IF EXISTS `buyer`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `buyer` AS SELECT 
- 1 AS `userFk`,
- 1 AS `nickname`*/;
+/*!50001 CREATE TABLE `buyer` (
+  `userFk` tinyint NOT NULL,
+  `nickname` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -23827,11 +25585,12 @@ DROP TABLE IF EXISTS `buyerSales`;
 /*!50001 DROP VIEW IF EXISTS `buyerSales`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `buyerSales` AS SELECT 
- 1 AS `importe`,
- 1 AS `comprador`,
- 1 AS `año`,
- 1 AS `semana`*/;
+/*!50001 CREATE TABLE `buyerSales` (
+  `importe` tinyint NOT NULL,
+  `comprador` tinyint NOT NULL,
+  `año` tinyint NOT NULL,
+  `semana` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -23916,11 +25675,12 @@ DROP TABLE IF EXISTS `calendar__`;
 /*!50001 DROP VIEW IF EXISTS `calendar__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `calendar__` AS SELECT 
- 1 AS `id`,
- 1 AS `businessFk`,
- 1 AS `dayOffTypeFk`,
- 1 AS `dated`*/;
+/*!50001 CREATE TABLE `calendar__` (
+  `id` tinyint NOT NULL,
+  `businessFk` tinyint NOT NULL,
+  `dayOffTypeFk` tinyint NOT NULL,
+  `dated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -23933,8 +25693,8 @@ DROP TABLE IF EXISTS `campaign`;
 CREATE TABLE `campaign` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `code` enum('mothersDay','allSaints','valentinesDay') COLLATE utf8_unicode_ci NOT NULL,
-  `dated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `scopeDays` int(11) NOT NULL DEFAULT '15',
+  `dated` datetime NOT NULL DEFAULT current_timestamp(),
+  `scopeDays` int(11) NOT NULL DEFAULT 15,
   PRIMARY KEY (`id`),
   UNIQUE KEY `campaign_dated_uindex` (`dated`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -23965,6 +25725,7 @@ DROP TABLE IF EXISTS `chain`;
 CREATE TABLE `chain` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
+  `rappel` decimal(5,2) NOT NULL DEFAULT 0.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Grupos de clientes';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -23997,13 +25758,13 @@ CREATE TABLE `claim` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `ticketCreated` date NOT NULL,
   `claimDepartmentFk__` tinyint(3) unsigned DEFAULT NULL,
-  `claimStateFk` int(10) unsigned NOT NULL DEFAULT '1',
-  `observation` text COLLATE utf8_unicode_ci,
+  `claimStateFk` int(10) unsigned NOT NULL DEFAULT 1,
+  `observation` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `clientFk` int(11) NOT NULL,
   `workerFk` int(11) NOT NULL,
-  `responsibility` int(1) unsigned NOT NULL DEFAULT '3',
-  `isChargedToMana` tinyint(1) NOT NULL DEFAULT '0',
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `responsibility` int(1) unsigned NOT NULL DEFAULT 3,
+  `isChargedToMana` tinyint(1) NOT NULL DEFAULT 0,
+  `created` timestamp NULL DEFAULT current_timestamp(),
   `ticketFk` int(11) DEFAULT NULL,
   `hasToPickUp` tinyint(1) NOT NULL,
   PRIMARY KEY (`id`),
@@ -24030,8 +25791,8 @@ CREATE TABLE `claimBeginning` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `claimFk` int(10) unsigned NOT NULL,
   `saleFk` int(11) DEFAULT NULL,
-  `claimComplaintFk__` int(10) unsigned NOT NULL DEFAULT '1',
-  `claimRequestFk__` int(1) unsigned NOT NULL DEFAULT '1',
+  `claimComplaintFk__` int(10) unsigned NOT NULL DEFAULT 1,
+  `claimRequestFk__` int(1) unsigned NOT NULL DEFAULT 1,
   `quantity` double DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `Id_Movimiento` (`saleFk`),
@@ -24096,12 +25857,12 @@ DROP TABLE IF EXISTS `claimDevelopment`;
 CREATE TABLE `claimDevelopment` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `claimFk` int(10) unsigned NOT NULL,
-  `claimResponsibleFk` int(10) unsigned NOT NULL DEFAULT '1',
+  `claimResponsibleFk` int(10) unsigned NOT NULL DEFAULT 1,
   `workerFk` int(11) DEFAULT NULL,
-  `claimReasonFk` int(10) unsigned NOT NULL DEFAULT '1',
-  `claimResultFk` int(10) unsigned NOT NULL DEFAULT '1',
-  `claimRedeliveryFk` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `claimDestinationFk` tinyint(3) unsigned NOT NULL DEFAULT '2',
+  `claimReasonFk` int(10) unsigned NOT NULL DEFAULT 1,
+  `claimResultFk` int(10) unsigned NOT NULL DEFAULT 1,
+  `claimRedeliveryFk` tinyint(3) unsigned NOT NULL DEFAULT 1,
+  `claimDestinationFk` tinyint(3) unsigned NOT NULL DEFAULT 2,
   PRIMARY KEY (`id`),
   KEY `cl_main_id` (`claimFk`),
   KEY `cl_res_id` (`claimResponsibleFk`),
@@ -24148,9 +25909,9 @@ CREATE TABLE `claimEnd` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `saleFk` int(11) DEFAULT NULL,
   `claimFk` int(10) unsigned NOT NULL,
-  `workerFk` int(11) NOT NULL DEFAULT '20',
+  `workerFk` int(11) NOT NULL DEFAULT 20,
   `claimDestinationFk` tinyint(4) DEFAULT NULL,
-  `isGreuge` tinyint(4) NOT NULL DEFAULT '0',
+  `isGreuge` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `cl_main_id` (`claimFk`),
   KEY `Id_Trabajador` (`workerFk`),
@@ -24174,11 +25935,11 @@ CREATE TABLE `claimLog` (
   `originFk` int(10) unsigned NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -24197,12 +25958,12 @@ DROP TABLE IF EXISTS `claimRatio`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `claimRatio` (
-  `clientFk` int(11) NOT NULL DEFAULT '0',
+  `clientFk` int(11) NOT NULL DEFAULT 0,
   `yearSale` decimal(10,2) DEFAULT NULL,
   `claimAmount` decimal(10,2) DEFAULT NULL,
   `claimingRate` decimal(5,2) DEFAULT NULL,
   `priceIncreasing` decimal(5,2) DEFAULT NULL,
-  `packingRate` decimal(5,2) NOT NULL DEFAULT '1.00',
+  `packingRate` decimal(5,2) NOT NULL DEFAULT 1.00,
   PRIMARY KEY (`clientFk`),
   CONSTRAINT `claimRatio_ibfk_1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -24216,13 +25977,14 @@ DROP TABLE IF EXISTS `claimRatio__`;
 /*!50001 DROP VIEW IF EXISTS `claimRatio__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `claimRatio__` AS SELECT 
- 1 AS `clientFk`,
- 1 AS `yearSale`,
- 1 AS `claimAmount`,
- 1 AS `claimingRate`,
- 1 AS `priceIncreasing`,
- 1 AS `packingRate`*/;
+/*!50001 CREATE TABLE `claimRatio__` (
+  `clientFk` tinyint NOT NULL,
+  `yearSale` tinyint NOT NULL,
+  `claimAmount` tinyint NOT NULL,
+  `claimingRate` tinyint NOT NULL,
+  `priceIncreasing` tinyint NOT NULL,
+  `packingRate` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -24263,7 +26025,7 @@ DROP TABLE IF EXISTS `claimResponsible`;
 CREATE TABLE `claimResponsible` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `description` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
-  `responsability` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'if=1 >sensib >culpa',
+  `responsability` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'if=1 >sensib >culpa',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Responsables de las causas';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -24293,8 +26055,8 @@ CREATE TABLE `claimState` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `code` varchar(45) CHARACTER SET utf8 DEFAULT NULL,
   `description` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
-  `roleFk` int(10) unsigned NOT NULL DEFAULT '1',
-  `priority` int(11) NOT NULL DEFAULT '1',
+  `roleFk` int(10) unsigned NOT NULL DEFAULT 1,
+  `priority` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   KEY `roleFgn_idx` (`roleFk`),
   CONSTRAINT `roleFgn` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`) ON UPDATE CASCADE
@@ -24311,66 +26073,66 @@ DROP TABLE IF EXISTS `client`;
 CREATE TABLE `client` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `discount` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'obsoleta (comprobar)',
+  `discount` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'obsoleta (comprobar)',
   `defaultAddressFk` int(11) DEFAULT NULL,
-  `street` longtext COLLATE utf8_unicode_ci,
+  `street` longtext COLLATE utf8_unicode_ci DEFAULT NULL,
   `fi` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `phone` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fax` varchar(11) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'obsoleta (comprobar)',
   `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `cc` varchar(23) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'obsoleta (comprobar)',
-  `dueDay` smallint(6) NOT NULL DEFAULT '5',
-  `receipt` int(11) DEFAULT '1' COMMENT 'obsoleta',
-  `isOfficial` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'obsoleta (comprobar)',
-  `isTaxDataChecked` tinyint(1) NOT NULL DEFAULT '0',
+  `dueDay` smallint(6) NOT NULL DEFAULT 5,
+  `receipt` int(11) DEFAULT 1 COMMENT 'obsoleta',
+  `isOfficial` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'obsoleta (comprobar)',
+  `isTaxDataChecked` tinyint(1) NOT NULL DEFAULT 0,
   `mobile` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `accountingAccount` varchar(10) CHARACTER SET utf8 NOT NULL,
-  `isEqualizated` tinyint(1) NOT NULL DEFAULT '0',
+  `isEqualizated` tinyint(1) NOT NULL DEFAULT 0,
   `city` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
   `provinceFk` smallint(5) unsigned DEFAULT NULL,
   `postcode` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
   `socialName` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL,
   `contact` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `wholesaler` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'obsoleta (comprobar)',
-  `isReExpedition` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'obsoleta (comprobar)',
-  `hasToInvoice` tinyint(1) NOT NULL DEFAULT '1',
-  `notes` text COLLATE utf8_unicode_ci COMMENT 'obsoleta (comprobar)',
+  `wholesaler` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'obsoleta (comprobar)',
+  `isReExpedition` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'obsoleta (comprobar)',
+  `hasToInvoice` tinyint(1) NOT NULL DEFAULT 1,
+  `notes` text COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'obsoleta (comprobar)',
   `administrativeNotes` text COLLATE utf8_unicode_ci NOT NULL COMMENT 'obsoleta (comprobar)',
-  `invoiceCopy` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'obsoleta (comprobar)',
-  `hold` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'obsoleta (comprobar)',
-  `isFreezed` tinyint(1) NOT NULL DEFAULT '0',
+  `invoiceCopy` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'obsoleta (comprobar)',
+  `hold` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'obsoleta (comprobar)',
+  `isFreezed` tinyint(1) NOT NULL DEFAULT 0,
   `salesPersonFk` int(11) DEFAULT NULL,
-  `credit` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `credit` decimal(10,2) NOT NULL DEFAULT 0.00,
   `cyc` double DEFAULT NULL COMMENT 'obsoleta (comprobar)',
-  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT '1',
-  `isActive` tinyint(1) NOT NULL DEFAULT '1',
+  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT 1,
+  `isActive` tinyint(1) NOT NULL DEFAULT 1,
   `gestdocFk` int(11) DEFAULT NULL,
-  `quality` int(2) DEFAULT '11',
-  `payMethodFk` tinyint(3) unsigned NOT NULL DEFAULT '5',
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `isToBeMailed` tinyint(1) NOT NULL DEFAULT '1',
+  `quality` int(2) DEFAULT 11,
+  `payMethodFk` tinyint(3) unsigned NOT NULL DEFAULT 5,
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  `isToBeMailed` tinyint(1) NOT NULL DEFAULT 1,
   `contactChannelFk` smallint(6) DEFAULT NULL,
-  `isVies` tinyint(4) NOT NULL DEFAULT '0',
-  `splitHolland` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'obsoleta (comprobar)',
-  `sepaFth` tinyint(1) DEFAULT '0' COMMENT 'campo para recibir los escritos de los clientes para el sepa\n\nobsoleta (comprobar)',
-  `hasSepaVnl` tinyint(1) DEFAULT '0',
-  `coreFth` tinyint(1) DEFAULT '0' COMMENT 'obsoleta (comprobar)',
-  `hasCoreVnl` tinyint(1) DEFAULT '0',
+  `isVies` tinyint(4) NOT NULL DEFAULT 0,
+  `splitHolland` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'obsoleta (comprobar)',
+  `sepaFth` tinyint(1) DEFAULT 0 COMMENT 'campo para recibir los escritos de los clientes para el sepa\n\nobsoleta (comprobar)',
+  `hasSepaVnl` tinyint(1) DEFAULT 0,
+  `coreFth` tinyint(1) DEFAULT 0 COMMENT 'obsoleta (comprobar)',
+  `hasCoreVnl` tinyint(1) DEFAULT 0,
   `riskCalculated` date NOT NULL,
-  `hasCoreVnh` tinyint(1) DEFAULT '0',
-  `isRelevant` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'Define los clientes cuyas ventas hay que tener en cuenta en los calculos estadisticos.',
-  `clientTypeFk` int(11) NOT NULL DEFAULT '1',
+  `hasCoreVnh` tinyint(1) DEFAULT 0,
+  `isRelevant` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Define los clientes cuyas ventas hay que tener en cuenta en los calculos estadisticos.',
+  `clientTypeFk` int(11) NOT NULL DEFAULT 1,
   `postcodeOld` int(11) unsigned DEFAULT NULL COMMENT 'obsoleta (comprobar)',
   `mailAddress` int(11) DEFAULT NULL,
   `codposOLD` char(5) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'obsoleta (comprobar)',
   `creditInsurance` int(11) DEFAULT NULL,
-  `eypbc` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Email\\nYesterday\\nPurchases\\nBy\\nConsigna',
-  `hasToInvoiceByAddress` tinyint(1) DEFAULT '0',
-  `cplusTerIdNifFk` int(11) NOT NULL DEFAULT '1' COMMENT 'OBSOLETO',
-  `isCreatedAsServed` tinyint(1) DEFAULT '0',
-  `hasInvoiceSimplified` tinyint(1) NOT NULL DEFAULT '0',
+  `eypbc` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Email\\nYesterday\\nPurchases\\nBy\\nConsigna',
+  `hasToInvoiceByAddress` tinyint(1) DEFAULT 0,
+  `cplusTerIdNifFk` int(11) NOT NULL DEFAULT 1 COMMENT 'OBSOLETO',
+  `isCreatedAsServed` tinyint(1) DEFAULT 0,
+  `hasInvoiceSimplified` tinyint(1) NOT NULL DEFAULT 0,
   `iban` varchar(45) CHARACTER SET utf8 DEFAULT NULL,
-  `hasLcr` tinyint(1) NOT NULL DEFAULT '0',
+  `hasLcr` tinyint(1) NOT NULL DEFAULT 0,
   `bankEntityFk` int(10) DEFAULT NULL,
   `typeFk` varchar(20) CHARACTER SET utf8 NOT NULL DEFAULT 'normal',
   `taxTypeSageFk` smallint(6) DEFAULT NULL COMMENT 'Tipo de Iva por defecto asociado al cliente en SAGE',
@@ -24512,9 +26274,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -24529,6 +26291,13 @@ BEGIN
 		UPDATE `address` SET isDefaultAddress = 1
             WHERE id = NEW.defaultAddressFk;      
     END IF;
+   
+	IF NOT (NEW.provinceFk <=> OLD.provinceFk) THEN
+   		INSERT IGNORE INTO ticketRecalc (ticketFk)
+   			SELECT id FROM ticket t 
+   				WHERE t.clientFk = NEW.id
+   					AND t.refFk IS NULL;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -24582,7 +26351,7 @@ CREATE TABLE `clientCredit` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `clientFk` int(11) NOT NULL,
   `amount` double unsigned NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `workerFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `workers_fk_idx` (`workerFk`),
@@ -24639,11 +26408,11 @@ CREATE TABLE `clientLog` (
   `originFk` int(11) NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -24663,7 +26432,7 @@ DROP TABLE IF EXISTS `clientManaCache`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `clientManaCache` (
   `clientFk` int(11) NOT NULL,
-  `mana` decimal(10,0) NOT NULL DEFAULT '0',
+  `mana` decimal(10,0) NOT NULL DEFAULT 0,
   `dated` date NOT NULL,
   PRIMARY KEY (`clientFk`,`dated`),
   KEY `manaCustomerIdx1` (`dated`),
@@ -24679,10 +26448,11 @@ DROP TABLE IF EXISTS `clientManaCache__`;
 /*!50001 DROP VIEW IF EXISTS `clientManaCache__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `clientManaCache__` AS SELECT 
- 1 AS `clientFk`,
- 1 AS `mana`,
- 1 AS `dated`*/;
+/*!50001 CREATE TABLE `clientManaCache__` (
+  `clientFk` tinyint NOT NULL,
+  `mana` tinyint NOT NULL,
+  `dated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -24697,7 +26467,7 @@ CREATE TABLE `clientObservation` (
   `clientFk` int(11) NOT NULL,
   `workerFk` int(11) NOT NULL,
   `text` text COLLATE utf8_unicode_ci NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `Id_Trabajador` (`workerFk`),
   KEY `Id_Cliente` (`clientFk`),
@@ -24758,7 +26528,7 @@ DROP TABLE IF EXISTS `clientProtected`;
 CREATE TABLE `clientProtected` (
   `clientFk` int(11) NOT NULL,
   `workerFk` int(11) NOT NULL,
-  `isValidated__` tinyint(1) NOT NULL DEFAULT '0',
+  `isValidated__` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clientFk`),
   KEY `clientProtected_fk2_idx` (`workerFk`),
   CONSTRAINT `clientProtected_fk1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -24774,8 +26544,8 @@ DROP TABLE IF EXISTS `clientRisk`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `clientRisk` (
-  `clientFk` int(11) NOT NULL DEFAULT '0',
-  `companyFk` smallint(6) unsigned NOT NULL DEFAULT '0',
+  `clientFk` int(11) NOT NULL DEFAULT 0,
+  `companyFk` smallint(6) unsigned NOT NULL DEFAULT 0,
   `amount` decimal(10,2) DEFAULT NULL,
   PRIMARY KEY (`clientFk`,`companyFk`),
   KEY `company_id` (`companyFk`),
@@ -24792,10 +26562,11 @@ DROP TABLE IF EXISTS `clientRisk__`;
 /*!50001 DROP VIEW IF EXISTS `clientRisk__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `clientRisk__` AS SELECT 
- 1 AS `clientFk`,
- 1 AS `companyFk`,
- 1 AS `amount`*/;
+/*!50001 CREATE TABLE `clientRisk__` (
+  `clientFk` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -24809,7 +26580,7 @@ CREATE TABLE `clientSample` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `clientFk` int(10) unsigned NOT NULL,
   `typeFk` int(10) unsigned NOT NULL,
-  `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` datetime NOT NULL DEFAULT current_timestamp(),
   `workerFk` int(10) unsigned NOT NULL,
   `balance` float NOT NULL,
   `companyFk` smallint(5) unsigned DEFAULT NULL,
@@ -24831,7 +26602,7 @@ CREATE TABLE `clientType` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `code` varchar(20) CHARACTER SET utf8 NOT NULL,
   `type` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
-  `isCreatedAsServed` tinyint(1) DEFAULT '0',
+  `isCreatedAsServed` tinyint(1) DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_UNIQUE` (`code`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Establece categorias para poder agrupar las ventas';
@@ -24869,7 +26640,7 @@ CREATE TABLE `cmr` (
   `senderInstruccions` varchar(255) COLLATE utf8_unicode_ci DEFAULT 'Flowers 4º C. Plants 14º C',
   `paymentInstruccions` varchar(255) COLLATE utf8_unicode_ci DEFAULT 'Carriage paid',
   `specialAgreements` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NULL DEFAULT current_timestamp(),
   `companyFk` smallint(5) unsigned DEFAULT NULL,
   `addressToFk` int(11) DEFAULT NULL,
   `addressFromFk` int(11) DEFAULT NULL,
@@ -24938,7 +26709,7 @@ CREATE TABLE `cmr_expeditionPallet` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `cmrFk` int(11) NOT NULL,
   `expeditionPalletFk` int(11) NOT NULL,
-  `scanned` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `scanned` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `cmr_expeditionPallet_fk1_idx` (`cmrFk`),
   KEY `cmr_expeditionPallet_fk2_idx` (`expeditionPalletFk`),
@@ -24955,39 +26726,40 @@ DROP TABLE IF EXISTS `cmr_list`;
 /*!50001 DROP VIEW IF EXISTS `cmr_list`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `cmr_list` AS SELECT 
- 1 AS `cmrFk`,
- 1 AS `ticketFk`,
- 1 AS `truckPlate`,
- 1 AS `observations`,
- 1 AS `senderInstruccions`,
- 1 AS `paymentInstruccions`,
- 1 AS `specialAgreements`,
- 1 AS `created`,
- 1 AS `packagesList`,
- 1 AS `clientName`,
- 1 AS `clientPostalCode`,
- 1 AS `clientStreet`,
- 1 AS `clientCity`,
- 1 AS `clientProvince`,
- 1 AS `clientCountry`,
- 1 AS `companyName`,
- 1 AS `companyStreet`,
- 1 AS `companyPostCode`,
- 1 AS `companyCity`,
- 1 AS `companyCountry`,
- 1 AS `warehouseAddress`,
- 1 AS `shipped`,
- 1 AS `clientOficialName`,
- 1 AS `supplierFk`,
- 1 AS `carrierName`,
- 1 AS `carrierStreet`,
- 1 AS `carrierPostCode`,
- 1 AS `carrierCity`,
- 1 AS `carrierCountry`,
- 1 AS `phone`,
- 1 AS `mobile`,
- 1 AS `addressFk`*/;
+/*!50001 CREATE TABLE `cmr_list` (
+  `cmrFk` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL,
+  `truckPlate` tinyint NOT NULL,
+  `observations` tinyint NOT NULL,
+  `senderInstruccions` tinyint NOT NULL,
+  `paymentInstruccions` tinyint NOT NULL,
+  `specialAgreements` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `packagesList` tinyint NOT NULL,
+  `clientName` tinyint NOT NULL,
+  `clientPostalCode` tinyint NOT NULL,
+  `clientStreet` tinyint NOT NULL,
+  `clientCity` tinyint NOT NULL,
+  `clientProvince` tinyint NOT NULL,
+  `clientCountry` tinyint NOT NULL,
+  `companyName` tinyint NOT NULL,
+  `companyStreet` tinyint NOT NULL,
+  `companyPostCode` tinyint NOT NULL,
+  `companyCity` tinyint NOT NULL,
+  `companyCountry` tinyint NOT NULL,
+  `warehouseAddress` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `clientOficialName` tinyint NOT NULL,
+  `supplierFk` tinyint NOT NULL,
+  `carrierName` tinyint NOT NULL,
+  `carrierStreet` tinyint NOT NULL,
+  `carrierPostCode` tinyint NOT NULL,
+  `carrierCity` tinyint NOT NULL,
+  `carrierCountry` tinyint NOT NULL,
+  `phone` tinyint NOT NULL,
+  `mobile` tinyint NOT NULL,
+  `addressFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -24999,7 +26771,7 @@ DROP TABLE IF EXISTS `collection`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `collection` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `workerFk` int(11) DEFAULT NULL,
   `stateFk` tinyint(3) unsigned DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -25018,15 +26790,16 @@ DROP TABLE IF EXISTS `collectionReportSource`;
 /*!50001 DROP VIEW IF EXISTS `collectionReportSource`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `collectionReportSource` AS SELECT 
- 1 AS `collectionFk`,
- 1 AS `ticketFk`,
- 1 AS `itemFk`,
- 1 AS `concept`,
- 1 AS `size`,
- 1 AS `quantity`,
- 1 AS `nicho`,
- 1 AS `level`*/;
+/*!50001 CREATE TABLE `collectionReportSource` (
+  `collectionFk` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `concept` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `nicho` tinyint NOT NULL,
+  `level` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -25038,10 +26811,10 @@ DROP TABLE IF EXISTS `collectionVolumetry`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `collectionVolumetry` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `level` int(10) unsigned NOT NULL DEFAULT '0',
-  `lines` int(10) unsigned NOT NULL DEFAULT '1',
-  `liters` int(10) unsigned NOT NULL DEFAULT '0',
-  `height` int(10) unsigned NOT NULL DEFAULT '20',
+  `level` int(10) unsigned NOT NULL DEFAULT 0,
+  `lines` int(10) unsigned NOT NULL DEFAULT 1,
+  `liters` int(10) unsigned NOT NULL DEFAULT 0,
+  `height` int(10) unsigned NOT NULL DEFAULT 20,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -25055,10 +26828,10 @@ DROP TABLE IF EXISTS `collectionVolumetry_Paloma`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `collectionVolumetry_Paloma` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `level` int(10) unsigned NOT NULL DEFAULT '0',
-  `lines` int(10) unsigned NOT NULL DEFAULT '1',
-  `liters` int(10) unsigned NOT NULL DEFAULT '0',
-  `height` int(10) unsigned NOT NULL DEFAULT '20',
+  `level` int(10) unsigned NOT NULL DEFAULT 0,
+  `lines` int(10) unsigned NOT NULL DEFAULT 1,
+  `liters` int(10) unsigned NOT NULL DEFAULT 0,
+  `height` int(10) unsigned NOT NULL DEFAULT 20,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -25071,7 +26844,7 @@ DROP TABLE IF EXISTS `commissionConfig`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `commissionConfig` (
-  `rate` decimal(5,4) NOT NULL DEFAULT '0.0000',
+  `rate` decimal(5,4) NOT NULL DEFAULT 0.0000,
   `plusTeamAmount` int(11) DEFAULT NULL,
   `plusNewBornAmount` int(11) DEFAULT NULL,
   `plusSalesAmount` int(11) DEFAULT NULL,
@@ -25097,22 +26870,22 @@ CREATE TABLE `company` (
   `workerManagerFk` int(11) NOT NULL,
   `registered` date NOT NULL,
   `expired` date DEFAULT NULL,
-  `logo` longblob,
-  `isOfficial` tinyint(1) unsigned NOT NULL DEFAULT '1',
-  `hasCyc` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
+  `logo` longblob DEFAULT NULL,
+  `isOfficial` tinyint(1) unsigned NOT NULL DEFAULT 1,
+  `hasCyc` tinyint(1) unsigned zerofill NOT NULL DEFAULT 0,
   `rgb` varchar(6) COLLATE utf8_unicode_ci NOT NULL,
   `email` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `stamp` blob,
-  `created` timestamp NOT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `stamp` blob DEFAULT NULL,
+  `created` timestamp NOT NULL ON UPDATE current_timestamp(),
   `clientFk` int(11) DEFAULT NULL,
   `sage200Company` int(2) DEFAULT NULL,
   `supplierAccountFk` mediumint(8) unsigned DEFAULT NULL,
-  `isDefaulter` tinyint(4) NOT NULL DEFAULT '0',
-  `companyGroupFk` int(11) NOT NULL DEFAULT '1' COMMENT 'usado para calcular los greuges ',
+  `isDefaulter` tinyint(4) NOT NULL DEFAULT 0,
+  `companyGroupFk` int(11) NOT NULL DEFAULT 1 COMMENT 'usado para calcular los greuges ',
   `companyCode` int(2) DEFAULT NULL COMMENT 'Campo para movConta',
   `companyCodeTest` int(2) DEFAULT NULL,
-  `footnotes` longtext COLLATE utf8_unicode_ci COMMENT 'pie de paginas en las facturas',
-  `phytosanitary` longtext COLLATE utf8_unicode_ci,
+  `footnotes` longtext COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'pie de paginas en las facturas',
+  `phytosanitary` longtext COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `gerente_id` (`workerManagerFk`),
   KEY `empresa_cliente_idx` (`clientFk`),
@@ -25152,7 +26925,7 @@ CREATE TABLE `component` (
   `typeFk` int(11) NOT NULL,
   `classRate` smallint(6) DEFAULT NULL,
   `tax` double DEFAULT NULL,
-  `isRenewable` tinyint(2) NOT NULL DEFAULT '1',
+  `isRenewable` tinyint(2) NOT NULL DEFAULT 1,
   `code` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `series_componentes_idx` (`typeFk`),
@@ -25169,14 +26942,15 @@ DROP TABLE IF EXISTS `componentRate__`;
 /*!50001 DROP VIEW IF EXISTS `componentRate__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `componentRate__` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `componentTypeRate`,
- 1 AS `classRate`,
- 1 AS `tax`,
- 1 AS `isRenewable`,
- 1 AS `code`*/;
+/*!50001 CREATE TABLE `componentRate__` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `componentTypeRate` tinyint NOT NULL,
+  `classRate` tinyint NOT NULL,
+  `tax` tinyint NOT NULL,
+  `isRenewable` tinyint NOT NULL,
+  `code` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -25189,8 +26963,8 @@ DROP TABLE IF EXISTS `componentType`;
 CREATE TABLE `componentType` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `type` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
-  `isBase` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Marca aquellas series que se utilizan para calcular el precio base de las ventas, a efectos estadisticos',
-  `isMargin` tinyint(4) NOT NULL DEFAULT '0',
+  `isBase` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'Marca aquellas series que se utilizan para calcular el precio base de las ventas, a efectos estadisticos',
+  `isMargin` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `Serie_UNIQUE` (`type`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Permite organizar de forma ordenada los distintos componentes';
@@ -25204,10 +26978,11 @@ DROP TABLE IF EXISTS `componentTypeRate__`;
 /*!50001 DROP VIEW IF EXISTS `componentTypeRate__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `componentTypeRate__` AS SELECT 
- 1 AS `id`,
- 1 AS `type`,
- 1 AS `base`*/;
+/*!50001 CREATE TABLE `componentTypeRate__` (
+  `id` tinyint NOT NULL,
+  `type` tinyint NOT NULL,
+  `base` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -25218,11 +26993,12 @@ DROP TABLE IF EXISTS `componentType__`;
 /*!50001 DROP VIEW IF EXISTS `componentType__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `componentType__` AS SELECT 
- 1 AS `id`,
- 1 AS `type`,
- 1 AS `isBase`,
- 1 AS `isMargin`*/;
+/*!50001 CREATE TABLE `componentType__` (
+  `id` tinyint NOT NULL,
+  `type` tinyint NOT NULL,
+  `isBase` tinyint NOT NULL,
+  `isMargin` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -25233,14 +27009,15 @@ DROP TABLE IF EXISTS `component__`;
 /*!50001 DROP VIEW IF EXISTS `component__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `component__` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `typeFk`,
- 1 AS `classRate`,
- 1 AS `tax`,
- 1 AS `isRenewable`,
- 1 AS `code`*/;
+/*!50001 CREATE TABLE `component__` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `typeFk` tinyint NOT NULL,
+  `classRate` tinyint NOT NULL,
+  `tax` tinyint NOT NULL,
+  `isRenewable` tinyint NOT NULL,
+  `code` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -25267,70 +27044,53 @@ DROP TABLE IF EXISTS `config`;
 CREATE TABLE `config` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `ochoa` int(10) unsigned NOT NULL,
-  `invoiceOutFk` int(11) DEFAULT '0',
-  `bookFk` int(11) DEFAULT '0',
-  `serialAFk` int(11) DEFAULT '0',
-  `serialEFk` int(11) DEFAULT '0',
-  `serialRFk` int(11) DEFAULT '0',
-  `serialCFk` int(11) DEFAULT '0',
+  `invoiceOutFk` int(11) DEFAULT 0,
+  `bookFk` int(11) DEFAULT 0,
+  `serialAFk` int(11) DEFAULT 0,
+  `serialEFk` int(11) DEFAULT 0,
+  `serialRFk` int(11) DEFAULT 0,
+  `serialCFk` int(11) DEFAULT 0,
   `serialHFk` int(11) NOT NULL,
-  `serialPFk` int(11) DEFAULT '0',
-  `serialTFk` int(11) DEFAULT '0',
+  `serialPFk` int(11) DEFAULT 0,
+  `serialTFk` int(11) DEFAULT 0,
   `inventoried` datetime DEFAULT NULL,
-  `serialMFk` int(11) DEFAULT '0',
-  `itemLog` int(11) DEFAULT '0',
+  `serialMFk` int(11) DEFAULT 0,
+  `itemLog` int(11) DEFAULT 0,
   `weekGoal` int(11) DEFAULT NULL,
   `photosPath` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cashBoxNumber` int(11) DEFAULT '0',
+  `cashBoxNumber` int(11) DEFAULT 0,
   `redCode` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `TabletTime` datetime DEFAULT NULL,
-  `t0` int(11) NOT NULL DEFAULT '0',
-  `t1` int(11) NOT NULL DEFAULT '0',
-  `t2` int(11) NOT NULL DEFAULT '0',
-  `t3` int(11) NOT NULL DEFAULT '0',
-  `cc` double NOT NULL DEFAULT '0',
-  `palet` double NOT NULL DEFAULT '0',
+  `t0` int(11) NOT NULL DEFAULT 0,
+  `t1` int(11) NOT NULL DEFAULT 0,
+  `t2` int(11) NOT NULL DEFAULT 0,
+  `t3` int(11) NOT NULL DEFAULT 0,
+  `cc` double NOT NULL DEFAULT 0,
+  `palet` double NOT NULL DEFAULT 0,
   `campaign` datetime NOT NULL,
   `campaignLife` tinyint(3) unsigned NOT NULL,
   `truckDays` tinyint(3) unsigned NOT NULL,
   `transportCharges` double NOT NULL,
   `escanerPath` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `printedTurn` int(4) DEFAULT NULL,
-  `truckLength` int(11) DEFAULT '24',
+  `truckLength` int(11) DEFAULT 24,
   `fuelConsumption` int(11) DEFAULT NULL,
   `petrol` decimal(10,1) DEFAULT NULL,
   `maintenance` decimal(10,1) DEFAULT NULL,
   `hourPrice` decimal(10,1) DEFAULT NULL,
   `meterPrice` decimal(10,1) DEFAULT NULL,
   `kmPrice` decimal(10,1) DEFAULT NULL,
-  `routeOption` int(11) DEFAULT '1',
-  `dbproduccion` tinyint(1) NOT NULL DEFAULT '1',
+  `routeOption` int(11) DEFAULT 1,
+  `dbproduccion` tinyint(1) NOT NULL DEFAULT 1,
   `mdbServer` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `fakeEmail` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `defaultersMaxAmount` int(10) DEFAULT '200' COMMENT 'maxima deuda permitida a partir de la cual se bloquea a un usuario',
+  `defaultersMaxAmount` int(10) DEFAULT 200 COMMENT 'maxima deuda permitida a partir de la cual se bloquea a un usuario',
   `ASIEN` bigint(20) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fechainv_idx` (`inventoried`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `config__`
---
-
-DROP TABLE IF EXISTS `config__`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `config__` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `mdbServer` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `fakeEmail` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `defaultersMaxAmount` int(10) DEFAULT '200' COMMENT 'maxima deuda permitida a partir de la cual se bloquea a un usuario',
-  `ASIEN` bigint(20) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `contactChannel`
 --
@@ -25345,6 +27105,22 @@ CREATE TABLE `contactChannel` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Canal por el que nos ha conocido un cliente y  se ha dado de';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `continent`
+--
+
+DROP TABLE IF EXISTS `continent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `continent` (
+  `id` tinyint(4) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(2) CHARACTER SET utf8 NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `continent_name_uindex` (`name`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='World continents';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `contratos_subvencion_270619`
 --
@@ -25357,7 +27133,7 @@ CREATE TABLE `contratos_subvencion_270619` (
   `workerFk` int(11) NOT NULL,
   `cod_centroFk` int(11) NOT NULL,
   `CodContratoFk` int(11) NOT NULL,
-  `journey` decimal(5,2) NOT NULL DEFAULT '8.00',
+  `journey` decimal(5,2) NOT NULL DEFAULT 8.00,
   `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `nif` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`),
@@ -25380,13 +27156,13 @@ DROP TABLE IF EXISTS `conveyor`;
 CREATE TABLE `conveyor` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `typeFk` int(11) NOT NULL,
-  `stratum` int(11) NOT NULL DEFAULT '0',
+  `stratum` int(11) NOT NULL DEFAULT 0,
   `length` int(11) DEFAULT NULL,
   `width` int(11) DEFAULT NULL,
   `height` int(11) DEFAULT NULL,
   `x` int(11) DEFAULT NULL,
   `y` int(11) DEFAULT NULL,
-  `color` int(11) DEFAULT '14548991',
+  `color` int(11) DEFAULT 14548991,
   PRIMARY KEY (`id`),
   KEY `conveyor_fk1_idx` (`typeFk`),
   CONSTRAINT `conveyor_fk1` FOREIGN KEY (`typeFk`) REFERENCES `conveyorType` (`id`) ON UPDATE CASCADE
@@ -25403,7 +27179,7 @@ DROP TABLE IF EXISTS `conveyorBuildingClass`;
 CREATE TABLE `conveyorBuildingClass` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `priority` int(11) NOT NULL DEFAULT '0',
+  `priority` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tipo de caja para el montaje de pallets';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -25436,15 +27212,15 @@ DROP TABLE IF EXISTS `conveyorExpedition`;
 CREATE TABLE `conveyorExpedition` (
   `expeditionFk` int(11) NOT NULL,
   `conveyorFk` int(11) DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `conveyorBuildingClassFk` int(11) NOT NULL,
-  `length` int(11) NOT NULL DEFAULT '1',
-  `width` int(11) NOT NULL DEFAULT '1',
-  `height` int(11) NOT NULL DEFAULT '1',
-  `x` int(11) NOT NULL DEFAULT '1',
-  `y` int(11) NOT NULL DEFAULT '1',
+  `length` int(11) NOT NULL DEFAULT 1,
+  `width` int(11) NOT NULL DEFAULT 1,
+  `height` int(11) NOT NULL DEFAULT 1,
+  `x` int(11) NOT NULL DEFAULT 1,
+  `y` int(11) NOT NULL DEFAULT 1,
   `routeFk` int(11) NOT NULL,
-  `isBuilt` tinyint(4) NOT NULL DEFAULT '0',
+  `isBuilt` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`expeditionFk`),
   KEY `conveyorExpedition_fk1_idx` (`conveyorFk`),
   KEY `conveyorExpedition_fk2_idx` (`conveyorBuildingClassFk`),
@@ -25464,7 +27240,7 @@ CREATE TABLE `conveyorMode` (
   `code` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
   `saturacion` int(11) NOT NULL,
   `gap` int(11) NOT NULL,
-  `isActive` tinyint(4) NOT NULL DEFAULT '0',
+  `isActive` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -25511,18 +27287,21 @@ DROP TABLE IF EXISTS `country`;
 CREATE TABLE `country` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   `country` varchar(25) COLLATE utf8_unicode_ci NOT NULL,
-  `CEE` tinyint(1) NOT NULL DEFAULT '1',
+  `CEE` tinyint(1) NOT NULL DEFAULT 1,
   `code` varchar(2) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT 1,
   `politicalCountryFk` mediumint(8) unsigned NOT NULL COMMENT 'Pais Real(apaño por culpa del España Exento)',
   `geoFk` int(11) DEFAULT NULL,
-  `hasDailyInvoice` tinyint(4) NOT NULL DEFAULT '0',
-  `isUeeMember` tinyint(4) NOT NULL DEFAULT '0',
+  `hasDailyInvoice` tinyint(4) NOT NULL DEFAULT 0,
+  `isUeeMember` tinyint(4) NOT NULL DEFAULT 0,
   `ibanLength` tinyint(4) DEFAULT NULL,
+  `continentFk` tinyint(4) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `Id_Paisreal` (`politicalCountryFk`),
   KEY `currency_id_fk_idx` (`currencyFk`),
   KEY `country_Ix4` (`country`),
+  KEY `continent_id_fk_idx` (`continentFk`),
+  CONSTRAINT `continent_id_fk` FOREIGN KEY (`continentFk`) REFERENCES `continent` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `currency_id_fk` FOREIGN KEY (`currencyFk`) REFERENCES `currency` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -25786,7 +27565,7 @@ CREATE TABLE `creditInsurance` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `creditClassification` int(11) DEFAULT NULL,
   `credit` int(11) DEFAULT NULL,
-  `creationDate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `creationDate` timestamp NOT NULL DEFAULT current_timestamp(),
   `grade` tinyint(1) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `CreditInsurance_Fk1_idx` (`creditClassification`),
@@ -25826,7 +27605,7 @@ CREATE TABLE `currency` (
   `id` tinyint(3) unsigned NOT NULL,
   `code` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
   `name` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ratio` double NOT NULL DEFAULT '1',
+  `ratio` double NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `Moneda_UNIQUE` (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -25876,12 +27655,13 @@ DROP TABLE IF EXISTS `defaulter`;
 /*!50001 DROP VIEW IF EXISTS `defaulter`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `defaulter` AS SELECT 
- 1 AS `clientFk`,
- 1 AS `created`,
- 1 AS `amount`,
- 1 AS `defaulterSinced`,
- 1 AS `hasChanged`*/;
+/*!50001 CREATE TABLE `defaulter` (
+  `clientFk` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `defaulterSinced` tinyint NOT NULL,
+  `hasChanged` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -25954,6 +27734,7 @@ DROP TABLE IF EXISTS `department`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `department` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   `lft` int(11) DEFAULT NULL,
   `rgt` int(11) DEFAULT NULL,
@@ -25962,14 +27743,14 @@ CREATE TABLE `department` (
   `bossFk__` int(11) DEFAULT NULL,
   `x__` int(11) DEFAULT NULL,
   `y__` int(11) DEFAULT NULL,
-  `isProduction` tinyint(4) NOT NULL DEFAULT '0',
-  `isSelected` tinyint(1) NOT NULL DEFAULT '0',
-  `depth` int(11) NOT NULL DEFAULT '0',
-  `sons` decimal(10,0) NOT NULL DEFAULT '0',
+  `isProduction` tinyint(4) NOT NULL DEFAULT 0,
+  `isSelected` tinyint(1) NOT NULL DEFAULT 0,
+  `depth` int(11) NOT NULL DEFAULT 0,
+  `sons` decimal(10,0) NOT NULL DEFAULT 0,
   `parentFk` int(10) unsigned DEFAULT NULL,
   `path` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `chatName` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isTeleworking` tinyint(1) DEFAULT '0',
+  `isTeleworking` tinyint(1) DEFAULT 0,
   `notificationEmail` varchar(150) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name_UNIQUE` (`name`),
@@ -26069,9 +27850,10 @@ DROP TABLE IF EXISTS `departmentTree`;
 /*!50001 DROP VIEW IF EXISTS `departmentTree`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `departmentTree` AS SELECT 
- 1 AS `id`,
- 1 AS `dep`*/;
+/*!50001 CREATE TABLE `departmentTree` (
+  `id` tinyint NOT NULL,
+  `dep` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -26120,7 +27902,7 @@ CREATE TABLE `deviceProduction` (
   `macWifi` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `serialNumber` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `departmentFk` int(11) DEFAULT NULL,
-  `isOutOfService` tinyint(1) NOT NULL DEFAULT '0',
+  `isOutOfService` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `device_id_UNIQUE` (`id`),
   UNIQUE KEY `sn_UNIQUE` (`imei`),
@@ -26184,17 +27966,17 @@ DROP TABLE IF EXISTS `dms`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `dms` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `dmsTypeFk` int(11) NOT NULL DEFAULT '1',
+  `dmsTypeFk` int(11) NOT NULL DEFAULT 1,
   `reference` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `description` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
   `hardCopyNumber` mediumint(8) unsigned DEFAULT NULL,
   `contentType` varchar(150) COLLATE utf8_unicode_ci DEFAULT NULL,
   `file` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `hasFile` tinyint(4) NOT NULL DEFAULT '0',
+  `hasFile` tinyint(4) NOT NULL DEFAULT 0,
   `workerFk` int(11) DEFAULT NULL,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `warehouseFk` smallint(5) unsigned NOT NULL DEFAULT '1',
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  `warehouseFk` smallint(5) unsigned NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `emp_id` (`companyFk`,`hardCopyNumber`,`warehouseFk`),
   KEY `trabajador_id` (`workerFk`),
@@ -26286,7 +28068,7 @@ DROP TABLE IF EXISTS `dmsRecover`;
 CREATE TABLE `dmsRecover` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `ticketFk` int(11) DEFAULT NULL,
-  `sign` text COLLATE utf8_unicode_ci,
+  `sign` text COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `ticketFk_idx` (`ticketFk`),
   CONSTRAINT `ticketFk` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@@ -26332,14 +28114,14 @@ CREATE TABLE `dua` (
   `bookEntried` date DEFAULT NULL,
   `gestdocFk` int(11) DEFAULT NULL,
   `customsValue` decimal(10,2) DEFAULT NULL,
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
   `ASIEN` double DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_awb_dua_awb_idx` (`awbFk`),
   KEY `fk_dua_gestdoc1_idx` (`gestdocFk`),
   KEY `dua_fk4_idx` (`companyFk`),
   CONSTRAINT `dua_fk1` FOREIGN KEY (`gestdocFk`) REFERENCES `dms` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
-  CONSTRAINT `dua_fk2` FOREIGN KEY (`awbFk`) REFERENCES `vn2008`.`awb` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `dua_fk2` FOREIGN KEY (`awbFk`) REFERENCES `awb` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `dua_fk4` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -26376,7 +28158,7 @@ CREATE TABLE `duaIntrastat` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `duaFk` int(11) NOT NULL,
   `intrastatFk` int(8) unsigned NOT NULL,
-  `amount` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `amount` decimal(10,2) NOT NULL DEFAULT 0.00,
   PRIMARY KEY (`id`),
   KEY `duaIntrastat_fk1_idx` (`intrastatFk`),
   KEY `duaIntrastat_fk2_idx` (`duaFk`),
@@ -26476,12 +28258,13 @@ DROP TABLE IF EXISTS `ediGenus`;
 /*!50001 DROP VIEW IF EXISTS `ediGenus`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `ediGenus` AS SELECT 
- 1 AS `id`,
- 1 AS `latinGenusName`,
- 1 AS `entried`,
- 1 AS `dued`,
- 1 AS `modified`*/;
+/*!50001 CREATE TABLE `ediGenus` (
+  `id` tinyint NOT NULL,
+  `latinGenusName` tinyint NOT NULL,
+  `entried` tinyint NOT NULL,
+  `dued` tinyint NOT NULL,
+  `modified` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -26492,13 +28275,14 @@ DROP TABLE IF EXISTS `ediSpecie`;
 /*!50001 DROP VIEW IF EXISTS `ediSpecie`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `ediSpecie` AS SELECT 
- 1 AS `id`,
- 1 AS `genusFk`,
- 1 AS `latinSpeciesName`,
- 1 AS `entried`,
- 1 AS `dued`,
- 1 AS `modified`*/;
+/*!50001 CREATE TABLE `ediSpecie` (
+  `id` tinyint NOT NULL,
+  `genusFk` tinyint NOT NULL,
+  `latinSpeciesName` tinyint NOT NULL,
+  `entried` tinyint NOT NULL,
+  `dued` tinyint NOT NULL,
+  `modified` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -26593,24 +28377,24 @@ DROP TABLE IF EXISTS `entry`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `entry` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `supplierFk` int(11) NOT NULL DEFAULT '644',
+  `supplierFk` int(11) NOT NULL DEFAULT 644,
   `dated` datetime NOT NULL,
   `ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isBooked` tinyint(1) NOT NULL DEFAULT '0',
-  `isInventory` tinyint(1) NOT NULL DEFAULT '0',
-  `notes` longtext COLLATE utf8_unicode_ci,
-  `isConfirmed` tinyint(1) NOT NULL DEFAULT '0',
-  `isOrdered` tinyint(1) NOT NULL DEFAULT '0',
-  `isRaid` tinyint(1) NOT NULL DEFAULT '0',
-  `commission` float DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `isBooked` tinyint(1) NOT NULL DEFAULT 0,
+  `isInventory` tinyint(1) NOT NULL DEFAULT 0,
+  `notes` longtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `isConfirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `isOrdered` tinyint(1) NOT NULL DEFAULT 0,
+  `isRaid` tinyint(1) NOT NULL DEFAULT 0,
+  `commission` float DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `evaNotes` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `travelFk` int(11) unsigned DEFAULT NULL,
-  `currencyFk` tinyint(3) unsigned DEFAULT '1',
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `currencyFk` tinyint(3) unsigned DEFAULT 1,
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
   `gestDocFk` int(11) DEFAULT NULL,
   `invoiceInFk` mediumint(8) unsigned DEFAULT NULL,
-  `isBlocked` tinyint(4) NOT NULL DEFAULT '0',
+  `isBlocked` tinyint(4) NOT NULL DEFAULT 0,
   `loadPriority` int(11) DEFAULT NULL,
   `kop` int(11) DEFAULT NULL,
   `sub` mediumint(8) unsigned DEFAULT NULL,
@@ -26807,6 +28591,19 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
+--
+-- Table structure for table `entryConfig`
+--
+
+DROP TABLE IF EXISTS `entryConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `entryConfig` (
+  `defaultEntry` int(11) NOT NULL,
+  PRIMARY KEY (`defaultEntry`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `entryList`
 --
@@ -26815,17 +28612,18 @@ DROP TABLE IF EXISTS `entryList`;
 /*!50001 DROP VIEW IF EXISTS `entryList`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `entryList` AS SELECT 
- 1 AS `entryFk`,
- 1 AS `isHere`,
- 1 AS `landed`,
- 1 AS `supplier`,
- 1 AS `entryRef`,
- 1 AS `agency`,
- 1 AS `travelRef`,
- 1 AS `appointment`,
- 1 AS `supplierFk`,
- 1 AS `warehouseInFk`*/;
+/*!50001 CREATE TABLE `entryList` (
+  `entryFk` tinyint NOT NULL,
+  `isHere` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `supplier` tinyint NOT NULL,
+  `entryRef` tinyint NOT NULL,
+  `agency` tinyint NOT NULL,
+  `travelRef` tinyint NOT NULL,
+  `appointment` tinyint NOT NULL,
+  `supplierFk` tinyint NOT NULL,
+  `warehouseInFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -26840,11 +28638,11 @@ CREATE TABLE `entryLog` (
   `originFk` int(11) NOT NULL,
   `userFk` int(10) unsigned NOT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -26864,7 +28662,7 @@ DROP TABLE IF EXISTS `entryShelving__`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `entryShelving__` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `entryFk` int(11) NOT NULL DEFAULT '204539',
+  `entryFk` int(11) NOT NULL DEFAULT 204539,
   `shelvingFk` varchar(10) CHARACTER SET utf8 NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `shelvingFk_UNIQUE` (`shelvingFk`),
@@ -26954,7 +28752,7 @@ CREATE TABLE `envialiaConfig` (
   `endRange` bigint(25) DEFAULT NULL COMMENT 'limite del rango que nos proporciona enviaría',
   `cargoAgency` varchar(25) COLLATE utf8_unicode_ci DEFAULT '004666' COMMENT 'numero de verdnatura dado por enviaría',
   `actualNumber` bigint(25) DEFAULT NULL COMMENT 'Numero actual de etiquetas imprimidas , comprimido entre startRange y endRange, ',
-  `isAlreadyNotified` int(1) NOT NULL DEFAULT '0' COMMENT 'Booleano para que el evento vn.envialiaRangeChecker compruebe si se a enviado una notificación\n',
+  `isAlreadyNotified` int(1) NOT NULL DEFAULT 0 COMMENT 'Booleano para que el evento vn.envialiaRangeChecker compruebe si se a enviado una notificación\n',
   `notificationThrehold` int(11) DEFAULT NULL COMMENT 'Umbral para avisar a enviaría de reseetar el startRange y endRange\nSe avisara a enviaría si el umbral + el actualNumber es superior a endRange\n',
   PRIMARY KEY (`serviceType`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -26988,7 +28786,7 @@ CREATE TABLE `erte` (
   `workerFk` int(11) NOT NULL,
   `started` date DEFAULT NULL,
   `ended` date DEFAULT NULL,
-  `reduction` int(3) NOT NULL DEFAULT '1',
+  `reduction` int(3) NOT NULL DEFAULT 1,
   `monday` tinyint(1) DEFAULT NULL,
   `tuesday` tinyint(1) DEFAULT NULL,
   `wednesday` tinyint(1) DEFAULT NULL,
@@ -27008,10 +28806,11 @@ DROP TABLE IF EXISTS `exchangeInsuranceEntry`;
 /*!50001 DROP VIEW IF EXISTS `exchangeInsuranceEntry`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `exchangeInsuranceEntry` AS SELECT 
- 1 AS `dated`,
- 1 AS `Dolares`,
- 1 AS `rate`*/;
+/*!50001 CREATE TABLE `exchangeInsuranceEntry` (
+  `dated` tinyint NOT NULL,
+  `Dolares` tinyint NOT NULL,
+  `rate` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27022,10 +28821,11 @@ DROP TABLE IF EXISTS `exchangeInsuranceIn`;
 /*!50001 DROP VIEW IF EXISTS `exchangeInsuranceIn`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `exchangeInsuranceIn` AS SELECT 
- 1 AS `dated`,
- 1 AS `amount`,
- 1 AS `rate`*/;
+/*!50001 CREATE TABLE `exchangeInsuranceIn` (
+  `dated` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `rate` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27036,10 +28836,11 @@ DROP TABLE IF EXISTS `exchangeInsuranceOut`;
 /*!50001 DROP VIEW IF EXISTS `exchangeInsuranceOut`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `exchangeInsuranceOut` AS SELECT 
- 1 AS `received`,
- 1 AS `divisa`,
- 1 AS `rate`*/;
+/*!50001 CREATE TABLE `exchangeInsuranceOut` (
+  `received` tinyint NOT NULL,
+  `divisa` tinyint NOT NULL,
+  `rate` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27050,14 +28851,15 @@ DROP TABLE IF EXISTS `exchangeReportSourcePrevious`;
 /*!50001 DROP VIEW IF EXISTS `exchangeReportSourcePrevious`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `exchangeReportSourcePrevious` AS SELECT 
- 1 AS `dated`,
- 1 AS `amountIn`,
- 1 AS `rateIn`,
- 1 AS `amountOut`,
- 1 AS `rateOut`,
- 1 AS `amountEntry`,
- 1 AS `rateEntry`*/;
+/*!50001 CREATE TABLE `exchangeReportSourcePrevious` (
+  `dated` tinyint NOT NULL,
+  `amountIn` tinyint NOT NULL,
+  `rateIn` tinyint NOT NULL,
+  `amountOut` tinyint NOT NULL,
+  `rateOut` tinyint NOT NULL,
+  `amountEntry` tinyint NOT NULL,
+  `rateEntry` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27070,7 +28872,7 @@ DROP TABLE IF EXISTS `excuse`;
 CREATE TABLE `excuse` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `txt` varchar(255) CHARACTER SET latin1 NOT NULL,
-  `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `date` datetime NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -27086,13 +28888,13 @@ CREATE TABLE `expedition` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `agencyModeFk` int(11) NOT NULL,
   `ticketFk` int(10) NOT NULL,
-  `isBox` int(11) DEFAULT '1' COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `isBox` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
+  `created` timestamp NULL DEFAULT current_timestamp(),
   `isRefund` bit(1) DEFAULT b'0',
   `isPickUp` bit(1) DEFAULT b'0',
   `itemFk` int(11) DEFAULT NULL COMMENT 'Este campo hace referencia al artículo que habria que facturar si las cajas no fueran incluidos.\\nSe debería llamar packageItemFk',
   `counter` smallint(5) unsigned NOT NULL,
-  `checked` tinyint(4) NOT NULL DEFAULT '0',
+  `checked` tinyint(4) NOT NULL DEFAULT 0,
   `workerFk` int(11) DEFAULT NULL,
   `externalId` bigint(25) DEFAULT NULL,
   `packagingFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -27223,18 +29025,19 @@ DROP TABLE IF EXISTS `expeditionCommon`;
 /*!50001 DROP VIEW IF EXISTS `expeditionCommon`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionCommon` AS SELECT 
- 1 AS `truckFk`,
- 1 AS `etd`,
- 1 AS `description`,
- 1 AS `palletFk`,
- 1 AS `routeFk`,
- 1 AS `scanFk`,
- 1 AS `expeditionFk`,
- 1 AS `expeditionTruckFk`,
- 1 AS `warehouseFk`,
- 1 AS `lastPacked`,
- 1 AS `ticketFk`*/;
+/*!50001 CREATE TABLE `expeditionCommon` (
+  `truckFk` tinyint NOT NULL,
+  `etd` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `palletFk` tinyint NOT NULL,
+  `routeFk` tinyint NOT NULL,
+  `scanFk` tinyint NOT NULL,
+  `expeditionFk` tinyint NOT NULL,
+  `expeditionTruckFk` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `lastPacked` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27247,9 +29050,9 @@ DROP TABLE IF EXISTS `expeditionPallet`;
 CREATE TABLE `expeditionPallet` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `truckFk` int(11) NOT NULL,
-  `built` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `built` datetime NOT NULL DEFAULT current_timestamp(),
   `position` int(11) DEFAULT NULL,
-  `isPrint` tinyint(4) NOT NULL DEFAULT '2',
+  `isPrint` tinyint(4) NOT NULL DEFAULT 2,
   PRIMARY KEY (`id`),
   KEY `expeditionPallet_fk1_idx` (`truckFk`),
   CONSTRAINT `expeditionPallet_fk1` FOREIGN KEY (`truckFk`) REFERENCES `expeditionTruck` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@@ -27290,14 +29093,15 @@ DROP TABLE IF EXISTS `expeditionPallet_Print`;
 /*!50001 DROP VIEW IF EXISTS `expeditionPallet_Print`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionPallet_Print` AS SELECT 
- 1 AS `truck`,
- 1 AS `routeFk`,
- 1 AS `zone`,
- 1 AS `eti`,
- 1 AS `palletFk`,
- 1 AS `isMatch`,
- 1 AS `warehouseFk`*/;
+/*!50001 CREATE TABLE `expeditionPallet_Print` (
+  `truck` tinyint NOT NULL,
+  `routeFk` tinyint NOT NULL,
+  `zone` tinyint NOT NULL,
+  `eti` tinyint NOT NULL,
+  `palletFk` tinyint NOT NULL,
+  `isMatch` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27308,12 +29112,13 @@ DROP TABLE IF EXISTS `expeditionRoute_Monitor`;
 /*!50001 DROP VIEW IF EXISTS `expeditionRoute_Monitor`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionRoute_Monitor` AS SELECT 
- 1 AS `routeFk`,
- 1 AS `tickets`,
- 1 AS `expeditions`,
- 1 AS `scanned`,
- 1 AS `lastPacked`*/;
+/*!50001 CREATE TABLE `expeditionRoute_Monitor` (
+  `routeFk` tinyint NOT NULL,
+  `tickets` tinyint NOT NULL,
+  `expeditions` tinyint NOT NULL,
+  `scanned` tinyint NOT NULL,
+  `lastPacked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27324,12 +29129,13 @@ DROP TABLE IF EXISTS `expeditionRoute_freeTickets`;
 /*!50001 DROP VIEW IF EXISTS `expeditionRoute_freeTickets`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionRoute_freeTickets` AS SELECT 
- 1 AS `routeFk`,
- 1 AS `ticket`,
- 1 AS `code`,
- 1 AS `almacen`,
- 1 AS `updated`*/;
+/*!50001 CREATE TABLE `expeditionRoute_freeTickets` (
+  `routeFk` tinyint NOT NULL,
+  `ticket` tinyint NOT NULL,
+  `code` tinyint NOT NULL,
+  `almacen` tinyint NOT NULL,
+  `updated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27342,7 +29148,7 @@ DROP TABLE IF EXISTS `expeditionScan`;
 CREATE TABLE `expeditionScan` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `expeditionFk` int(11) NOT NULL,
-  `scanned` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `scanned` datetime NOT NULL DEFAULT current_timestamp(),
   `palletFk` int(11) NOT NULL,
   `workerFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -27384,16 +29190,17 @@ DROP TABLE IF EXISTS `expeditionScan_Monitor`;
 /*!50001 DROP VIEW IF EXISTS `expeditionScan_Monitor`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionScan_Monitor` AS SELECT 
- 1 AS `truckFk`,
- 1 AS `ETD`,
- 1 AS `description`,
- 1 AS `palletFk`,
- 1 AS `position`,
- 1 AS `built`,
- 1 AS `scanFk`,
- 1 AS `expeditionFk`,
- 1 AS `scanned`*/;
+/*!50001 CREATE TABLE `expeditionScan_Monitor` (
+  `truckFk` tinyint NOT NULL,
+  `ETD` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `palletFk` tinyint NOT NULL,
+  `position` tinyint NOT NULL,
+  `built` tinyint NOT NULL,
+  `scanFk` tinyint NOT NULL,
+  `expeditionFk` tinyint NOT NULL,
+  `scanned` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27404,13 +29211,14 @@ DROP TABLE IF EXISTS `expeditionTimeExpended`;
 /*!50001 DROP VIEW IF EXISTS `expeditionTimeExpended`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionTimeExpended` AS SELECT 
- 1 AS `ticketFk`,
- 1 AS `started`,
- 1 AS `finished`,
- 1 AS `cajas`,
- 1 AS `code`,
- 1 AS `warehouseFk`*/;
+/*!50001 CREATE TABLE `expeditionTimeExpended` (
+  `ticketFk` tinyint NOT NULL,
+  `started` tinyint NOT NULL,
+  `finished` tinyint NOT NULL,
+  `cajas` tinyint NOT NULL,
+  `code` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27477,17 +29285,18 @@ DROP TABLE IF EXISTS `expeditionTruck_Control`;
 /*!50001 DROP VIEW IF EXISTS `expeditionTruck_Control`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionTruck_Control` AS SELECT 
- 1 AS `id`,
- 1 AS `ETD`,
- 1 AS `description`,
- 1 AS `ticketsSinBultos`,
- 1 AS `pallets`,
- 1 AS `routes`,
- 1 AS `scans`,
- 1 AS `expeditions`,
- 1 AS `fallos`,
- 1 AS `lastPacked`*/;
+/*!50001 CREATE TABLE `expeditionTruck_Control` (
+  `id` tinyint NOT NULL,
+  `ETD` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `ticketsSinBultos` tinyint NOT NULL,
+  `pallets` tinyint NOT NULL,
+  `routes` tinyint NOT NULL,
+  `scans` tinyint NOT NULL,
+  `expeditions` tinyint NOT NULL,
+  `fallos` tinyint NOT NULL,
+  `lastPacked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27498,16 +29307,17 @@ DROP TABLE IF EXISTS `expeditionTruck_Control_Detail`;
 /*!50001 DROP VIEW IF EXISTS `expeditionTruck_Control_Detail`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionTruck_Control_Detail` AS SELECT 
- 1 AS `id`,
- 1 AS `ETD`,
- 1 AS `destino`,
- 1 AS `pallet`,
- 1 AS `routes`,
- 1 AS `scans`,
- 1 AS `destinos`,
- 1 AS `fallos`,
- 1 AS `lastPacked`*/;
+/*!50001 CREATE TABLE `expeditionTruck_Control_Detail` (
+  `id` tinyint NOT NULL,
+  `ETD` tinyint NOT NULL,
+  `destino` tinyint NOT NULL,
+  `pallet` tinyint NOT NULL,
+  `routes` tinyint NOT NULL,
+  `scans` tinyint NOT NULL,
+  `destinos` tinyint NOT NULL,
+  `fallos` tinyint NOT NULL,
+  `lastPacked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27518,17 +29328,18 @@ DROP TABLE IF EXISTS `expeditionTruck_Control_Detail_Pallet`;
 /*!50001 DROP VIEW IF EXISTS `expeditionTruck_Control_Detail_Pallet`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `expeditionTruck_Control_Detail_Pallet` AS SELECT 
- 1 AS `id`,
- 1 AS `ETD`,
- 1 AS `destino`,
- 1 AS `pallet`,
- 1 AS `route`,
- 1 AS `scans`,
- 1 AS `destinos`,
- 1 AS `fallos`,
- 1 AS `expeditionTruckFk`,
- 1 AS `lastPacked`*/;
+/*!50001 CREATE TABLE `expeditionTruck_Control_Detail_Pallet` (
+  `id` tinyint NOT NULL,
+  `ETD` tinyint NOT NULL,
+  `destino` tinyint NOT NULL,
+  `pallet` tinyint NOT NULL,
+  `route` tinyint NOT NULL,
+  `scans` tinyint NOT NULL,
+  `destinos` tinyint NOT NULL,
+  `fallos` tinyint NOT NULL,
+  `expeditionTruckFk` tinyint NOT NULL,
+  `lastPacked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27542,9 +29353,9 @@ CREATE TABLE `expence` (
   `id` varchar(10) NOT NULL,
   `taxTypeFk` tinyint(4) NOT NULL,
   `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isConbase` tinyint(4) NOT NULL DEFAULT '1',
-  `isWithheld` tinyint(4) NOT NULL DEFAULT '0',
-  `isForSale` tinyint(4) NOT NULL DEFAULT '0',
+  `isConbase` tinyint(4) NOT NULL DEFAULT 1,
+  `isWithheld` tinyint(4) NOT NULL DEFAULT 0,
+  `isForSale` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`taxTypeFk`),
   KEY `iva_tipo_id` (`taxTypeFk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -27558,9 +29369,10 @@ DROP TABLE IF EXISTS `firstTicketShipped`;
 /*!50001 DROP VIEW IF EXISTS `firstTicketShipped`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `firstTicketShipped` AS SELECT 
- 1 AS `shipped`,
- 1 AS `clientFk`*/;
+/*!50001 CREATE TABLE `firstTicketShipped` (
+  `shipped` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27571,13 +29383,14 @@ DROP TABLE IF EXISTS `floraHollandBuyedItems`;
 /*!50001 DROP VIEW IF EXISTS `floraHollandBuyedItems`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `floraHollandBuyedItems` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `longName`,
- 1 AS `quantity`,
- 1 AS `buyingValue`,
- 1 AS `landed`,
- 1 AS `companyFk`*/;
+/*!50001 CREATE TABLE `floraHollandBuyedItems` (
+  `itemFk` tinyint NOT NULL,
+  `longName` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `buyingValue` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27595,7 +29408,7 @@ CREATE TABLE `floramondoConfig` (
   `warehouseOutFk__` smallint(6) unsigned DEFAULT NULL,
   `agencyModeFk__` int(11) DEFAULT NULL,
   `MaxLatestDeliveryHour` int(11) DEFAULT NULL,
-  `MaxLatestOrderHour` int(11) DEFAULT '12' COMMENT 'Hora máxima para aceptar pedidos hoy',
+  `MaxLatestOrderHour` int(11) DEFAULT 12 COMMENT 'Hora máxima para aceptar pedidos hoy',
   PRIMARY KEY (`id`),
   KEY `floramondoConfigWarehouseIn_idx` (`warehouseInFk`),
   KEY `floramondoConfigWarehouseOut_idx` (`warehouseOutFk__`),
@@ -27655,6 +29468,21 @@ CREATE TABLE `gateArea` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `genus`
+--
+
+DROP TABLE IF EXISTS `genus`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `genus` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `genus_PK2` (`name`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `greuge`
 --
@@ -27667,8 +29495,8 @@ CREATE TABLE `greuge` (
   `clientFk` int(10) unsigned NOT NULL,
   `description` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   `amount` decimal(10,2) NOT NULL,
-  `shipped` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `shipped` datetime NOT NULL DEFAULT current_timestamp(),
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `greugeTypeFk` int(11) DEFAULT NULL,
   `ticketFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`Id`),
@@ -27739,9 +29567,10 @@ DROP TABLE IF EXISTS `holidayDetail__`;
 /*!50001 DROP VIEW IF EXISTS `holidayDetail__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `holidayDetail__` AS SELECT 
- 1 AS `id`,
- 1 AS `description`*/;
+/*!50001 CREATE TABLE `holidayDetail__` (
+  `id` tinyint NOT NULL,
+  `description` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27752,9 +29581,10 @@ DROP TABLE IF EXISTS `holidayLegend__`;
 /*!50001 DROP VIEW IF EXISTS `holidayLegend__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `holidayLegend__` AS SELECT 
- 1 AS `id`,
- 1 AS `description`*/;
+/*!50001 CREATE TABLE `holidayLegend__` (
+  `id` tinyint NOT NULL,
+  `description` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27765,10 +29595,11 @@ DROP TABLE IF EXISTS `holidayType__`;
 /*!50001 DROP VIEW IF EXISTS `holidayType__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `holidayType__` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `rgb`*/;
+/*!50001 CREATE TABLE `holidayType__` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `rgb` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27779,11 +29610,12 @@ DROP TABLE IF EXISTS `holiday__`;
 /*!50001 DROP VIEW IF EXISTS `holiday__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `holiday__` AS SELECT 
- 1 AS `holidayDetailFk`,
- 1 AS `holidayTypeFk`,
- 1 AS `workCenterFk`,
- 1 AS `dated`*/;
+/*!50001 CREATE TABLE `holiday__` (
+  `holidayDetailFk` tinyint NOT NULL,
+  `holidayTypeFk` tinyint NOT NULL,
+  `workCenterFk` tinyint NOT NULL,
+  `dated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27812,8 +29644,8 @@ CREATE TABLE `ink` (
   `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `picture` blob NOT NULL,
   `showOrder` int(11) NOT NULL,
-  `ball` blob,
-  `isCargex` tinyint(4) NOT NULL DEFAULT '0',
+  `ball` blob DEFAULT NULL,
+  `isCargex` tinyint(4) NOT NULL DEFAULT 0,
   `dutchCode` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   `hex` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -27845,9 +29677,10 @@ DROP TABLE IF EXISTS `inkL10n`;
 /*!50001 DROP VIEW IF EXISTS `inkL10n`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `inkL10n` AS SELECT 
- 1 AS `id`,
- 1 AS `name`*/;
+/*!50001 CREATE TABLE `inkL10n` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27860,9 +29693,9 @@ DROP TABLE IF EXISTS `intrastat`;
 CREATE TABLE `intrastat` (
   `id` int(8) unsigned zerofill NOT NULL,
   `description` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import__` tinyint(4) NOT NULL DEFAULT '0',
-  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `taxCodeFk` tinyint(2) unsigned NOT NULL DEFAULT '64',
+  `import__` tinyint(4) NOT NULL DEFAULT 0,
+  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT 2,
+  `taxCodeFk` tinyint(2) unsigned NOT NULL DEFAULT 64,
   PRIMARY KEY (`id`),
   KEY `iva_group_id` (`taxClassFk`),
   CONSTRAINT `intrastat_ibfk_1` FOREIGN KEY (`taxClassFk`) REFERENCES `taxClass` (`id`) ON UPDATE CASCADE
@@ -27927,7 +29760,7 @@ CREATE TABLE `invoiceCorrection` (
   `correctedFk` int(10) unsigned NOT NULL COMMENT 'Factura rectificada',
   `cplusRectificationTypeFk` int(10) unsigned NOT NULL,
   `cplusInvoiceType477Fk` int(10) unsigned NOT NULL,
-  `invoiceCorrectionTypeFk` int(11) NOT NULL DEFAULT '3',
+  `invoiceCorrectionTypeFk` int(11) NOT NULL DEFAULT 3,
   PRIMARY KEY (`correctingFk`),
   KEY `correctedFk_idx` (`correctedFk`),
   KEY `invoiceCorrection_ibfk_1_idx` (`cplusRectificationTypeFk`),
@@ -27949,15 +29782,16 @@ DROP TABLE IF EXISTS `invoiceCorrectionDataSource`;
 /*!50001 DROP VIEW IF EXISTS `invoiceCorrectionDataSource`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `invoiceCorrectionDataSource` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `concept`,
- 1 AS `price`,
- 1 AS `discount`,
- 1 AS `refFk`,
- 1 AS `saleFk`,
- 1 AS `shipped`*/;
+/*!50001 CREATE TABLE `invoiceCorrectionDataSource` (
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `concept` tinyint NOT NULL,
+  `price` tinyint NOT NULL,
+  `discount` tinyint NOT NULL,
+  `refFk` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -27975,6 +29809,175 @@ CREATE TABLE `invoiceCorrectionType` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `invoiceIn`
+--
+
+DROP TABLE IF EXISTS `invoiceIn`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invoiceIn` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `serialNumber` mediumint(11) unsigned DEFAULT NULL COMMENT 'insertado por Trigger',
+  `serial` char(1) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'R',
+  `supplierFk` int(11) NOT NULL,
+  `issued` date NOT NULL COMMENT 'Fecha de emision de la factura',
+  `supplierRef` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `isBooked` tinyint(1) NOT NULL DEFAULT 0,
+  `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT 1,
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
+  `docFk` int(11) DEFAULT NULL,
+  `booked` date DEFAULT NULL COMMENT 'Fecha de contabilizacion',
+  `operated` date DEFAULT NULL COMMENT 'Fecha de entrega de la mercancia o el suministro',
+  `cplusInvoiceType472Fk` int(10) unsigned DEFAULT 1,
+  `cplusRectificationTypeFk` int(10) unsigned DEFAULT 1,
+  `cplusSubjectOpFk` int(10) unsigned DEFAULT 1,
+  `cplusTaxBreakFk` int(10) unsigned DEFAULT 1,
+  `cplusTrascendency472Fk` int(10) unsigned DEFAULT 1,
+  `bookEntried` date DEFAULT NULL COMMENT 'Fecha Asiento',
+  `isVatDeductible` tinyint(1) NOT NULL DEFAULT 1,
+  `withholdingSageFk` smallint(6) DEFAULT NULL COMMENT 'Tipos de retención SAGE',
+  PRIMARY KEY (`id`),
+  KEY `proveedor_id` (`supplierFk`),
+  KEY `empresa_id` (`companyFk`),
+  KEY `serie` (`serial`),
+  KEY `num_recibida_2` (`serialNumber`),
+  KEY `gestdoc_id` (`docFk`),
+  KEY `fecha` (`issued`),
+  KEY `recibida_ibfk_3_idx` (`cplusSubjectOpFk`),
+  KEY `recibida_ibfk_4_idx` (`cplusTaxBreakFk`),
+  KEY `recibida_ibfk_5_idx` (`cplusInvoiceType472Fk`),
+  KEY `recibida_ibfk_6` (`cplusRectificationTypeFk`),
+  KEY `recibida_ibfk_7` (`cplusTrascendency472Fk`),
+  KEY `invoiceIn_withholdingFk_idx` (`withholdingSageFk`),
+  CONSTRAINT `invoiceIn_ibfk_1` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceIn_ibfk_2` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceIn_ibfk_3` FOREIGN KEY (`cplusSubjectOpFk`) REFERENCES `cplusSubjectOp` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceIn_ibfk_4` FOREIGN KEY (`cplusTaxBreakFk`) REFERENCES `cplusTaxBreak` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceIn_ibfk_5` FOREIGN KEY (`cplusInvoiceType472Fk`) REFERENCES `cplusInvoiceType472` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceIn_ibfk_6` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceIn_ibfk_7` FOREIGN KEY (`cplusTrascendency472Fk`) REFERENCES `cplusTrascendency472` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceIn_withholdingFk` FOREIGN KEY (`withholdingSageFk`) REFERENCES `sage`.`TiposRetencion` (`CodigoRetencion`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `invoiceIn_bi` BEFORE INSERT ON `invoiceIn` FOR EACH ROW BEGIN
+		DECLARE vSerie CHAR(1) DEFAULT 'R';
+		DECLARE vNumReceived INT;
+		DECLARE vIssuingCountry, vhostCountry INT;
+        DECLARE vActive TINYINT;
+		DECLARE vWithholdingSageFk INT;
+        
+        SELECT  withholdingSageFk INTO  vWithholdingSageFk 
+			FROM vn.supplier 
+			WHERE id = NEW.supplierFk;
+
+		SET NEW.withholdingSageFk = vWithholdingSageFk; 
+		
+        SELECT countryFk, isActive INTO vIssuingCountry, vActive 
+			FROM vn.supplier 
+			WHERE id = NEW.supplierFk;
+		
+        SELECT countryFk INTO vhostCountry 
+			FROM vn.supplier 
+            WHERE id = NEW.companyFk;
+
+		IF vActive = 0 THEN
+        	CALL util.throw('INACTIVE_PROVIDER');
+		END IF;
+        
+        IF (SELECT COUNT(*) FROM vn.invoiceIn WHERE supplierRef = NEW.supplierRef AND supplierFk = NEW.supplierFk AND YEAR(issued) = YEAR(CURDATE())) THEN
+			CALL util.throw('reference duplicated');
+        END IF;
+        
+		SELECT CASE WHEN (SELECT account FROM vn.supplier  where id = NEW.supplierFk) LIKE '___3______' THEN 'C'
+					WHEN (SELECT vIssuingCountry=vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry 
+								where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'R'
+					WHEN (SELECT vIssuingCountry <> vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry 
+								where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'E' 
+					WHEN (SELECT vIssuingCountry<>vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry
+								where NOT p1.CEE < 2 AND not p1.id = 1) = 1 THEN 'W'	
+				END INTO vSerie;
+		
+		SET NEW.serial =  IFNULL(vSerie,'R');
+	
+		IF vSerie LIKE 'W' THEN
+			SELECT IFNULL(MAX(serialNumber) + 1,1) INTO vNumReceived 
+				FROM invoiceIn 
+				WHERE `serial` LIKE NEW.serial AND 
+					  YEAR(issued) = YEAR(NEW.issued) AND 
+                      companyFk = NEW.companyFk;
+			SET NEW.serialNumber = vNumReceived;
+		END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `invoiceIn_bu` BEFORE UPDATE ON `invoiceIn` FOR EACH ROW
+BEGIN
+
+	DECLARE vWithholdingSageFk INT;
+	   
+	IF 	NEW.supplierFk != OLD.supplierFk THEN
+		SELECT withholdingSageFk INTO   vWithholdingSageFk
+				FROM vn.supplier 
+				WHERE id = NEW.supplierFk;
+		SET NEW.withholdingSageFk = vWithholdingSageFk;
+	END IF;  
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `invoiceIn_au` AFTER UPDATE ON `invoiceIn` FOR EACH ROW
+BEGIN
+
+	IF 	NEW.issued != OLD.issued 
+		OR
+        NEW.currencyFk != OLD.currencyFk 
+		THEN
+    
+			CALL vn2008.recibidaIvaDivisaUpdate(NEW.id); 
+    
+    END IF;
+
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+
 --
 -- Temporary table structure for view `invoiceInAwb__`
 --
@@ -27983,12 +29986,112 @@ DROP TABLE IF EXISTS `invoiceInAwb__`;
 /*!50001 DROP VIEW IF EXISTS `invoiceInAwb__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `invoiceInAwb__` AS SELECT 
- 1 AS `invoiceInFk`,
- 1 AS `awbFk`,
- 1 AS `dua`*/;
+/*!50001 CREATE TABLE `invoiceInAwb__` (
+  `invoiceInFk` tinyint NOT NULL,
+  `awbFk` tinyint NOT NULL,
+  `dua` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `invoiceInDueDay`
+--
+
+DROP TABLE IF EXISTS `invoiceInDueDay`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invoiceInDueDay` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `invoiceInFk` mediumint(8) unsigned NOT NULL,
+  `dueDated` date NOT NULL,
+  `bankFk` int(11) NOT NULL DEFAULT 3117,
+  `amount` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `foreignValue` decimal(10,2) DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `recibida_id` (`invoiceInFk`),
+  KEY `banco_id` (`bankFk`),
+  CONSTRAINT `invoiceInDueDay_ibfk_6` FOREIGN KEY (`bankFk`) REFERENCES `bank` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceInDueDay_ibfk_7` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_beforeInsert`
+BEFORE INSERT ON `vn`.`invoiceInDueDay`
+FOR EACH ROW
+BEGIN
+	DECLARE vIsNotified BOOLEAN;
+    
+    SELECT isNotified INTO vIsNotified 
+		FROM vn.invoiceIn ii 
+			JOIN vn.supplier s ON s.id = ii.supplierFk
+            JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+		WHERE ii.id = NEW.invoiceInFk;
+        
+	IF (NEW.dueDated <= CURDATE() AND vIsNotified)
+    THEN
+		INSERT INTO vn.mail SET
+			`sender` = 'begonya@verdnatura.es',
+            `replyTo` = 'begonya@verdnatura.es',
+            `subject` = 'Añadido vencimiento en el pasado',
+			`body` = CONCAT(account.myUserGetName(), ' ha añadido un vencimiento de ', 
+            NEW.amount,'€ en una fecha pasada en la recibida ',
+				NEW.invoiceInFk);
+	END IF;
+    
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_beforeUpdate` 
+BEFORE UPDATE ON `vn`.`invoiceInDueDay`
+FOR EACH ROW
+BEGIN
+	DECLARE vIsNotified BOOLEAN;
+    
+    SELECT isNotified INTO vIsNotified 
+		FROM vn.invoiceIn ii 
+			JOIN vn.supplier s ON s.id = ii.supplierFk
+            JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+		WHERE ii.id = NEW.invoiceInFk;
+        
+	IF (NEW.dueDated <= CURDATE() AND vIsNotified)
+    THEN
+		INSERT INTO vn.mail SET
+			`sender` = 'begonya@verdnatura.es',
+            `replyTo` = 'begonya@verdnatura.es',
+            `subject` = 'Añadido vencimiento en el pasado',
+			`body` = CONCAT(account.myUserGetName(), ' ha añadido un vencimiento de ', 
+            NEW.amount,'€ en una fecha pasada en la recibida ',
+				NEW.invoiceInFk);
+	END IF;
+    
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+
 --
 -- Temporary table structure for view `invoiceInDueDay__`
 --
@@ -27997,14 +30100,15 @@ DROP TABLE IF EXISTS `invoiceInDueDay__`;
 /*!50001 DROP VIEW IF EXISTS `invoiceInDueDay__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `invoiceInDueDay__` AS SELECT 
- 1 AS `id`,
- 1 AS `invoiceInFk`,
- 1 AS `dueDated`,
- 1 AS `bankFk`,
- 1 AS `amount`,
- 1 AS `foreignValue`,
- 1 AS `created`*/;
+/*!50001 CREATE TABLE `invoiceInDueDay__` (
+  `id` tinyint NOT NULL,
+  `invoiceInFk` tinyint NOT NULL,
+  `dueDated` tinyint NOT NULL,
+  `bankFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `foreignValue` tinyint NOT NULL,
+  `created` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -28015,15 +30119,35 @@ DROP TABLE IF EXISTS `invoiceInEntry__`;
 /*!50001 DROP VIEW IF EXISTS `invoiceInEntry__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `invoiceInEntry__` AS SELECT 
- 1 AS `id`,
- 1 AS `invoiceInFk`,
- 1 AS `entryFk`,
- 1 AS `percentage`,
- 1 AS `invoiceInAwbFk`,
- 1 AS `isBooked`*/;
+/*!50001 CREATE TABLE `invoiceInEntry__` (
+  `id` tinyint NOT NULL,
+  `invoiceInFk` tinyint NOT NULL,
+  `entryFk` tinyint NOT NULL,
+  `percentage` tinyint NOT NULL,
+  `invoiceInAwbFk` tinyint NOT NULL,
+  `isBooked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `invoiceInIntrastat`
+--
+
+DROP TABLE IF EXISTS `invoiceInIntrastat`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invoiceInIntrastat` (
+  `invoiceInFk` mediumint(8) unsigned NOT NULL,
+  `intrastatFk` int(8) unsigned zerofill NOT NULL,
+  `amount` decimal(10,2) NOT NULL,
+  PRIMARY KEY (`invoiceInFk`,`intrastatFk`),
+  KEY `Codintrastat` (`intrastatFk`),
+  KEY `recibida_id` (`invoiceInFk`),
+  CONSTRAINT `invoiceInIntrastat_ibfk_1` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `invoiceInIntrastat_ibfk_2` FOREIGN KEY (`intrastatFk`) REFERENCES `intrastat` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `invoiceInIntrastat__`
 --
@@ -28032,10 +30156,11 @@ DROP TABLE IF EXISTS `invoiceInIntrastat__`;
 /*!50001 DROP VIEW IF EXISTS `invoiceInIntrastat__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `invoiceInIntrastat__` AS SELECT 
- 1 AS `invoiceInFk`,
- 1 AS `intrastatFk`,
- 1 AS `amount`*/;
+/*!50001 CREATE TABLE `invoiceInIntrastat__` (
+  `invoiceInFk` tinyint NOT NULL,
+  `intrastatFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -28048,7 +30173,7 @@ DROP TABLE IF EXISTS `invoiceInSerial`;
 CREATE TABLE `invoiceInSerial` (
   `code` varchar(2) COLLATE utf8_unicode_ci NOT NULL,
   `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cplusTerIdNifFk` int(11) NOT NULL DEFAULT '1',
+  `cplusTerIdNifFk` int(11) NOT NULL DEFAULT 1,
   `taxAreaFk` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
   PRIMARY KEY (`code`),
   KEY `InvoiceInSerial_Fk1_idx` (`cplusTerIdNifFk`),
@@ -28058,6 +30183,64 @@ CREATE TABLE `invoiceInSerial` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `invoiceInTax`
+--
+
+DROP TABLE IF EXISTS `invoiceInTax`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invoiceInTax` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `invoiceInFk` mediumint(8) unsigned NOT NULL,
+  `taxCodeFk` int(10) unsigned NOT NULL,
+  `taxableBase` decimal(10,2) NOT NULL,
+  `expenceFk` varchar(10) CHARACTER SET utf8 NOT NULL,
+  `foreignValue` decimal(10,2) DEFAULT NULL,
+  `taxTypeSageFk` smallint(6) DEFAULT NULL COMMENT 'Tipo de IVA SAGE',
+  `transactionTypeSageFk` tinyint(4) DEFAULT NULL COMMENT 'Tipo de transacción SAGE',
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `recibida_id` (`invoiceInFk`),
+  KEY `recibida_iva_ibfk_2` (`taxCodeFk`),
+  KEY `recibida_iva_gastos_id` (`expenceFk`),
+  KEY `recibida_iva_taxTypeSageFk` (`taxTypeSageFk`),
+  KEY `invoiceInTax_transactionTypeSageFk_idx` (`transactionTypeSageFk`),
+  CONSTRAINT `invoiceInTax_ibfk_2` FOREIGN KEY (`taxCodeFk`) REFERENCES `taxCode` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+  CONSTRAINT `invoiceInTax_ibfk_5` FOREIGN KEY (`invoiceInFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `invoiceInTax_transactionTypeSageFk` FOREIGN KEY (`transactionTypeSageFk`) REFERENCES `sage`.`TiposTransacciones` (`CodigoTransaccion`) ON UPDATE CASCADE,
+  CONSTRAINT `recibida_iva_gastos_id` FOREIGN KEY (`expenceFk`) REFERENCES `expence` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  CONSTRAINT `recibida_iva_taxTypeSageFk` FOREIGN KEY (`taxTypeSageFk`) REFERENCES `sage`.`TiposIva` (`CodigoIva`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceInTax_beforeInsert` BEFORE INSERT ON `invoiceInTax` FOR EACH ROW
+BEGIN
+	DECLARE vTaxTypeSageFk INT;
+	DECLARE vTransactionTypeSageFk INT;
+  
+	SELECT taxTypeSageFk, transactionTypeSageFk INTO vTaxTypeSageFk,vTransactionTypeSageFk
+		FROM vn.supplier  s
+			JOIN vn.invoiceIn i On i.supplierFk = s.id
+		WHERE i.id = NEW.invoiceInFk;
+   
+	SET NEW.taxTypeSageFk = vTaxTypeSageFk;
+	SET NEW.transactionTypeSageFk = vTransactionTypeSageFk;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+
 --
 -- Table structure for table `invoiceInTaxBookingAccount`
 --
@@ -28067,13 +30250,13 @@ DROP TABLE IF EXISTS `invoiceInTaxBookingAccount`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `invoiceInTaxBookingAccount` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
-  `effectived` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `effectived` timestamp NOT NULL DEFAULT current_timestamp(),
   `account` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
   `taxAreaFk` varchar(15) CHARACTER SET utf8 NOT NULL,
   `priority` int(2) unsigned DEFAULT NULL,
-  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT '1',
-  `rate` decimal(5,2) NOT NULL DEFAULT '0.00',
+  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT 1,
+  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT 1,
+  `rate` decimal(5,2) NOT NULL DEFAULT 0.00,
   PRIMARY KEY (`id`),
   KEY `invoiceInTaxBookingAccount_fk1_idx` (`taxAreaFk`),
   KEY `invoiceInTaxBookingAccount_fk2_idx` (`taxClassFk`),
@@ -28092,28 +30275,29 @@ DROP TABLE IF EXISTS `invoiceIn__`;
 /*!50001 DROP VIEW IF EXISTS `invoiceIn__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `invoiceIn__` AS SELECT 
- 1 AS `id`,
- 1 AS `serialNumber`,
- 1 AS `serial`,
- 1 AS `supplierFk`,
- 1 AS `issued`,
- 1 AS `supplierRef`,
- 1 AS `isBooked`,
- 1 AS `currencyFk`,
- 1 AS `created`,
- 1 AS `companyFk`,
- 1 AS `docFk`,
- 1 AS `booked`,
- 1 AS `operated`,
- 1 AS `cplusInvoiceType472Fk`,
- 1 AS `cplusRectificationTypeFk`,
- 1 AS `cplusSubjectOpFk`,
- 1 AS `cplusTaxBreakFk`,
- 1 AS `cplusTrascendency472Fk`,
- 1 AS `bookEntried`,
- 1 AS `isVatDeductible`,
- 1 AS `withholdingSageFk`*/;
+/*!50001 CREATE TABLE `invoiceIn__` (
+  `id` tinyint NOT NULL,
+  `serialNumber` tinyint NOT NULL,
+  `serial` tinyint NOT NULL,
+  `supplierFk` tinyint NOT NULL,
+  `issued` tinyint NOT NULL,
+  `supplierRef` tinyint NOT NULL,
+  `isBooked` tinyint NOT NULL,
+  `currencyFk` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL,
+  `docFk` tinyint NOT NULL,
+  `booked` tinyint NOT NULL,
+  `operated` tinyint NOT NULL,
+  `cplusInvoiceType472Fk` tinyint NOT NULL,
+  `cplusRectificationTypeFk` tinyint NOT NULL,
+  `cplusSubjectOpFk` tinyint NOT NULL,
+  `cplusTaxBreakFk` tinyint NOT NULL,
+  `cplusTrascendency472Fk` tinyint NOT NULL,
+  `bookEntried` tinyint NOT NULL,
+  `isVatDeductible` tinyint NOT NULL,
+  `withholdingSageFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -28128,28 +30312,28 @@ CREATE TABLE `invoiceOut` (
   `ref` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
   `serial` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   `issued` date DEFAULT NULL,
-  `amount` decimal(12,2) DEFAULT '0.00',
+  `amount` decimal(12,2) DEFAULT 0.00,
   `dued` datetime DEFAULT NULL,
   `bankFk` int(11) DEFAULT NULL,
-  `clientFk` int(11) DEFAULT '0',
+  `clientFk` int(11) DEFAULT 0,
   `Id_Remesa__` int(11) DEFAULT NULL,
-  `Remesar__` tinyint(1) NOT NULL DEFAULT '0',
-  `taxableBase7` decimal(12,2) DEFAULT '0.00',
-  `taxableBase16` decimal(12,2) DEFAULT '0.00',
-  `equ1` decimal(12,2) DEFAULT '0.00',
-  `equ4` decimal(12,2) DEFAULT '0.00',
-  `vat7` decimal(12,2) DEFAULT '0.00',
-  `vat16` decimal(12,2) DEFAULT '0.00',
-  `workerFk` int(11) DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
-  `liquidacion__` smallint(6) DEFAULT '0',
-  `hasPdf` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Remesar__` tinyint(1) NOT NULL DEFAULT 0,
+  `taxableBase7` decimal(12,2) DEFAULT 0.00,
+  `taxableBase16` decimal(12,2) DEFAULT 0.00,
+  `equ1` decimal(12,2) DEFAULT 0.00,
+  `equ4` decimal(12,2) DEFAULT 0.00,
+  `vat7` decimal(12,2) DEFAULT 0.00,
+  `vat16` decimal(12,2) DEFAULT 0.00,
+  `workerFk` int(11) DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
+  `liquidacion__` smallint(6) DEFAULT 0,
+  `hasPdf` tinyint(3) unsigned NOT NULL DEFAULT 0,
   `booked` date DEFAULT NULL,
-  `cplusInvoiceType477Fk` int(10) unsigned NOT NULL DEFAULT '1',
-  `cplusTaxBreakFk` int(10) unsigned NOT NULL DEFAULT '1',
-  `cplusSubjectOpFk` int(10) unsigned NOT NULL DEFAULT '1',
-  `cplusTrascendency477Fk` int(10) unsigned NOT NULL DEFAULT '1',
+  `cplusInvoiceType477Fk` int(10) unsigned NOT NULL DEFAULT 1,
+  `cplusTaxBreakFk` int(10) unsigned NOT NULL DEFAULT 1,
+  `cplusSubjectOpFk` int(10) unsigned NOT NULL DEFAULT 1,
+  `cplusTrascendency477Fk` int(10) unsigned NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`,`ref`),
   UNIQUE KEY `Id_Factura` (`ref`),
   KEY `Id_Banco` (`bankFk`),
@@ -28243,10 +30427,10 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeUpdate` BEFORE UPDATE ON `vn`.`invoiceOut` FOR EACH ROW
-BEGIN
-CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
-CALL clientRisk_update (NEW.clientFk, NEW.companyFk, NEW.amount);
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeUpdate` BEFORE UPDATE ON `vn`.`invoiceOut` FOR EACH ROW
+BEGIN
+CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
+CALL clientRisk_update (NEW.clientFk, NEW.companyFk, NEW.amount);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -28281,9 +30465,9 @@ DROP TABLE IF EXISTS `invoiceOutExpence`;
 CREATE TABLE `invoiceOutExpence` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `invoiceOutFk` int(10) unsigned NOT NULL,
-  `amount` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `amount` decimal(10,2) NOT NULL DEFAULT 0.00,
   `expenceFk` varchar(10) CHARACTER SET utf8 NOT NULL,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `invoiceOutExpence_FK_1_idx` (`invoiceOutFk`),
   KEY `invoiceOutExpence_FK_2_idx` (`expenceFk`),
@@ -28302,11 +30486,11 @@ DROP TABLE IF EXISTS `invoiceOutSerial`;
 CREATE TABLE `invoiceOutSerial` (
   `code` varchar(2) COLLATE utf8_unicode_ci NOT NULL,
   `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isTaxed` tinyint(1) NOT NULL DEFAULT '1',
+  `isTaxed` tinyint(1) NOT NULL DEFAULT 1,
   `taxAreaFk` varchar(15) CHARACTER SET utf8 NOT NULL DEFAULT 'NATIONAL',
-  `isCEE` tinyint(1) NOT NULL DEFAULT '0',
-  `cplusInvoiceType477Fk` int(10) unsigned DEFAULT '1',
-  `footNotes` longtext COLLATE utf8_unicode_ci,
+  `isCEE` tinyint(1) NOT NULL DEFAULT 0,
+  `cplusInvoiceType477Fk` int(10) unsigned DEFAULT 1,
+  `footNotes` longtext COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`code`),
   KEY `taxAreaFk_idx` (`taxAreaFk`),
   CONSTRAINT `invoiceOutSeriaTaxArea` FOREIGN KEY (`taxAreaFk`) REFERENCES `taxArea` (`code`) ON UPDATE CASCADE
@@ -28324,8 +30508,8 @@ CREATE TABLE `invoiceOutTax` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `invoiceOutFk` int(10) unsigned NOT NULL,
   `taxableBase` decimal(10,2) NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `vat` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `vat` decimal(10,2) NOT NULL DEFAULT 0.00,
   `pgcFk` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0000000000',
   PRIMARY KEY (`id`),
   UNIQUE KEY `invoiceOutTax_Resctriccion` (`invoiceOutFk`,`pgcFk`),
@@ -28348,33 +30532,33 @@ CREATE TABLE `item` (
   `equivalent` int(11) unsigned DEFAULT NULL,
   `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `size` int(10) unsigned DEFAULT NULL,
-  `stems` int(11) DEFAULT '1',
-  `minPrice` double DEFAULT '0',
-  `isToPrint` tinyint(1) NOT NULL DEFAULT '0',
-  `isDeliveryNote__` tinyint(1) NOT NULL DEFAULT '0',
-  `taxClassFk` tinyint(4) unsigned NOT NULL DEFAULT '1',
+  `stems` int(11) DEFAULT 1,
+  `minPrice` double DEFAULT 0,
+  `isToPrint` tinyint(1) NOT NULL DEFAULT 0,
+  `isDeliveryNote__` tinyint(1) NOT NULL DEFAULT 0,
+  `taxClassFk` tinyint(4) unsigned NOT NULL DEFAULT 1,
   `family` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'VT',
-  `box` tinyint(1) NOT NULL DEFAULT '0',
+  `box` tinyint(1) NOT NULL DEFAULT 0,
   `category` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   `originFk` tinyint(2) unsigned NOT NULL,
-  `doPhoto` tinyint(4) NOT NULL DEFAULT '0',
+  `doPhoto` tinyint(4) NOT NULL DEFAULT 0,
   `image` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `inkFk` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   `niche` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `intrastatFk` int(8) unsigned zerofill NOT NULL DEFAULT '06039010',
-  `hasMinPrice` tinyint(1) NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `isOnOffer` tinyint(4) NOT NULL DEFAULT '0',
-  `isBargain` tinyint(4) NOT NULL DEFAULT '0',
+  `intrastatFk` int(8) unsigned zerofill NOT NULL DEFAULT 06039010,
+  `hasMinPrice` tinyint(1) NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `isOnOffer` tinyint(4) NOT NULL DEFAULT 0,
+  `isBargain` tinyint(4) NOT NULL DEFAULT 0,
   `comment` varchar(150) COLLATE utf8_unicode_ci DEFAULT NULL,
   `typeFk` smallint(5) unsigned NOT NULL,
-  `generic` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
+  `generic` tinyint(1) unsigned zerofill NOT NULL DEFAULT 0,
   `producerFk` mediumint(3) unsigned DEFAULT NULL,
   `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `density` int(11) NOT NULL DEFAULT '167' COMMENT 'Almacena la densidad en kg/m3 para el calculo de los portes, si no se especifica se pone por defecto la del tipo en un trigger',
-  `relevancy` tinyint(1) NOT NULL DEFAULT '0',
+  `density` int(11) NOT NULL DEFAULT 167 COMMENT 'Almacena la densidad en kg/m3 para el calculo de los portes, si no se especifica se pone por defecto la del tipo en un trigger',
+  `relevancy` tinyint(1) NOT NULL DEFAULT 0,
   `expenceFk` varchar(10) CHARACTER SET utf8 NOT NULL DEFAULT '7001000000',
-  `isActive` tinyint(1) NOT NULL DEFAULT '1',
+  `isActive` tinyint(1) NOT NULL DEFAULT 1,
   `longName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `subName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `tag5` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -28389,19 +30573,19 @@ CREATE TABLE `item` (
   `value9` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `tag10` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `value10` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `compression` decimal(5,2) NOT NULL DEFAULT '1.00' COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.\n\nMenor que 1 significa que se puede comprimir más que el volumen original.',
-  `minimum` decimal(10,0) unsigned NOT NULL DEFAULT '3' COMMENT 'Cantidad máxima de cajas / cubos que cabe en un nicho',
-  `upToDown` decimal(10,0) unsigned NOT NULL DEFAULT '0' COMMENT 'Se muestra el precio por kilo ',
+  `compression` decimal(5,2) NOT NULL DEFAULT 1.00 COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.\n\nMenor que 1 significa que se puede comprimir más que el volumen original.',
+  `minimum` decimal(10,0) unsigned NOT NULL DEFAULT 3 COMMENT 'Cantidad máxima de cajas / cubos que cabe en un nicho',
+  `upToDown` decimal(10,0) unsigned NOT NULL DEFAULT 0 COMMENT 'Se muestra el precio por kilo ',
   `supplyResponseFk` int(11) DEFAULT NULL,
-  `hasKgPrice` tinyint(1) NOT NULL DEFAULT '0',
-  `sectorFk` int(11) DEFAULT '2',
-  `isFloramondo` tinyint(1) NOT NULL DEFAULT '0',
-  `isFragile` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'articulos solo para recogidas por su fragilidad',
+  `hasKgPrice` tinyint(1) NOT NULL DEFAULT 0,
+  `sectorFk` int(11) DEFAULT 2,
+  `isFloramondo` tinyint(1) NOT NULL DEFAULT 0,
+  `isFragile` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'articulos solo para recogidas por su fragilidad',
   `numberOfItemsPerCask` int(11) DEFAULT NULL COMMENT 'Campo para Floramondo',
   `embalageCode` int(11) DEFAULT NULL COMMENT 'Campo para Floramondo',
   `quality` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Campo para Floramondo',
   `stars` int(11) DEFAULT NULL,
-  `stemMultiplier` double NOT NULL DEFAULT '1' COMMENT 'este valor multiplica las unidades y divide los precios en el procedimiento edi.ekt_load',
+  `stemMultiplier` double NOT NULL DEFAULT 1 COMMENT 'este valor multiplica las unidades y divide los precios en el procedimiento edi.ekt_load',
   PRIMARY KEY (`id`),
   UNIQUE KEY `item_supplyResponseFk_idx` (`supplyResponseFk`),
   KEY `Color` (`inkFk`),
@@ -28576,12 +30760,14 @@ DROP TABLE IF EXISTS `itemBotanical`;
 CREATE TABLE `itemBotanical` (
   `itemFk` int(11) NOT NULL,
   `botanical` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `genusFk` mediumint(8) unsigned DEFAULT NULL,
-  `specieFk` mediumint(8) unsigned DEFAULT NULL,
+  `genusFk` int(11) DEFAULT NULL,
+  `specieFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`itemFk`),
   KEY `genusFgn_idx` (`genusFk`),
   KEY `specieFgn_idx` (`specieFk`),
-  CONSTRAINT `itemBotanicalItemFkFk` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+  CONSTRAINT `itemBotanicalItemFkFk` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `itemBotanical_FK` FOREIGN KEY (`specieFk`) REFERENCES `specie` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `itemBotanical_fk2` FOREIGN KEY (`genusFk`) REFERENCES `genus` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Sustituye a antiguo NomBotanic de Articles';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -28595,10 +30781,13 @@ CREATE TABLE `itemBotanical` (
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemBotanical_beforeInsert` BEFORE INSERT ON `itemBotanical` FOR EACH ROW
 BEGIN
-	IF NEW.botanical = '' THEN
-		SET NEW.botanical = NULL;
+/**
+ * Hay una versión en salix que machacará toda esta función/procedimiento avisa
+ * a jgallego de los cambios que quieres hacer.
+ */
+	IF (NEW.botanical >= '') THEN
+		CALL util.throw('no se puede modificar el nombre botanico, use los campos genero y especie');
 	END IF;
-    
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -28616,10 +30805,13 @@ DELIMITER ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemBotanical_beforeUpdate` BEFORE UPDATE ON `itemBotanical` FOR EACH ROW
 BEGIN
-	IF NEW.botanical = '' THEN
-		SET NEW.botanical = NULL;
-	END IF;
-    
+/**
+ * Hay una versión en salix que machacará toda esta función/procedimiento avisa
+ * a jgallego de los cambios que quieres hacer.
+ 
+	IF (NEW.botanical >= '') THEN
+		CALL util.throw('no se puede modificar el nombre botanico, use los campos genero y especie');
+	END IF; */
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -28635,9 +30827,10 @@ DROP TABLE IF EXISTS `itemBotanicalWithGenus`;
 /*!50001 DROP VIEW IF EXISTS `itemBotanicalWithGenus`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemBotanicalWithGenus` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `ediBotanic`*/;
+/*!50001 CREATE TABLE `itemBotanicalWithGenus` (
+  `itemFk` tinyint NOT NULL,
+  `ediBotanic` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -28651,13 +30844,13 @@ CREATE TABLE `itemCategory` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   `order` int(10) unsigned DEFAULT NULL,
-  `display` tinyint(4) NOT NULL DEFAULT '1',
+  `display` tinyint(4) NOT NULL DEFAULT 1,
   `color` char(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `shortLife` int(11) NOT NULL DEFAULT '0' COMMENT 'Sirve para filtrar aquellos reinos que tienen precios estables',
-  `merchandise` tinyint(1) NOT NULL DEFAULT '1',
+  `shortLife` int(11) NOT NULL DEFAULT 0 COMMENT 'Sirve para filtrar aquellos reinos que tienen precios estables',
+  `merchandise` tinyint(1) NOT NULL DEFAULT 1,
   `icon` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `code` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isReclining` tinyint(4) NOT NULL DEFAULT '1',
+  `isReclining` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `reino_UNIQUE` (`name`),
   KEY `itemCategory_idx3` (`merchandise`),
@@ -28688,9 +30881,10 @@ DROP TABLE IF EXISTS `itemCategoryL10n`;
 /*!50001 DROP VIEW IF EXISTS `itemCategoryL10n`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemCategoryL10n` AS SELECT 
- 1 AS `id`,
- 1 AS `name`*/;
+/*!50001 CREATE TABLE `itemCategoryL10n` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -28701,9 +30895,10 @@ DROP TABLE IF EXISTS `itemColor`;
 /*!50001 DROP VIEW IF EXISTS `itemColor`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemColor` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `color`*/;
+/*!50001 CREATE TABLE `itemColor` (
+  `itemFk` tinyint NOT NULL,
+  `color` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -28733,15 +30928,15 @@ DROP TABLE IF EXISTS `itemCost`;
 CREATE TABLE `itemCost` (
   `itemFk` int(11) NOT NULL,
   `warehouseFk` smallint(6) unsigned NOT NULL,
-  `quantity` int(10) NOT NULL DEFAULT '0',
-  `rotation` decimal(10,4) NOT NULL DEFAULT '0.0000',
-  `cm3` int(11) NOT NULL DEFAULT '0',
-  `storage` decimal(10,4) NOT NULL DEFAULT '0.0000',
-  `handling` decimal(10,4) NOT NULL DEFAULT '0.0000',
-  `extraCharge` decimal(10,4) NOT NULL DEFAULT '0.0000',
-  `wasted` decimal(10,4) NOT NULL DEFAULT '0.0000',
-  `cm3delivery` int(11) NOT NULL DEFAULT '0',
-  `grams` int(11) NOT NULL DEFAULT '0' COMMENT 'peso en gramos de una unidad de venta',
+  `quantity` int(10) NOT NULL DEFAULT 0,
+  `rotation` decimal(10,4) NOT NULL DEFAULT 0.0000,
+  `cm3` int(11) NOT NULL DEFAULT 0,
+  `storage` decimal(10,4) NOT NULL DEFAULT 0.0000,
+  `handling` decimal(10,4) NOT NULL DEFAULT 0.0000,
+  `extraCharge` decimal(10,4) NOT NULL DEFAULT 0.0000,
+  `wasted` decimal(10,4) NOT NULL DEFAULT 0.0000,
+  `cm3delivery` int(11) NOT NULL DEFAULT 0,
+  `grams` int(11) NOT NULL DEFAULT 0 COMMENT 'peso en gramos de una unidad de venta',
   PRIMARY KEY (`itemFk`,`warehouseFk`),
   KEY `warehouse_id_rotacion_idx` (`warehouseFk`),
   CONSTRAINT `id_article_rotaci` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -28797,14 +30992,15 @@ DROP TABLE IF EXISTS `itemEntryIn`;
 /*!50001 DROP VIEW IF EXISTS `itemEntryIn`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemEntryIn` AS SELECT 
- 1 AS `warehouseInFk`,
- 1 AS `landed`,
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `isReceived`,
- 1 AS `isVirtualStock`,
- 1 AS `entryFk`*/;
+/*!50001 CREATE TABLE `itemEntryIn` (
+  `warehouseInFk` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `isReceived` tinyint NOT NULL,
+  `isVirtualStock` tinyint NOT NULL,
+  `entryFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -28815,28 +31011,16 @@ DROP TABLE IF EXISTS `itemEntryOut`;
 /*!50001 DROP VIEW IF EXISTS `itemEntryOut`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemEntryOut` AS SELECT 
- 1 AS `warehouseOutFk`,
- 1 AS `shipped`,
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `isDelivered`,
- 1 AS `entryFk`*/;
+/*!50001 CREATE TABLE `itemEntryOut` (
+  `warehouseOutFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `isDelivered` tinyint NOT NULL,
+  `entryFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
---
--- Table structure for table `itemFreeNumber__`
---
-
-DROP TABLE IF EXISTS `itemFreeNumber__`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `itemFreeNumber__` (
-  `itemFk` int(11) NOT NULL,
-  PRIMARY KEY (`itemFk`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `itemImageQueue`
 --
@@ -28847,9 +31031,11 @@ DROP TABLE IF EXISTS `itemImageQueue`;
 CREATE TABLE `itemImageQueue` (
   `itemFk` int(11) NOT NULL,
   `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `error` text COLLATE utf8_unicode_ci,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `error` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `attempts` int(11) DEFAULT 0,
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  `updated` timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `priority` int(11) DEFAULT 99,
   PRIMARY KEY (`itemFk`),
   CONSTRAINT `itemImageQueueItemIdx` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Cola para añadir las imagenes al campo vn.item.image a partir de una url';
@@ -28884,11 +31070,11 @@ CREATE TABLE `itemLog` (
   `originFk` int(11) NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -28909,11 +31095,11 @@ DROP TABLE IF EXISTS `itemPlacement`;
 CREATE TABLE `itemPlacement` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `itemFk` int(11) NOT NULL,
-  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '1',
+  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 1,
   `code` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
-  `modificationDate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `modificationDate` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `reserve` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pickable` int(11) unsigned NOT NULL DEFAULT '0',
+  `pickable` int(11) unsigned NOT NULL DEFAULT 0,
   `sectorFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `Id_Article_UNIQUE` (`itemFk`,`warehouseFk`),
@@ -28976,9 +31162,9 @@ DROP TABLE IF EXISTS `itemPlacementSupply`;
 CREATE TABLE `itemPlacementSupply` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `itemFk` int(11) NOT NULL,
-  `quantity` decimal(10,0) NOT NULL DEFAULT '0',
-  `priority` int(10) unsigned NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `quantity` decimal(10,0) NOT NULL DEFAULT 0,
+  `priority` int(10) unsigned NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `userFk` int(10) unsigned NOT NULL COMMENT 'Persona que crea la orden',
   `repoUserFk` int(10) unsigned DEFAULT NULL COMMENT 'Reponedor que la tiene asignada',
   `sectorFk` int(11) DEFAULT NULL,
@@ -29002,21 +31188,22 @@ DROP TABLE IF EXISTS `itemPlacementSupplyList`;
 /*!50001 DROP VIEW IF EXISTS `itemPlacementSupplyList`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemPlacementSupplyList` AS SELECT 
- 1 AS `id`,
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `priority`,
- 1 AS `created`,
- 1 AS `userFk`,
- 1 AS `repoUserFk`,
- 1 AS `saldo`,
- 1 AS `longName`,
- 1 AS `subName`,
- 1 AS `size`,
- 1 AS `workerCode`,
- 1 AS `repoCode`,
- 1 AS `sectorFk`*/;
+/*!50001 CREATE TABLE `itemPlacementSupplyList` (
+  `id` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `priority` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `userFk` tinyint NOT NULL,
+  `repoUserFk` tinyint NOT NULL,
+  `saldo` tinyint NOT NULL,
+  `longName` tinyint NOT NULL,
+  `subName` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `workerCode` tinyint NOT NULL,
+  `repoCode` tinyint NOT NULL,
+  `sectorFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29027,9 +31214,10 @@ DROP TABLE IF EXISTS `itemProductor`;
 /*!50001 DROP VIEW IF EXISTS `itemProductor`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemProductor` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `productor`*/;
+/*!50001 CREATE TABLE `itemProductor` (
+  `itemFk` tinyint NOT NULL,
+  `productor` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29042,7 +31230,7 @@ DROP TABLE IF EXISTS `itemProposal`;
 CREATE TABLE `itemProposal` (
   `itemFk` int(11) NOT NULL,
   `mateFk` int(11) NOT NULL,
-  `counter` int(11) NOT NULL DEFAULT '0',
+  `counter` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`itemFk`,`mateFk`),
   KEY `itemProposal_fk2_idx` (`mateFk`),
   CONSTRAINT `itemProposal_fk1` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -29059,7 +31247,7 @@ DROP TABLE IF EXISTS `itemRepo`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `itemRepo` (
   `itemFk` int(11) NOT NULL,
-  `quantity` int(10) unsigned NOT NULL DEFAULT '0',
+  `quantity` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`itemFk`),
   CONSTRAINT `itemRepo_fk1` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -29077,11 +31265,11 @@ CREATE TABLE `itemShelving` (
   `itemFk` int(11) NOT NULL,
   `shelvingFk` varchar(10) CHARACTER SET utf8 NOT NULL,
   `shelve` varchar(2) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'A',
-  `deep` int(11) unsigned NOT NULL DEFAULT '1',
-  `quantity` int(11) NOT NULL DEFAULT '0',
-  `visible` int(11) NOT NULL DEFAULT '0',
-  `available` int(11) NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `deep` int(11) unsigned NOT NULL DEFAULT 1,
+  `quantity` int(11) NOT NULL DEFAULT 0,
+  `visible` int(11) NOT NULL DEFAULT 0,
+  `available` int(11) NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `priority` int(11) unsigned DEFAULT NULL COMMENT 'El 0 es la mínima prioridad',
   `grouping` smallint(5) unsigned DEFAULT NULL,
   `packing` int(11) unsigned DEFAULT NULL,
@@ -29255,30 +31443,31 @@ DROP TABLE IF EXISTS `itemShelvingAvailable`;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingAvailable`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingAvailable` AS SELECT 
- 1 AS `saleFk`,
- 1 AS `Modificado`,
- 1 AS `ticketFk`,
- 1 AS `isPicked`,
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `concept`,
- 1 AS `size`,
- 1 AS `Estado`,
- 1 AS `sectorProdPriority`,
- 1 AS `available`,
- 1 AS `sectorFk`,
- 1 AS `matricula`,
- 1 AS `parking`,
- 1 AS `itemShelving`,
- 1 AS `Agency`,
- 1 AS `shipped`,
- 1 AS `grouping`,
- 1 AS `packing`,
- 1 AS `hour`,
- 1 AS `isPreviousPreparable`,
- 1 AS `physicalVolume`,
- 1 AS `warehouseFk`*/;
+/*!50001 CREATE TABLE `itemShelvingAvailable` (
+  `saleFk` tinyint NOT NULL,
+  `Modificado` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL,
+  `isPicked` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `concept` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `Estado` tinyint NOT NULL,
+  `sectorProdPriority` tinyint NOT NULL,
+  `available` tinyint NOT NULL,
+  `sectorFk` tinyint NOT NULL,
+  `matricula` tinyint NOT NULL,
+  `parking` tinyint NOT NULL,
+  `itemShelving` tinyint NOT NULL,
+  `Agency` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `grouping` tinyint NOT NULL,
+  `packing` tinyint NOT NULL,
+  `hour` tinyint NOT NULL,
+  `isPreviousPreparable` tinyint NOT NULL,
+  `physicalVolume` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29289,16 +31478,17 @@ DROP TABLE IF EXISTS `itemShelvingList`;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingList`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingList` AS SELECT 
- 1 AS `shelvingFk`,
- 1 AS `visible`,
- 1 AS `created`,
- 1 AS `parking`,
- 1 AS `itemFk`,
- 1 AS `longName`,
- 1 AS `size`,
- 1 AS `subName`,
- 1 AS `parked`*/;
+/*!50001 CREATE TABLE `itemShelvingList` (
+  `shelvingFk` tinyint NOT NULL,
+  `visible` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `parking` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `longName` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `subName` tinyint NOT NULL,
+  `parked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29312,7 +31502,7 @@ CREATE TABLE `itemShelvingLog` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `itemShelvingFk` int(10) unsigned DEFAULT NULL,
   `workerFk` int(11) DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `accion` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `itemFk` int(11) DEFAULT NULL,
   `shelvingFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -29338,10 +31528,10 @@ CREATE TABLE `itemShelvingPlacementSupply` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `itemShelvingFk` int(10) unsigned NOT NULL,
   `itemPlacementSupplyFk` int(10) unsigned NOT NULL,
-  `quantity` decimal(10,0) NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `quantity` decimal(10,0) NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `userFk` int(10) unsigned NOT NULL,
-  `isPicked` tinyint(4) NOT NULL DEFAULT '0',
+  `isPicked` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `itemShelvingPlacementSupply_fk1_idx` (`itemShelvingFk`),
   KEY `itemShelvingPlacementSupply_fk2_idx` (`itemPlacementSupplyFk`),
@@ -29359,21 +31549,22 @@ DROP TABLE IF EXISTS `itemShelvingPlacementSupplyStock`;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingPlacementSupplyStock`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingPlacementSupplyStock` AS SELECT 
- 1 AS `itemShelvingFk`,
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `packing`,
- 1 AS `stock`,
- 1 AS `longName`,
- 1 AS `size`,
- 1 AS `subName`,
- 1 AS `shelving`,
- 1 AS `parking`,
- 1 AS `created`,
- 1 AS `priority`,
- 1 AS `parkingFk`,
- 1 AS `sectorFk`*/;
+/*!50001 CREATE TABLE `itemShelvingPlacementSupplyStock` (
+  `itemShelvingFk` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `packing` tinyint NOT NULL,
+  `stock` tinyint NOT NULL,
+  `longName` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `subName` tinyint NOT NULL,
+  `shelving` tinyint NOT NULL,
+  `parking` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `priority` tinyint NOT NULL,
+  `parkingFk` tinyint NOT NULL,
+  `sectorFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29384,19 +31575,20 @@ DROP TABLE IF EXISTS `itemShelvingPlacementSupplyStock__`;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingPlacementSupplyStock__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingPlacementSupplyStock__` AS SELECT 
- 1 AS `itemShelvingFk`,
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `packing`,
- 1 AS `stock`,
- 1 AS `longName`,
- 1 AS `size`,
- 1 AS `subName`,
- 1 AS `shelving`,
- 1 AS `parking`,
- 1 AS `created`,
- 1 AS `priority`*/;
+/*!50001 CREATE TABLE `itemShelvingPlacementSupplyStock__` (
+  `itemShelvingFk` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `packing` tinyint NOT NULL,
+  `stock` tinyint NOT NULL,
+  `longName` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `subName` tinyint NOT NULL,
+  `shelving` tinyint NOT NULL,
+  `parking` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `priority` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29410,8 +31602,8 @@ CREATE TABLE `itemShelvingSale` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `itemShelvingFk` int(10) unsigned NOT NULL,
   `saleFk` int(11) NOT NULL,
-  `quantity` decimal(10,0) NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `quantity` decimal(10,0) NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `userFk` int(11) unsigned NOT NULL,
   PRIMARY KEY (`id`),
   KEY `itemShelvingSale_fk1_idx` (`itemShelvingFk`),
@@ -29475,13 +31667,14 @@ DROP TABLE IF EXISTS `itemShelvingSaleSum`;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingSaleSum`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingSaleSum` AS SELECT 
- 1 AS `id`,
- 1 AS `itemShelvingFk`,
- 1 AS `saleFk`,
- 1 AS `quantity`,
- 1 AS `created`,
- 1 AS `sectorFk`*/;
+/*!50001 CREATE TABLE `itemShelvingSaleSum` (
+  `id` tinyint NOT NULL,
+  `itemShelvingFk` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `sectorFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29492,21 +31685,22 @@ DROP TABLE IF EXISTS `itemShelvingStock`;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingStock`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingStock` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `visible`,
- 1 AS `packing`,
- 1 AS `grouping`,
- 1 AS `sector`,
- 1 AS `visibleOriginal`,
- 1 AS `removed`,
- 1 AS `sectorFk`,
- 1 AS `warehouseFk`,
- 1 AS `shelvingFk`,
- 1 AS `parkingCode`,
- 1 AS `parkingFk`,
- 1 AS `itemShelvingFk`,
- 1 AS `created`*/;
+/*!50001 CREATE TABLE `itemShelvingStock` (
+  `itemFk` tinyint NOT NULL,
+  `visible` tinyint NOT NULL,
+  `packing` tinyint NOT NULL,
+  `grouping` tinyint NOT NULL,
+  `sector` tinyint NOT NULL,
+  `visibleOriginal` tinyint NOT NULL,
+  `removed` tinyint NOT NULL,
+  `sectorFk` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `shelvingFk` tinyint NOT NULL,
+  `parkingCode` tinyint NOT NULL,
+  `parkingFk` tinyint NOT NULL,
+  `itemShelvingFk` tinyint NOT NULL,
+  `created` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29517,20 +31711,21 @@ DROP TABLE IF EXISTS `itemShelvingStockFull`;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingStockFull`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingStockFull` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `packing`,
- 1 AS `grouping`,
- 1 AS `sector`,
- 1 AS `removed`,
- 1 AS `sectorFk`,
- 1 AS `warehouseFk`,
- 1 AS `shelvingFk`,
- 1 AS `parkingCode`,
- 1 AS `parkingFk`,
- 1 AS `itemShelvingFk`,
- 1 AS `created`*/;
+/*!50001 CREATE TABLE `itemShelvingStockFull` (
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `packing` tinyint NOT NULL,
+  `grouping` tinyint NOT NULL,
+  `sector` tinyint NOT NULL,
+  `removed` tinyint NOT NULL,
+  `sectorFk` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `shelvingFk` tinyint NOT NULL,
+  `parkingCode` tinyint NOT NULL,
+  `parkingFk` tinyint NOT NULL,
+  `itemShelvingFk` tinyint NOT NULL,
+  `created` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29541,10 +31736,11 @@ DROP TABLE IF EXISTS `itemShelvingStockRemoved`;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingStockRemoved`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemShelvingStockRemoved` AS SELECT 
- 1 AS `itemShelvingFk`,
- 1 AS `itemFk`,
- 1 AS `removed`*/;
+/*!50001 CREATE TABLE `itemShelvingStockRemoved` (
+  `itemShelvingFk` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `removed` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29560,7 +31756,7 @@ CREATE TABLE `itemTag` (
   `tagFk` int(11) NOT NULL,
   `value` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `intValue` int(11) DEFAULT NULL,
-  `priority` int(2) NOT NULL DEFAULT '0',
+  `priority` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `itemFk` (`itemFk`,`tagFk`,`value`) USING BTREE,
   KEY `tagFk` (`tagFk`,`value`),
@@ -29593,21 +31789,23 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_AFTER_INSERT` AFTER INSERT ON `itemTag` FOR EACH ROW
 trig: BEGIN
+	DECLARE vItemFk INT;
 	IF @isTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
-    
+	
+    SET vItemFk = NEW.itemFk;
 	DROP TEMPORARY TABLE IF EXISTS tmp.item;
 	CREATE TEMPORARY TABLE tmp.item
-		SELECT NEW.itemFk id;
+		SELECT vItemFk id;
 	CALL item_refreshTags();
 	DROP TEMPORARY TABLE tmp.item;
 END */;;
@@ -29619,15 +31817,15 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_beforeUpdate`
 	BEFORE UPDATE ON `itemTag` FOR EACH ROW
-BEGIN
+BEGIN 
     IF !(OLD.`value` <=> NEW.`value`)
     OR !(OLD.intValue <=> NEW.intValue) THEN
 		SET NEW.intValue = itemTag_getIntValue(NEW.`value`);
@@ -29650,15 +31848,18 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_afterUpdate`
 	AFTER UPDATE ON `itemTag` FOR EACH ROW
 trig: BEGIN
-	/**
-	 * Hay una versión en salix que machacará toda esta función/procedimiento avisa
-	 * a Bernat de los cambios que quieres hacer.
-	 */
+	DECLARE vItemFk INT;
 	IF @isTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
-    
-	CALL vn.itemRefreshTags(NEW.itemFk);
+ 	
+	SET vItemFk = NEW.itemFk;
+	DROP TEMPORARY TABLE IF EXISTS tmp.item;
+  	CREATE TEMPORARY TABLE tmp.item
+		SELECT vItemFk id;
+
+	CALL item_refreshTags();
+	DROP TEMPORARY TABLE tmp.item;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -29668,22 +31869,24 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_afterDelete`
 	AFTER DELETE ON `itemTag` FOR EACH ROW
 trig: BEGIN
+	DECLARE vItemFk INT;
 	IF @isTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
- 
+	
+	SET vItemFk = OLD.itemFk;
 	DROP TEMPORARY TABLE IF EXISTS tmp.item;
 	CREATE TEMPORARY TABLE tmp.item
-		SELECT OLD.itemFk id;
+		SELECT vItemFk id;
 	CALL item_refreshTags();
 	DROP TEMPORARY TABLE tmp.item;
 END */;;
@@ -29701,8 +31904,9 @@ DROP TABLE IF EXISTS `itemTagged`;
 /*!50001 DROP VIEW IF EXISTS `itemTagged`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemTagged` AS SELECT 
- 1 AS `itemFk`*/;
+/*!50001 CREATE TABLE `itemTagged` (
+  `itemFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29716,8 +31920,8 @@ CREATE TABLE `itemTaxCountry` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `itemFk` int(11) DEFAULT NULL,
   `countryFk` mediumint(8) unsigned DEFAULT NULL,
-  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `effectived` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT 1,
+  `effectived` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   UNIQUE KEY `itemFk_UNIQUE` (`itemFk`,`countryFk`),
   KEY `taxClassFK_idx` (`taxClassFk`),
@@ -29736,16 +31940,17 @@ DROP TABLE IF EXISTS `itemTicketOut`;
 /*!50001 DROP VIEW IF EXISTS `itemTicketOut`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemTicketOut` AS SELECT 
- 1 AS `warehouseFk`,
- 1 AS `shipped`,
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `isPicked`,
- 1 AS `reserved`,
- 1 AS `refFk`,
- 1 AS `saleFk`,
- 1 AS `ticketFk`*/;
+/*!50001 CREATE TABLE `itemTicketOut` (
+  `warehouseFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `isPicked` tinyint NOT NULL,
+  `reserved` tinyint NOT NULL,
+  `refFk` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29761,32 +31966,32 @@ CREATE TABLE `itemType` (
   `name` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
   `gramsMin` int(11) DEFAULT NULL,
   `gramsMax` int(11) DEFAULT NULL,
-  `order` int(11) DEFAULT '0',
-  `temperature` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `order` int(11) DEFAULT 0,
+  `temperature` tinyint(1) unsigned NOT NULL DEFAULT 0,
   `categoryFk` int(10) unsigned NOT NULL,
   `workerFk` int(11) NOT NULL,
-  `isInventory` tinyint(4) NOT NULL DEFAULT '1' COMMENT 'Se utiliza tanto en el cálculo del inventario, como en el del informe del inventario valorado',
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `f11` tinyint(4) NOT NULL DEFAULT '0',
+  `isInventory` tinyint(4) NOT NULL DEFAULT 1 COMMENT 'Se utiliza tanto en el cálculo del inventario, como en el del informe del inventario valorado',
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  `f11` tinyint(4) NOT NULL DEFAULT 0,
   `father__` smallint(5) DEFAULT NULL,
-  `transaction` tinyint(4) NOT NULL DEFAULT '0',
+  `transaction` tinyint(4) NOT NULL DEFAULT 0,
   `making` int(10) unsigned DEFAULT NULL,
   `location` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
   `life` smallint(5) unsigned DEFAULT NULL,
-  `maneuver` double NOT NULL DEFAULT '0.21',
-  `target` double NOT NULL DEFAULT '0.15',
-  `topMargin` double NOT NULL DEFAULT '0.3',
-  `profit` double NOT NULL DEFAULT '0.02',
-  `isFV` tinyint(3) DEFAULT '1',
-  `density` double NOT NULL DEFAULT '167' COMMENT 'Almacena el valor por defecto de la densidad en kg/m3 para el calculo de los portes aereos, en articulos se guarda la correcta',
-  `promo` double NOT NULL DEFAULT '0',
-  `isBox__` tinyint(4) NOT NULL DEFAULT '0',
-  `CYM__` int(11) NOT NULL DEFAULT '0',
-  `isPackaging` tinyint(1) NOT NULL DEFAULT '0',
-  `hasComponents` tinyint(1) NOT NULL DEFAULT '1',
+  `maneuver` double NOT NULL DEFAULT 0.21,
+  `target` double NOT NULL DEFAULT 0.15,
+  `topMargin` double NOT NULL DEFAULT 0.3,
+  `profit` double NOT NULL DEFAULT 0.02,
+  `isFV` tinyint(3) DEFAULT 1,
+  `density` double NOT NULL DEFAULT 167 COMMENT 'Almacena el valor por defecto de la densidad en kg/m3 para el calculo de los portes aereos, en articulos se guarda la correcta',
+  `promo` double NOT NULL DEFAULT 0,
+  `isBox__` tinyint(4) NOT NULL DEFAULT 0,
+  `CYM__` int(11) NOT NULL DEFAULT 0,
+  `isPackaging` tinyint(1) NOT NULL DEFAULT 0,
+  `hasComponents` tinyint(1) NOT NULL DEFAULT 1,
   `roleCodeFk__` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '1',
-  `compression` decimal(5,2) DEFAULT '1.00',
+  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 1,
+  `compression` decimal(5,2) DEFAULT 1.00,
   PRIMARY KEY (`code`),
   UNIQUE KEY `tipo_id_UNIQUE` (`id`),
   UNIQUE KEY `Tipo_UNIQUE` (`name`,`categoryFk`),
@@ -29857,9 +32062,10 @@ DROP TABLE IF EXISTS `itemTypeL10n`;
 /*!50001 DROP VIEW IF EXISTS `itemTypeL10n`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemTypeL10n` AS SELECT 
- 1 AS `id`,
- 1 AS `name`*/;
+/*!50001 CREATE TABLE `itemTypeL10n` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29873,7 +32079,7 @@ CREATE TABLE `itemTypeTag` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `itemTypeFk` smallint(5) unsigned NOT NULL,
   `tagFk` int(11) NOT NULL,
-  `priority` int(2) unsigned NOT NULL DEFAULT '0',
+  `priority` int(2) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `itemTypeFk_UNIQUE` (`itemTypeFk`,`tagFk`),
   KEY `itemTypeTagTipo_idx` (`itemTypeFk`),
@@ -29906,8 +32112,9 @@ DROP TABLE IF EXISTS `item_Free_Id`;
 /*!50001 DROP VIEW IF EXISTS `item_Free_Id`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `item_Free_Id` AS SELECT 
- 1 AS `newId`*/;
+/*!50001 CREATE TABLE `item_Free_Id` (
+  `newId` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29918,23 +32125,24 @@ DROP TABLE IF EXISTS `labelInfo`;
 /*!50001 DROP VIEW IF EXISTS `labelInfo`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `labelInfo` AS SELECT 
- 1 AS `itemId`,
- 1 AS `itemName`,
- 1 AS `stickers`,
- 1 AS `life`,
- 1 AS `colorCode`,
- 1 AS `stems`,
- 1 AS `category`,
- 1 AS `productor`,
- 1 AS `packing`,
- 1 AS `warehouse_id`,
- 1 AS `size`,
- 1 AS `isPickedOff`,
- 1 AS `notes`,
- 1 AS `wh_in`,
- 1 AS `entryId`,
- 1 AS `buyId`*/;
+/*!50001 CREATE TABLE `labelInfo` (
+  `itemId` tinyint NOT NULL,
+  `itemName` tinyint NOT NULL,
+  `stickers` tinyint NOT NULL,
+  `life` tinyint NOT NULL,
+  `colorCode` tinyint NOT NULL,
+  `stems` tinyint NOT NULL,
+  `category` tinyint NOT NULL,
+  `productor` tinyint NOT NULL,
+  `packing` tinyint NOT NULL,
+  `warehouse_id` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `isPickedOff` tinyint NOT NULL,
+  `notes` tinyint NOT NULL,
+  `wh_in` tinyint NOT NULL,
+  `entryId` tinyint NOT NULL,
+  `buyId` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29945,11 +32153,11 @@ DROP TABLE IF EXISTS `labourTree`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `labourTree` (
-  `id` int(11) NOT NULL DEFAULT '0',
+  `id` int(11) NOT NULL DEFAULT 0,
   `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   `lft` int(11) NOT NULL,
   `rgt` int(11) NOT NULL,
-  `depth` bigint(22) NOT NULL DEFAULT '0',
+  `depth` bigint(22) NOT NULL DEFAULT 0,
   `sons` decimal(10,0) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -29963,9 +32171,10 @@ DROP TABLE IF EXISTS `lastHourProduction`;
 /*!50001 DROP VIEW IF EXISTS `lastHourProduction`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `lastHourProduction` AS SELECT 
- 1 AS `warehouseFk`,
- 1 AS `m3`*/;
+/*!50001 CREATE TABLE `lastHourProduction` (
+  `warehouseFk` tinyint NOT NULL,
+  `m3` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -29976,13 +32185,14 @@ DROP TABLE IF EXISTS `lastTopClaims`;
 /*!50001 DROP VIEW IF EXISTS `lastTopClaims`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `lastTopClaims` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `itemName`,
- 1 AS `itemTypeName`,
- 1 AS `claimsNumber`,
- 1 AS `claimedAmount`,
- 1 AS `totalAmount`*/;
+/*!50001 CREATE TABLE `lastTopClaims` (
+  `itemFk` tinyint NOT NULL,
+  `itemName` tinyint NOT NULL,
+  `itemTypeName` tinyint NOT NULL,
+  `claimsNumber` tinyint NOT NULL,
+  `claimedAmount` tinyint NOT NULL,
+  `totalAmount` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -30026,13 +32236,13 @@ CREATE TABLE `mail` (
   `replyTo` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `subject` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
   `body` text COLLATE utf8_unicode_ci NOT NULL,
-  `sent` tinyint(2) NOT NULL DEFAULT '0',
-  `creationDate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `sent` tinyint(2) NOT NULL DEFAULT 0,
+  `creationDate` timestamp NOT NULL DEFAULT current_timestamp(),
   `attachment` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `status` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'OK',
   `senderFk` int(11) DEFAULT NULL,
   `recipientFk` int(11) DEFAULT NULL,
-  `plainTextBody` text COLLATE utf8_unicode_ci,
+  `plainTextBody` text COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `sent_idx` (`sent`),
   KEY `creation_idx` (`creationDate`)
@@ -30066,7 +32276,7 @@ CREATE TABLE `mandate` (
   `clientFk` int(11) NOT NULL,
   `companyFk` smallint(5) unsigned NOT NULL,
   `code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NULL DEFAULT current_timestamp(),
   `finished` timestamp NULL DEFAULT NULL,
   `mandateTypeFk` smallint(5) NOT NULL,
   PRIMARY KEY (`id`),
@@ -30127,8 +32337,8 @@ DROP TABLE IF EXISTS `manuscript`;
 CREATE TABLE `manuscript` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `code` varchar(45) CHARACTER SET utf8 NOT NULL,
-  `description` text COLLATE utf8_unicode_ci,
-  `enabled` tinyint(1) NOT NULL DEFAULT '1',
+  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `enabled` tinyint(1) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_UNIQUE` (`code`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -30164,7 +32374,7 @@ CREATE TABLE `medicalReview` (
   `isFit` tinyint(1) DEFAULT NULL,
   `amount` double DEFAULT NULL,
   `invoice` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `remark` longtext COLLATE utf8_unicode_ci,
+  `remark` longtext COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `frgcenter_idx` (`centerFk`),
   KEY `frgnkWorker_idx` (`workerFk`),
@@ -30185,8 +32395,8 @@ CREATE TABLE `message` (
   `uuid` varchar(50) CHARACTER SET utf8 NOT NULL,
   `sender` varchar(50) CHARACTER SET utf8 NOT NULL,
   `recipient` varchar(50) CHARACTER SET utf8 NOT NULL,
-  `message` longtext CHARACTER SET utf8,
-  `sendDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `message` longtext CHARACTER SET utf8 DEFAULT NULL,
+  `sendDate` timestamp NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `sender` (`sender`),
   KEY `recipient` (`recipient`),
@@ -30207,8 +32417,8 @@ CREATE TABLE `messageInbox` (
   `sender` varchar(50) CHARACTER SET utf8 NOT NULL,
   `recipient` varchar(45) CHARACTER SET utf8 NOT NULL,
   `finalRecipient` varchar(50) CHARACTER SET utf8 NOT NULL,
-  `message` longtext CHARACTER SET utf8,
-  `sendDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `message` longtext CHARACTER SET utf8 DEFAULT NULL,
+  `sendDate` timestamp NULL DEFAULT current_timestamp(),
   `read` varchar(45) CHARACTER SET utf8 NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `uuid` (`uuid`(8)),
@@ -30224,15 +32434,16 @@ DROP TABLE IF EXISTS `mistake`;
 /*!50001 DROP VIEW IF EXISTS `mistake`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `mistake` AS SELECT 
- 1 AS `revisador`,
- 1 AS `concept`,
- 1 AS `sacador`,
- 1 AS `firstName`,
- 1 AS `lastName`,
- 1 AS `description`,
- 1 AS `created`,
- 1 AS `workerFk`*/;
+/*!50001 CREATE TABLE `mistake` (
+  `revisador` tinyint NOT NULL,
+  `concept` tinyint NOT NULL,
+  `sacador` tinyint NOT NULL,
+  `firstName` tinyint NOT NULL,
+  `lastName` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `workerFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -30243,15 +32454,16 @@ DROP TABLE IF EXISTS `mistakeRatio`;
 /*!50001 DROP VIEW IF EXISTS `mistakeRatio`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `mistakeRatio` AS SELECT 
- 1 AS `revisador`,
- 1 AS `sacador`,
- 1 AS `firstName`,
- 1 AS `lastName`,
- 1 AS `description`,
- 1 AS `created`,
- 1 AS `workerFk`,
- 1 AS `saleFk`*/;
+/*!50001 CREATE TABLE `mistakeRatio` (
+  `revisador` tinyint NOT NULL,
+  `sacador` tinyint NOT NULL,
+  `firstName` tinyint NOT NULL,
+  `lastName` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `workerFk` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -30278,7 +32490,7 @@ DROP TABLE IF EXISTS `mobileAppVersionControl`;
 CREATE TABLE `mobileAppVersionControl` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `appName` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `version` int(11) NOT NULL DEFAULT '0',
+  `version` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tabla para llevar el control de las Versions de las aplicaciones móvil ';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -30297,7 +32509,7 @@ CREATE TABLE `mrw` (
   `shipped` date DEFAULT NULL,
   `price` decimal(10,2) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -30308,11 +32520,30 @@ DROP TABLE IF EXISTS `newBornSales`;
 /*!50001 DROP VIEW IF EXISTS `newBornSales`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `newBornSales` AS SELECT 
- 1 AS `amount`,
- 1 AS `userFk`,
- 1 AS `dated`,
- 1 AS `firstShipped`*/;
+/*!50001 CREATE TABLE `newBornSales` (
+  `amount` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `userFk` tinyint NOT NULL,
+  `dated` tinyint NOT NULL,
+  `firstShipped` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Temporary table structure for view `newBornSales__`
+--
+
+DROP TABLE IF EXISTS `newBornSales__`;
+/*!50001 DROP VIEW IF EXISTS `newBornSales__`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `newBornSales__` (
+  `amount` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `userFk` tinyint NOT NULL,
+  `dated` tinyint NOT NULL,
+  `firstShipped` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -30327,9 +32558,9 @@ CREATE TABLE `noticeCategory` (
   `keyName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `subject` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci,
-  `isEnabled` tinyint(1) NOT NULL DEFAULT '1',
-  `requiredRole` int(11) NOT NULL DEFAULT '1',
+  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `isEnabled` tinyint(1) NOT NULL DEFAULT 1,
+  `requiredRole` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `keyName_UNIQUE` (`keyName`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -30343,8 +32574,8 @@ DROP TABLE IF EXISTS `noticeSubscription`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `noticeSubscription` (
-  `noticeCategoryFk` int(11) NOT NULL DEFAULT '0',
-  `userFk` int(10) unsigned NOT NULL DEFAULT '0',
+  `noticeCategoryFk` int(11) NOT NULL DEFAULT 0,
+  `userFk` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`noticeCategoryFk`,`userFk`),
   KEY `noticeSubscription_ibfk_2` (`userFk`),
   CONSTRAINT `noticeSubscription_ibfk_1` FOREIGN KEY (`noticeCategoryFk`) REFERENCES `noticeCategory` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -30376,7 +32607,7 @@ DROP TABLE IF EXISTS `orderTicket`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `orderTicket` (
   `orderFk` int(10) unsigned NOT NULL,
-  `ticketFk` int(11) NOT NULL DEFAULT '0',
+  `ticketFk` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ticketFk`,`orderFk`),
   KEY `order_id` (`orderFk`),
   CONSTRAINT `hedera_id` FOREIGN KEY (`orderFk`) REFERENCES `hedera`.`order` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -30395,10 +32626,10 @@ CREATE TABLE `origin` (
   `id` tinyint(2) unsigned NOT NULL AUTO_INCREMENT,
   `code` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
   `name` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
-  `warehouseFk` smallint(5) unsigned DEFAULT '4',
-  `flag` blob,
-  `nl` tinyint(4) NOT NULL DEFAULT '0',
-  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT '1',
+  `warehouseFk` smallint(5) unsigned DEFAULT 4,
+  `flag` blob DEFAULT NULL,
+  `nl` tinyint(4) NOT NULL DEFAULT 0,
+  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `Abreviatura` (`code`),
   KEY `warehouse_id` (`warehouseFk`),
@@ -30430,9 +32661,10 @@ DROP TABLE IF EXISTS `originL10n`;
 /*!50001 DROP VIEW IF EXISTS `originL10n`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `originL10n` AS SELECT 
- 1 AS `id`,
- 1 AS `name`*/;
+/*!50001 CREATE TABLE `originL10n` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -30492,9 +32724,10 @@ DROP TABLE IF EXISTS `packageEquivalentItem`;
 /*!50001 DROP VIEW IF EXISTS `packageEquivalentItem`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `packageEquivalentItem` AS SELECT 
- 1 AS `itemFk`,
- 1 AS `equivalentFk`*/;
+/*!50001 CREATE TABLE `packageEquivalentItem` (
+  `itemFk` tinyint NOT NULL,
+  `equivalentFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -30506,25 +32739,25 @@ DROP TABLE IF EXISTS `packaging`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `packaging` (
   `id` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
-  `volume` decimal(10,2) DEFAULT '0.00',
-  `width` decimal(10,2) DEFAULT '0.00',
-  `depth` decimal(10,2) DEFAULT '0.00',
-  `height` decimal(10,2) DEFAULT '0.00',
-  `value` decimal(10,2) DEFAULT '0.00',
-  `isPackageReturnable` tinyint(1) NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `volume` decimal(10,2) DEFAULT 0.00,
+  `width` decimal(10,2) DEFAULT 0.00,
+  `depth` decimal(10,2) DEFAULT 0.00,
+  `height` decimal(10,2) DEFAULT 0.00,
+  `value` decimal(10,2) DEFAULT 0.00,
+  `isPackageReturnable` tinyint(1) NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `packagingReturnFk` int(11) DEFAULT NULL,
   `lower` int(11) DEFAULT NULL,
   `upload` int(11) DEFAULT NULL,
   `base` decimal(10,2) DEFAULT NULL,
   `itemFk` int(11) DEFAULT NULL,
   `price` decimal(10,2) NOT NULL,
-  `isBox` tinyint(1) NOT NULL DEFAULT '0',
+  `isBox` tinyint(1) NOT NULL DEFAULT 0,
   `cubicPackage` decimal(10,2) DEFAULT NULL,
-  `returnCost` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `returnCost` decimal(10,2) NOT NULL DEFAULT 0.00,
   `cmrName` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `freightItemFk` int(11) DEFAULT NULL,
-  `hasCompressionVariations` tinyint(1) DEFAULT '0' COMMENT 'Floramondo puede servirlos no llenos del todo',
+  `hasCompressionVariations` tinyint(1) DEFAULT 0 COMMENT 'Floramondo puede servirlos no llenos del todo',
   PRIMARY KEY (`id`),
   KEY `packaging_fk1` (`itemFk`),
   KEY `packaging_fk2_idx` (`freightItemFk`),
@@ -30558,7 +32791,7 @@ CREATE TABLE `parking` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `column` varchar(5) CHARACTER SET utf8 DEFAULT '--',
   `row` varchar(5) CHARACTER SET utf8 DEFAULT '--',
-  `sectorFk` int(11) NOT NULL DEFAULT '2',
+  `sectorFk` int(11) NOT NULL DEFAULT 2,
   `code` varchar(8) CHARACTER SET utf8 DEFAULT NULL,
   `pickingOrder` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -30634,10 +32867,10 @@ CREATE TABLE `payMethod` (
   `code` varchar(50) CHARACTER SET utf8 DEFAULT NULL,
   `name` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
   `solution` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `outstandingDebt` tinyint(3) unsigned zerofill NOT NULL DEFAULT '000',
-  `graceDays` int(11) unsigned NOT NULL DEFAULT '0',
-  `ibanRequired` tinyint(3) DEFAULT '0',
-  `isNotified` tinyint(3) NOT NULL DEFAULT '1',
+  `outstandingDebt` tinyint(3) unsigned zerofill NOT NULL DEFAULT 000,
+  `graceDays` int(11) unsigned NOT NULL DEFAULT 0,
+  `ibanRequired` tinyint(3) DEFAULT 0,
+  `isNotified` tinyint(3) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -30653,16 +32886,16 @@ CREATE TABLE `payment` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `received` date NOT NULL,
   `supplierFk` int(11) NOT NULL,
-  `amount` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `amount` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT 1,
   `divisa` decimal(10,2) DEFAULT NULL,
-  `bankFk` int(11) NOT NULL DEFAULT '0',
+  `bankFk` int(11) NOT NULL DEFAULT 0,
   `payMethodFk` tinyint(3) unsigned NOT NULL,
-  `bankingFees` double(6,2) unsigned NOT NULL DEFAULT '0.00',
+  `bankingFees` double(6,2) unsigned NOT NULL DEFAULT 0.00,
   `concept` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `isConciliated` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `isConciliated` tinyint(1) unsigned zerofill NOT NULL DEFAULT 0,
   `exchangeInsuranceFk` int(11) DEFAULT NULL,
   `dueDated` date DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -30744,19 +32977,20 @@ DROP TABLE IF EXISTS `payment__`;
 /*!50001 DROP VIEW IF EXISTS `payment__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `payment__` AS SELECT 
- 1 AS `id`,
- 1 AS `received`,
- 1 AS `dueDated`,
- 1 AS `supplierFk`,
- 1 AS `amount`,
- 1 AS `currencyFk`,
- 1 AS `divisa`,
- 1 AS `bankFk`,
- 1 AS `payMethodFk`,
- 1 AS `companyFk`,
- 1 AS `exchangeInsuranceFk`,
- 1 AS `isConciliated`*/;
+/*!50001 CREATE TABLE `payment__` (
+  `id` tinyint NOT NULL,
+  `received` tinyint NOT NULL,
+  `dueDated` tinyint NOT NULL,
+  `supplierFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `currencyFk` tinyint NOT NULL,
+  `divisa` tinyint NOT NULL,
+  `bankFk` tinyint NOT NULL,
+  `payMethodFk` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL,
+  `exchangeInsuranceFk` tinyint NOT NULL,
+  `isConciliated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -30767,7 +33001,7 @@ DROP TABLE IF EXISTS `pcs`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `pcs` (
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NULL DEFAULT current_timestamp(),
   `routeFk` int(10) unsigned DEFAULT NULL,
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `pallet` int(11) DEFAULT NULL,
@@ -30784,7 +33018,7 @@ DROP TABLE IF EXISTS `pcs_graf`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `pcs_graf` (
-  `id` int(11) NOT NULL DEFAULT '0',
+  `id` int(11) NOT NULL DEFAULT 0,
   `dia` date DEFAULT NULL,
   `created` datetime DEFAULT NULL,
   `box` decimal(4,0) DEFAULT NULL,
@@ -30842,9 +33076,9 @@ CREATE TABLE `person` (
   `birth` date DEFAULT NULL,
   `readerId` int(11) DEFAULT NULL,
   `workerFk` int(11) DEFAULT NULL,
-  `isDisable` tinyint(1) NOT NULL DEFAULT '0',
-  `isFreelance` tinyint(1) NOT NULL DEFAULT '0',
-  `isSsDiscounted` tinyint(1) NOT NULL DEFAULT '0',
+  `isDisable` tinyint(1) NOT NULL DEFAULT 0,
+  `isFreelance` tinyint(1) NOT NULL DEFAULT 0,
+  `isSsDiscounted` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `nif` (`fi`),
   KEY `nifIndex` (`fi`),
@@ -30861,9 +33095,10 @@ DROP TABLE IF EXISTS `personMedia`;
 /*!50001 DROP VIEW IF EXISTS `personMedia`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `personMedia` AS SELECT 
- 1 AS `workerFk`,
- 1 AS `mediaValue`*/;
+/*!50001 CREATE TABLE `personMedia` (
+  `workerFk` tinyint NOT NULL,
+  `mediaValue` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -30877,11 +33112,11 @@ CREATE TABLE `pgc` (
   `code` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
   `rate` decimal(10,2) NOT NULL,
   `name` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cplusTaxBreakFk` int(10) unsigned DEFAULT '1',
-  `mod340` tinyint(1) NOT NULL DEFAULT '0',
-  `mod347` tinyint(1) NOT NULL DEFAULT '0',
-  `cplusTrascendency477Fk` int(10) unsigned DEFAULT '1',
-  `isEqualizated` tinyint(1) DEFAULT '0',
+  `cplusTaxBreakFk` int(10) unsigned DEFAULT 1,
+  `mod340` tinyint(1) NOT NULL DEFAULT 0,
+  `mod347` tinyint(1) NOT NULL DEFAULT 0,
+  `cplusTrascendency477Fk` int(10) unsigned DEFAULT 1,
+  `isEqualizated` tinyint(1) DEFAULT 0,
   PRIMARY KEY (`code`),
   KEY `pgc_fk1_idx` (`cplusTaxBreakFk`),
   KEY `pgc_fk2_idx` (`cplusTrascendency477Fk`),
@@ -30932,7 +33167,7 @@ CREATE TABLE `plantpassport` (
   `producerFk` mediumint(3) unsigned NOT NULL,
   `plantpassportAuthorityFk` mediumint(3) unsigned NOT NULL,
   `number` varchar(25) CHARACTER SET utf8 DEFAULT NULL,
-  `isRequested` tinyint(2) NOT NULL DEFAULT '0',
+  `isRequested` tinyint(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`producerFk`,`plantpassportAuthorityFk`),
   KEY `plantpassport_authority_idx` (`plantpassportAuthorityFk`),
   KEY `producer_id_idx` (`producerFk`),
@@ -31072,11 +33307,11 @@ DROP TABLE IF EXISTS `ppe`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ppe` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `amortization` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `amortization` decimal(10,2) NOT NULL DEFAULT 0.00,
   `firstAmortizated` date DEFAULT NULL,
   `lastAmortizated` date DEFAULT NULL,
   `finished` date DEFAULT NULL,
-  `value` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `value` decimal(10,2) NOT NULL DEFAULT 0.00,
   `planFk` int(11) NOT NULL,
   `groupFk` int(11) DEFAULT NULL,
   `account` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -31086,10 +33321,10 @@ CREATE TABLE `ppe` (
   `location` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
   `discharged` date DEFAULT NULL,
   `cause` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `photo` blob,
-  `isInvestmentAsset` tinyint(4) NOT NULL DEFAULT '0',
+  `photo` blob DEFAULT NULL,
+  `isInvestmentAsset` tinyint(4) NOT NULL DEFAULT 0,
   `workerFk` int(11) DEFAULT NULL,
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
   `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `ppe_fk1_idx` (`workerFk`),
@@ -31120,7 +33355,7 @@ CREATE TABLE `ppeComponent` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `ppeFk` int(11) NOT NULL,
   `invoiceInFk` mediumint(8) unsigned NOT NULL,
-  `amount` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `amount` decimal(10,2) NOT NULL DEFAULT 0.00,
   PRIMARY KEY (`id`),
   KEY `ppeComponent_fk1_idx` (`ppeFk`),
   KEY `ppeComponent_fk2_idx` (`invoiceInFk`),
@@ -31171,8 +33406,8 @@ DROP TABLE IF EXISTS `ppePlan`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ppePlan` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `rate` decimal(3,2) NOT NULL DEFAULT '1.00',
-  `days` int(11) NOT NULL DEFAULT '365',
+  `rate` decimal(3,2) NOT NULL DEFAULT 1.00,
+  `days` int(11) NOT NULL DEFAULT 365,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Plan de amortizacion para la tabla ppe';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -31234,9 +33469,9 @@ CREATE TABLE `priceFixed` (
   `rate3` double NOT NULL,
   `started` date NOT NULL,
   `ended` date NOT NULL,
-  `bonus` double NOT NULL DEFAULT '0',
-  `warehouseFk` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `bonus` double NOT NULL DEFAULT 0,
+  `warehouseFk` smallint(5) unsigned NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `grouping` smallint(5) DEFAULT NULL,
   `packing` int(11) DEFAULT NULL,
@@ -31310,16 +33545,16 @@ CREATE TABLE `printServerQueue` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `printerFk` tinyint(3) unsigned DEFAULT NULL,
   `priorityFk` tinyint(3) unsigned DEFAULT NULL,
-  `reportFk` tinyint(3) unsigned DEFAULT '0',
-  `statusFk` tinyint(3) unsigned DEFAULT '1',
+  `reportFk` tinyint(3) unsigned DEFAULT 0,
+  `statusFk` tinyint(3) unsigned DEFAULT 1,
   `started` datetime DEFAULT NULL,
   `finished` datetime DEFAULT NULL,
   `param1` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `workerFk` int(11) DEFAULT NULL,
   `param2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `param3` text COLLATE utf8_unicode_ci,
-  `error` text COLLATE utf8_unicode_ci,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `param3` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `error` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   UNIQUE KEY `Id_Impresora_2` (`printerFk`,`priorityFk`,`reportFk`,`statusFk`,`param1`,`workerFk`,`param2`),
   KEY `Id_estado` (`statusFk`),
@@ -31329,7 +33564,7 @@ CREATE TABLE `printServerQueue` (
   KEY `Id_Trabajador` (`workerFk`),
   CONSTRAINT `printServerQueue_ibfk_3` FOREIGN KEY (`priorityFk`) REFERENCES `queuePriority` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `printServerQueue_ibfk_4` FOREIGN KEY (`printerFk`) REFERENCES `vn2008`.`Impresoras` (`Id_Impresora`) ON UPDATE CASCADE
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -31343,15 +33578,15 @@ CREATE TABLE `printServerQueue2` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `printerFk` tinyint(3) unsigned DEFAULT NULL,
   `priorityFk` tinyint(3) unsigned DEFAULT NULL,
-  `reportFk` tinyint(3) unsigned DEFAULT '0',
-  `statusFk` tinyint(3) unsigned DEFAULT '1',
+  `reportFk` tinyint(3) unsigned DEFAULT 0,
+  `statusFk` tinyint(3) unsigned DEFAULT 1,
   `started` datetime DEFAULT NULL,
   `finished` datetime DEFAULT NULL,
   `param1` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `workerFk` int(11) DEFAULT NULL,
   `param2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `param3` text COLLATE utf8_unicode_ci,
-  `error` text COLLATE utf8_unicode_ci,
+  `param3` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `error` text COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `Id_Impresora_2` (`printerFk`,`priorityFk`,`reportFk`,`statusFk`,`param1`,`workerFk`,`param2`),
   KEY `Id_estado` (`statusFk`),
@@ -31370,9 +33605,9 @@ DROP TABLE IF EXISTS `printingQueueCheck`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `printingQueueCheck` (
-  `lastCount` int(11) unsigned NOT NULL DEFAULT '0',
-  `lastCheckSum` int(11) unsigned NOT NULL DEFAULT '0',
-  `isAlreadyNotified` tinyint(2) NOT NULL DEFAULT '0',
+  `lastCount` int(11) unsigned NOT NULL DEFAULT 0,
+  `lastCheckSum` int(11) unsigned NOT NULL DEFAULT 0,
+  `isAlreadyNotified` tinyint(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`lastCount`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Comprueba que el servidor de impresion no esta parado';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -31387,7 +33622,7 @@ DROP TABLE IF EXISTS `producer`;
 CREATE TABLE `producer` (
   `id` mediumint(3) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isVisible` tinyint(1) NOT NULL DEFAULT '1',
+  `isVisible` tinyint(1) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name_UNIQUE` (`name`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -31401,12 +33636,13 @@ DROP TABLE IF EXISTS `productionVolume`;
 /*!50001 DROP VIEW IF EXISTS `productionVolume`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `productionVolume` AS SELECT 
- 1 AS `hora`,
- 1 AS `minuto`,
- 1 AS `cm3`,
- 1 AS `warehouseFk`,
- 1 AS `created`*/;
+/*!50001 CREATE TABLE `productionVolume` (
+  `hora` tinyint NOT NULL,
+  `minuto` tinyint NOT NULL,
+  `cm3` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `created` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -31417,9 +33653,10 @@ DROP TABLE IF EXISTS `productionVolume_LastHour`;
 /*!50001 DROP VIEW IF EXISTS `productionVolume_LastHour`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `productionVolume_LastHour` AS SELECT 
- 1 AS `m3`,
- 1 AS `warehouseFk`*/;
+/*!50001 CREATE TABLE `productionVolume_LastHour` (
+  `m3` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -31430,13 +33667,13 @@ DROP TABLE IF EXISTS `professionalCategory`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `professionalCategory` (
-  `id` int(11) NOT NULL,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `salary` decimal(10,2) DEFAULT NULL,
   `salaryorSeniority` decimal(10,2) DEFAULT NULL,
   `year` int(2) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -31449,7 +33686,7 @@ DROP TABLE IF EXISTS `profile`;
 CREATE TABLE `profile` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `personFk` int(11) DEFAULT NULL,
-  `profileTypeFk` int(11) NOT NULL DEFAULT '1',
+  `profileTypeFk` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   KEY `personFk` (`personFk`),
   KEY `profileTypeFk` (`profileTypeFk`),
@@ -31592,7 +33829,7 @@ DROP TABLE IF EXISTS `punchState`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `punchState` (
   `workerFk` int(11) NOT NULL,
-  `state` tinyint(4) DEFAULT '1',
+  `state` tinyint(4) DEFAULT 1,
   `created` datetime DEFAULT NULL,
   PRIMARY KEY (`workerFk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Table for storing punches that have cars with errors';
@@ -31606,7 +33843,7 @@ DROP TABLE IF EXISTS `queuePriority`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `queuePriority` (
-  `id` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `id` tinyint(3) unsigned NOT NULL DEFAULT 0,
   `priority` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -31620,11 +33857,12 @@ DROP TABLE IF EXISTS `rankingNewBornByQuarter__`;
 /*!50001 DROP VIEW IF EXISTS `rankingNewBornByQuarter__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `rankingNewBornByQuarter__` AS SELECT 
- 1 AS `total`,
- 1 AS `name`,
- 1 AS `time_sec`,
- 1 AS `userFk`*/;
+/*!50001 CREATE TABLE `rankingNewBornByQuarter__` (
+  `total` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `time_sec` tinyint NOT NULL,
+  `userFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -31635,13 +33873,35 @@ DROP TABLE IF EXISTS `rankingSellingByQuarter__`;
 /*!50001 DROP VIEW IF EXISTS `rankingSellingByQuarter__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `rankingSellingByQuarter__` AS SELECT 
- 1 AS `importe`,
- 1 AS `name`,
- 1 AS `userFk`,
- 1 AS `time_sec`*/;
+/*!50001 CREATE TABLE `rankingSellingByQuarter__` (
+  `importe` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `userFk` tinyint NOT NULL,
+  `time_sec` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `rate`
+--
+
+DROP TABLE IF EXISTS `rate`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `rate` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `dated` date NOT NULL,
+  `warehouseFk` smallint(6) unsigned NOT NULL,
+  `rate0` double NOT NULL,
+  `rate1` double NOT NULL,
+  `rate2` double NOT NULL,
+  `rate3` double NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `tarifa_warehouse` (`warehouseFk`),
+  CONSTRAINT `tarifa_warehouse` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `rateConfig`
 --
@@ -31659,6 +33919,25 @@ CREATE TABLE `rateConfig` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Temporary table structure for view `rate__`
+--
+
+DROP TABLE IF EXISTS `rate__`;
+/*!50001 DROP VIEW IF EXISTS `rate__`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `rate__` (
+  `id` tinyint NOT NULL,
+  `dated` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL,
+  `rate0` tinyint NOT NULL,
+  `rate1` tinyint NOT NULL,
+  `rate2` tinyint NOT NULL,
+  `rate3` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
 --
 -- Table structure for table `receipt`
 --
@@ -31669,15 +33948,15 @@ DROP TABLE IF EXISTS `receipt`;
 CREATE TABLE `receipt` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `invoiceFk` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'nombre incorrecto, renombrar a description',
-  `amountPaid` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `amountUnpaid` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `amountPaid` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `amountUnpaid` decimal(10,2) NOT NULL DEFAULT 0.00,
   `payed` datetime DEFAULT NULL,
   `workerFk` int(11) DEFAULT NULL,
-  `bankFk` int(11) DEFAULT '0',
-  `clientFk` int(11) DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
-  `isConciliate` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
+  `bankFk` int(11) DEFAULT 0,
+  `clientFk` int(11) DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
+  `isConciliate` tinyint(1) unsigned zerofill NOT NULL DEFAULT 0,
   PRIMARY KEY (`Id`),
   KEY `Id_Banco` (`bankFk`),
   KEY `Id_Trabajador` (`workerFk`),
@@ -31699,6 +33978,26 @@ CREATE TABLE `receipt` (
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER vn.receipt_beforeInsert
+BEFORE INSERT
+ON receipt FOR EACH ROW
+BEGIN
+	
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_afterInsert` AFTER INSERT ON `receipt` FOR EACH ROW 
 	CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid) */;;
 DELIMITER ;
@@ -31734,14 +34033,14 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_afterUpdate` AFTER UPDATE ON `receipt` FOR EACH ROW
-BEGIN
-	IF NEW.isConciliate = FALSE AND NEW.payed > OLD.payed THEN
-		INSERT INTO vn.mail(`sender`, subject, `body`)
-			SELECT 'finanzas@verdnatura.es', 
-				CONCAT(' Cambios de recibos del cliente: ', NEW.clientFk),
-                CONCAT('Se ha cambiado el recibo: ', NEW.Id, ' de ', OLD.payed, ' a ', NEW.payed);
-	END IF;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_afterUpdate` AFTER UPDATE ON `receipt` FOR EACH ROW
+BEGIN
+	IF NEW.isConciliate = FALSE AND NEW.payed > OLD.payed THEN
+		INSERT INTO vn.mail(`sender`, subject, `body`)
+			SELECT 'finanzas@verdnatura.es', 
+				CONCAT(' Cambios de recibos del cliente: ', NEW.clientFk),
+                CONCAT('Se ha cambiado el recibo: ', NEW.Id, ' de ', OLD.payed, ' a ', NEW.payed);
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -31780,7 +34079,7 @@ CREATE TABLE `recipe` (
   `originFk` tinyint(2) unsigned DEFAULT NULL,
   `typeFk` smallint(5) unsigned DEFAULT NULL,
   `longName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `quantity` int(11) NOT NULL DEFAULT '1',
+  `quantity` int(11) NOT NULL DEFAULT 1,
   `element` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `inkFk` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -31817,11 +34116,11 @@ DROP TABLE IF EXISTS `recovery`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `recovery` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `clientFk` int(11) NOT NULL DEFAULT '0',
+  `clientFk` int(11) NOT NULL DEFAULT 0,
   `started` date NOT NULL COMMENT 'Fecha a partir de la que comienza el recobro',
   `finished` date DEFAULT NULL COMMENT 'Fecha en la que acaba',
   `amount` double NOT NULL,
-  `period` tinyint(3) unsigned NOT NULL DEFAULT '7' COMMENT 'numero de dias que indica cada cuanto hare el recobro',
+  `period` tinyint(3) unsigned NOT NULL DEFAULT 7 COMMENT 'numero de dias que indica cada cuanto hare el recobro',
   PRIMARY KEY (`id`),
   KEY `cliente_idx` (`clientFk`),
   CONSTRAINT `cliente333` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE,
@@ -31870,7 +34169,7 @@ DROP TABLE IF EXISTS `referenceRateConfig`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `referenceRateConfig` (
-  `simulatedValue` float unsigned NOT NULL DEFAULT '1.2309',
+  `simulatedValue` float unsigned NOT NULL DEFAULT 1.2309,
   PRIMARY KEY (`simulatedValue`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -31883,11 +34182,12 @@ DROP TABLE IF EXISTS `role`;
 /*!50001 DROP VIEW IF EXISTS `role`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `role` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `description`,
- 1 AS `hasLogin`*/;
+/*!50001 CREATE TABLE `role` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `hasLogin` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -31904,7 +34204,7 @@ CREATE TABLE `route` (
   `vehicleFk` int(10) unsigned DEFAULT NULL,
   `agencyModeFk` int(11) DEFAULT NULL,
   `time` datetime DEFAULT NULL,
-  `isOk` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `isOk` tinyint(1) unsigned NOT NULL DEFAULT 0,
   `kmStart` mediumint(9) NOT NULL,
   `kmEnd` mediumint(9) NOT NULL,
   `started` datetime NOT NULL,
@@ -31912,9 +34212,9 @@ CREATE TABLE `route` (
   `gestdocFk` int(11) DEFAULT NULL,
   `cost` double unsigned DEFAULT NULL,
   `m3` decimal(10,1) unsigned DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci,
+  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `zoneFk` int(11) DEFAULT NULL,
-  `priority` int(11) NOT NULL DEFAULT '0',
+  `priority` int(11) NOT NULL DEFAULT 0,
   `invoiceInFk` mediumint(8) unsigned DEFAULT NULL,
   `beachFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -32047,6 +34347,30 @@ CREATE TABLE `routeComplement` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `routeConfig`
+--
+
+DROP TABLE IF EXISTS `routeConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `routeConfig` (
+  `id` int(10) unsigned NOT NULL,
+  `kmRate` decimal(10,4) DEFAULT NULL,
+  `m3Distribution` decimal(10,4) DEFAULT NULL,
+  `m3Management` decimal(10,2) DEFAULT NULL,
+  `m3Palletization` decimal(10,2) DEFAULT NULL,
+  `load1m3` decimal(10,4) DEFAULT NULL,
+  `load2m3` decimal(10,4) DEFAULT NULL,
+  `load3m3` decimal(10,4) DEFAULT NULL,
+  `load4m3` decimal(10,4) DEFAULT NULL,
+  `load5m3` decimal(10,4) DEFAULT NULL,
+  `load6m3` decimal(10,4) DEFAULT NULL,
+  `rateHoliday` decimal(5,2) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `routeGate`
 --
@@ -32058,15 +34382,15 @@ CREATE TABLE `routeGate` (
   `deviceId` varchar(30) CHARACTER SET utf8 NOT NULL,
   `displayText` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `status` set('idle','doing','done','') CHARACTER SET utf8 DEFAULT 'idle',
-  `gateAreaFk` int(11) NOT NULL DEFAULT '1',
+  `gateAreaFk` int(11) NOT NULL DEFAULT 1,
   `routeFk` int(11) DEFAULT NULL,
   `freeTickets` int(11) DEFAULT NULL,
   `expeditions` int(11) DEFAULT NULL,
   `scanned` int(11) DEFAULT NULL,
-  `flag` blob,
+  `flag` blob DEFAULT NULL,
   `pallets` int(11) DEFAULT NULL,
   `lastScanned` datetime DEFAULT NULL,
-  `ready` tinyint(4) NOT NULL DEFAULT '0',
+  `ready` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`deviceId`),
   KEY `routeGate_fk1_idx` (`gateAreaFk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -32134,11 +34458,11 @@ CREATE TABLE `routeLog` (
   `originFk` int(10) unsigned NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -32149,29 +34473,6 @@ CREATE TABLE `routeLog` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `routeParams`
---
-
-DROP TABLE IF EXISTS `routeParams`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `routeParams` (
-  `id` int(10) unsigned NOT NULL,
-  `kmRate` decimal(10,4) DEFAULT NULL,
-  `m3Distribution` decimal(10,4) DEFAULT NULL,
-  `m3Management` decimal(10,2) DEFAULT NULL,
-  `m3Palletization` decimal(10,2) DEFAULT NULL,
-  `load1m3` decimal(10,4) DEFAULT NULL,
-  `load2m3` decimal(10,4) DEFAULT NULL,
-  `load3m3` decimal(10,4) DEFAULT NULL,
-  `load4m3` decimal(10,4) DEFAULT NULL,
-  `load5m3` decimal(10,4) DEFAULT NULL,
-  `load6m3` decimal(10,4) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `routeUserPercentage`
 --
@@ -32198,21 +34499,22 @@ DROP TABLE IF EXISTS `routesMonitor`;
 /*!50001 DROP VIEW IF EXISTS `routesMonitor`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `routesMonitor` AS SELECT 
- 1 AS `routeFk`,
- 1 AS `name`,
- 1 AS `beachFk`,
- 1 AS `ticketPacked`,
- 1 AS `ticketFree`,
- 1 AS `ticketProduction`,
- 1 AS `packages`,
- 1 AS `note`,
- 1 AS `dated`,
- 1 AS `dockFk`,
- 1 AS `m3`,
- 1 AS `priority`,
- 1 AS `etd`,
- 1 AS `expeditionTruckFk`*/;
+/*!50001 CREATE TABLE `routesMonitor` (
+  `routeFk` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `beachFk` tinyint NOT NULL,
+  `ticketPacked` tinyint NOT NULL,
+  `ticketFree` tinyint NOT NULL,
+  `ticketProduction` tinyint NOT NULL,
+  `packages` tinyint NOT NULL,
+  `note` tinyint NOT NULL,
+  `dated` tinyint NOT NULL,
+  `dockFk` tinyint NOT NULL,
+  `m3` tinyint NOT NULL,
+  `priority` tinyint NOT NULL,
+  `etd` tinyint NOT NULL,
+  `expeditionTruckFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32227,16 +34529,16 @@ CREATE TABLE `sale` (
   `itemFk` int(11) NOT NULL,
   `ticketFk` int(11) NOT NULL,
   `concept` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `quantity` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `quantity` decimal(10,2) NOT NULL DEFAULT 0.00,
   `originalQuantity` double(9,1) DEFAULT NULL,
-  `price` decimal(10,2) DEFAULT '0.00',
-  `discount` tinyint(2) unsigned NOT NULL DEFAULT '0',
-  `priceFixed` decimal(10,2) NOT NULL DEFAULT '0.00',
-  `reserved` tinyint(1) NOT NULL DEFAULT '0',
-  `isPicked` tinyint(1) NOT NULL DEFAULT '0',
-  `isPriceFixed` tinyint(1) NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `isAdded` tinyint(1) NOT NULL DEFAULT '0',
+  `price` decimal(10,2) DEFAULT 0.00,
+  `discount` tinyint(2) unsigned NOT NULL DEFAULT 0,
+  `priceFixed` decimal(10,2) NOT NULL DEFAULT 0.00,
+  `reserved` tinyint(1) NOT NULL DEFAULT 0,
+  `isPicked` tinyint(1) NOT NULL DEFAULT 0,
+  `isPriceFixed` tinyint(1) NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `isAdded` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `Id_Ticket` (`ticketFk`),
   KEY `itemFk_ticketFk` (`itemFk`,`ticketFk`),
@@ -32247,9 +34549,9 @@ CREATE TABLE `sale` (
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -32258,6 +34560,7 @@ DELIMITER ;;
     FOR EACH ROW
 BEGIN	
 	CALL stock.log_add('sale', NEW.id, NULL);
+	CALL ticket_requestRecalc(NEW.ticketFk);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -32305,8 +34608,10 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `sale_afterUpdate`
 	AFTER UPDATE ON `sale`
     FOR EACH ROW
-BEGIN	
-    IF !(NEW.id <=> OLD.id)
+BEGIN
+	DECLARE  vIsToSendMail BOOL;
+    
+	IF !(NEW.id <=> OLD.id)
     OR !(NEW.ticketFk <=> OLD.ticketFk)
     OR !(NEW.itemFk <=> OLD.itemFk)
     OR !(NEW.quantity <=> OLD.quantity)
@@ -32315,10 +34620,38 @@ BEGIN
 		CALL stock.log_add('sale', NEW.id, OLD.id);
 	END IF;
 
+    IF !(NEW.price <=> OLD.price)
+    OR !(NEW.ticketFk <=> OLD.ticketFk)
+    OR !(NEW.itemFk <=> OLD.itemFk)
+    OR !(NEW.quantity <=> OLD.quantity)
+    OR !(NEW.discount <=> OLD.discount) THEN
+		CALL ticket_requestRecalc(NEW.ticketFk);
+		CALL ticket_requestRecalc(OLD.ticketFk);
+	END IF;
+
 	IF !(OLD.ticketFk <=> NEW.ticketFk) THEN
 		UPDATE ticketRequest SET ticketFk = NEW.ticketFk
 			WHERE saleFk = NEW.id;
 	END IF;
+	
+	IF !(OLD.quantity <=> NEW.quantity) THEN
+		SELECT COUNT(*) INTO vIsToSendMail 
+			FROM vncontrol.inter i
+				JOIN vn.state s ON s.id = i.state_id
+			WHERE s.code='PACKED' AND i.Id_Ticket = OLD.ticketFk
+			LIMIT 1;
+		    
+		IF vIsToSendMail THEN 
+			CALL vn.mail_insert('jefesventas@verdnatura.es',
+								'noreply@verdnatura.es',
+								CONCAT('Ticket ', OLD.ticketFk ,' modificada cantidad tras encajado'),
+								CONCAT('Ticket <a href=\"https://salix.verdnatura.es/#!/ticket/', OLD.ticketFk ,'/log\">', OLD.ticketFk ,'</a>. <br>',
+									'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity, 
+									' del artículo ', OLD.itemFk, ' tras estado encajado del ticket. <br>',
+									'Este email se ha generado automáticamente' )
+								);
+		END IF; 
+	END IF;	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -32338,7 +34671,25 @@ DELIMITER ;;
 	AFTER DELETE ON `sale`
     FOR EACH ROW
 BEGIN	
-    CALL stock.log_add('sale', NULL, OLD.id);
+   	DECLARE vIsToSendMail BOOL;
+   
+	CALL stock.log_add('sale', NULL, OLD.id);
+  	CALL ticket_requestRecalc(OLD.ticketFk);
+
+	SELECT COUNT(*) INTO vIsToSendMail 
+		FROM vncontrol.inter i
+			JOIN vn.state s ON s.id = i.state_id
+		WHERE s.code='PACKED' AND i.Id_Ticket = OLD.ticketFk
+        LIMIT 1;
+    
+    IF vIsToSendMail THEN 
+		CALL vn.mail_insert('jefesventas@verdnatura.es',
+							'noreply@verdnatura.es',
+							CONCAT('Ticket ', OLD.ticketFk ,' eliminado artículo tras encajado' ),
+							CONCAT('Ticket <a href=\"https://salix.verdnatura.es/#!/ticket/', OLD.ticketFk ,'/log\">', OLD.ticketFk ,'</a>. <br>',
+								'Eliminado artículo ', OLD.itemFk, ' tras estado encajado del ticket. <br> Este email se ha generado automáticamente' )
+							);
+    END IF;                        
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -32346,6 +34697,48 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
+--
+-- Table structure for table `saleBuy`
+--
+
+DROP TABLE IF EXISTS `saleBuy`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `saleBuy` (
+  `saleFk` int(11) NOT NULL,
+  `buyFk` int(11) NOT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `workerFk` int(11) NOT NULL,
+  PRIMARY KEY (`saleFk`),
+  KEY `saleBuy_FK` (`buyFk`),
+  CONSTRAINT `saleBuy_FK` FOREIGN KEY (`buyFk`) REFERENCES `buy` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `saleBuy_FK_1` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER BEFORE_INSERT
+BEFORE INSERT
+ON saleBuy FOR EACH ROW
+
+	BEGIN 
+		
+		SET NEW.workerFk = vn.getUser();
+	
+	END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+
 --
 -- Table structure for table `saleChecked`
 --
@@ -32355,7 +34748,7 @@ DROP TABLE IF EXISTS `saleChecked`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `saleChecked` (
   `saleFk` int(11) NOT NULL,
-  `isChecked` int(11) NOT NULL DEFAULT '0',
+  `isChecked` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`saleFk`),
   CONSTRAINT `fk_Movimientos_checked_1` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -32389,8 +34782,8 @@ CREATE TABLE `saleComponent` (
   `saleFk` int(11) NOT NULL,
   `componentFk` int(11) NOT NULL,
   `value` double NOT NULL,
-  `isGreuge` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Indica si ya se ha tenido en cuenta para calcular el greuge',
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `isGreuge` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'Indica si ya se ha tenido en cuenta para calcular el greuge',
+  `created` timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`saleFk`,`componentFk`),
   KEY `fk_mov_comp_idx` (`componentFk`),
   CONSTRAINT `mc_fk1` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -32406,16 +34799,17 @@ DROP TABLE IF EXISTS `saleFreight__`;
 /*!50001 DROP VIEW IF EXISTS `saleFreight__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `saleFreight__` AS SELECT 
- 1 AS `ticketFk`,
- 1 AS `clientFk`,
- 1 AS `routeFk`,
- 1 AS `saleFk`,
- 1 AS `zoneFk`,
- 1 AS `companyFk`,
- 1 AS `shipped`,
- 1 AS `price`,
- 1 AS `freight`*/;
+/*!50001 CREATE TABLE `saleFreight__` (
+  `ticketFk` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `routeFk` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL,
+  `zoneFk` tinyint NOT NULL,
+  `companyFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `price` tinyint NOT NULL,
+  `freight` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32429,8 +34823,8 @@ CREATE TABLE `saleItemShelving` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `saleFk` int(11) NOT NULL,
   `itemShelvingFk` int(10) unsigned NOT NULL,
-  `quantity` int(11) NOT NULL DEFAULT '0',
-  `isPicked` tinyint(4) NOT NULL DEFAULT '0',
+  `quantity` int(11) NOT NULL DEFAULT 0,
+  `isPicked` tinyint(4) NOT NULL DEFAULT 0,
   `ubication` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `saleItemShelving_fk1_idx` (`itemShelvingFk`)
@@ -32449,7 +34843,7 @@ CREATE TABLE `saleMistake` (
   `saleFk` int(11) NOT NULL,
   `userFk` int(11) NOT NULL,
   `typeFk` int(11) NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `saleMistake_fk1_idx` (`saleFk`),
   KEY `saleMistake_fk2_idx` (`userFk`),
@@ -32461,20 +34855,59 @@ CREATE TABLE `saleMistake` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Temporary table structure for view `saleMistake_list`
+-- Temporary table structure for view `saleMistakeList`
 --
 
-DROP TABLE IF EXISTS `saleMistake_list`;
-/*!50001 DROP VIEW IF EXISTS `saleMistake_list`*/;
+DROP TABLE IF EXISTS `saleMistakeList`;
+/*!50001 DROP VIEW IF EXISTS `saleMistakeList`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `saleMistake_list` AS SELECT 
- 1 AS `saleFk`,
- 1 AS `sacador`,
- 1 AS `created`,
- 1 AS `revisador`,
- 1 AS `description`,
- 1 AS `controlled`*/;
+/*!50001 CREATE TABLE `saleMistakeList` (
+  `saleFk` tinyint NOT NULL,
+  `workerFk` tinyint NOT NULL,
+  `sacador` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `revisador` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `controlled` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Temporary table structure for view `saleMistake_list__`
+--
+
+DROP TABLE IF EXISTS `saleMistake_list__`;
+/*!50001 DROP VIEW IF EXISTS `saleMistake_list__`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `saleMistake_list__` (
+  `saleFk` tinyint NOT NULL,
+  `sacador` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `revisador` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `controlled` tinyint NOT NULL
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Temporary table structure for view `saleMistake_list__2`
+--
+
+DROP TABLE IF EXISTS `saleMistake_list__2`;
+/*!50001 DROP VIEW IF EXISTS `saleMistake_list__2`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `saleMistake_list__2` (
+  `saleFk` tinyint NOT NULL,
+  `workerFk` tinyint NOT NULL,
+  `sacador` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `revisador` tinyint NOT NULL,
+  `description` tinyint NOT NULL,
+  `controlled` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32503,8 +34936,8 @@ DROP TABLE IF EXISTS `saleTracking`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `saleTracking` (
   `saleFk` int(11) NOT NULL,
-  `isChecked` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `isChecked` tinyint(3) unsigned NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `originalQuantity` double DEFAULT NULL,
   `workerFk` int(11) NOT NULL,
   `actionFk` int(11) DEFAULT NULL,
@@ -32553,19 +34986,20 @@ DROP TABLE IF EXISTS `saleValue`;
 /*!50001 DROP VIEW IF EXISTS `saleValue`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `saleValue` AS SELECT 
- 1 AS `warehouse`,
- 1 AS `client`,
- 1 AS `clientTypeFk`,
- 1 AS `buyer`,
- 1 AS `family`,
- 1 AS `itemFk`,
- 1 AS `concept`,
- 1 AS `quantity`,
- 1 AS `cost`,
- 1 AS `value`,
- 1 AS `year`,
- 1 AS `week`*/;
+/*!50001 CREATE TABLE `saleValue` (
+  `warehouse` tinyint NOT NULL,
+  `client` tinyint NOT NULL,
+  `clientTypeFk` tinyint NOT NULL,
+  `buyer` tinyint NOT NULL,
+  `family` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `concept` tinyint NOT NULL,
+  `quantity` tinyint NOT NULL,
+  `cost` tinyint NOT NULL,
+  `value` tinyint NOT NULL,
+  `year` tinyint NOT NULL,
+  `week` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32576,21 +35010,22 @@ DROP TABLE IF EXISTS `saleVolume`;
 /*!50001 DROP VIEW IF EXISTS `saleVolume`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `saleVolume` AS SELECT 
- 1 AS `ticketFk`,
- 1 AS `saleFk`,
- 1 AS `litros`,
- 1 AS `routeFk`,
- 1 AS `shipped`,
- 1 AS `landed`,
- 1 AS `volume`,
- 1 AS `physicalWeight`,
- 1 AS `weight`,
- 1 AS `physicalVolume`,
- 1 AS `freight`,
- 1 AS `zoneFk`,
- 1 AS `clientFk`,
- 1 AS `isPicked`*/;
+/*!50001 CREATE TABLE `saleVolume` (
+  `ticketFk` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL,
+  `litros` tinyint NOT NULL,
+  `routeFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `volume` tinyint NOT NULL,
+  `physicalWeight` tinyint NOT NULL,
+  `weight` tinyint NOT NULL,
+  `physicalVolume` tinyint NOT NULL,
+  `freight` tinyint NOT NULL,
+  `zoneFk` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `isPicked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32601,11 +35036,12 @@ DROP TABLE IF EXISTS `saleVolume_Today_VNH`;
 /*!50001 DROP VIEW IF EXISTS `saleVolume_Today_VNH`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `saleVolume_Today_VNH` AS SELECT 
- 1 AS `Cliente`,
- 1 AS `Provincia`,
- 1 AS `Pais`,
- 1 AS `volume`*/;
+/*!50001 CREATE TABLE `saleVolume_Today_VNH` (
+  `Cliente` tinyint NOT NULL,
+  `Provincia` tinyint NOT NULL,
+  `Pais` tinyint NOT NULL,
+  `volume` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32616,10 +35052,11 @@ DROP TABLE IF EXISTS `sale_freightComponent`;
 /*!50001 DROP VIEW IF EXISTS `sale_freightComponent`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `sale_freightComponent` AS SELECT 
- 1 AS `ticketFk`,
- 1 AS `amount`,
- 1 AS `shipped`*/;
+/*!50001 CREATE TABLE `sale_freightComponent` (
+  `ticketFk` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32630,9 +35067,10 @@ DROP TABLE IF EXISTS `salesPersonSince`;
 /*!50001 DROP VIEW IF EXISTS `salesPersonSince`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `salesPersonSince` AS SELECT 
- 1 AS `workerFk`,
- 1 AS `started`*/;
+/*!50001 CREATE TABLE `salesPersonSince` (
+  `workerFk` tinyint NOT NULL,
+  `started` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32643,20 +35081,21 @@ DROP TABLE IF EXISTS `salesPreparedLastHour`;
 /*!50001 DROP VIEW IF EXISTS `salesPreparedLastHour`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `salesPreparedLastHour` AS SELECT 
- 1 AS `warehouseFk`,
- 1 AS `saleFk`,
- 1 AS `isChecked`,
- 1 AS `originalQuantity`,
- 1 AS `accion`,
- 1 AS `created`,
- 1 AS `code`,
- 1 AS `firstname`,
- 1 AS `lastName`,
- 1 AS `workerCode`,
- 1 AS `litros`,
- 1 AS `concept`,
- 1 AS `departmentName`*/;
+/*!50001 CREATE TABLE `salesPreparedLastHour` (
+  `warehouseFk` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL,
+  `isChecked` tinyint NOT NULL,
+  `originalQuantity` tinyint NOT NULL,
+  `accion` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `code` tinyint NOT NULL,
+  `firstname` tinyint NOT NULL,
+  `lastName` tinyint NOT NULL,
+  `workerCode` tinyint NOT NULL,
+  `litros` tinyint NOT NULL,
+  `concept` tinyint NOT NULL,
+  `departmentName` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32667,8 +35106,9 @@ DROP TABLE IF EXISTS `salesPreviousPreparated`;
 /*!50001 DROP VIEW IF EXISTS `salesPreviousPreparated`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `salesPreviousPreparated` AS SELECT 
- 1 AS `saleFk`*/;
+/*!50001 CREATE TABLE `salesPreviousPreparated` (
+  `saleFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -32682,9 +35122,9 @@ CREATE TABLE `sample` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `code` varchar(20) CHARACTER SET utf8 NOT NULL,
   `description` varchar(105) COLLATE utf8_unicode_ci NOT NULL,
-  `isVisible` tinyint(1) unsigned NOT NULL DEFAULT '1',
-  `hasCompany` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `hasPreview` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `isVisible` tinyint(1) unsigned NOT NULL DEFAULT 1,
+  `hasCompany` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `hasPreview` tinyint(1) unsigned NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -32699,16 +35139,16 @@ DROP TABLE IF EXISTS `sector`;
 CREATE TABLE `sector` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `description` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
-  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '1',
-  `isPreviousPreparedByPacking` tinyint(4) NOT NULL DEFAULT '1',
+  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 1,
+  `isPreviousPreparedByPacking` tinyint(4) NOT NULL DEFAULT 1,
   `code` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `pickingPlacement` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `path` int(11) DEFAULT NULL,
-  `isPreviousPrepared` tinyint(1) NOT NULL DEFAULT '0',
-  `isPackagingArea` tinyint(1) NOT NULL DEFAULT '0',
+  `isPreviousPrepared` tinyint(1) NOT NULL DEFAULT 0,
+  `isPackagingArea` tinyint(1) NOT NULL DEFAULT 0,
   `labelReport` int(11) DEFAULT NULL,
   `sonFk` int(11) DEFAULT NULL,
-  `isMain` tinyint(1) NOT NULL DEFAULT '0',
+  `isMain` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`warehouseFk`),
   UNIQUE KEY `code_UNIQUE` (`code`),
   KEY `sector_fk1_idx` (`warehouseFk`),
@@ -32729,7 +35169,7 @@ CREATE TABLE `sharingCart` (
   `started` date NOT NULL,
   `ended` date NOT NULL,
   `workerSubstitute` int(11) NOT NULL,
-  `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`id`),
   UNIQUE KEY `workerFk_UNIQUE` (`workerFk`,`started`,`ended`,`workerSubstitute`),
   KEY `Suplent` (`workerSubstitute`),
@@ -32827,7 +35267,7 @@ CREATE TABLE `sharingCartDaily` (
   `ownerFk` int(11) NOT NULL,
   `substituteFk` int(11) NOT NULL,
   `dated` date NOT NULL,
-  `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`id`),
   UNIQUE KEY `sharingCartDailyWorker_idx` (`ownerFk`,`dated`),
   KEY `sharingCartDailySubstitute_idx` (`substituteFk`),
@@ -32905,9 +35345,9 @@ DROP TABLE IF EXISTS `shelving`;
 CREATE TABLE `shelving` (
   `code` varchar(10) CHARACTER SET utf8 NOT NULL,
   `parkingFk` int(11) DEFAULT NULL,
-  `isPrinted` tinyint(4) NOT NULL DEFAULT '0',
+  `isPrinted` tinyint(4) NOT NULL DEFAULT 0,
   `priority` int(11) DEFAULT NULL,
-  `parked` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `parked` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `userFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`code`),
   KEY `shelving_fk1_idx` (`parkingFk`),
@@ -32946,6 +35386,61 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
+--
+-- Table structure for table `sinister`
+--
+
+DROP TABLE IF EXISTS `sinister`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sinister` (
+  `id` int(11) NOT NULL,
+  `supplierFk` int(11) NOT NULL,
+  `clientFk` int(11) NOT NULL,
+  `amount` decimal(10,2) NOT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `insureRate` decimal(3,2) NOT NULL DEFAULT 0.75,
+  `isBooked` tinyint(4) NOT NULL DEFAULT 0,
+  `workerFk` int(11) NOT NULL,
+  `companyFk` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `sinister_fk1_idx` (`supplierFk`),
+  KEY `sinister_fk2_idx` (`clientFk`),
+  KEY `sinister_fk3_idx` (`workerFk`),
+  KEY `sinister_fk4_idx` (`companyFk`),
+  CONSTRAINT `sinister_fk1` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `sinister_fk2` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `sinister_fk3` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `sinister_fk4` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Impago de cliente asegurado';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `sinisterDetail`
+--
+
+DROP TABLE IF EXISTS `sinisterDetail`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sinisterDetail` (
+  `id` int(11) NOT NULL,
+  `sinisterFk` int(11) NOT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `amountIn` decimal(10,2) DEFAULT NULL,
+  `amountOut` decimal(10,2) DEFAULT NULL,
+  `isConciliated` tinyint(1) NOT NULL DEFAULT 0,
+  `workerFk` int(11) NOT NULL,
+  `bankFk` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `sinisterDetail_fk1_idx` (`sinisterFk`),
+  KEY `sinisterDetail_fk2_idx` (`workerFk`),
+  KEY `sinisterDetail_fk3_idx` (`bankFk`),
+  CONSTRAINT `sinisterDetail_fk1` FOREIGN KEY (`sinisterFk`) REFERENCES `sinister` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `sinisterDetail_fk2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `sinisterDetail_fk3` FOREIGN KEY (`bankFk`) REFERENCES `bank` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `sms`
 --
@@ -32960,9 +35455,9 @@ CREATE TABLE `sms` (
   `sender` varchar(15) CHARACTER SET utf8 NOT NULL DEFAULT '693474205',
   `destination` varchar(15) CHARACTER SET utf8 NOT NULL,
   `message` varchar(160) COLLATE utf8_unicode_ci NOT NULL,
-  `statusCode` smallint(9) NOT NULL DEFAULT '0',
+  `statusCode` smallint(9) NOT NULL DEFAULT 0,
   `status` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -33086,21 +35581,21 @@ DROP TABLE IF EXISTS `sorter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `sorter` (
-  `id` int(11) NOT NULL DEFAULT '0',
+  `id` int(11) NOT NULL DEFAULT 0,
   `created` datetime NOT NULL,
   `routeFk` int(10) unsigned NOT NULL,
   `ticketFk` int(10) NOT NULL,
-  `isBox` int(11) DEFAULT '1',
+  `isBox` int(11) DEFAULT 1,
   `itemFk` int(11) DEFAULT NULL,
-  `width` decimal(10,2) DEFAULT '0.00',
-  `depth` decimal(10,2) DEFAULT '0.00',
-  `height` decimal(10,2) DEFAULT '0.00',
-  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '1',
-  `weight` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `buildingOrder` int(5) NOT NULL DEFAULT '0',
+  `width` decimal(10,2) DEFAULT 0.00,
+  `depth` decimal(10,2) DEFAULT 0.00,
+  `height` decimal(10,2) DEFAULT 0.00,
+  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 1,
+  `weight` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `buildingOrder` int(5) NOT NULL DEFAULT 0,
   `ETD` time NOT NULL DEFAULT '23:59:00',
   `palletOrder` int(5) DEFAULT NULL,
-  `lungGrow` int(11) DEFAULT '0',
+  `lungGrow` int(11) DEFAULT 0,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -33114,9 +35609,9 @@ DROP TABLE IF EXISTS `specialPrice`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `specialPrice` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `clientFk` int(11) NOT NULL DEFAULT '0',
-  `itemFk` int(11) NOT NULL DEFAULT '0',
-  `value` double NOT NULL DEFAULT '0',
+  `clientFk` int(11) NOT NULL DEFAULT 0,
+  `itemFk` int(11) NOT NULL DEFAULT 0,
+  `value` double NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `Id_Cliente_2` (`clientFk`,`itemFk`),
   KEY `Id_Article` (`itemFk`),
@@ -33128,6 +35623,57 @@ CREATE TABLE `specialPrice` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `specie`
+--
+
+DROP TABLE IF EXISTS `specie`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `specie` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `specie_UN` (`name`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`z-developer`@`%`*/ /*!50003 TRIGGER `vn`.`specie_BEFORE_INSERT` BEFORE INSERT ON `specie` FOR EACH ROW
+BEGIN
+	SET NEW.name = LCASE(NEW.name);
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`z-developer`@`%`*/ /*!50003 TRIGGER `vn`.`specie_BEFORE_UPDATE` BEFORE UPDATE ON `specie` FOR EACH ROW
+BEGIN
+	SET NEW.name = LCASE(NEW.name);
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+
 --
 -- Table structure for table `state`
 --
@@ -33139,18 +35685,18 @@ CREATE TABLE `state` (
   `id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
   `order` tinyint(3) unsigned DEFAULT NULL,
-  `alertLevel` int(11) NOT NULL DEFAULT '0',
+  `alertLevel` int(11) NOT NULL DEFAULT 0,
   `code` varchar(45) CHARACTER SET utf8 NOT NULL,
   `sectorProdPriority` tinyint(3) DEFAULT NULL,
   `nextStateFk` tinyint(4) NOT NULL COMMENT 'Estado al que tiene que cambiar el ticket despues de preparacion previa',
-  `isPreviousPreparable` tinyint(1) NOT NULL DEFAULT '0',
-  `isPicked` tinyint(1) NOT NULL DEFAULT '0',
-  `isPreparable` tinyint(1) NOT NULL DEFAULT '0',
-  `semaphore` int(11) NOT NULL DEFAULT '0',
-  `isPrintable` tinyint(4) NOT NULL DEFAULT '0',
-  `isOK` tinyint(4) NOT NULL DEFAULT '0',
-  `graphCategory` int(11) NOT NULL DEFAULT '0',
-  `isNotValidated` tinyint(1) DEFAULT '0' COMMENT 'Los tienen que ser validados por un comercial para prepararse',
+  `isPreviousPreparable` tinyint(1) NOT NULL DEFAULT 0,
+  `isPicked` tinyint(1) NOT NULL DEFAULT 0,
+  `isPreparable` tinyint(1) NOT NULL DEFAULT 0,
+  `semaphore` int(11) NOT NULL DEFAULT 0,
+  `isPrintable` tinyint(4) NOT NULL DEFAULT 0,
+  `isOK` tinyint(4) NOT NULL DEFAULT 0,
+  `graphCategory` int(11) NOT NULL DEFAULT 0,
+  `isNotValidated` tinyint(1) DEFAULT 0 COMMENT 'Los tienen que ser validados por un comercial para prepararse',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_UNIQUE` (`code`),
   KEY `state_id3` (`semaphore`)
@@ -33169,7 +35715,7 @@ CREATE TABLE `stockBuyed` (
   `user` int(10) unsigned DEFAULT NULL,
   `buyed` decimal(10,2) DEFAULT NULL,
   `date` date DEFAULT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
   `reserved` decimal(10,2) DEFAULT NULL,
   `requested` decimal(10,2) DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -33189,7 +35735,7 @@ DROP TABLE IF EXISTS `stowaway`;
 CREATE TABLE `stowaway` (
   `id` int(11) NOT NULL COMMENT 'ticket pequeño',
   `shipFk` int(11) NOT NULL COMMENT 'ticket grande',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tickets polizones y sus naves de embarque';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -33210,26 +35756,26 @@ CREATE TABLE `supplier` (
   `provinceFk` smallint(5) unsigned DEFAULT NULL,
   `countryFk` mediumint(8) unsigned DEFAULT NULL,
   `nif` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isOfficial` tinyint(1) NOT NULL DEFAULT '1',
-  `isFarmer` tinyint(1) NOT NULL DEFAULT '0',
+  `isOfficial` tinyint(1) NOT NULL DEFAULT 1,
+  `isFarmer` tinyint(1) NOT NULL DEFAULT 0,
   `retAccount` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
   `phone` varchar(16) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
   `Fax__` varchar(16) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
-  `commission` float NOT NULL DEFAULT '0',
+  `commission` float NOT NULL DEFAULT 0,
   `nickname` varchar(45) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
   `payMethodFk` tinyint(3) unsigned NOT NULL,
   `payDay` tinyint(4) unsigned DEFAULT NULL,
-  `payDemFk` tinyint(3) unsigned NOT NULL DEFAULT '7',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `isSerious` tinyint(1) unsigned zerofill DEFAULT '1',
-  `note` text CHARACTER SET utf8 COLLATE utf8_unicode_ci,
+  `payDemFk` tinyint(3) unsigned NOT NULL DEFAULT 7,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `isSerious` tinyint(1) unsigned zerofill DEFAULT 1,
+  `note` text CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
   `postcodeFk` int(11) unsigned DEFAULT NULL,
   `postCode` char(5) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isActive` tinyint(4) DEFAULT '1',
+  `isActive` tinyint(4) DEFAULT 1,
   `taxTypeSageFk` smallint(6) DEFAULT NULL COMMENT 'Tipo de IVA SAGE',
   `withholdingSageFk` smallint(6) DEFAULT NULL COMMENT 'Tipos de retención SAGE',
   `transactionTypeSageFk` tinyint(4) DEFAULT NULL COMMENT 'Ti po de transacción SAGE',
-  `isTrucker` tinyint(1) NOT NULL DEFAULT '0',
+  `isTrucker` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `cuenta` (`account`),
   UNIQUE KEY `NIF` (`nif`),
@@ -33316,7 +35862,7 @@ CREATE TABLE `supplierContact` (
   `phone` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
   `mobile` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
   `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `observation` text COLLATE utf8_unicode_ci,
+  `observation` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `supplier_id` (`supplierFk`),
@@ -33335,13 +35881,13 @@ CREATE TABLE `supplierExpense` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `dated` date NOT NULL,
   `supplierFk` int(11) NOT NULL,
-  `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `amount` decimal(10,2) NOT NULL DEFAULT '0.00',
+  `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT 2,
+  `amount` decimal(10,2) NOT NULL DEFAULT 0.00,
   `description` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
   `dmsFk` int(11) DEFAULT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `isConciliated` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `isConciliated` tinyint(1) unsigned zerofill NOT NULL DEFAULT 0,
   `dueDated` date NOT NULL,
   PRIMARY KEY (`id`),
   KEY `empresa_id` (`companyFk`),
@@ -33357,6 +35903,33 @@ CREATE TABLE `supplierExpense` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `supplierLog`
+--
+
+DROP TABLE IF EXISTS `supplierLog`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `supplierLog` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `originFk` int(11) NOT NULL,
+  `userFk` int(10) unsigned NOT NULL,
+  `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
+  `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `changedModelId` int(11) DEFAULT NULL,
+  `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `logSupplier_ibfk_1` (`originFk`),
+  KEY `supplierLog_ibfk_2` (`userFk`),
+  CONSTRAINT `supplierLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `supplier` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `supplierLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `supplierPackaging`
 --
@@ -33365,16 +35938,17 @@ DROP TABLE IF EXISTS `supplierPackaging`;
 /*!50001 DROP VIEW IF EXISTS `supplierPackaging`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `supplierPackaging` AS SELECT 
- 1 AS `supplierFk`,
- 1 AS `itemFk`,
- 1 AS `longName`,
- 1 AS `supplier`,
- 1 AS `entryFk`,
- 1 AS `landed`,
- 1 AS `out`,
- 1 AS `in`,
- 1 AS `almacen`*/;
+/*!50001 CREATE TABLE `supplierPackaging` (
+  `supplierFk` tinyint NOT NULL,
+  `itemFk` tinyint NOT NULL,
+  `longName` tinyint NOT NULL,
+  `supplier` tinyint NOT NULL,
+  `entryFk` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `out` tinyint NOT NULL,
+  `in` tinyint NOT NULL,
+  `almacen` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -33421,8 +35995,8 @@ CREATE TABLE `tag` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `code` varchar(45) CHARACTER SET utf8 DEFAULT NULL,
   `name` varchar(25) COLLATE utf8_unicode_ci NOT NULL,
-  `isFree` tinyint(1) NOT NULL DEFAULT '1',
-  `isQuantitatif` tinyint(4) NOT NULL DEFAULT '0',
+  `isFree` tinyint(1) NOT NULL DEFAULT 1,
+  `isQuantitatif` tinyint(4) NOT NULL DEFAULT 0,
   `sourceTable` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `unit` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `ediTypeFk` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -33491,9 +36065,10 @@ DROP TABLE IF EXISTS `tagL10n`;
 /*!50001 DROP VIEW IF EXISTS `tagL10n`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `tagL10n` AS SELECT 
- 1 AS `id`,
- 1 AS `name`*/;
+/*!50001 CREATE TABLE `tagL10n` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -33556,17 +36131,18 @@ CREATE TABLE `taxCode` (
   `dated` date NOT NULL,
   `code` varchar(10) CHARACTER SET utf8 NOT NULL,
   `taxTypeFk` tinyint(2) NOT NULL,
-  `rate` decimal(4,1) NOT NULL DEFAULT '0.0',
-  `equalizationTax` decimal(4,1) NOT NULL DEFAULT '0.0',
-  `type` char(1) COLLATE utf8_unicode_ci NOT NULL,
-  `link` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'las que tienen el mismo valor se contabilizan emparejadas',
-  `isActive` tinyint(2) NOT NULL DEFAULT '1',
-  `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `rate` decimal(4,1) NOT NULL DEFAULT 0.0,
+  `equalizationTax` decimal(4,1) NOT NULL DEFAULT 0.0,
+  `type` char(1) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Solo rellenar si en el asiento ira en el DEBE',
+  `link` tinyint(4) unsigned DEFAULT 0 COMMENT 'las que tienen el mismo valor se contabilizan emparejadas',
+  `isActive` tinyint(2) NOT NULL DEFAULT 1,
+  `updated` timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `transactionCode` varchar(2) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Código de Transacción de SAGE',
   `operationCode` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Código de operaciones de SAGE',
   `taxCode` int(4) DEFAULT NULL COMMENT 'Código de IVA SAGE',
-  `isIntracommunity` tinyint(2) DEFAULT '0',
+  `isIntracommunity` tinyint(2) DEFAULT 0,
   PRIMARY KEY (`id`),
+  UNIQUE KEY `taxCode_dated_IDX` (`dated`,`taxTypeFk`,`type`,`link`) USING BTREE,
   KEY `iva_tipo_id` (`taxTypeFk`),
   KEY `codigo` (`code`),
   KEY `tipo_index` (`type`),
@@ -33584,7 +36160,7 @@ DROP TABLE IF EXISTS `taxType`;
 CREATE TABLE `taxType` (
   `id` tinyint(2) NOT NULL AUTO_INCREMENT,
   `nickname` varchar(6) COLLATE utf8_unicode_ci NOT NULL,
-  `isAccrued` tinyint(4) NOT NULL DEFAULT '0',
+  `isAccrued` tinyint(4) NOT NULL DEFAULT 0,
   `serial` char(1) COLLATE utf8_unicode_ci DEFAULT NULL,
   `TIPOOPE` varchar(1) COLLATE utf8_unicode_ci NOT NULL DEFAULT ' ' COMMENT 'respetar el nombre de la columna, se utiliza en contaplus',
   `description` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
@@ -33619,38 +36195,40 @@ DROP TABLE IF EXISTS `ticket`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ticket` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `clientFk` int(11) NOT NULL DEFAULT '0',
-  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '1',
+  `clientFk` int(11) NOT NULL DEFAULT 0,
+  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT 1,
   `shipped` datetime NOT NULL,
   `nickname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `notes` longtext COLLATE utf8_unicode_ci,
+  `notes` longtext COLLATE utf8_unicode_ci DEFAULT NULL,
   `refFk` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `invoiceOutFk` int(10) unsigned DEFAULT NULL COMMENT 'eliminar',
-  `isBooked` tinyint(1) NOT NULL DEFAULT '0',
-  `addressFk` int(11) NOT NULL DEFAULT '0',
+  `isBooked` tinyint(1) NOT NULL DEFAULT 0,
+  `addressFk` int(11) NOT NULL DEFAULT 0,
   `workerFk` int(11) DEFAULT NULL,
   `observations` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'eliminar',
-  `isSigned` tinyint(1) NOT NULL DEFAULT '0',
-  `isLabeled` tinyint(1) NOT NULL DEFAULT '0',
-  `isPrinted` tinyint(1) NOT NULL DEFAULT '0',
-  `packages` smallint(10) unsigned DEFAULT '0',
+  `isSigned` tinyint(1) NOT NULL DEFAULT 0,
+  `isLabeled` tinyint(1) NOT NULL DEFAULT 0,
+  `isPrinted` tinyint(1) NOT NULL DEFAULT 0,
+  `packages` smallint(10) unsigned DEFAULT 0,
   `location` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `hour` int(11) DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `isBlocked` tinyint(1) NOT NULL DEFAULT '1',
+  `hour` int(11) DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `isBlocked` tinyint(1) NOT NULL DEFAULT 1,
   `solution` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
   `routeFk` int(10) unsigned DEFAULT NULL,
   `priority` tinyint(3) unsigned DEFAULT NULL,
-  `hasPriority` tinyint(1) unsigned NOT NULL DEFAULT '1',
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `hasPriority` tinyint(1) unsigned NOT NULL DEFAULT 1,
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
   `agencyModeFk` int(11) DEFAULT NULL,
   `landed` date DEFAULT NULL,
-  `isBoxed` tinyint(2) NOT NULL DEFAULT '0',
-  `isDeleted` tinyint(2) NOT NULL DEFAULT '0',
+  `isBoxed` tinyint(2) NOT NULL DEFAULT 0,
+  `isDeleted` tinyint(2) NOT NULL DEFAULT 0,
   `zoneFk` int(11) DEFAULT NULL,
   `collectionFk` int(11) DEFAULT NULL,
   `zonePrice` decimal(10,2) DEFAULT NULL,
   `zoneBonus` decimal(10,2) DEFAULT NULL,
+  `totalWithVat` decimal(10,2) DEFAULT NULL COMMENT 'cache calculada del total con iva',
+  `totalWithoutVat` decimal(10,2) DEFAULT NULL COMMENT 'cache calculada del total sin iva',
   PRIMARY KEY (`id`),
   KEY `Id_Cliente` (`clientFk`),
   KEY `Id_Consigna` (`addressFk`),
@@ -33811,9 +36389,15 @@ DELIMITER ;;
     FOR EACH ROW
 BEGIN
     IF !(NEW.id <=> OLD.id)
-    OR !(NEW.warehouseFk <=> OLD.warehouseFk)
-    OR !(NEW.shipped <=> OLD.shipped) THEN
-		CALL stock.log_add('ticket', NEW.id, OLD.id);
+	    OR !(NEW.warehouseFk <=> OLD.warehouseFk)
+	    OR !(NEW.shipped <=> OLD.shipped) THEN
+			CALL stock.log_add('ticket', NEW.id, OLD.id);
+	END IF;
+
+    IF !(NEW.clientFk <=> OLD.clientFk)
+	    OR !(NEW.addressFk <=> OLD.addressFk)
+	    OR !(NEW.companyFk <=> OLD.companyFk) THEN
+	    	CALL ticket_requestRecalc(NEW.id);
 	END IF;
    
     IF NEW.clientFk = 2067 AND !(NEW.clientFk <=> OLD.clientFk)  THEN
@@ -33865,9 +36449,9 @@ CREATE TABLE `ticketCollection` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `ticketFk` int(11) NOT NULL,
   `collectionFk` int(11) NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `level` int(11) DEFAULT NULL,
-  `wagon` int(11) NOT NULL DEFAULT '0',
+  `wagon` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ticketCollection_fk2_idx` (`ticketFk`),
   KEY `ticketCollection_fk1_idx` (`collectionFk`),
@@ -33955,8 +36539,8 @@ DROP TABLE IF EXISTS `ticketDown`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ticketDown` (
   `ticketFk` int(11) NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `selected` int(11) NOT NULL DEFAULT '0',
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `selected` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ticketFk`),
   KEY `created_idx` (`created`),
   KEY `selected_idx` (`selected`),
@@ -33987,12 +36571,13 @@ DROP TABLE IF EXISTS `ticketGetVolume__`;
 /*!50001 DROP VIEW IF EXISTS `ticketGetVolume__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `ticketGetVolume__` AS SELECT 
- 1 AS `ticketFk`,
- 1 AS `routeFk`,
- 1 AS `saleFk`,
- 1 AS `shipped`,
- 1 AS `volume`*/;
+/*!50001 CREATE TABLE `ticketGetVolume__` (
+  `ticketFk` tinyint NOT NULL,
+  `routeFk` tinyint NOT NULL,
+  `saleFk` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `volume` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -34003,7 +36588,7 @@ DROP TABLE IF EXISTS `ticketLastState`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ticketLastState` (
-  `ticketFk` int(11) NOT NULL DEFAULT '0',
+  `ticketFk` int(11) NOT NULL DEFAULT 0,
   `ticketTrackingFk` int(11) NOT NULL,
   `name` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`ticketFk`),
@@ -34025,11 +36610,11 @@ CREATE TABLE `ticketLog` (
   `originFk` int(11) NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `action` set('insert','update','delete','select') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -34048,13 +36633,14 @@ DROP TABLE IF EXISTS `ticketNotInvoiced`;
 /*!50001 DROP VIEW IF EXISTS `ticketNotInvoiced`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `ticketNotInvoiced` AS SELECT 
- 1 AS `companyFk`,
- 1 AS `companyCode`,
- 1 AS `clientFk`,
- 1 AS `clientName`,
- 1 AS `shipped`,
- 1 AS `value`*/;
+/*!50001 CREATE TABLE `ticketNotInvoiced` (
+  `companyFk` tinyint NOT NULL,
+  `companyCode` tinyint NOT NULL,
+  `clientFk` tinyint NOT NULL,
+  `clientName` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `value` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -34086,7 +36672,7 @@ DROP TABLE IF EXISTS `ticketPackage`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ticketPackage` (
   `ticket` int(11) NOT NULL,
-  `counter` int(10) unsigned NOT NULL DEFAULT '0',
+  `counter` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`ticket`),
   CONSTRAINT `ticketPackage_ticketFk` FOREIGN KEY (`ticket`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -34103,8 +36689,8 @@ CREATE TABLE `ticketPackaging` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `ticketFk` int(11) NOT NULL,
   `packagingFk` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
-  `quantity` int(10) DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `quantity` int(10) DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `pvp` double DEFAULT NULL,
   `workerFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -34150,7 +36736,7 @@ CREATE TABLE `ticketPackagingStartingStock` (
   `itemFk` int(11) NOT NULL,
   `sent` int(11) DEFAULT NULL,
   `returned` int(11) DEFAULT NULL,
-  `isForgetable` tinyint(1) NOT NULL DEFAULT '0',
+  `isForgetable` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clientFk`,`packagingFk`),
   KEY `ticketPackagingStartingStock_fk2_idx` (`packagingFk`),
   KEY `ticketPackagingStartingStock_fk3_idx` (`itemFk`),
@@ -34171,7 +36757,7 @@ CREATE TABLE `ticketParking` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `ticketFk` int(11) NOT NULL,
   `parkingFk` int(11) NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   `workerFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ticketParking_idx1` (`ticketFk`,`parkingFk`),
@@ -34210,17 +36796,32 @@ DROP TABLE IF EXISTS `ticketPreviousPreparingList`;
 /*!50001 DROP VIEW IF EXISTS `ticketPreviousPreparingList`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `ticketPreviousPreparingList` AS SELECT 
- 1 AS `ticketFk`,
- 1 AS `code`,
- 1 AS `saleLines`,
- 1 AS `alreadyMadeSaleLines`,
- 1 AS `madeRate`,
- 1 AS `created`,
- 1 AS `sectorFk`,
- 1 AS `parking`*/;
+/*!50001 CREATE TABLE `ticketPreviousPreparingList` (
+  `ticketFk` tinyint NOT NULL,
+  `code` tinyint NOT NULL,
+  `saleLines` tinyint NOT NULL,
+  `alreadyMadeSaleLines` tinyint NOT NULL,
+  `madeRate` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `sectorFk` tinyint NOT NULL,
+  `parking` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `ticketRecalc`
+--
+
+DROP TABLE IF EXISTS `ticketRecalc`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ticketRecalc` (
+  `ticketFk` int(11) NOT NULL,
+  PRIMARY KEY (`ticketFk`),
+  CONSTRAINT `ticketRecalc_ibfk_1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Queue of changed tickets to recalc its total';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `ticketRequest`
 --
@@ -34240,13 +36841,13 @@ CREATE TABLE `ticketRequest` (
   `price__` double DEFAULT NULL,
   `itemFk` double DEFAULT NULL,
   `clientFk` int(11) DEFAULT NULL,
-  `response` longtext COLLATE utf8_unicode_ci,
-  `ok__` tinyint(1) NOT NULL DEFAULT '0',
+  `response` longtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ok__` tinyint(1) NOT NULL DEFAULT 0,
   `total` int(11) DEFAULT NULL,
   `buyed` datetime DEFAULT NULL,
-  `ko__` tinyint(1) NOT NULL DEFAULT '0',
+  `ko__` tinyint(1) NOT NULL DEFAULT 0,
   `saleFk` int(11) DEFAULT NULL,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NULL DEFAULT current_timestamp(),
   `isOk` tinyint(1) DEFAULT NULL,
   `requesterFk` int(11) DEFAULT NULL,
   `attenderFk` int(11) DEFAULT NULL,
@@ -34334,9 +36935,9 @@ DROP TABLE IF EXISTS `ticketService`;
 CREATE TABLE `ticketService` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `quantity` int(11) NOT NULL DEFAULT '0',
-  `price` decimal(10,2) unsigned NOT NULL DEFAULT '0.00',
-  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT '2',
+  `quantity` int(11) NOT NULL DEFAULT 0,
+  `price` decimal(10,2) unsigned NOT NULL DEFAULT 0.00,
+  `taxClassFk` tinyint(3) unsigned NOT NULL DEFAULT 2,
   `ticketFk` int(11) NOT NULL,
   `ticketServiceTypeFk` int(11) NOT NULL,
   PRIMARY KEY (`id`),
@@ -34374,19 +36975,20 @@ DROP TABLE IF EXISTS `ticketState`;
 /*!50001 DROP VIEW IF EXISTS `ticketState`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `ticketState` AS SELECT 
- 1 AS `updated`,
- 1 AS `stateFk`,
- 1 AS `workerFk`,
- 1 AS `ticketFk`,
- 1 AS `state`,
- 1 AS `productionOrder`,
- 1 AS `alertLevel`,
- 1 AS `code`,
- 1 AS `ticket`,
- 1 AS `worker`,
- 1 AS `isPreviousPreparable`,
- 1 AS `isPicked`*/;
+/*!50001 CREATE TABLE `ticketState` (
+  `updated` tinyint NOT NULL,
+  `stateFk` tinyint NOT NULL,
+  `workerFk` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL,
+  `state` tinyint NOT NULL,
+  `productionOrder` tinyint NOT NULL,
+  `alertLevel` tinyint NOT NULL,
+  `code` tinyint NOT NULL,
+  `ticket` tinyint NOT NULL,
+  `worker` tinyint NOT NULL,
+  `isPreviousPreparable` tinyint NOT NULL,
+  `isPicked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -34397,15 +36999,16 @@ DROP TABLE IF EXISTS `ticketStateToday`;
 /*!50001 DROP VIEW IF EXISTS `ticketStateToday`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `ticketStateToday` AS SELECT 
- 1 AS `ticket`,
- 1 AS `state`,
- 1 AS `productionOrder`,
- 1 AS `alertLevel`,
- 1 AS `worker`,
- 1 AS `code`,
- 1 AS `updated`,
- 1 AS `isPicked`*/;
+/*!50001 CREATE TABLE `ticketStateToday` (
+  `ticket` tinyint NOT NULL,
+  `state` tinyint NOT NULL,
+  `productionOrder` tinyint NOT NULL,
+  `alertLevel` tinyint NOT NULL,
+  `worker` tinyint NOT NULL,
+  `code` tinyint NOT NULL,
+  `updated` tinyint NOT NULL,
+  `isPicked` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -34416,12 +37019,13 @@ DROP TABLE IF EXISTS `ticketTracking`;
 /*!50001 DROP VIEW IF EXISTS `ticketTracking`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `ticketTracking` AS SELECT 
- 1 AS `id`,
- 1 AS `stateFk`,
- 1 AS `created`,
- 1 AS `ticketFk`,
- 1 AS `workerFk`*/;
+/*!50001 CREATE TABLE `ticketTracking` (
+  `id` tinyint NOT NULL,
+  `stateFk` tinyint NOT NULL,
+  `created` tinyint NOT NULL,
+  `ticketFk` tinyint NOT NULL,
+  `workerFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -34433,7 +37037,7 @@ DROP TABLE IF EXISTS `ticketTrolley`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ticketTrolley` (
   `ticket` int(11) NOT NULL,
-  `labelCount` int(11) NOT NULL DEFAULT '0',
+  `labelCount` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ticket`),
   CONSTRAINT `fk_ticketTrolley_vs_ticket` FOREIGN KEY (`ticket`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -34463,7 +37067,7 @@ DROP TABLE IF EXISTS `ticketWeekly`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `ticketWeekly` (
   `ticketFk` int(11) NOT NULL AUTO_INCREMENT,
-  `weekDay` tinyint(1) NOT NULL COMMENT 'funcion de mysql Lunes = 0, Domingo = 6',
+  `weekDay` tinyint(1) NOT NULL COMMENT 'funcion de mysql Lunes = 0, Domingo = 6\nShipped, dia de preparacion del pedido',
   `agencyModeFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`ticketFk`),
   KEY `agencyModeFk_idx` (`agencyModeFk`),
@@ -34472,25 +37076,6 @@ CREATE TABLE `ticketWeekly` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `ticket_print__`
---
-
-DROP TABLE IF EXISTS `ticket_print__`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ticket_print__` (
-  `ticketFk` int(11) NOT NULL,
-  `isPrinted` tinyint(1) NOT NULL DEFAULT '0',
-  `counter` int(11) NOT NULL DEFAULT '0',
-  `workerFk` int(11) DEFAULT NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `computername` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tabla para la campaña de Santos 2020';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `till`
 --
@@ -34501,20 +37086,20 @@ DROP TABLE IF EXISTS `till`;
 CREATE TABLE `till` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `dated` date NOT NULL,
-  `isAccountable` tinyint(1) NOT NULL DEFAULT '0',
+  `isAccountable` tinyint(1) NOT NULL DEFAULT 0,
   `serie` varchar(2) COLLATE utf8_unicode_ci DEFAULT NULL,
   `number` int(11) DEFAULT NULL,
   `concept` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `in` decimal(10,2) DEFAULT NULL,
   `out` decimal(10,2) DEFAULT NULL,
-  `bankFk` int(11) DEFAULT '1',
+  `bankFk` int(11) DEFAULT 1,
   `workerFk` int(11) DEFAULT NULL,
-  `companyFk` smallint(5) unsigned DEFAULT '442' COMMENT 'kakear',
-  `isLinked` tinyint(4) DEFAULT '0',
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `isOk` tinyint(4) NOT NULL DEFAULT '0',
-  `warehouseFk` smallint(5) unsigned NOT NULL DEFAULT '1' COMMENT 'to kak\\n',
-  `isConciliate` tinyint(4) NOT NULL DEFAULT '0',
+  `companyFk` smallint(5) unsigned DEFAULT 442 COMMENT 'kakear',
+  `isLinked` tinyint(4) DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `isOk` tinyint(4) NOT NULL DEFAULT 0,
+  `warehouseFk` smallint(5) unsigned NOT NULL DEFAULT 1 COMMENT 'to kak\\n',
+  `isConciliate` tinyint(4) NOT NULL DEFAULT 0,
   `supplierAccountFk` mediumint(8) unsigned NOT NULL,
   `calculatedCode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `InForeignValue` decimal(10,2) DEFAULT NULL,
@@ -34562,7 +37147,7 @@ DROP TABLE IF EXISTS `tillConfig`;
 CREATE TABLE `tillConfig` (
   `id` int(11) NOT NULL,
   `openingBalance` decimal(10,2) NOT NULL,
-  `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -34624,14 +37209,15 @@ DROP TABLE IF EXISTS `time__`;
 /*!50001 DROP VIEW IF EXISTS `time__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `time__` AS SELECT 
- 1 AS `dated`,
- 1 AS `period`,
- 1 AS `month`,
- 1 AS `year`,
- 1 AS `day`,
- 1 AS `week`,
- 1 AS `yearMonth`*/;
+/*!50001 CREATE TABLE `time__` (
+  `dated` tinyint NOT NULL,
+  `period` tinyint NOT NULL,
+  `month` tinyint NOT NULL,
+  `year` tinyint NOT NULL,
+  `day` tinyint NOT NULL,
+  `week` tinyint NOT NULL,
+  `yearMonth` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -34748,22 +37334,23 @@ DROP TABLE IF EXISTS `tr2`;
 /*!50001 DROP VIEW IF EXISTS `tr2`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `tr2` AS SELECT 
- 1 AS `id`,
- 1 AS `shipped`,
- 1 AS `shipmentHour`,
- 1 AS `landed`,
- 1 AS `landingHour`,
- 1 AS `warehouseInFk`,
- 1 AS `warehouseOutFk`,
- 1 AS `agencyFk`,
- 1 AS `ref`,
- 1 AS `isDelivered`,
- 1 AS `isReceived`,
- 1 AS `m3`,
- 1 AS `kg`,
- 1 AS `cargoSupplierFk`,
- 1 AS `totalEntries`*/;
+/*!50001 CREATE TABLE `tr2` (
+  `id` tinyint NOT NULL,
+  `shipped` tinyint NOT NULL,
+  `shipmentHour` tinyint NOT NULL,
+  `landed` tinyint NOT NULL,
+  `landingHour` tinyint NOT NULL,
+  `warehouseInFk` tinyint NOT NULL,
+  `warehouseOutFk` tinyint NOT NULL,
+  `agencyFk` tinyint NOT NULL,
+  `ref` tinyint NOT NULL,
+  `isDelivered` tinyint NOT NULL,
+  `isReceived` tinyint NOT NULL,
+  `m3` tinyint NOT NULL,
+  `kg` tinyint NOT NULL,
+  `cargoSupplierFk` tinyint NOT NULL,
+  `totalEntries` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -34796,9 +37383,9 @@ CREATE TABLE `trainingCourse` (
   `ended` datetime NOT NULL,
   `invoice` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `amount` double DEFAULT NULL,
-  `remark` longtext COLLATE utf8_unicode_ci,
-  `hasDiscount` tinyint(1) NOT NULL DEFAULT '0',
-  `hasDiploma` tinyint(1) NOT NULL DEFAULT '0',
+  `remark` longtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `hasDiscount` tinyint(1) NOT NULL DEFAULT 0,
+  `hasDiploma` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `frgnWorker_idx` (`workerFk`),
   KEY `frgnCenter_idx` (`centerFk`),
@@ -34840,12 +37427,12 @@ CREATE TABLE `travel` (
   `warehouseOutFk` smallint(6) unsigned DEFAULT NULL,
   `agencyFk` int(11) DEFAULT NULL,
   `ref` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `isDelivered` tinyint(1) NOT NULL DEFAULT '0',
-  `isReceived` tinyint(1) NOT NULL DEFAULT '0',
+  `isDelivered` tinyint(1) NOT NULL DEFAULT 0,
+  `isReceived` tinyint(1) NOT NULL DEFAULT 0,
   `m3` decimal(10,2) unsigned DEFAULT NULL,
   `kg` decimal(10,0) unsigned DEFAULT NULL,
   `cargoSupplierFk` int(11) DEFAULT NULL,
-  `totalEntries` tinyint(4) unsigned DEFAULT '0',
+  `totalEntries` tinyint(4) unsigned DEFAULT 0,
   `appointment` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `shipment_2` (`shipped`,`landed`,`warehouseInFk`,`warehouseOutFk`,`agencyFk`,`ref`),
@@ -34857,8 +37444,7 @@ CREATE TABLE `travel` (
   KEY `travel_ibfk_4_idx` (`cargoSupplierFk`),
   CONSTRAINT `travel_ibfk_1` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `travel_ibfk_2` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `travel_ibfk_3` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `travel_ibfk_4` FOREIGN KEY (`cargoSupplierFk`) REFERENCES `vn2008`.`Proveedores_cargueras` (`Id_Proveedor`) ON DELETE SET NULL ON UPDATE CASCADE
+  CONSTRAINT `travel_ibfk_3` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -34953,11 +37539,11 @@ CREATE TABLE `travelLog` (
   `originFk` int(10) unsigned NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -34980,7 +37566,7 @@ CREATE TABLE `travelObservation` (
   `originFk` int(11) NOT NULL,
   `userFk` int(11) NOT NULL,
   `description` text COLLATE utf8_unicode_ci NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Observaciones de travel';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -35036,7 +37622,7 @@ DROP TABLE IF EXISTS `trolley`;
 CREATE TABLE `trolley` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `workerFk` int(11) DEFAULT NULL,
-  `coupled` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `coupled` timestamp NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `trolley_FK` (`workerFk`),
   CONSTRAINT `trolley_FK` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
@@ -35051,14 +37637,15 @@ DROP TABLE IF EXISTS `user`;
 /*!50001 DROP VIEW IF EXISTS `user`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `user` AS SELECT 
- 1 AS `id`,
- 1 AS `name`,
- 1 AS `password`,
- 1 AS `role`,
- 1 AS `active`,
- 1 AS `recoverPass`,
- 1 AS `lastPassChange`*/;
+/*!50001 CREATE TABLE `user` (
+  `id` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `password` tinyint NOT NULL,
+  `role` tinyint NOT NULL,
+  `active` tinyint NOT NULL,
+  `recoverPass` tinyint NOT NULL,
+  `lastPassChange` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35072,8 +37659,8 @@ CREATE TABLE `userConfig` (
   `userFk` int(10) unsigned NOT NULL,
   `warehouseFk` smallint(6) DEFAULT NULL,
   `companyFk` smallint(5) unsigned DEFAULT NULL,
-  `created` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  `updated` timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`userFk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Configuración de usuario en Salix';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -35090,11 +37677,11 @@ CREATE TABLE `userLog` (
   `originFk` int(10) unsigned NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `description` text CHARACTER SET utf8,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -35151,9 +37738,9 @@ CREATE TABLE `vehicle` (
   `numberPlate` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
   `model` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
   `tradeMark` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
-  `companyFk` smallint(5) unsigned NOT NULL DEFAULT '442',
+  `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442,
   `m3` double DEFAULT NULL,
-  `isActive` tinyint(4) NOT NULL DEFAULT '1',
+  `isActive` tinyint(4) NOT NULL DEFAULT 1,
   `warehouseFk` smallint(6) unsigned DEFAULT NULL,
   `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `deliveryPointFk` int(11) DEFAULT NULL,
@@ -35167,6 +37754,19 @@ CREATE TABLE `vehicle` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `volumeConfig`
+--
+
+DROP TABLE IF EXISTS `volumeConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `volumeConfig` (
+  `espai` decimal(10,2) DEFAULT NULL,
+  `carro` decimal(10,2) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='almacena el valor standard para volumenes convencionales de Verdnatura, en metros cúbicos';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `wagon`
 --
@@ -35176,7 +37776,7 @@ DROP TABLE IF EXISTS `wagon`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `wagon` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `volume` int(11) NOT NULL DEFAULT '150' COMMENT 'Volumen en litros',
+  `volume` int(11) NOT NULL DEFAULT 150 COMMENT 'Volumen en litros',
   `plate` varchar(10) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Matrícula',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -35191,10 +37791,10 @@ DROP TABLE IF EXISTS `wagonVolumetry`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `wagonVolumetry` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `level` int(10) unsigned NOT NULL DEFAULT '0',
-  `lines` int(10) unsigned NOT NULL DEFAULT '1',
-  `liters` int(10) unsigned NOT NULL DEFAULT '0',
-  `height` int(10) unsigned NOT NULL DEFAULT '20',
+  `level` int(10) unsigned NOT NULL DEFAULT 0,
+  `lines` int(10) unsigned NOT NULL DEFAULT 1,
+  `liters` int(10) unsigned NOT NULL DEFAULT 0,
+  `height` int(10) unsigned NOT NULL DEFAULT 20,
   `wagonFk` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `wagonVolumetry_FK` (`wagonFk`),
@@ -35212,26 +37812,26 @@ DROP TABLE IF EXISTS `warehouse`;
 CREATE TABLE `warehouse` (
   `id` smallint(6) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
-  `isFeedStock` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `isFeedStock` tinyint(1) unsigned NOT NULL DEFAULT 0,
   `addressName` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `delay` double NOT NULL DEFAULT '0.004',
-  `hasAvailable` tinyint(4) NOT NULL DEFAULT '0',
-  `isForTicket` tinyint(2) unsigned zerofill NOT NULL DEFAULT '00',
-  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT '1',
-  `labelZone` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'almacenes donde hay produccion',
-  `hasComission` tinyint(4) NOT NULL DEFAULT '0',
-  `isInventory` tinyint(2) NOT NULL DEFAULT '0',
-  `isComparative` tinyint(2) NOT NULL DEFAULT '0' COMMENT 'Si esta a true,en la comparativa muestra el stock de este almacen, cuando no se especifica almacen.',
-  `valuatedInventory` tinyint(2) NOT NULL DEFAULT '0' COMMENT 'Determina si se incluye en el informe de inventario valorado',
-  `isManaged` tinyint(2) NOT NULL DEFAULT '0' COMMENT 'Se añaden los cubos de expedition a la tabla ticketPackaging',
-  `hasConfectionTeam` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `hasStowaway` tinyint(1) NOT NULL DEFAULT '0',
-  `hasDms` tinyint(1) NOT NULL DEFAULT '0',
+  `delay` double NOT NULL DEFAULT 0.004,
+  `hasAvailable` tinyint(4) NOT NULL DEFAULT 0,
+  `isForTicket` tinyint(2) unsigned zerofill NOT NULL DEFAULT 00,
+  `countryFk` mediumint(8) unsigned NOT NULL DEFAULT 1,
+  `labelZone` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'almacenes donde hay produccion',
+  `hasComission` tinyint(4) NOT NULL DEFAULT 0,
+  `isInventory` tinyint(2) NOT NULL DEFAULT 0,
+  `isComparative` tinyint(2) NOT NULL DEFAULT 0 COMMENT 'Si esta a true,en la comparativa muestra el stock de este almacen, cuando no se especifica almacen.',
+  `valuatedInventory` tinyint(2) NOT NULL DEFAULT 0 COMMENT 'Determina si se incluye en el informe de inventario valorado',
+  `isManaged` tinyint(2) NOT NULL DEFAULT 0 COMMENT 'Se añaden los cubos de expedition a la tabla ticketPackaging',
+  `hasConfectionTeam` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `hasStowaway` tinyint(1) NOT NULL DEFAULT 0,
+  `hasDms` tinyint(1) NOT NULL DEFAULT 0,
   `pickUpAgencyModeFk` int(11) DEFAULT NULL,
-  `isBuyerToBeEmailed` tinyint(2) NOT NULL DEFAULT '0',
+  `isBuyerToBeEmailed` tinyint(2) NOT NULL DEFAULT 0,
   `aliasFk` smallint(5) unsigned DEFAULT NULL,
   `labelReport` int(11) DEFAULT NULL,
-  `hasUbications` tinyint(1) NOT NULL DEFAULT '1',
+  `hasUbications` tinyint(1) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name_UNIQUE` (`name`),
   KEY `Id_Paises` (`countryFk`),
@@ -35309,7 +37909,7 @@ DROP TABLE IF EXISTS `workCenter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workCenter` (
-  `id` int(11) NOT NULL DEFAULT '0',
+  `id` int(11) NOT NULL DEFAULT 0,
   `name` varchar(255) DEFAULT NULL,
   `payrollCenterFk` int(11) DEFAULT NULL,
   `counter` bigint(20) DEFAULT NULL,
@@ -35359,7 +37959,7 @@ CREATE TABLE `worker` (
   `started__` datetime DEFAULT NULL,
   `ended__` datetime DEFAULT NULL,
   `notes__` varchar(254) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `photo` blob,
+  `photo` blob DEFAULT NULL,
   `fi` varchar(9) COLLATE utf8_unicode_ci DEFAULT NULL,
   `address__` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `birthed__` date NOT NULL,
@@ -35367,9 +37967,9 @@ CREATE TABLE `worker` (
   `phone` varchar(9) COLLATE utf8_unicode_ci NOT NULL,
   `clientFk__` int(11) DEFAULT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
-  `bossFk` int(11) NOT NULL DEFAULT '103',
+  `bossFk` int(11) NOT NULL DEFAULT 103,
   `fiDueDate` datetime DEFAULT NULL,
-  `hasMachineryAutorized` tinyint(2) DEFAULT '0',
+  `hasMachineryAutorized` tinyint(2) DEFAULT 0,
   `seniority` date DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `CodigoTrabajador_UNIQUE` (`code`),
@@ -35411,11 +38011,12 @@ DROP TABLE IF EXISTS `workerCalendar`;
 /*!50001 DROP VIEW IF EXISTS `workerCalendar`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerCalendar` AS SELECT 
- 1 AS `businessFk`,
- 1 AS `workerFk`,
- 1 AS `absenceTypeFk`,
- 1 AS `dated`*/;
+/*!50001 CREATE TABLE `workerCalendar` (
+  `businessFk` tinyint NOT NULL,
+  `workerFk` tinyint NOT NULL,
+  `absenceTypeFk` tinyint NOT NULL,
+  `dated` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35430,7 +38031,7 @@ CREATE TABLE `workerClockLog` (
   `originFk` int(11) NOT NULL,
   `userFk` int(10) unsigned NOT NULL,
   `action` set('insert','update','delete','select') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
   `description` text COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`),
   KEY `logWorkerClockoriginFk` (`originFk`),
@@ -35462,9 +38063,10 @@ DROP TABLE IF EXISTS `workerDepartment`;
 /*!50001 DROP VIEW IF EXISTS `workerDepartment`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerDepartment` AS SELECT 
- 1 AS `workerFk`,
- 1 AS `departmentFk`*/;
+/*!50001 CREATE TABLE `workerDepartment` (
+  `workerFk` tinyint NOT NULL,
+  `departmentFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35493,7 +38095,7 @@ CREATE TABLE `workerDocument` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `worker` int(10) unsigned DEFAULT NULL,
   `document` int(11) DEFAULT NULL,
-  `isReadableByWorker` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indica si el empleado tiene permiso para acceder al documento',
+  `isReadableByWorker` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Indica si el empleado tiene permiso para acceder al documento',
   PRIMARY KEY (`id`),
   KEY `workerDocument_ibfk_1` (`worker`),
   KEY `workerDocument_ibfk_2` (`document`),
@@ -35546,14 +38148,14 @@ CREATE TABLE `workerIrpf` (
   `spouseNif` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `geographicMobilityDate` date DEFAULT NULL,
   `disabilityGradeFk` int(11) DEFAULT NULL,
-  `isDependend` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Acredita la necesidad de ayuda de terceras personas o movilidad reducida',
+  `isDependend` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Acredita la necesidad de ayuda de terceras personas o movilidad reducida',
   `familySituation` enum('1','2','3') COLLATE utf8_unicode_ci DEFAULT '1',
   `spousePension` decimal(10,2) DEFAULT NULL COMMENT 'Apartado 4 - Pensión compensatoria en favor del conyuge ',
   `childPension` decimal(10,2) DEFAULT NULL COMMENT 'Apartado 4 - Anualidades por alimentos en favor de los hijos',
-  `hasHousingPaymentBefore` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Apartado 5 - Pagos por adquisición o rehabilitación de la vivienda habitual utilizando financiación ajena, con derecho a deducción del IRPF',
-  `hasHousingPaymentAfter` tinyint(1) NOT NULL DEFAULT '0',
-  `hasExtendedWorking` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Aprtado 1 - prolongar la actividad laboral',
-  `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `hasHousingPaymentBefore` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Apartado 5 - Pagos por adquisición o rehabilitación de la vivienda habitual utilizando financiación ajena, con derecho a deducción del IRPF',
+  `hasHousingPaymentAfter` tinyint(1) NOT NULL DEFAULT 0,
+  `hasExtendedWorking` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Aprtado 1 - prolongar la actividad laboral',
+  `updated` timestamp NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`workerFk`),
   KEY `workerIrpf_disabilityGradeFk` (`disabilityGradeFk`),
   CONSTRAINT `workerIrpf_disabilityGradeFk` FOREIGN KEY (`disabilityGradeFk`) REFERENCES `disabilityGrade` (`id`) ON UPDATE CASCADE,
@@ -35572,21 +38174,21 @@ CREATE TABLE `workerJourney` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `userFk` int(10) unsigned NOT NULL,
   `dated` date NOT NULL,
-  `total` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `priceOrdinaryHour` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `nocturn` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `priceNocturnHour` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `hollyday` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `priceHollydayHour` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `lunch` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `priceExtraHour` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `extra` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `contractJourney` decimal(5,2) NOT NULL DEFAULT '0.00',
-  `priceExtraHollyday` decimal(5,2) NOT NULL DEFAULT '0.00',
+  `total` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `priceOrdinaryHour` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `nocturn` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `priceNocturnHour` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `hollyday` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `priceHollydayHour` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `lunch` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `priceExtraHour` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `extra` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `contractJourney` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `priceExtraHollyday` decimal(5,2) NOT NULL DEFAULT 0.00,
   `businessFk` int(11) DEFAULT NULL,
-  `isPaid` tinyint(1) NOT NULL DEFAULT '0',
-  `isUpdated` tinyint(1) NOT NULL DEFAULT '0',
-  `permission` decimal(5,2) NOT NULL DEFAULT '0.00',
+  `isPaid` tinyint(1) NOT NULL DEFAULT 0,
+  `isUpdated` tinyint(1) NOT NULL DEFAULT 0,
+  `permission` decimal(5,2) NOT NULL DEFAULT 0.00,
   PRIMARY KEY (`id`),
   UNIQUE KEY `userFk_UNIQUE` (`userFk`,`dated`),
   KEY `fk_workerJourney_user_idx` (`userFk`),
@@ -35602,13 +38204,14 @@ DROP TABLE IF EXISTS `workerLabour`;
 /*!50001 DROP VIEW IF EXISTS `workerLabour`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerLabour` AS SELECT 
- 1 AS `businessFk`,
- 1 AS `workerFk`,
- 1 AS `workCenterFk`,
- 1 AS `started`,
- 1 AS `ended`,
- 1 AS `departmentFk`*/;
+/*!50001 CREATE TABLE `workerLabour` (
+  `businessFk` tinyint NOT NULL,
+  `workerFk` tinyint NOT NULL,
+  `workCenterFk` tinyint NOT NULL,
+  `started` tinyint NOT NULL,
+  `ended` tinyint NOT NULL,
+  `departmentFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35623,11 +38226,11 @@ CREATE TABLE `workerLog` (
   `originFk` int(11) NOT NULL,
   `userFk` int(10) unsigned NOT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
-  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
   `description` text COLLATE utf8_unicode_ci NOT NULL,
   `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `oldInstance` text COLLATE utf8_unicode_ci,
-  `newInstance` text COLLATE utf8_unicode_ci,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `changedModelId` int(11) DEFAULT NULL,
   `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -35647,12 +38250,12 @@ DROP TABLE IF EXISTS `workerMana`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workerMana` (
   `workerFk` int(11) NOT NULL,
-  `size` int(11) NOT NULL DEFAULT '300',
-  `amount` int(11) NOT NULL DEFAULT '0',
-  `pricesModifierRate` double NOT NULL DEFAULT '0',
-  `isPricesModifierActivated` tinyint(1) NOT NULL DEFAULT '1',
-  `minRate` decimal(3,2) NOT NULL DEFAULT '-0.05',
-  `maxRate` decimal(3,2) NOT NULL DEFAULT '0.05',
+  `size` int(11) NOT NULL DEFAULT 300,
+  `amount` int(11) NOT NULL DEFAULT 0,
+  `pricesModifierRate` double NOT NULL DEFAULT 0,
+  `isPricesModifierActivated` tinyint(1) NOT NULL DEFAULT 1,
+  `minRate` decimal(3,2) NOT NULL DEFAULT -0.05,
+  `maxRate` decimal(3,2) NOT NULL DEFAULT 0.05,
   PRIMARY KEY (`workerFk`),
   KEY `fk_mana_spellers_Trabajadores_idx` (`workerFk`),
   CONSTRAINT `fk_mana_spellers_Trabajadores` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@@ -35681,14 +38284,15 @@ DROP TABLE IF EXISTS `workerMana__`;
 /*!50001 DROP VIEW IF EXISTS `workerMana__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerMana__` AS SELECT 
- 1 AS `workerFk`,
- 1 AS `size`,
- 1 AS `amount`,
- 1 AS `pricesModifierRate`,
- 1 AS `isPricesModifierActivated`,
- 1 AS `minRate`,
- 1 AS `maxRate`*/;
+/*!50001 CREATE TABLE `workerMana__` (
+  `workerFk` tinyint NOT NULL,
+  `size` tinyint NOT NULL,
+  `amount` tinyint NOT NULL,
+  `pricesModifierRate` tinyint NOT NULL,
+  `isPricesModifierActivated` tinyint NOT NULL,
+  `minRate` tinyint NOT NULL,
+  `maxRate` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35699,9 +38303,10 @@ DROP TABLE IF EXISTS `workerMedia`;
 /*!50001 DROP VIEW IF EXISTS `workerMedia`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerMedia` AS SELECT 
- 1 AS `workerFk`,
- 1 AS `mediaValue`*/;
+/*!50001 CREATE TABLE `workerMedia` (
+  `workerFk` tinyint NOT NULL,
+  `mediaValue` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35714,13 +38319,13 @@ DROP TABLE IF EXISTS `workerRelatives`;
 CREATE TABLE `workerRelatives` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `workerFk` int(11) NOT NULL,
-  `isDescendant` tinyint(1) DEFAULT '1' COMMENT 'Descendientes - Ascendientes',
+  `isDescendant` tinyint(1) DEFAULT 1 COMMENT 'Descendientes - Ascendientes',
   `disabilityGradeFk` int(11) DEFAULT NULL,
   `birthed` int(4) NOT NULL,
   `adoptionYear` int(4) DEFAULT NULL COMMENT 'Solo en el caso de descendientes',
-  `isDependend` tinyint(1) DEFAULT '0',
-  `isJointCustody` tinyint(1) DEFAULT '0' COMMENT 'Solo en el caso de descendientes',
-  `updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `isDependend` tinyint(1) DEFAULT 0,
+  `isJointCustody` tinyint(1) DEFAULT 0 COMMENT 'Solo en el caso de descendientes',
+  `updated` timestamp NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`id`),
   KEY `workerRelatives_disabilityGradeFk` (`disabilityGradeFk`),
   KEY `workerRelatives_workerFk` (`workerFk`),
@@ -35737,14 +38342,15 @@ DROP TABLE IF EXISTS `workerSpeedExpedition`;
 /*!50001 DROP VIEW IF EXISTS `workerSpeedExpedition`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerSpeedExpedition` AS SELECT 
- 1 AS `ticketFk`,
- 1 AS `litros`,
- 1 AS `literLastHour`,
- 1 AS `litersByMinute`,
- 1 AS `workerCode`,
- 1 AS `cajas`,
- 1 AS `warehouseFk`*/;
+/*!50001 CREATE TABLE `workerSpeedExpedition` (
+  `ticketFk` tinyint NOT NULL,
+  `litros` tinyint NOT NULL,
+  `literLastHour` tinyint NOT NULL,
+  `litersByMinute` tinyint NOT NULL,
+  `workerCode` tinyint NOT NULL,
+  `cajas` tinyint NOT NULL,
+  `warehouseFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35755,16 +38361,17 @@ DROP TABLE IF EXISTS `workerSpeedSaleTracking`;
 /*!50001 DROP VIEW IF EXISTS `workerSpeedSaleTracking`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerSpeedSaleTracking` AS SELECT 
- 1 AS `warehouseFk`,
- 1 AS `accion`,
- 1 AS `workerCode`,
- 1 AS `sumaLitros`,
- 1 AS `started`,
- 1 AS `finished`,
- 1 AS `sumaLitrosLastHour`,
- 1 AS `litersByMinute`,
- 1 AS `departmentName`*/;
+/*!50001 CREATE TABLE `workerSpeedSaleTracking` (
+  `warehouseFk` tinyint NOT NULL,
+  `accion` tinyint NOT NULL,
+  `workerCode` tinyint NOT NULL,
+  `sumaLitros` tinyint NOT NULL,
+  `started` tinyint NOT NULL,
+  `finished` tinyint NOT NULL,
+  `sumaLitrosLastHour` tinyint NOT NULL,
+  `litersByMinute` tinyint NOT NULL,
+  `departmentName` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35793,9 +38400,10 @@ DROP TABLE IF EXISTS `workerTeamCollegues`;
 /*!50001 DROP VIEW IF EXISTS `workerTeamCollegues`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerTeamCollegues` AS SELECT 
- 1 AS `workerFk`,
- 1 AS `collegueFk`*/;
+/*!50001 CREATE TABLE `workerTeamCollegues` (
+  `workerFk` tinyint NOT NULL,
+  `collegueFk` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35809,11 +38417,11 @@ CREATE TABLE `workerTimeControl` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `userFk` int(10) unsigned NOT NULL,
   `timed` datetime NOT NULL,
-  `manual` tinyint(4) NOT NULL DEFAULT '0',
+  `manual` tinyint(4) NOT NULL DEFAULT 0,
   `order` int(11) DEFAULT NULL,
   `warehouseFk` smallint(6) unsigned DEFAULT NULL,
   `direction` enum('in','out','middle') COLLATE utf8_unicode_ci DEFAULT 'middle',
-  `isSendMail` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Fichadas generadas autómaticamente con el procedimiento vn.workerTimeControl_sendMail',
+  `isSendMail` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'Fichadas generadas autómaticamente con el procedimiento vn.workerTimeControl_sendMail',
   PRIMARY KEY (`id`),
   UNIQUE KEY `userFk_Timed_uniq` (`userFk`,`timed`),
   KEY `warehouseFkfk1_idx` (`warehouseFk`),
@@ -35849,7 +38457,7 @@ DROP TABLE IF EXISTS `workerTimeControlLog`;
 CREATE TABLE `workerTimeControlLog` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `userFk` int(10) NOT NULL,
-  `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created` datetime NOT NULL DEFAULT current_timestamp(),
   `description` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Log de fichadas, se rellena cuando el fichador(tablet) no autoriza el fichaje (PROC:vn.workerTimeControl_check)';
@@ -35868,9 +38476,9 @@ CREATE TABLE `workerTimeControlMail` (
   `year` int(4) NOT NULL,
   `week` int(2) NOT NULL,
   `state` enum('SENDED','CONFIRMED','REVISE') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'SENDED',
-  `updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Fecha/hora último cambio de estado',
-  `sendedCounter` int(3) NOT NULL DEFAULT '1' COMMENT 'Número de veces que se ha enviado el correo',
-  `emailResponse` text COLLATE utf8_unicode_ci,
+  `updated` datetime NOT NULL DEFAULT current_timestamp() COMMENT 'Fecha/hora último cambio de estado',
+  `sendedCounter` int(3) NOT NULL DEFAULT 1 COMMENT 'Número de veces que se ha enviado el correo',
+  `emailResponse` text COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `workerFk_UNIQUE` (`workerFk`,`year`,`week`),
   KEY `workerFk_idx` (`workerFk`),
@@ -35942,15 +38550,16 @@ DROP TABLE IF EXISTS `workerTimeControlUserInfo`;
 /*!50001 DROP VIEW IF EXISTS `workerTimeControlUserInfo`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerTimeControlUserInfo` AS SELECT 
- 1 AS `userFk`,
- 1 AS `name`,
- 1 AS `surname`,
- 1 AS `user`,
- 1 AS `password`,
- 1 AS `bcryptPassword`,
- 1 AS `departmentFk`,
- 1 AS `dni`*/;
+/*!50001 CREATE TABLE `workerTimeControlUserInfo` (
+  `userFk` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `surname` tinyint NOT NULL,
+  `user` tinyint NOT NULL,
+  `password` tinyint NOT NULL,
+  `bcryptPassword` tinyint NOT NULL,
+  `departmentFk` tinyint NOT NULL,
+  `dni` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35961,16 +38570,17 @@ DROP TABLE IF EXISTS `workerTimeControlWorking`;
 /*!50001 DROP VIEW IF EXISTS `workerTimeControlWorking`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerTimeControlWorking` AS SELECT 
- 1 AS `userFk`,
- 1 AS `timed`,
- 1 AS `name`,
- 1 AS `surname`,
- 1 AS `phone`,
- 1 AS `workerPhone`,
- 1 AS `department`,
- 1 AS `workerCenter`,
- 1 AS `maxOrder`*/;
+/*!50001 CREATE TABLE `workerTimeControlWorking` (
+  `userFk` tinyint NOT NULL,
+  `timed` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `surname` tinyint NOT NULL,
+  `phone` tinyint NOT NULL,
+  `workerPhone` tinyint NOT NULL,
+  `department` tinyint NOT NULL,
+  `workerCenter` tinyint NOT NULL,
+  `maxOrder` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35981,13 +38591,14 @@ DROP TABLE IF EXISTS `workerTimeControl_Journey__`;
 /*!50001 DROP VIEW IF EXISTS `workerTimeControl_Journey__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerTimeControl_Journey__` AS SELECT 
- 1 AS `userFk`,
- 1 AS `dated`,
- 1 AS `Journey`,
- 1 AS `dayName`,
- 1 AS `name`,
- 1 AS `firstname`*/;
+/*!50001 CREATE TABLE `workerTimeControl_Journey__` (
+  `userFk` tinyint NOT NULL,
+  `dated` tinyint NOT NULL,
+  `Journey` tinyint NOT NULL,
+  `dayName` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `firstname` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -35998,13 +38609,14 @@ DROP TABLE IF EXISTS `workerTimeJourneyNG`;
 /*!50001 DROP VIEW IF EXISTS `workerTimeJourneyNG`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerTimeJourneyNG` AS SELECT 
- 1 AS `userFk`,
- 1 AS `dated`,
- 1 AS `Journey`,
- 1 AS `dayName`,
- 1 AS `name`,
- 1 AS `firstname`*/;
+/*!50001 CREATE TABLE `workerTimeJourneyNG` (
+  `userFk` tinyint NOT NULL,
+  `dated` tinyint NOT NULL,
+  `Journey` tinyint NOT NULL,
+  `dayName` tinyint NOT NULL,
+  `name` tinyint NOT NULL,
+  `firstname` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -36015,8 +38627,8 @@ DROP TABLE IF EXISTS `workers20190711`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workers20190711` (
-  `person_id` int(11) NOT NULL DEFAULT '0',
-  `business_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
+  `business_id` int(11) NOT NULL DEFAULT 0,
   `Apellidos` varchar(60) CHARACTER SET utf8 NOT NULL,
   `Nombre` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
   `nif` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
@@ -36041,7 +38653,7 @@ DROP TABLE IF EXISTS `workers20190711_FichadasAbril`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workers20190711_FichadasAbril` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `person_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
   `nif` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
   `Apellidos` varchar(60) CHARACTER SET utf8 NOT NULL,
   `Nombre` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
@@ -36049,7 +38661,7 @@ CREATE TABLE `workers20190711_FichadasAbril` (
   `Hora` int(2) DEFAULT NULL,
   `Minuto` int(2) DEFAULT NULL,
   `sumable` double DEFAULT NULL,
-  `jornada` decimal(5,2) NOT NULL DEFAULT '8.00',
+  `jornada` decimal(5,2) NOT NULL DEFAULT 8.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -36063,7 +38675,7 @@ DROP TABLE IF EXISTS `workers20190711_FichadasJulio11`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workers20190711_FichadasJulio11` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `person_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
   `nif` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
   `Apellidos` varchar(60) CHARACTER SET utf8 NOT NULL,
   `Nombre` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
@@ -36071,7 +38683,7 @@ CREATE TABLE `workers20190711_FichadasJulio11` (
   `Hora` int(2) DEFAULT NULL,
   `Minuto` int(2) DEFAULT NULL,
   `sumable` double DEFAULT NULL,
-  `jornada` decimal(5,2) NOT NULL DEFAULT '8.00',
+  `jornada` decimal(5,2) NOT NULL DEFAULT 8.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -36085,7 +38697,7 @@ DROP TABLE IF EXISTS `workers20190711_FichadasJunio`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workers20190711_FichadasJunio` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `person_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
   `nif` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
   `Apellidos` varchar(60) CHARACTER SET utf8 NOT NULL,
   `Nombre` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
@@ -36093,7 +38705,7 @@ CREATE TABLE `workers20190711_FichadasJunio` (
   `Hora` int(2) DEFAULT NULL,
   `Minuto` int(2) DEFAULT NULL,
   `sumable` double DEFAULT NULL,
-  `jornada` decimal(5,2) NOT NULL DEFAULT '8.00',
+  `jornada` decimal(5,2) NOT NULL DEFAULT 8.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -36107,7 +38719,7 @@ DROP TABLE IF EXISTS `workers20190711_FichadasMayo`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workers20190711_FichadasMayo` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `person_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
   `nif` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
   `Apellidos` varchar(60) CHARACTER SET utf8 NOT NULL,
   `Nombre` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
@@ -36115,7 +38727,7 @@ CREATE TABLE `workers20190711_FichadasMayo` (
   `Hora` int(2) DEFAULT NULL,
   `Minuto` int(2) DEFAULT NULL,
   `sumable` double DEFAULT NULL,
-  `jornada` decimal(5,2) NOT NULL DEFAULT '8.00',
+  `jornada` decimal(5,2) NOT NULL DEFAULT 8.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -36129,7 +38741,7 @@ DROP TABLE IF EXISTS `workers20190711_FichadasOctubre`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workers20190711_FichadasOctubre` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `person_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
   `nif` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
   `Apellidos` varchar(60) CHARACTER SET utf8 NOT NULL,
   `Nombre` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
@@ -36137,7 +38749,7 @@ CREATE TABLE `workers20190711_FichadasOctubre` (
   `Hora` int(2) DEFAULT NULL,
   `Minuto` int(2) DEFAULT NULL,
   `sumable` double DEFAULT NULL,
-  `jornada` decimal(5,2) NOT NULL DEFAULT '8.00',
+  `jornada` decimal(5,2) NOT NULL DEFAULT 8.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -36151,7 +38763,7 @@ DROP TABLE IF EXISTS `workers20190711_Garrote`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `workers20190711_Garrote` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `person_id` int(11) NOT NULL DEFAULT '0',
+  `person_id` int(11) NOT NULL DEFAULT 0,
   `nif` varchar(15) CHARACTER SET utf8 DEFAULT NULL,
   `Apellidos` varchar(60) CHARACTER SET utf8 NOT NULL,
   `Nombre` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
@@ -36159,7 +38771,7 @@ CREATE TABLE `workers20190711_Garrote` (
   `Hora` int(2) DEFAULT NULL,
   `Minuto` int(2) DEFAULT NULL,
   `sumable` double DEFAULT NULL,
-  `jornada` decimal(5,2) NOT NULL DEFAULT '8.00',
+  `jornada` decimal(5,2) NOT NULL DEFAULT 8.00,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -36217,11 +38829,11 @@ CREATE TABLE `zone` (
   `hour` datetime NOT NULL,
   `warehouseFk__` smallint(6) unsigned DEFAULT NULL,
   `agencyModeFk` int(11) NOT NULL,
-  `travelingDays` int(11) NOT NULL DEFAULT '1',
-  `price` double NOT NULL DEFAULT '0',
-  `bonus` double NOT NULL DEFAULT '0',
-  `isVolumetric` tinyint(1) NOT NULL DEFAULT '0',
-  `inflation` decimal(5,2) NOT NULL DEFAULT '1.00',
+  `travelingDays` int(11) NOT NULL DEFAULT 1,
+  `price` double NOT NULL DEFAULT 0,
+  `bonus` double NOT NULL DEFAULT 0,
+  `isVolumetric` tinyint(1) NOT NULL DEFAULT 0,
+  `inflation` decimal(5,2) NOT NULL DEFAULT 1.00,
   `m3Max` decimal(10,2) unsigned DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_zone_1_idx` (`warehouseFk__`),
@@ -36276,7 +38888,7 @@ DROP TABLE IF EXISTS `zoneConfig`;
 CREATE TABLE `zoneConfig` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `scope` int(10) unsigned NOT NULL,
-  `forwardDays` int(10) NOT NULL DEFAULT '7' COMMENT 'days forward to show zone_upcomingDeliveries',
+  `forwardDays` int(10) NOT NULL DEFAULT 7 COMMENT 'days forward to show zone_upcomingDeliveries',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -36289,15 +38901,16 @@ DROP TABLE IF EXISTS `zoneEstimatedDelivery`;
 /*!50001 DROP VIEW IF EXISTS `zoneEstimatedDelivery`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `zoneEstimatedDelivery` AS SELECT 
- 1 AS `zoneFk`,
- 1 AS `hourTheoretical`,
- 1 AS `totalVolume`,
- 1 AS `remainingVolume`,
- 1 AS `speed`,
- 1 AS `hourEffective`,
- 1 AS `minutesLess`,
- 1 AS `etc`*/;
+/*!50001 CREATE TABLE `zoneEstimatedDelivery` (
+  `zoneFk` tinyint NOT NULL,
+  `hourTheoretical` tinyint NOT NULL,
+  `totalVolume` tinyint NOT NULL,
+  `remainingVolume` tinyint NOT NULL,
+  `speed` tinyint NOT NULL,
+  `hourEffective` tinyint NOT NULL,
+  `minutesLess` tinyint NOT NULL,
+  `etc` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -36359,7 +38972,7 @@ CREATE TABLE `zoneGeo` (
   `path` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `lft` int(11) DEFAULT NULL,
   `rgt` int(11) DEFAULT NULL,
-  `depth` bigint(22) NOT NULL DEFAULT '0',
+  `depth` bigint(22) NOT NULL DEFAULT 0,
   `sons` decimal(10,0) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `lft_rgt_depth_idx` (`lft`,`rgt`,`depth`),
@@ -36441,6 +39054,33 @@ CREATE TABLE `zoneIncluded` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `zoneLog`
+--
+
+DROP TABLE IF EXISTS `zoneLog`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `zoneLog` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `originFk` int(10) NOT NULL,
+  `userFk` int(10) unsigned DEFAULT NULL,
+  `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8 DEFAULT NULL,
+  `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `changedModelId` int(11) DEFAULT NULL,
+  `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `originFk` (`originFk`),
+  KEY `userFk` (`userFk`),
+  CONSTRAINT `zoneLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `zone` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `zoneLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `zonePromo`
 --
@@ -36453,7 +39093,7 @@ CREATE TABLE `zonePromo` (
   `zoneFk` int(11) NOT NULL,
   `dated` date NOT NULL,
   `amount` decimal(10,2) NOT NULL,
-  `isDone` tinyint(4) NOT NULL DEFAULT '0',
+  `isDone` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `zonePromo_fk1_idx` (`zoneFk`),
   CONSTRAINT `zonePromo_fk1` FOREIGN KEY (`zoneFk`) REFERENCES `zone` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@@ -36486,15 +39126,16 @@ DROP TABLE IF EXISTS `zone_ETD`;
 /*!50001 DROP VIEW IF EXISTS `zone_ETD`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `zone_ETD` AS SELECT 
- 1 AS `zoneFk`,
- 1 AS `HoraTeórica`,
- 1 AS `volumenTotal`,
- 1 AS `volumenPendiente`,
- 1 AS `velocidad`,
- 1 AS `HoraPráctica`,
- 1 AS `minutesLess`,
- 1 AS `etc`*/;
+/*!50001 CREATE TABLE `zone_ETD` (
+  `zoneFk` tinyint NOT NULL,
+  `HoraTeórica` tinyint NOT NULL,
+  `volumenTotal` tinyint NOT NULL,
+  `volumenPendiente` tinyint NOT NULL,
+  `velocidad` tinyint NOT NULL,
+  `HoraPráctica` tinyint NOT NULL,
+  `minutesLess` tinyint NOT NULL,
+  `etc` tinyint NOT NULL
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -36575,90 +39216,90 @@ DELIMITER ;;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`z-sysadmin`@`%`*/ /*!50106 EVENT `printQueue_check` ON SCHEDULE EVERY 10 MINUTE STARTS '2019-11-08 00:00:00' ON COMPLETION PRESERVE ENABLE COMMENT 'Notifica en caso de que el servidor de impresión este parado' DO BEGIN
-
-	DECLARE vCurrentCount INT;
-	DECLARE vCheckSum INT;
-    DECLARE vIsAlreadyNotified BOOLEAN;
-    DECLARE vTableQueue TEXT;
-	DECLARE vLineQueue TEXT;
-    DECLARE vDone BOOL DEFAULT FALSE;
-    DECLARE vCur CURSOR FOR 
-    	SELECT  CONCAT('<tr>
-							<td>', IFNULL(pq.id, ''), '</td>
-							<td>', IFNULL(p.path, ''),'</td>
-							<td>', IFNULL(i.Informe, ''),'</td>
-							<td>', IFNULL(e.Estado, ''),'</td>
-							<td>', IFNULL(w.firstname, ''), " ", IFNULL(w.lastName, ''),'</td>
-							<td>', IFNULL(pq.`error`, ''),'</td>
-						</tr>')
-            FROM vn.printingQueue pq
-                LEFT JOIN vn.worker w ON w.id = pq.worker
-                LEFT JOIN vn.printer p ON p.id = pq.printer
-                LEFT JOIN vn2008.Informes i ON i.Id_Informe = pq.report
-                JOIN  vn2008.Estados e ON e.Id_Estado = pq.state
-            LIMIT 30;
-	
-    DECLARE CONTINUE HANDLER FOR NOT FOUND
-    SET vDone = TRUE; 		
-
-	SELECT COUNT(*), IFNULL(SUM(id),0) INTO vCurrentCount, vCheckSum
-		FROM vn.printingQueue WHERE state = 1;
-        
-    SELECT isAlreadyNotified INTO vIsAlreadyNotified 
-    	FROM printingQueueCheck;
-		
-	IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND
-		(SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND
-        vIsAlreadyNotified = FALSE AND vCurrentCount  > 0
-	THEN
-
-		SELECT  '<table  cellspacing="10">
-					<tr>
-						<td>Id Cola</td>
-						<td>Ruta Impresora</td>
-						<td>Informe</td>
-						<td>Estado</td>
-						<td>Trabajador</td>
-						<td>Error</td>
-                     </tr>' INTO vTableQueue;
-			
-		OPEN vCur;
-	  
-		l: LOOP
-			
-			SET vDone = FALSE;
-            
-			FETCH vCur INTO vLineQueue;
-            
-            IF vDone THEN
-				LEAVE l;
-			END IF;
-            
-            SELECT CONCAT(vTableQueue, vLineQueue) INTO vTableQueue;
-			
-		END LOOP;
-	  
-		CLOSE vCur;     
-               
-        INSERT INTO vn2008.mail (`to`, subject, text)
-			VALUES ('cau@verdnatura.es, sysadmin@verdnatura.es',
-				'servidor de impresion parado', 
-                CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas', vTableQueue, '</table>'));
-		 
-         UPDATE printingQueueCheck SET isAlreadyNotified = TRUE; 
-	END IF;
-    
-    IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND
-        vIsAlreadyNotified = TRUE
-	THEN
-		UPDATE printingQueueCheck SET isAlreadyNotified = FALSE;
-	END IF;
-    
-	UPDATE printingQueueCheck
-		SET lastCount = vCurrentCount,
-			lastCheckSum = vCheckSum;
-            
+/*!50106 CREATE*/ /*!50117 DEFINER=`z-sysadmin`@`%`*/ /*!50106 EVENT `printQueue_check` ON SCHEDULE EVERY 10 MINUTE STARTS '2019-11-08 00:00:00' ON COMPLETION PRESERVE ENABLE COMMENT 'Notifica en caso de que el servidor de impresión este parado' DO BEGIN
+
+	DECLARE vCurrentCount INT;
+	DECLARE vCheckSum INT;
+    DECLARE vIsAlreadyNotified BOOLEAN;
+    DECLARE vTableQueue TEXT;
+	DECLARE vLineQueue TEXT;
+    DECLARE vDone BOOL DEFAULT FALSE;
+    DECLARE vCur CURSOR FOR 
+    	SELECT  CONCAT('<tr>
+							<td>', IFNULL(pq.id, ''), '</td>
+							<td>', IFNULL(p.path, ''),'</td>
+							<td>', IFNULL(i.Informe, ''),'</td>
+							<td>', IFNULL(e.Estado, ''),'</td>
+							<td>', IFNULL(w.firstname, ''), " ", IFNULL(w.lastName, ''),'</td>
+							<td>', IFNULL(pq.`error`, ''),'</td>
+						</tr>')
+            FROM vn.printingQueue pq
+                LEFT JOIN vn.worker w ON w.id = pq.worker
+                LEFT JOIN vn.printer p ON p.id = pq.printer
+                LEFT JOIN vn2008.Informes i ON i.Id_Informe = pq.report
+                JOIN  vn2008.Estados e ON e.Id_Estado = pq.state
+            LIMIT 30;
+	
+    DECLARE CONTINUE HANDLER FOR NOT FOUND
+    SET vDone = TRUE; 		
+
+	SELECT COUNT(*), IFNULL(SUM(id),0) INTO vCurrentCount, vCheckSum
+		FROM vn.printingQueue WHERE state = 1;
+        
+    SELECT isAlreadyNotified INTO vIsAlreadyNotified 
+    	FROM printingQueueCheck;
+		
+	IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND
+		(SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND
+        vIsAlreadyNotified = FALSE AND vCurrentCount  > 0
+	THEN
+
+		SELECT  '<table  cellspacing="10">
+					<tr>
+						<td>Id Cola</td>
+						<td>Ruta Impresora</td>
+						<td>Informe</td>
+						<td>Estado</td>
+						<td>Trabajador</td>
+						<td>Error</td>
+                     </tr>' INTO vTableQueue;
+			
+		OPEN vCur;
+	  
+		l: LOOP
+			
+			SET vDone = FALSE;
+            
+			FETCH vCur INTO vLineQueue;
+            
+            IF vDone THEN
+				LEAVE l;
+			END IF;
+            
+            SELECT CONCAT(vTableQueue, vLineQueue) INTO vTableQueue;
+			
+		END LOOP;
+	  
+		CLOSE vCur;     
+               
+        INSERT INTO vn2008.mail (`to`, subject, text)
+			VALUES ('cau@verdnatura.es, sysadmin@verdnatura.es',
+				'servidor de impresion parado', 
+                CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas', vTableQueue, '</table>'));
+		 
+         UPDATE printingQueueCheck SET isAlreadyNotified = TRUE; 
+	END IF;
+    
+    IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND
+        vIsAlreadyNotified = TRUE
+	THEN
+		UPDATE printingQueueCheck SET isAlreadyNotified = FALSE;
+	END IF;
+    
+	UPDATE printingQueueCheck
+		SET lastCount = vCurrentCount,
+			lastCheckSum = vCheckSum;
+            
 END */ ;;
 /*!50003 SET time_zone             = @saved_time_zone */ ;;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;;
@@ -36701,6 +39342,24 @@ DELIMITER ;;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;;
 /*!50003 SET character_set_results = @saved_cs_results */ ;;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;;
+/*!50106 DROP EVENT IF EXISTS `ticket_doRecalc` */;;
+DELIMITER ;;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
+/*!50003 SET character_set_client  = utf8 */ ;;
+/*!50003 SET character_set_results = utf8 */ ;;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET @saved_time_zone      = @@time_zone */ ;;
+/*!50003 SET time_zone             = 'SYSTEM' */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`z-sysadmin`@`%`*/ /*!50106 EVENT `ticket_doRecalc` ON SCHEDULE EVERY 10 SECOND STARTS '2021-02-26 07:32:23' ON COMPLETION PRESERVE ENABLE DO CALL ticket_doRecalc */ ;;
+/*!50003 SET time_zone             = @saved_time_zone */ ;;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;;
+/*!50003 SET character_set_results = @saved_cs_results */ ;;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;;
 /*!50106 DROP EVENT IF EXISTS `travel_doRecalc` */;;
 DELIMITER ;;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
@@ -36731,16 +39390,16 @@ DELIMITER ;;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
-/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `workerTimeControl_sendMail` ON SCHEDULE EVERY 1 WEEK STARTS '2020-11-25 08:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
-	DECLARE vWeek,vYear INT;
-
-	SELECT week,year INTO vWeek,vYear
-		FROM vn.time 
-		WHERE dated IN (DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL -4 DAY))
-		GROUP BY year,week
-		LIMIT 1;
- 
-	CALL vn.workerTimeControl_sendMail(vWeek, vYear, NULL);
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`%`*/ /*!50106 EVENT `workerTimeControl_sendMail` ON SCHEDULE EVERY 1 WEEK STARTS '2020-11-25 08:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+	DECLARE vWeek,vYear INT;
+
+	SELECT week,year INTO vWeek,vYear
+		FROM vn.time 
+		WHERE dated IN (DATE_ADD(CURDATE(), INTERVAL -10 DAY), DATE_ADD(CURDATE(), INTERVAL -4 DAY))
+		GROUP BY year,week
+		LIMIT 1;
+ 
+	CALL vn.workerTimeControl_sendMail(vWeek, vYear, NULL);
 END */ ;;
 /*!50003 SET time_zone             = @saved_time_zone */ ;;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;;
@@ -37910,210 +40569,25 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`z-developer`@`%` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS int(11)
     READS SQL DATA
-BEGIN
-	DECLARE vTravelFk INT;
-    DECLARE vEntryFk INT DEFAULT 0;
-   	DECLARE vEntryAssignFk INT;
-
-    SET vTravelFk = vn.ekt_getTravel(vEktFk);
-    
-    IF vTravelFk THEN
-    
-    	SELECT ea.id INTO vEntryAssignFk
-			FROM edi.ekt e
-				JOIN vn.travel tr ON tr.id = vTravelFk
-				JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
-										 AND ea.warehouseInFk = tr.warehouseInFk
-										 AND ea.agencyModeFk = tr.agencyFk
-										 AND IFNULL(ea.sub, e.sub) <=> e.sub 
-										 AND IFNULL(ea.kop, e.kop) <=> e.kop 
-										 AND IFNULL(ea.pro, e.pro) <=> e.pro
-			WHERE e.id = vEktFk
-						ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC, 
-								 ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
-								 ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC, 
-								 ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC, 
-								 ISNULL(ea.sub)   AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC, 
-								 ISNULL(ea.sub)   AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
-								 ISNULL(ea.sub)   AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
-			LIMIT 1;
-    
-    	SELECT MAX(e.id) INTO vEntryFk
-    		FROM vn.entry e
-    			JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
-    		WHERE e.travelFk = vTravelFk
-    			AND e.sub <=> ea.sub 
-    			AND e.kop <=> ea.kop 
-    			AND e.pro <=> ea.pro;
-    	
-    	
-		IF IFNULL(vEntryFk,0) = 0 THEN
-		
-			INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
-				SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
-					FROM vn.ektEntryAssign ea
-						JOIN vn.company c ON c.code = 'VNL'
-						JOIN vn.currency cu ON cu.code = 'EUR'	
-					WHERE ea.id = vEntryAssignFk;
-							
-			SELECT MAX(id) INTO vEntryFk 
-				FROM vn.entry
-				WHERE travelFk = vTravelFk;
-				
-		END IF;
-	
-		UPDATE vn.ektEntryAssign 
-    		SET entryFk = vEntryFk
-    		WHERE id = vEntryAssignFk;
- 
-	ELSE
-    
-		SET vEntryFk = 9200;
-            
-	END IF;
-	
-	RETURN vEntryFk;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP FUNCTION IF EXISTS `ekt_getEntry_beta` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`z-developer`@`%` FUNCTION `ekt_getEntry_beta`(vEktFk INT) RETURNS int(11)
-    READS SQL DATA
-BEGIN
-	DECLARE vTravelFk INT;
-    DECLARE vEntryFk INT DEFAULT 0;
-   	DECLARE vEntryAssignFk INT;
-
-    SET vTravelFk = vn.ekt_getTravel(vEktFk);
-    
-    IF vTravelFk THEN
-    
-    	SELECT ea.id INTO vEntryAssignFk
-			FROM edi.ekt e
-				JOIN vn.travel tr ON tr.id = vTravelFk
-				JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
-										 AND ea.warehouseInFk = tr.warehouseInFk
-										 AND ea.agencyModeFk = tr.agencyFk
-										 AND IFNULL(ea.sub, e.sub) <=> e.sub 
-										 AND IFNULL(ea.kop, e.kop) <=> e.kop 
-										 AND IFNULL(ea.pro, e.pro) <=> e.pro
-			WHERE e.id = vEktFk
-						ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC, 
-								 ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
-								 ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC, 
-								 ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC, 
-								 ISNULL(ea.sub)   AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC, 
-								 ISNULL(ea.sub)   AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
-								 ISNULL(ea.sub)   AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
-			LIMIT 1;
-    
-    	SELECT MAX(e.id) INTO vEntryFk
-    		FROM vn.entry e
-    			JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
-    		WHERE e.travelFk = vTravelFk
-    			AND e.sub <=> ea.sub 
-    			AND e.kop <=> ea.kop 
-    			AND e.pro <=> ea.pro;
-    	
-    	
-		IF IFNULL(vEntryFk,0) = 0 THEN
-		
-			INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
-				SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
-					FROM vn.ektEntryAssign ea
-						JOIN vn.company c ON c.code = 'VNL'
-						JOIN vn.currency cu ON cu.code = 'EUR'	
-					WHERE ea.id = vEntryAssignFk;
-							
-			SELECT MAX(id) INTO vEntryFk 
-				FROM vn.entry
-				WHERE travelFk = vTravelFk;
-				
-		END IF;
-	
-		UPDATE vn.ektEntryAssign 
-    		SET entryFk = vEntryFk
-    		WHERE id = vEntryAssignFk;
- 
-	ELSE
-    
-		SET vEntryFk = 9200;
-            
-	END IF;
-	
-	RETURN vEntryFk;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP FUNCTION IF EXISTS `ekt_getEntry__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ekt_getEntry__`(vEktFk INT) RETURNS int(11)
-    READS SQL DATA
 BEGIN
-
 	DECLARE vTravelFk INT;
     DECLARE vEntryFk INT DEFAULT 0;
+   	DECLARE vEntryAssignFk INT;
 
     SET vTravelFk = vn.ekt_getTravel(vEktFk);
     
     IF vTravelFk THEN
     
-		SELECT ea.id INTO vEntryFk 
-			FROM vn.entry ea
-			JOIN edi.ekt e ON e.id = vEktFk
-			WHERE ea.travelFk = vTravelFk
-                AND ea.invoiceInFk IS NULL
-                AND NOT (ea.isConfirmed AND ea.isOrdered)
-                AND (ea.sub = e.sub OR ea.kop = e.kop OR ea.pro = e.pro)
-            ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC, 
-					 ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
-					 ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC, 
-					 ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC, 
-					 ISNULL(ea.sub)   AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC, 
-					 ISNULL(ea.sub)   AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
-					 ISNULL(ea.sub)   AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
-
-            LIMIT 1;
-
-		IF NOT vEntryFk THEN
-		
-			INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
-				SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
-					FROM edi.ekt e
-						JOIN vn.travel tr ON tr.id = vTravelFk
-						JOIN vn.company c ON c.code = 'VNL'
-						JOIN vn.currency cu ON cu.code = 'EUR'
-						JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
-												 AND ea.warehouseInFk = tr.warehouseInFk
-												 AND ea.agencyModeFk = tr.agencyFk
-												 AND IFNULL(ea.sub, e.sub) <=> e.sub 
-												 AND IFNULL(ea.kop, e.kop) <=> e.kop 
-												 AND IFNULL(ea.pro, e.pro) <=> e.pro
-												 AND tr.landed = e.fec
-					WHERE e.id = vEktFk
+    	SELECT ea.id INTO vEntryAssignFk
+			FROM edi.ekt e
+				JOIN vn.travel tr ON tr.id = vTravelFk
+				JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
+										 AND ea.warehouseInFk = tr.warehouseInFk
+										 AND ea.agencyModeFk = tr.agencyFk
+										 AND IFNULL(ea.sub, e.sub) <=> e.sub 
+										 AND IFNULL(ea.kop, e.kop) <=> e.kop 
+										 AND IFNULL(ea.pro, e.pro) <=> e.pro
+			WHERE e.id = vEktFk
 						ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC, 
 								 ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
 								 ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC, 
@@ -38121,23 +40595,45 @@ BEGIN
 								 ISNULL(ea.sub)   AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC, 
 								 ISNULL(ea.sub)   AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
 								 ISNULL(ea.sub)   AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
-
-						LIMIT 1;
-					
+			LIMIT 1;
+    
+    	SELECT MAX(e.id) INTO vEntryFk
+    		FROM vn.entry e
+    			JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
+    		WHERE e.travelFk = vTravelFk
+    			AND e.sub <=> ea.sub 
+    			AND e.kop <=> ea.kop 
+    			AND e.pro <=> ea.pro;
+    	
+    	
+		IF IFNULL(vEntryFk,0) = 0 THEN
+		
+			INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
+				SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
+					FROM vn.ektEntryAssign ea
+						JOIN vn.company c ON c.code = 'VNL'
+						JOIN vn.currency cu ON cu.code = 'EUR'	
+					WHERE ea.id = vEntryAssignFk;
+							
 			SELECT MAX(id) INTO vEntryFk 
 				FROM vn.entry
 				WHERE travelFk = vTravelFk;
 				
 		END IF;
+	
+		UPDATE vn.ektEntryAssign 
+    		SET entryFk = vEntryFk
+    		WHERE id = vEntryAssignFk;
  
 	ELSE
     
 		SET vEntryFk = 9200;
-            
+			
+		INSERT IGNORE INTO vn.entry(id) VALUES(vEntryFk);
+	        
 	END IF;
 	
 	RETURN vEntryFk;
-    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -39618,6 +42114,37 @@ BEGIN
 
 	RETURN isIntrastatOperation;
 
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `isLogifloraDay` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` FUNCTION `isLogifloraDay`(vShipped DATE, vWarehouse INT) RETURNS tinyint(1)
+    DETERMINISTIC
+BEGIN
+		
+	DECLARE vIsLogifloraDay BOOLEAN;
+
+	SELECT COUNT(*) INTO vIsLogifloraDay
+			FROM edi.warehouseFloramondo wf
+				JOIN vn.floramondoConfig fc 
+			WHERE wf.warehouseFk = vWarehouse
+				AND vShipped BETWEEN DATE(TIMESTAMPADD(DAY, wf.travellingDays , fc.nextLanded))
+					AND  DATE(TIMESTAMPADD(DAY, wf.travellingDays + wf.dayRange , fc.nextLanded));
+			
+	RETURN vIsLogifloraDay;
+			
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -39821,17 +42348,17 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `item_getFhImage`(itemFk INT) RETURNS varchar(255) CHARSET utf8 COLLATE utf8_unicode_ci
     DETERMINISTIC
-BEGIN
-	DECLARE vImageUrl VARCHAR(255);
-	SELECT sr.PictureReference INTO vImageUrl
-		FROM vn.buy b
-			JOIN edi.ekt e ON b.ektFk = e.id
-			JOIN edi.supplyResponse sr ON sr.Item_ArticleCode =e.`ref`
-			JOIN vn.item i ON i.id = b.itemFk
-		WHERE b.itemFk = itemFk
-			ORDER BY (sr.EmbalageCode = e.package) DESC
-			LIMIT 1;
-	RETURN vImageUrl;
+BEGIN
+	DECLARE vImageUrl VARCHAR(255);
+	SELECT sr.PictureReference INTO vImageUrl
+		FROM vn.buy b
+			JOIN edi.ekt e ON b.ektFk = e.id
+			JOIN edi.supplyResponse sr ON sr.Item_ArticleCode =e.`ref`
+			JOIN vn.item i ON i.id = b.itemFk
+		WHERE b.itemFk = itemFk
+			ORDER BY (sr.EmbalageCode = e.package) DESC
+			LIMIT 1;
+	RETURN vImageUrl;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -40884,13 +43411,13 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`z-sysadmin`@`%` FUNCTION `time_getSalesYear`(vMonth INT, vYear INT) RETURNS int(11)
     DETERMINISTIC
-BEGIN
-DECLARE vSalesYear INT;
-SELECT salesYear INTO vSalesYear
-FROM `time`
-WHERE `month` = vMonth AND `year` = vYear
-LIMIT 1;
-RETURN vSalesYear;
+BEGIN
+DECLARE vSalesYear INT;
+SELECT salesYear INTO vSalesYear
+FROM `time`
+WHERE `month` = vMonth AND `year` = vYear
+LIMIT 1;
+RETURN vSalesYear;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -41594,6 +44121,40 @@ BEGIN
     
    DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourGetShipped;
     
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `agencyVolume` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`z-developer`@`%` PROCEDURE `agencyVolume`(vDated DATE, vAgency INT)
+BEGIN
+	
+	SELECT ELT(it.temperature + 1,'Calientes','Frios','Secos') AS Temp,  
+		CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+			 vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.carro / 1000000 ,1) AS DECIMAL(10,2)) AS carros ,
+		CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+			 vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.espai / 1000000,1) AS DECIMAL(10,2)) AS espais
+	FROM vn.buy b 
+		INNER JOIN vn.entry e ON e.id = b.entryFk 
+		INNER JOIN vn.travel tr ON tr.id = e.travelFk 
+		INNER JOIN vn.volumeConfig vc 
+		INNER JOIN vn.item i ON i.id = b.itemFk 
+		INNER JOIN vn.itemType it ON it.id = i.typeFk
+		WHERE tr.landed = vDated
+			AND tr.agencyFk IN (0, vAgency)
+		GROUP BY Temp;
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -42985,9 +45546,8 @@ proc: BEGIN
  * @param vWarehouseFk warehouse de salida del pedido
  * @param tmp.ticketLot (warehouseFk, available, itemFk, buyFk, zoneFk)
  *
- * @return tmp.ticketComponent(itemFk, warehouseFk, available, rate2, rate3, minPrice,
- *		packing, grouping, groupingMode, buyFk, typeFk)
- * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, grouping, price)
+ * @return tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+ * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
  */
 	DECLARE vClientFk INT;
     DECLARE vGeneralInflationCoefficient INT DEFAULT 1;
@@ -43009,6 +45569,7 @@ proc: BEGIN
     DECLARE vMaxLogifloraDays INT;
     DECLARE vRangeLogifloraDays INT DEFAULT 3;
     DECLARE vVisibleCache INT;
+    DECLARE vRappelComponent INT DEFAULT 44;
 
     SELECT volume INTO vBoxVolume
 		FROM vn.packaging
@@ -43028,13 +45589,13 @@ proc: BEGIN
 	SELECT travellingDays INTO vMaxLogifloraDays
 		FROM edi.warehouseFloramondo
         WHERE warehouseFk = vWarehouseFk;
-
-    
-    
+  
     IF (NOT vIsLogifloraAllowed AND vVNHWarehouseFk != vWarehouseFk) 
-		OR (vShipped > TIMESTAMPADD(DAY, vMaxLogifloraDays + vRangeLogifloraDays, CURDATE()) ) 
+		OR (vn.isLogifloraDay(vShipped, vWarehouseFk) = FALSE)
 	THEN
+	
 		CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
+
     	DELETE tl FROM tmp.ticketLot tl
 	    		JOIN item i ON i.id = tl.itemFk
 	    		LEFT JOIN cache.visible v ON v.calc_id = vVisibleCache AND v.item_id = i.id
@@ -43047,8 +45608,36 @@ proc: BEGIN
 		    							AND t.zoneFk = vZoneFk) sub ON sub.itemFk = i.id
 	    	WHERE i.supplyResponseFk
 	    		AND ISNULL(sub.itemFk)
-	    		AND IFNULL(v.visible ,0) = 0;
+	    		AND IFNULL(v.visible,0) = 0
+	    		AND vWarehouseFk = tl.warehouseFk;
+	    	
     END IF;
+   
+    -- Eliminem productes de la oferta que no deuen vore els francesos
+     IF vIsFrenchVNHBuyer THEN
+     
+		
+		CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
+        
+    	DELETE tl FROM tmp.ticketLot tl
+	    		JOIN item i ON i.id = tl.itemFk
+                JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
+                JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
+	    		LEFT JOIN cache.visible v ON v.calc_id = vVisibleCache AND v.item_id = i.id
+	    		LEFT JOIN (SELECT DISTINCT s.itemFk
+	    						FROM vn.sale s
+		    						JOIN vn.ticket t ON t.id = s.ticketFk
+		    						WHERE t.warehouseFk = vWarehouseFk
+		    							AND t.addressFk = vAddressFk
+		    							AND t.shipped = vShipped
+		    							AND t.zoneFk = vZoneFk) sub ON sub.itemFk = i.id
+	    	WHERE mp.isEarlyBird = FALSE
+				AND IFNULL(sub.itemFk,0) = 0
+	    		AND IFNULL(v.visible ,0) = 0
+                ;
+			
+    END IF;
+    
 
     SET @rate2 := 0;
     SET @rate3 := 0;
@@ -43128,13 +45717,7 @@ proc: BEGIN
 			GROUP BY tc.itemFk, warehouseFk;
 			
 	-- RECOBRO
-	/*
-    INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.priceIncreasing, 0.25), 3)
-			FROM tmp.ticketComponentBase tcb
-			JOIN claimRatio cr ON cr.clientFk = vClientFk
-				WHERE cr.priceIncreasing > 0.009;
-     */
+	
      INSERT INTO tmp.ticketComponent
 		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, 
 			ROUND(tcb.base * LEAST(MAX(GREATEST(IFNULL(cr.priceIncreasing,0), IFNULL(cr1.priceIncreasing,0), IFNULL(cr2.priceIncreasing,0))), 0.25), 3)
@@ -43147,7 +45730,7 @@ proc: BEGIN
 				WHERE GREATEST(IFNULL(cr.priceIncreasing,0), IFNULL(cr1.priceIncreasing,0), IFNULL(cr2.priceIncreasing,0)) > 0.009
                 GROUP BY tcb.itemFk;
      
-     
+	-- Mana auto
     INSERT INTO tmp.ticketComponent
 		SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
 			FROM tmp.ticketComponentBase tcb
@@ -43156,6 +45739,7 @@ proc: BEGIN
 			WHERE wm.isPricesModifierActivated
 			HAVING manaAuto <> 0;
 	
+    -- Precios especiales
 	INSERT INTO tmp.ticketComponent
 		SELECT tcb.warehouseFk, 
                 tcb.itemFk, 
@@ -43172,6 +45756,7 @@ proc: BEGIN
                 AND sp.value IS NULL
                 AND i.supplyResponseFk IS NULL; -- FLORAMONDO
 	
+    -- Venta por paquetes
 	INSERT INTO tmp.ticketComponent
 		SELECT tcc.warehouseFk, tcc.itemFk, vSellByPacketComponent, tcc.rate2 - tcc.rate3 
 			FROM tmp.ticketComponentCalculate tcc
@@ -43188,21 +45773,13 @@ proc: BEGIN
         SELECT vZoneFk id;
         
 	CALL zone_getOptionsForShipment(vShipped, TRUE);
-        
+	
+    -- Reparto
 	INSERT INTO tmp.ticketComponent
 		SELECT tcc.warehouseFK, 
 				tcc.itemFk,
 				vDeliveryComponent, 
-				vGeneralInflationCoefficient
-                * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / vBoxVolume, 4) cost
-				/*
-                * ROUND((
-					i.compression -- PAK 2020/06/19  
-					* ic.cm3 
-					 * IF(am.deliveryMethodFk = 1, (GREATEST(i.density, vMinimumDensityWeight) / vMinimumDensityWeight), 1) -- el packingOut soluciona este problema
-					* IFNULL((zo.price - zo.bonus)
-					 * amz.inflation , 50)) / vBoxVolume, 4
-				) cost */
+				vGeneralInflationCoefficient * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / vBoxVolume, 4) cost
 		FROM tmp.ticketComponentCalculate tcc
 			JOIN item i ON i.id = tcc.itemFk
             JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
@@ -43214,6 +45791,7 @@ proc: BEGIN
     
     DROP TEMPORARY TABLE tmp.zoneOption;
     
+    -- Extra reparto
     IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = vAddressFk) THEN
 		INSERT INTO tmp.ticketComponent
 			SELECT tcc.warehouseFk, b.itemFk, vExtraBaggedComponent, ap.packagingValue cost
@@ -43225,7 +45803,8 @@ proc: BEGIN
     DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCopy;
     CREATE TEMPORARY TABLE tmp.ticketComponentCopy ENGINE = MEMORY
 		SELECT * FROM tmp.ticketComponent;
-        
+    
+    -- Precio especial
 	INSERT INTO tmp.ticketComponent
 		SELECT tcc.warehouseFk, 
 				tcc.itemFk, 
@@ -43237,6 +45816,18 @@ proc: BEGIN
 			WHERE c.classRate IS NULL
 			GROUP BY tcc.itemFk, tcc.warehouseFk
 			HAVING ABS(sumCost) > 0.001;
+            
+	-- Rappel cadena
+	INSERT INTO tmp.ticketComponent
+		SELECT tcc.warehouseFk, 
+				tcc.itemFk, 
+				vRappelComponent, 
+				SUM(tcc.cost) * ((1/(1-c.rappel/100)) -1) sumCost
+			FROM tmp.ticketComponentCopy tcc
+				JOIN vn.clientChain cc ON cc.clientFk = vClientFK
+				JOIN vn.`chain` c ON c.id = cc.chainFk
+			GROUP BY tcc.itemFk, tcc.warehouseFk
+			HAVING ABS(sumCost) > 0.001;
 	
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentSum;
 	CREATE TEMPORARY TABLE tmp.ticketComponentSum
@@ -43375,9 +45966,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -43489,6 +46080,7 @@ BEGIN
 		SELECT e.*
 			FROM vn.entry e
 			LEFT JOIN vn.buy b ON b.entryFk = e.id
+			JOIN vn.entryConfig  ec ON e.id != ec.defaultEntry
 		WHERE e.dated < TIMESTAMPADD(MONTH, -3, CURDATE()) AND b.entryFK IS NULL;
 
 	DELETE e
@@ -43510,8 +46102,29 @@ BEGIN
 		FROM tmp.routeToDelete tmp
 		JOIN vn.route r ON  r.id = tmp.id;
         
+    -- borrar registros de dua y awb menores a 2 años
+    DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
+	CREATE TEMPORARY TABLE tmp.duaToDelete
+		SELECT * 
+        FROM vn.dua 
+        WHERE operated < TIMESTAMPADD(YEAR,-2,CURDATE()); 
+
+	UPDATE  tmp.duaToDelete tm
+		JOIN vn.dms d ON d.id = tm.gestdocFk
+		SET d.dmsTypeFk = vTrashId;
+
+	DELETE d
+		FROM tmp.duaToDelete tmp
+		JOIN vn.dua d ON d.id = tmp.id;
+           
+    DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,CURDATE());        
+        
+    -- Borra los ficheros gestDoc     
+    INSERT INTO vn.printServerQueue(priorityFk, reportFk)VALUES(1,11);    
+        
     DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
     DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
+	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
     
     DELETE FROM travelLog WHERE creationDate < v3Month;
     
@@ -43536,85 +46149,87 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `clean_logiflora`()
-BEGIN
+BEGIN
 	/* partir en 2 procedimientos, uno que borre compras y otro articulos
 	 * item_clean, buy_clean
 	 * */
-	
-	DECLARE vDone INT DEFAULT FALSE;
-	DECLARE vBuyFk INT;
-	DECLARE cur1 CURSOR FOR SELECT id FROM tmp.buy;
-	DECLARE cur2 CURSOR FOR SELECT id FROM tmp.item;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.buy;
-
-	CREATE TEMPORARY TABLE tmp.buy
-	ENGINE = MEMORY
-		SELECT b.id
-		FROM vn.buy b
-			JOIN vn.entry e ON e.id = b.entryFk
-			JOIN vn.travel tr ON tr.id = e.travelFk 
-			JOIN vn.agencyMode am ON am.id = tr.agencyFk 
-		WHERE b.quantity = 0
-			AND am.name = 'LOGIFLORA'
-			AND e.isRaid;
-
-	OPEN cur1;
-
- 	read_loop: LOOP
- 
- 		SET vDone = FALSE;
- 
-    	FETCH cur1 INTO vBuyFk;
-    
-	    IF vDone THEN
-			LEAVE read_loop;
-	    END IF;
-    
-		DELETE FROM vn.buy WHERE id = vBuyFk;
-    
-  	END LOOP;
-
-  	CLOSE cur1;
-	
-  	DROP TEMPORARY TABLE tmp.buy;
-  
-  	DROP TEMPORARY TABLE IF EXISTS tmp.item;
-
-	CREATE TEMPORARY TABLE tmp.item
-	ENGINE = MEMORY
-	SELECT DISTINCT i.id
-		FROM vn.item i
-			LEFT JOIN hedera.orderRow o ON o.itemFk = i.id
-			LEFT JOIN vn.sale s ON s.itemFk = i.id
-			LEFT JOIN vn.buy b ON b.itemFk = i.id  
-		WHERE i.supplyResponseFk 
-				AND o.id IS NULL
-				AND b.id IS NULL 
-				AND s.id IS NULL;
-			
-	OPEN cur2;
-
- 	read_loop: LOOP
- 
- 		SET vDone = FALSE;
- 
-    	FETCH cur2 INTO vBuyFk;
-    
-	    IF vDone THEN
-			LEAVE read_loop;
-	    END IF;
-    
-    	DELETE FROM vn.item WHERE id = vBuyFk;
-    
-  	END LOOP;
-
-  	CLOSE cur2;
-	
-  	DROP TEMPORARY TABLE tmp.item;
-    
+	
+	DECLARE vMaxDated DATE DEFAULT TIMESTAMPADD(DAY, - 7, CURDATE());
+	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vBuyFk INT;
+	DECLARE cur1 CURSOR FOR SELECT id FROM tmp.buy;
+	DECLARE cur2 CURSOR FOR SELECT id FROM tmp.item;
+	
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.buy;
+
+	CREATE TEMPORARY TABLE tmp.buy
+	ENGINE = MEMORY
+		SELECT b.id
+		FROM vn.buy b
+			JOIN vn.entry e ON e.id = b.entryFk
+			JOIN vn.travel tr ON tr.id = e.travelFk 
+			JOIN vn.agencyMode am ON am.id = tr.agencyFk 
+		WHERE b.quantity = 0
+			AND am.name = 'LOGIFLORA'
+			AND e.isRaid;
+
+	OPEN cur1;
+
+ 	read_loop: LOOP
+ 
+ 		SET vDone = FALSE;
+ 
+    	FETCH cur1 INTO vBuyFk;
+    
+	    IF vDone THEN
+			LEAVE read_loop;
+	    END IF;
+    
+		DELETE FROM vn.buy WHERE id = vBuyFk;
+    
+  	END LOOP;
+
+  	CLOSE cur1;
+	
+  	DROP TEMPORARY TABLE tmp.buy;
+  
+  	DROP TEMPORARY TABLE IF EXISTS tmp.item;
+
+	CREATE TEMPORARY TABLE tmp.item
+	ENGINE = MEMORY
+	SELECT DISTINCT i.id
+		FROM vn.item i
+			LEFT JOIN hedera.orderRow o ON o.itemFk = i.id
+			LEFT JOIN vn.sale s ON s.itemFk = i.id
+			LEFT JOIN vn.buy b ON b.itemFk = i.id  
+		WHERE i.supplyResponseFk 
+				AND o.id IS NULL
+				AND b.id IS NULL 
+				AND s.id IS NULL
+				AND i.created < vMaxDated;
+			
+	OPEN cur2;
+
+ 	read_loop: LOOP
+ 
+ 		SET vDone = FALSE;
+ 
+    	FETCH cur2 INTO vBuyFk;
+    
+	    IF vDone THEN
+			LEAVE read_loop;
+	    END IF;
+    
+    	DELETE FROM vn.item WHERE id = vBuyFk;
+    
+  	END LOOP;
+
+  	CLOSE cur2;
+	
+  	DROP TEMPORARY TABLE tmp.item;
+    
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -44852,7 +47467,7 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `cmr_new` */;
+/*!50003 DROP PROCEDURE IF EXISTS `cmr_getByTicket` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -44862,7 +47477,44 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `cmr_new`(vTicketFk INT)
+CREATE DEFINER=`root`@`%` PROCEDURE `cmr_getByTicket`(vTicketFk INT)
+BEGIN
+	IF vTicketFk THEN
+		IF (SELECT count(ticketFk) FROM vn.cmr WHERE ticketFk = vTicketFk) THEN
+			SELECT id FROM vn.cmr WHERE ticketFk = vTicketFk;
+		ELSE
+			INSERT INTO vn.cmr(ticketFk, companyFk, addressFromFk, addressToFk, supplierFk)
+				SELECT vTicketFk, t.companyFk, a.id, t.addressFk, ag.supplierFk
+					FROM vn.ticket t
+						JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+						JOIN vn.agency ag ON ag.id = am.agencyFk
+						JOIN vn.company cm  ON cm.id = t.companyFk
+						JOIN vn.client c ON c.id = cm.clientFk
+						JOIN vn.address a ON a.clientFk = c.id AND a.isDefaultAddress
+					WHERE t.id = vTicketFk;
+			SELECT LAST_INSERT_ID();
+		END IF;
+	ELSE
+		INSERT INTO vn.cmr(created) VALUES(NOW());
+		SELECT LAST_INSERT_ID();
+	END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `cmr_new__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `cmr_new__`(vTicketFk INT)
 BEGIN
 
 	IF vTicketFk THEN
@@ -48223,6 +50875,32 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ediTables_Update` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`z-developer`@`%` PROCEDURE `ediTables_Update`()
+BEGIN
+	
+	INSERT IGNORE INTO vn.genus(name) 
+		SELECT latin_genus_name
+			FROM edi.genus ;
+
+	INSERT IGNORE INTO vn.specie(name) 
+		SELECT LCASE(latin_species_name) 
+			FROM edi.specie ;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ektEntryAssign_setEntry` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -48342,6 +51020,82 @@ OPEN cur1;
 
   CLOSE cur1;
 	
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ekt_add` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `ekt_add`(vPutOrderFk INT)
+BEGIN
+	
+/**
+ *  Añade ekt para las ordenes de compra de proveedores que no envian el ekt por email
+ * 
+ * @param vPutOrderFk PutOrderId de donde coger los datos
+ **/
+	
+	INSERT INTO edi.ekt(entryYear, 
+						deliveryNumber, 
+						fec,
+						hor,
+						item,
+						pac,
+						qty,
+						ori,
+						cat,
+						pro,
+						pri,
+						package,
+						s1,
+						s2,
+						s3,
+						s4,
+						s5,
+						s6,
+						putOrderFk,
+						`ref`,
+						kop)
+		SELECT year(curdate()) entryYear,
+				p.id deliveryNumber ,
+				CURDATE() fec,
+				CURTIME() hor,
+				i.longName item,
+				sr.NumberOfItemsPerCask pac,
+				p.quantity qty,
+				o.code ori,
+				i.category cat,
+				mp.supplierFk pro,
+				sr.Price pri,
+				sr.EmbalageCode package,
+				i.value5 s1,
+				i.value6 s2,
+				i.value7 s3,
+				i.value8 s4,
+				i.value9 s5,
+				i.value10 s6,
+				p.id putOrderFk,
+				sr.Item_ArticleCode,
+				sr.vmpID 
+			FROM edi.putOrder p
+				JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID 
+				JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID 
+				JOIN vn.item i ON i.supplyResponseFk = sr.ID 
+				JOIN vn.origin o ON o.id = i.originFk 
+			WHERE p.id = vPutOrderFk;
+				
+	CALL edi.ekt_load(LAST_INSERT_ID());
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -48392,216 +51146,216 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `entryConverter`(IN `vEntry` INT)
-BEGIN
-
-    DECLARE vWarehouseIn INT;
-    DECLARE vWarehouseOut INT;
-    DECLARE vTravel INT;
-
-    DECLARE done BOOL DEFAULT FALSE;
-
-    DECLARE vId_Entrada INT;
-    DECLARE vId_Article INT;
-    DECLARE vEtiquetas INT;
-    DECLARE vId_Cubo VARCHAR(10);
-    DECLARE vPacking INT;
-    DECLARE vGrouping INT;
-    DECLARE vCantidad INT;    
-    DECLARE vCostefijo DECIMAL(10,3);
-    DECLARE vPortefijo DECIMAL(10,3);
-    DECLARE vEmbalajefijo DECIMAL(10);
-    DECLARE vComisionfija DECIMAL(10,3);
-    DECLARE vCaja INT;
-    DECLARE vNicho VARCHAR(5);
-    DECLARE vTarifa1 DECIMAL(10,2);
-    DECLARE vTarifa2 DECIMAL(10,2);
-    DECLARE vTarifa3 DECIMAL(10,2);
-    DECLARE vPVP DECIMAL(10,2);
-    DECLARE vCompra INT;
-
-    DECLARE rs CURSOR FOR
-		SELECT 
-                b.Id_Entrada,
-                b.Id_Article,
-                b.Etiquetas,
-                b.Id_Cubo,
-                b.Packing,
-                b.`grouping`,
-                b.Cantidad,    
-                b.Costefijo,
-                b.Portefijo,
-                b.Embalajefijo,
-                b.Comisionfija,
-                b.caja,
-                b.Nicho,
-                b.Tarifa1,
-                b.Tarifa2,
-                b.Tarifa3,
-                b.PVP 
-            FROM vn2008.Compres b 
-                JOIN vn.itemConversor ic ON ic.espItemFk = b.Id_Article
-            WHERE Id_Entrada = vEntry;
-
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
-    SELECT warehouseInFk, warehouseOutFk, tr.id
-            INTO vWarehouseIn, vWarehouseOut, vTravel
-        FROM travel tr 
-            JOIN entry e ON e.travelFk = tr.id
-        WHERE e.id = vEntry;
-
-    UPDATE travel 
-        SET warehouseInFk = vWarehouseOut,
-            warehouseOutFk = vWarehouseIn
-        WHERE id = vTravel;
-        
-	UPDATE vn2008.Compres c 
-		LEFT JOIN vn.itemConversor ic ON ic.espItemFk = c.Id_Article
-		SET Etiquetas = 0, Cantidad = 0
-		WHERE c.Id_Entrada = vEntry
-			AND ic.espItemFk IS NULL;
-
-    OPEN rs;
-    
-    DELETE FROM vn2008.Compres WHERE Id_Entrada = vEntry;
-
-    FETCH rs INTO  
-                    vId_Entrada,
-                    vId_Article,
-                    vEtiquetas,
-                    vId_Cubo,
-                    vPacking,
-                    vGrouping,
-                    vCantidad,
-                    vCostefijo,
-                    vPortefijo,
-                    vEmbalajefijo,
-                    vComisionfija,
-                    vCaja,
-                    vNicho,
-                    vTarifa1,
-                    vTarifa2,
-                    vTarifa3,
-                    vPVP;
-
-    WHILE NOT done DO
-
-        -- Primero la linea original con las cantidades invertidas
-        INSERT INTO vn2008.Compres
-                    (
-                    Id_Entrada,
-                    Id_Article,
-                    Etiquetas,
-                    Id_Cubo,
-                    Packing,
-                    `grouping`,
-                    Cantidad,    
-                    Costefijo,
-                    Portefijo,
-                    Embalajefijo,
-                    Comisionfija,
-                    caja,
-                    Nicho,
-                    Tarifa1,
-                    Tarifa2,
-                    Tarifa3,
-                    PVP    
-                    )
-            VALUES
-                    (
-                    vId_Entrada,
-                    vId_Article,
-                    - vEtiquetas,
-                    vId_Cubo,
-                    vPacking,
-                    vGrouping,
-                    - vCantidad,
-                    vCostefijo,
-                    vPortefijo,
-                    vEmbalajefijo,
-                    vComisionfija,
-                    vCaja,
-                    vNicho,
-                    vTarifa1,
-                    vTarifa2,
-                    vTarifa3,
-                    vPVP);
-
-            -- Ahora la linea nueva, con el item genérico
-            INSERT INTO vn2008.Compres
-                    (
-                    Id_Entrada,
-                    Id_Article,
-                    Etiquetas,
-                    Id_Cubo,
-                    Packing,
-                    `grouping`,
-                    Cantidad,    
-                    Costefijo,
-                    Portefijo,
-                    Embalajefijo,
-                    Comisionfija,
-                    caja,
-                    Nicho,
-                    Tarifa1,
-                    Tarifa2,
-                    Tarifa3,
-                    PVP    
-                    )
-            SELECT 
-                    vId_Entrada,
-                    genItemFk as Id_Article,
-                    vEtiquetas,
-                    vId_Cubo,
-                    vPacking,
-                    vGrouping,
-                    vCantidad,
-                    vCostefijo,
-                    vPortefijo,
-                    vEmbalajefijo,
-                    vComisionfija,
-                    vCaja,
-                    vNicho,
-                    vTarifa1,
-                    vTarifa2,
-                    vTarifa3,
-                    vPVP
-                FROM itemConversor 
-                WHERE espItemFk = vId_Article;
-
-            SELECT LAST_INSERT_ID() 
-                INTO vCompra;
-
-		    REPLACE vn2008.Compres_mark(Id_Compra,`comment`) 
-			    SELECT vCompra, vId_Article;
-
-
-        FETCH rs INTO  
-                        vId_Entrada,
-                        vId_Article,
-                        vEtiquetas,
-                        vId_Cubo,
-                        vPacking,
-                        vGrouping,
-                        vCantidad,
-                        vCostefijo,
-                        vPortefijo,
-                        vEmbalajefijo,
-                        vComisionfija,
-                        vCaja,
-                        vNicho,
-                        vTarifa1,
-                        vTarifa2,
-                        vTarifa3,
-                        vPVP;
-
-    END WHILE;
-
-
-    CLOSE rs;
-
-
-
+BEGIN
+
+    DECLARE vWarehouseIn INT;
+    DECLARE vWarehouseOut INT;
+    DECLARE vTravel INT;
+
+    DECLARE done BOOL DEFAULT FALSE;
+
+    DECLARE vId_Entrada INT;
+    DECLARE vId_Article INT;
+    DECLARE vEtiquetas INT;
+    DECLARE vId_Cubo VARCHAR(10);
+    DECLARE vPacking INT;
+    DECLARE vGrouping INT;
+    DECLARE vCantidad INT;    
+    DECLARE vCostefijo DECIMAL(10,3);
+    DECLARE vPortefijo DECIMAL(10,3);
+    DECLARE vEmbalajefijo DECIMAL(10);
+    DECLARE vComisionfija DECIMAL(10,3);
+    DECLARE vCaja INT;
+    DECLARE vNicho VARCHAR(5);
+    DECLARE vTarifa1 DECIMAL(10,2);
+    DECLARE vTarifa2 DECIMAL(10,2);
+    DECLARE vTarifa3 DECIMAL(10,2);
+    DECLARE vPVP DECIMAL(10,2);
+    DECLARE vCompra INT;
+
+    DECLARE rs CURSOR FOR
+		SELECT 
+                b.Id_Entrada,
+                b.Id_Article,
+                b.Etiquetas,
+                b.Id_Cubo,
+                b.Packing,
+                b.`grouping`,
+                b.Cantidad,    
+                b.Costefijo,
+                b.Portefijo,
+                b.Embalajefijo,
+                b.Comisionfija,
+                b.caja,
+                b.Nicho,
+                b.Tarifa1,
+                b.Tarifa2,
+                b.Tarifa3,
+                b.PVP 
+            FROM vn2008.Compres b 
+                JOIN vn.itemConversor ic ON ic.espItemFk = b.Id_Article
+            WHERE Id_Entrada = vEntry;
+
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+    SELECT warehouseInFk, warehouseOutFk, tr.id
+            INTO vWarehouseIn, vWarehouseOut, vTravel
+        FROM travel tr 
+            JOIN entry e ON e.travelFk = tr.id
+        WHERE e.id = vEntry;
+
+    UPDATE travel 
+        SET warehouseInFk = vWarehouseOut,
+            warehouseOutFk = vWarehouseIn
+        WHERE id = vTravel;
+        
+	UPDATE vn2008.Compres c 
+		LEFT JOIN vn.itemConversor ic ON ic.espItemFk = c.Id_Article
+		SET Etiquetas = 0, Cantidad = 0
+		WHERE c.Id_Entrada = vEntry
+			AND ic.espItemFk IS NULL;
+
+    OPEN rs;
+    
+    DELETE FROM vn2008.Compres WHERE Id_Entrada = vEntry;
+
+    FETCH rs INTO  
+                    vId_Entrada,
+                    vId_Article,
+                    vEtiquetas,
+                    vId_Cubo,
+                    vPacking,
+                    vGrouping,
+                    vCantidad,
+                    vCostefijo,
+                    vPortefijo,
+                    vEmbalajefijo,
+                    vComisionfija,
+                    vCaja,
+                    vNicho,
+                    vTarifa1,
+                    vTarifa2,
+                    vTarifa3,
+                    vPVP;
+
+    WHILE NOT done DO
+
+        -- Primero la linea original con las cantidades invertidas
+        INSERT INTO vn2008.Compres
+                    (
+                    Id_Entrada,
+                    Id_Article,
+                    Etiquetas,
+                    Id_Cubo,
+                    Packing,
+                    `grouping`,
+                    Cantidad,    
+                    Costefijo,
+                    Portefijo,
+                    Embalajefijo,
+                    Comisionfija,
+                    caja,
+                    Nicho,
+                    Tarifa1,
+                    Tarifa2,
+                    Tarifa3,
+                    PVP    
+                    )
+            VALUES
+                    (
+                    vId_Entrada,
+                    vId_Article,
+                    - vEtiquetas,
+                    vId_Cubo,
+                    vPacking,
+                    vGrouping,
+                    - vCantidad,
+                    vCostefijo,
+                    vPortefijo,
+                    vEmbalajefijo,
+                    vComisionfija,
+                    vCaja,
+                    vNicho,
+                    vTarifa1,
+                    vTarifa2,
+                    vTarifa3,
+                    vPVP);
+
+            -- Ahora la linea nueva, con el item genérico
+            INSERT INTO vn2008.Compres
+                    (
+                    Id_Entrada,
+                    Id_Article,
+                    Etiquetas,
+                    Id_Cubo,
+                    Packing,
+                    `grouping`,
+                    Cantidad,    
+                    Costefijo,
+                    Portefijo,
+                    Embalajefijo,
+                    Comisionfija,
+                    caja,
+                    Nicho,
+                    Tarifa1,
+                    Tarifa2,
+                    Tarifa3,
+                    PVP    
+                    )
+            SELECT 
+                    vId_Entrada,
+                    genItemFk as Id_Article,
+                    vEtiquetas,
+                    vId_Cubo,
+                    vPacking,
+                    vGrouping,
+                    vCantidad,
+                    vCostefijo,
+                    vPortefijo,
+                    vEmbalajefijo,
+                    vComisionfija,
+                    vCaja,
+                    vNicho,
+                    vTarifa1,
+                    vTarifa2,
+                    vTarifa3,
+                    vPVP
+                FROM itemConversor 
+                WHERE espItemFk = vId_Article;
+
+            SELECT LAST_INSERT_ID() 
+                INTO vCompra;
+
+		    REPLACE vn2008.Compres_mark(Id_Compra,`comment`) 
+			    SELECT vCompra, vId_Article;
+
+
+        FETCH rs INTO  
+                        vId_Entrada,
+                        vId_Article,
+                        vEtiquetas,
+                        vId_Cubo,
+                        vPacking,
+                        vGrouping,
+                        vCantidad,
+                        vCostefijo,
+                        vPortefijo,
+                        vEmbalajefijo,
+                        vComisionfija,
+                        vCaja,
+                        vNicho,
+                        vTarifa1,
+                        vTarifa2,
+                        vTarifa3,
+                        vPVP;
+
+    END WHILE;
+
+
+    CLOSE rs;
+
+
+
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -48663,62 +51417,62 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `entryPrepare`(IN `idE` BIGINT)
-BEGIN
- SELECT
-        b.quantity / b.packing AS Paquetes,
-        b.packing AS `Grouping`,
-        barcode,
-        'ASEGURADO' AS asegurado,
-        ic.name,
-        ic.order,
-        s.name AS Consignatario,
-        e.supplierFk AS Id_Cliente,
-        e.isOrdered,
-        e.isConfirmed,
-        10 AS Calidad,
-        LPAD(IFNULL(cpd.id, ip.code),
-                5,
-                '0') AS path,
-        b.entryFk AS Id_Ticket,
-        t.landed AS Fecha,
-        b.itemFk,
-        b.quantity,
-        i.name AS Concepte,
-        i.size,
-        i.inkFk,
-        i.category,
-        o.code AS Origen,
-        0 AS Bultos,
-        wIn.`name` AS Tipo,
-        0 AS OK,
-        0 AS Reservado,
-        i.stems,
-        b.id AS Id_Movimiento,
-        ip.code,
-        'PEDIDO ASEGURADO' AS MSG,
-        0 AS Seguro,
-        i.image,
-        pr.name AS producer
-         FROM vn.buy b
-        JOIN vn.entry e ON b.entryFk = e.id
-        JOIN vn.travel t ON t.id = e.travelFk
-        JOIN vn.warehouse wIn ON wIn.id = t.warehouseInFk
-        JOIN vn.warehouse wOut ON wOut.id = t.warehouseOutFk
-        JOIN vn.item i ON i.id = b.itemFk                                       
-        JOIN vn.itemType it ON it.id =i.typeFk
-        JOIN vn.itemCategory ic ON ic.id = it.categoryFk
-        JOIN vn.packaging pkg ON pkg.id = b.packageFk
-        LEFT JOIN vn.itemPlacement ip ON i.id = ip.itemFk AND ip.warehouseFk = wIn.id AND ip.warehouseFk = t.warehouseOutFk
-        LEFT JOIN (SELECT itemFk, code AS barcode FROM vn.itemBarcode GROUP BY itemFk) ib ON ib.itemFk = b.itemFk
-        LEFT JOIN vn.origin o ON o.id = i.originFk
-        LEFT JOIN vn.supplier s ON s.id = e.supplierFk
-        LEFT JOIN vn.producer pr on pr.id = i.producerFk
-        LEFT JOIN vn.coolerPathDetail cpd ON LEFT(ip.code, 3) = cpd.hallway
-    WHERE
-        NOT wIn.isFeedStock AND NOT e.isInventory AND NOT e.isRaid
-        AND e.id = 158772
-        AND i.typeFk IS NOT NULL
-        AND ic.merchandise IS NOT FALSE;
+BEGIN
+ SELECT
+        b.quantity / b.packing AS Paquetes,
+        b.packing AS `Grouping`,
+        barcode,
+        'ASEGURADO' AS asegurado,
+        ic.name,
+        ic.order,
+        s.name AS Consignatario,
+        e.supplierFk AS Id_Cliente,
+        e.isOrdered,
+        e.isConfirmed,
+        10 AS Calidad,
+        LPAD(IFNULL(cpd.id, ip.code),
+                5,
+                '0') AS path,
+        b.entryFk AS Id_Ticket,
+        t.landed AS Fecha,
+        b.itemFk,
+        b.quantity,
+        i.name AS Concepte,
+        i.size,
+        i.inkFk,
+        i.category,
+        o.code AS Origen,
+        0 AS Bultos,
+        wIn.`name` AS Tipo,
+        0 AS OK,
+        0 AS Reservado,
+        i.stems,
+        b.id AS Id_Movimiento,
+        ip.code,
+        'PEDIDO ASEGURADO' AS MSG,
+        0 AS Seguro,
+        i.image,
+        pr.name AS producer
+         FROM vn.buy b
+        JOIN vn.entry e ON b.entryFk = e.id
+        JOIN vn.travel t ON t.id = e.travelFk
+        JOIN vn.warehouse wIn ON wIn.id = t.warehouseInFk
+        JOIN vn.warehouse wOut ON wOut.id = t.warehouseOutFk
+        JOIN vn.item i ON i.id = b.itemFk                                       
+        JOIN vn.itemType it ON it.id =i.typeFk
+        JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+        JOIN vn.packaging pkg ON pkg.id = b.packageFk
+        LEFT JOIN vn.itemPlacement ip ON i.id = ip.itemFk AND ip.warehouseFk = wIn.id AND ip.warehouseFk = t.warehouseOutFk
+        LEFT JOIN (SELECT itemFk, code AS barcode FROM vn.itemBarcode GROUP BY itemFk) ib ON ib.itemFk = b.itemFk
+        LEFT JOIN vn.origin o ON o.id = i.originFk
+        LEFT JOIN vn.supplier s ON s.id = e.supplierFk
+        LEFT JOIN vn.producer pr on pr.id = i.producerFk
+        LEFT JOIN vn.coolerPathDetail cpd ON LEFT(ip.code, 3) = cpd.hallway
+    WHERE
+        NOT wIn.isFeedStock AND NOT e.isInventory AND NOT e.isRaid
+        AND e.id = 158772
+        AND i.typeFk IS NOT NULL
+        AND ic.merchandise IS NOT FALSE;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -48792,6 +51546,39 @@ BEGIN
 
 	CALL vn.ticket_recalcComponents(vTicketFk);
     
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `entryVolume` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`z-developer`@`%` PROCEDURE `entryVolume`(vEntryFk INT)
+BEGIN
+	
+	SELECT ELT(it.temperature + 1,'Calientes','Frios','Secos') AS Temp,  
+		CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+			 vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.carro / 1000000 ,1) AS DECIMAL(10,2)) AS carros ,
+		CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+			 vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.espai / 1000000,1) AS DECIMAL(10,2)) AS espais
+	FROM vn.buy b 
+		INNER JOIN vn.entry e ON e.id = b.entryFk 
+		INNER JOIN vn.travel tr ON tr.id = e.travelFk 
+		INNER JOIN vn.volumeConfig vc 
+		INNER JOIN vn.item i ON i.id = b.itemFk 
+		INNER JOIN vn.itemType it ON it.id = i.typeFk
+		WHERE e.id = vEntryFk 
+		GROUP BY Temp;
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -49592,6 +52379,29 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `getInfoDelivery` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `getInfoDelivery`(vRouteFk INT)
+BEGIN
+	SELECT s.name, s.street, s.city, s.nif, s.postCode FROM vn.route r
+    JOIN vn.agencyMode am ON r.agencyModeFk = am.id
+    JOIN vn.agency a ON am.agencyFk = a.id
+    JOIN vn.supplier s ON a.supplierFk = s.id
+    WHERE r.id = vRouteFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `getItemUbication` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -51439,438 +54249,6 @@ BEGIN
 
 	SELECT CONCAT(vContador, ' total') AS FACTURAS_ASENTADAS;
 
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `invoiceOutBooking__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutBooking__`(IN vInvoice INT)
-BEGIN
--- https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID=15627&&fromListView=true
-/* Asienta la factura emitida
-*
-* param vInvoice factura_id
-*/
-	DECLARE vBookNumber INT;
-    DECLARE vExpenceConcept VARCHAR(50);
-    DECLARE vIsUeeMember BOOL DEFAULT TRUE;
-    DECLARE vSpainCountryFk INT;
-    DECLARE vOldBookNumber INT;
-
-	SELECT id INTO vSpainCountryFk FROM country WHERE code = 'ES';
-
-    SELECT ASIEN
-			INTO vOldBookNumber
-		FROM XDiario x
-			JOIN invoiceOut io ON io.id = vInvoice
-        WHERE x.SERIE = io.serial
-			AND x.FACTURA = RIGHT(io.ref, LENGTH(io.ref) - 1)
-		LIMIT 1;
-
-	DELETE
-		FROM XDiario
-		WHERE ASIEN = vOldBookNumber;
-
-	DROP TEMPORARY TABLE IF EXISTS rs;
-	CREATE TEMPORARY TABLE rs
-		SELECT 
-				c.accountingAccount AS clientBookingAccount,
-				io.amount as totalAmount,
-				CONCAT('n/fra ', io.ref) as simpleConcept,
-				CONCAT('n/fra ', io.ref, ' ', c.name) as Concept,
-				io.serial AS SERIE,
-				io.issued AS FECHA_EX,
-				opDate.FECHA_OP,
-				io.issued AS FECHA,
-				1 AS NFACTICK,
-				IF(ic.correctingFk,'D','') AS  TIPOOPE,
-				io.cplusTrascendency477Fk AS TIPOCLAVE,
-				io.cplusTaxBreakFk AS TIPOEXENCI,
-				io.cplusSubjectOpFk AS TIPONOSUJE,
-				io.cplusInvoiceType477Fk AS TIPOFACT,
-				ic.cplusRectificationTypeFk AS TIPORECTIF,
-				io.companyFk,
-				RIGHT(io.ref, LENGTH(io.ref) - 1) AS invoiceNum,
-                IF(ct.politicalCountryFk = vSpainCountryFk, vSpainCountryFk, IF(ct.isUeeMember = vIsUeeMember,2,4)) AS TERIDNIF,
-				CONCAT(IF(ct.isUeeMember = vIsUeeMember AND ct.politicalCountryFk <> vSpainCountryFk,ct.code,''),c.fi) AS TERNIF,
-				c.socialName AS TERNOM,
-                ior.serial AS SERIE_RT,
-                RIGHT(ior.ref, LENGTH(ior.ref) - 1) AS FACTU_RT,
-                ior.issued AS FECHA_RT,
-                IF(ior.id,TRUE,FALSE) AS RECTIFICA
-		FROM invoiceOut io
-			JOIN (	
-					SELECT GREATEST(MAX(shipped), TIMESTAMPADD(DAY,-15,io.issued)) as FECHA_OP 
-						FROM ticket t
-							JOIN invoiceOut io ON io.ref = t.refFk
-						WHERE io.id = vInvoice ) opDate
-			JOIN invoiceOutSerial ios ON ios.code = io.serial
-			JOIN client c ON c.id = io.clientFk
-			JOIN country ct ON ct.id = c.countryFk
-			LEFT JOIN invoiceCorrection ic ON ic.correctingFk = io.id
-            LEFT JOIN invoiceOut ior ON ior.id = ic.correctedFk
-			WHERE io.id = vInvoice;
-
-	CALL vn.ledger_next(vBookNumber);
-    
-	-- Linea del cliente
-	INSERT INTO XDiario(
-								ASIEN,
-								FECHA,
-								SUBCTA,              
-								EURODEBE,
-								CONCEPTO, 
-								FECHA_EX,
-								FECHA_OP,
-								empresa_id
-								)
-		SELECT 
-				vBookNumber AS ASIEN,
-				rs.FECHA,
-				rs.clientBookingAccount AS SUBCTA,
-				rs.totalAmount AS EURODEBE,
-				rs.simpleConcept AS CONCEPTO,
-				rs.FECHA_EX,
-				rs.FECHA_OP,
-				rs.companyFk AS empresa_id
-			FROM rs;
-
-		-- Lineas de gasto
-		INSERT INTO XDiario(
-									ASIEN,
-									FECHA,
-									SUBCTA,
-									CONTRA,              
-									EUROHABER,
-									CONCEPTO, 
-									FECHA_EX,
-									FECHA_OP,
-									empresa_id
-									)
-		SELECT 
-				vBookNumber AS ASIEN,
-				rs.FECHA,
-				ioe.expenceFk AS SUBCTA,
-				rs.clientBookingAccount AS CONTRA,
-				ioe.amount AS EUROHABER,
-				rs.Concept AS CONCEPTO,
-				rs.FECHA_EX,
-				rs.FECHA_OP,
-				rs.companyFk AS empresa_id
-			FROM rs
-				JOIN invoiceOutExpence ioe
-			WHERE ioe.invoiceOutFk = vInvoice;
-
-    SELECT GROUP_CONCAT(`name` SEPARATOR ',') 
-            INTO vExpenceConcept 
-        FROM expence e
-            JOIN invoiceOutExpence ioe ON ioe.expenceFk = e.id
-        WHERE ioe.invoiceOutFk = vInvoice;
-
-		-- Lineas de IVA
-	INSERT INTO XDiario(
-								ASIEN,
-								FECHA,
-								SUBCTA,
-								CONTRA,              
-								EUROHABER,
-								BASEEURO,
-								CONCEPTO,
-								FACTURA,
-								IVA,
-								RECEQUIV,
-								AUXILIAR,
-								SERIE,
-								SERIE_RT,
-								FACTU_RT,
-								RECTIFICA,
-								FECHA_RT,
-								FECHA_OP,
-								FECHA_EX,
-								TIPOOPE,
-								NFACTICK,
-								TERIDNIF,
-								TERNIF,
-								TERNOM,
-								L340,
-								TIPOCLAVE,
-								TIPOEXENCI,
-								TIPONOSUJE,
-								TIPOFACT,
-								TIPORECTIF,
-								empresa_id
-								)
-		SELECT 
-				vBookNumber AS ASIEN,
-				rs.FECHA,
-				iot.pgcFk AS SUBCTA,
-				rs.clientBookingAccount AS CONTRA,
-				iot.vat AS EUROHABER,
-				iot.taxableBase AS BASEEURO,
-				CONCAT(vExpenceConcept,' : ',rs.Concept) AS CONCEPTO,
-				rs.invoiceNum AS FACTURA,
-                IF(pe2.equFk,0,pgc.rate) AS IVA,
-				IF(pe2.equFk,0,pgce.rate) AS RECEQUIV,
-				IF(pgc.mod347,'','*') AS AUXILIAR,
-				rs.SERIE,
-				rs.SERIE_RT,
-				rs.FACTU_RT,
-				rs.RECTIFICA,
-				rs.FECHA_RT,
-				rs.FECHA_OP,
-				rs.FECHA_EX,
-				rs.TIPOOPE,
-				rs.NFACTICK,   
-				rs.TERIDNIF,
-				rs.TERNIF,
-				rs.TERNOM,
-				pgc.mod340 AS L340,   
-				pgc.cplusTrascendency477Fk AS TIPOCLAVE,
-				pgc.cplusTaxBreakFk as TIPOEXENCI,
-				rs.TIPONOSUJE,
-				rs.TIPOFACT,
-				rs.TIPORECTIF,
-				rs.companyFk AS empresa_id
-			FROM rs
-				JOIN invoiceOutTax iot 
-				JOIN pgc ON pgc.code = iot.pgcFk
-				LEFT JOIN pgcEqu pe ON pe.vatFk = iot.pgcFk		-- --------------- Comprueba si la linea es de iva con rec.equiv. asociado
-				LEFT JOIN pgc pgce ON pgce.code = pe.equFk 
-				LEFT JOIN pgcEqu pe2 ON pe2.equFk = iot.pgcFk  	-- --------------- Comprueba si la linea es de rec.equiv.
-			WHERE iot.invoiceOutFk = vInvoice;
-            
-            UPDATE invoiceOut
-				SET booked = CURDATE()
-                WHERE id = vInvoice;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `invoiceOutBooking___` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOutBooking___`(IN vInvoice INT)
-BEGIN
--- bernat: working in this file
-/* Asienta la factura emitida
-*
-* param vInvoice factura_id
-*/
-
-	DECLARE vBookNumber INT;
-    DECLARE vExpenceConcept VARCHAR(50);
-    DECLARE isUEENotSpain INT DEFAULT 1;
-    DECLARE vSpain INT DEFAULT 1;
-    DECLARE vOldBookNumber INT;
-    
-    SELECT ASIEN
-			INTO vOldBookNumber
-		FROM vn2008.XDiario x
-			JOIN vn.invoiceOut io ON io.id = vInvoice
-        WHERE x.SERIE = io.serial
-			AND x.FACTURA = RIGHT(io.ref, LENGTH(io.ref) - 1)
-		LIMIT 1;
-        
-	DELETE 
-		FROM vn2008.XDiario
-		WHERE ASIEN = vOldBookNumber;
-
-	DROP TEMPORARY TABLE IF EXISTS rs;
-	CREATE TEMPORARY TABLE rs
-		SELECT 
-				c.accountingAccount AS clientBookingAccount,
-				io.amount as totalAmount,
-				CONCAT('n/fra ', io.ref) as simpleConcept,
-				CONCAT('n/fra ', io.ref, ' ', c.name) as Concept,
-				io.serial AS SERIE,
-				io.issued AS FECHA_EX,
-				opDate.FECHA_OP,
-				io.issued AS FECHA,
-				1 AS NFACTICK,
-				IF(ic.correctingFk,'D','') AS  TIPOOPE,
-				io.cplusTrascendency477Fk AS TIPOCLAVE,
-				io.cplusTaxBreakFk AS TIPOEXENCI,
-				io.cplusSubjectOpFk AS TIPONOSUJE,
-				io.cplusInvoiceType477Fk AS TIPOFACT,
-				ic.cplusRectificationTypeFk AS TIPORECTIF,
-				io.companyFk,
-				RIGHT(io.ref, LENGTH(io.ref) - 1) AS invoiceNum,
-                IF(ct.politicalCountryFk = vSpain, 1, IF(ct.CEE = isUEENotSpain,2,4)) AS TERIDNIF,
-				CONCAT(IF(ct.CEE = isUEENotSpain,ct.code,''),c.fi) AS TERNIF,
-				c.socialName AS TERNOM,
-                ior.serial AS SERIE_RT,
-                RIGHT(ior.ref, LENGTH(ior.ref) - 1) AS FACTU_RT,
-                ior.issued AS FECHA_RT,
-                IF(ior.id,TRUE,FALSE) AS RECTIFICA
-
-		FROM invoiceOut io
-			JOIN (	
-					SELECT GREATEST(MAX(shipped), TIMESTAMPADD(DAY,-15,io.issued)) as FECHA_OP 
-						FROM ticket t
-							JOIN invoiceOut io ON io.ref = t.refFk
-						WHERE io.id = vInvoice ) opDate
-			JOIN invoiceOutSerial ios ON ios.code = io.serial
-			JOIN client c ON c.id = io.clientFk
-			JOIN country ct ON ct.id = c.countryFk
-			LEFT JOIN invoiceCorrection ic ON ic.correctingFk = io.id
-            LEFT JOIN invoiceOut ior ON ior.id = ic.correctedFk
-			WHERE io.id = vInvoice;
-
-	SELECT MAX(ASIEN) + 1 
-			INTO vBookNumber
-		FROM vn2008.XDiario;
-    
-	-- Linea del cliente
-	INSERT INTO vn2008.XDiario(
-								ASIEN,
-								FECHA,
-								SUBCTA,              
-								EURODEBE,
-								CONCEPTO, 
-								FECHA_EX,
-								FECHA_OP,
-								empresa_id
-								)
-		SELECT 
-				vBookNumber AS ASIEN,
-				rs.FECHA,
-				rs.clientBookingAccount AS SUBCTA,
-				rs.totalAmount AS EURODEBE,
-				rs.simpleConcept AS CONCEPTO,
-				rs.FECHA_EX,
-				rs.FECHA_OP,
-				rs.companyFk AS empresa_id
-			FROM rs;
-
-		-- Lineas de gasto
-		INSERT INTO vn2008.XDiario(
-									ASIEN,
-									FECHA,
-									SUBCTA,
-									CONTRA,              
-									EUROHABER,
-									CONCEPTO, 
-									FECHA_EX,
-									FECHA_OP,
-									empresa_id
-									)
-		SELECT 
-				vBookNumber AS ASIEN,
-				rs.FECHA,
-				ioe.expenceFk AS SUBCTA,
-				rs.clientBookingAccount AS CONTRA,
-				ioe.amount AS EUROHABER,
-				rs.Concept AS CONCEPTO,
-				rs.FECHA_EX,
-				rs.FECHA_OP,
-				rs.companyFk AS empresa_id
-			FROM rs
-				JOIN invoiceOutExpence ioe
-			WHERE ioe.invoiceOutFk = vInvoice;
-
-    SELECT GROUP_CONCAT(`name` SEPARATOR ',') 
-            INTO vExpenceConcept 
-        FROM expence e
-            JOIN invoiceOutExpence ioe ON ioe.expenceFk = e.id
-        WHERE ioe.invoiceOutFk = vInvoice;
-
-		-- Lineas de IVA
-	INSERT INTO vn2008.XDiario(
-								ASIEN,
-								FECHA,
-								SUBCTA,
-								CONTRA,              
-								EUROHABER,
-								BASEEURO,
-								CONCEPTO,
-								FACTURA,
-								IVA,
-								RECEQUIV,
-								AUXILIAR,
-								SERIE,
-								SERIE_RT,
-								FACTU_RT,
-								RECTIFICA,
-								FECHA_RT,
-								FECHA_OP,
-								FECHA_EX,
-								TIPOOPE,
-								NFACTICK,
-								TERIDNIF,
-								TERNIF,
-								TERNOM,
-								L340,
-								TIPOCLAVE,
-								TIPOEXENCI,
-								TIPONOSUJE,
-								TIPOFACT,
-								TIPORECTIF,
-								empresa_id
-								)
-		SELECT 
-				vBookNumber AS ASIEN,
-				rs.FECHA,
-				iot.pgcFk AS SUBCTA,
-				rs.clientBookingAccount AS CONTRA,
-				iot.vat AS EUROHABER,
-				iot.taxableBase AS BASEEURO,
-				CONCAT(vExpenceConcept,' : ',rs.Concept) AS CONCEPTO,
-				rs.invoiceNum AS FACTURA,
-                IF(pe2.equFk,0,pgc.rate) AS IVA,
-				IF(pe2.equFk,0,pgce.rate) AS RECEQUIV,
-				IF(pgc.mod347,'','*') AS AUXILIAR,
-				rs.SERIE,
-				rs.SERIE_RT,
-				rs.FACTU_RT,
-				rs.RECTIFICA,
-				rs.FECHA_RT,
-				rs.FECHA_OP,
-				rs.FECHA_EX,
-				rs.TIPOOPE,
-				rs.NFACTICK,   
-				rs.TERIDNIF,
-				rs.TERNIF,
-				rs.TERNOM,
-				pgc.mod340 AS L340,   
-				pgc.cplusTrascendency477Fk AS TIPOCLAVE,
-				pgc.cplusTaxBreakFk as TIPOEXENCI,
-				rs.TIPONOSUJE,
-				rs.TIPOFACT,
-				rs.TIPORECTIF,
-				rs.companyFk AS empresa_id
-			FROM rs
-				JOIN invoiceOutTax iot 
-				JOIN pgc ON pgc.code = iot.pgcFk
-				LEFT JOIN pgcEqu pe ON pe.vatFk = iot.pgcFk		-- --------------- Comprueba si la linea es de iva con rec.equiv. asociado
-				LEFT JOIN pgc pgce ON pgce.code = pe.equFk 
-				LEFT JOIN pgcEqu pe2 ON pe2.equFk = iot.pgcFk  	-- --------------- Comprueba si la linea es de rec.equiv.
-			WHERE iot.invoiceOutFk = vInvoice;
-            
-            UPDATE invoiceOut
-				SET booked = CURDATE()
-                WHERE id = vInvoice;
-
-
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -52130,13 +54508,237 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_new`(
+	vSerial VARCHAR(255),
+	vInvoiceDate DATETIME,
+    vTaxArea VARCHAR(25),
+	OUT vNewInvoiceId INT)
+BEGIN
+
+/* Creación de facturas emitidas. 
+* requiere previamente tabla ticketToInvoice(id).
+*
+* @param vSerial serie a la cual se hace la factura
+* @param vInvoiceDate fecha de la factura
+* @param vTaxArea tipo de iva en relacion a la empresa y al cliente
+* @param vNewInvoiceId id de la factura que se acaba de generar
+*
+* @return vNewInvoiceId
+*/
+	
+    DECLARE vSpainCountryCode INT DEFAULT 1;
+	DECLARE vIsAnySaleToInvoice BOOL;
+	DECLARE vIsAnyServiceToInvoice BOOL;
+	DECLARE vNewRef VARCHAR(255);
+	DECLARE vWorker INT DEFAULT account.myUser_getId();
+    DECLARE vCompany INT;
+	DECLARE vClient INT;
+	DECLARE vCplusStandardInvoiceTypeFk INT DEFAULT 1;
+    DECLARE vCplusCorrectingInvoiceTypeFk INT DEFAULT 6;
+	DECLARE vCplusSimplifiedInvoiceTypeFk INT DEFAULT 2;
+    DECLARE vCorrectingSerial VARCHAR(1) DEFAULT 'R';
+	DECLARE vSimplifiedSerial VARCHAR(1) DEFAULT 'S';
+    
+	SET vInvoiceDate = IFNULL(vInvoiceDate,CURDATE());
+
+	SELECT t.clientFk, t.companyFk
+			INTO vClient, vCompany
+		FROM ticketToInvoice tt
+			JOIN ticket t ON t.id = tt.id
+            LIMIT 1;
+
+    -- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+	DELETE ti.* 
+        FROM ticketToInvoice ti 
+            JOIN ticket t ON t.id = ti.id
+            JOIN client c ON c.id = t.clientFk
+        WHERE YEAR(t.shipped) < 2001
+			OR c.isTaxDataChecked = FALSE
+            OR t.isDeleted
+            OR c.hasToInvoice = FALSE;
+
+    SELECT SUM(s.quantity * s.price * (100 - s.discount)/100), ts.id
+            INTO vIsAnySaleToInvoice, vIsAnyServiceToInvoice
+        FROM ticketToInvoice t
+            LEFT JOIN sale s ON s.ticketFk = t.id 
+        	LEFT JOIN ticketService ts ON ts.ticketFk = t.id;
+
+	IF vIsAnySaleToInvoice OR vIsAnyServiceToInvoice THEN
+
+		-- el trigger añade el siguiente Id_Factura correspondiente a la vSerial
+		   -- el trigger añade el siguiente Id_Factura correspondiente a la vSerial
+		INSERT INTO invoiceOut
+		(
+			ref,
+			serial,
+			issued,
+			clientFk,
+			dued,
+			companyFk,
+            cplusInvoiceType477Fk
+		)
+		SELECT 
+				1,
+				vSerial,
+				vInvoiceDate,
+				vClient,
+				getDueDate(vInvoiceDate, dueDay),
+				vCompany,
+                IF(vSerial = vCorrectingSerial, 
+					vCplusCorrectingInvoiceTypeFk, 
+					IF(vSerial = vSimplifiedSerial,
+						vCplusSimplifiedInvoiceTypeFk,
+						vCplusStandardInvoiceTypeFk))
+            FROM client
+            WHERE id = vClient;
+
+
+		SET vNewInvoiceId = LAST_INSERT_ID();
+        
+		SELECT `ref`
+				INTO vNewRef 
+			FROM invoiceOut
+			WHERE id = vNewInvoiceId;
+
+		UPDATE ticket t
+    			JOIN ticketToInvoice ti ON ti.id = t.id
+        	SET t.refFk = vNewRef;
+
+		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
+        CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
+			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador 
+				FROM ticketToInvoice ti
+					LEFT JOIN vn.ticketState ts ON ti.id = ts.ticket
+                    JOIN state s 
+				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = vn.getAlert3State(ti.id);
+	
+		INSERT INTO vncontrol.inter(state_id,Id_Ticket,Id_Trabajador)
+			SELECT * FROM tmp.updateInter;
+            
+
+		INSERT INTO ticketLog (action, userFk,originFk, description) 
+			SELECT 'UPDATE',account.userGetId(),ti.id, CONCAT('Crea factura ',vNewRef)
+				FROM ticketToInvoice ti;
+
+		CALL invoiceExpenceMake(vNewInvoiceId);
+		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
+		
+		UPDATE invoiceOut io
+				JOIN (
+					SELECT SUM(amount) AS total
+						FROM invoiceOutExpence 
+						WHERE invoiceOutFk = vNewInvoiceId
+					) base
+				JOIN (
+					SELECT SUM(vat) AS total
+						FROM invoiceOutTax 
+						WHERE invoiceOutFk = vNewInvoiceId
+					) vat
+			SET io.amount = base.total + vat.total
+			WHERE io.id = vNewInvoiceId;
+		
+		DROP TEMPORARY TABLE tmp.updateInter;
+	END IF;
+    
+	DROP TEMPORARY TABLE `ticketToInvoice`;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `invoiceOut_newFromClient` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_newFromClient`(vClientFk INT, vSerial CHAR(1), vShipped DATE, vCompanyFk INT, vTaxArea VARCHAR(25), OUT vInvoiceId INT)
+BEGIN
+/**
+ * Factura los tickets de un cliente
+ * @param vTicketFk Id del ticket
+ * @param vSerial Serie de factura
+ * @return Id factura
+ */
+	CALL invoiceFromClient(vShipped, vClientFk, vCompanyFk);
+    CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
+
+    IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
+		CALL invoiceOutBooking(vInvoiceId);
+        INSERT INTO printServerQueue(priorityFk, reportFk, param1) VALUES(1, 3, vInvoiceId); 
+    END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `invoiceOut_newFromTicket` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8mb4 */ ;
 /*!50003 SET character_set_results = utf8mb4 */ ;
 /*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_new`(
+CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_newFromTicket`(vTicketFk INT, vSerial CHAR(1), vTaxArea VARCHAR(25), OUT vInvoiceId INT)
+BEGIN
+/**
+ * Factura un ticket
+ * @param vTicketFk Id del ticket
+ * @param vSerial Serie de factura
+ * @param vTaxArea Area de la factura en caso de querer forzarlo, 
+ *     en la mayoria de los casos poner NULL
+ * @return vInvoiceId
+ */
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION 
+		BEGIN 
+			ROLLBACK;
+			RESIGNAL;
+		END;
+              
+	START TRANSACTION;
+	CALL invoiceFromTicket(vTicketFk);
+    CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
+
+    IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
+		CALL invoiceOutBooking(vInvoiceId);
+        IF account.myUser_getId() IS NOT NULL THEN
+            INSERT INTO printServerQueue(priorityFk, reportFk, param1, workerFk) VALUES(1, 3, vInvoiceId, account.myUser_getId()); 
+		END IF;
+    END IF;
+    
+    COMMIT;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `invoiceOut_new__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_new__`(
 	vSerial VARCHAR(255),
 	vInvoiceDate DATETIME,
     vTaxArea VARCHAR(25),
@@ -52278,81 +54880,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `invoiceOut_newFromClient` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_newFromClient`(vClientFk INT, vSerial CHAR(1), vShipped DATE, vCompanyFk INT, vTaxArea VARCHAR(25), OUT vInvoiceId INT)
-BEGIN
-/**
- * Factura los tickets de un cliente
- * @param vTicketFk Id del ticket
- * @param vSerial Serie de factura
- * @return Id factura
- */
-	CALL invoiceFromClient(vShipped, vClientFk, vCompanyFk);
-    CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
-
-    IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
-		CALL invoiceOutBooking(vInvoiceId);
-        INSERT INTO printServerQueue(priorityFk, reportFk, param1) VALUES(1, 3, vInvoiceId); 
-    END IF;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `invoiceOut_newFromTicket` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `invoiceOut_newFromTicket`(vTicketFk INT, vSerial CHAR(1), vTaxArea VARCHAR(25), OUT vInvoiceId INT)
-BEGIN
-/**
- * Factura un ticket
- * @param vTicketFk Id del ticket
- * @param vSerial Serie de factura
- * @param vTaxArea Area de la factura en caso de querer forzarlo, 
- *     en la mayoria de los casos poner NULL
- * @return vInvoiceId
- */
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION 
-		BEGIN 
-			ROLLBACK;
-			RESIGNAL;
-		END;
-              
-	START TRANSACTION;
-	CALL invoiceFromTicket(vTicketFk);
-    CALL invoiceOut_new(vSerial, CURDATE(), vTaxArea, vInvoiceId);
-
-    IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
-		CALL invoiceOutBooking(vInvoiceId);
-        IF account.myUser_getId() IS NOT NULL THEN
-            INSERT INTO printServerQueue(priorityFk, reportFk, param1, workerFk) VALUES(1, 3, vInvoiceId, account.myUser_getId()); 
-		END IF;
-    END IF;
-    
-    COMMIT;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `invoiceTaxMake` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -53823,19 +56350,26 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `itemRefreshTags`(IN vItem INT)
 BEGIN
-	/* DEPRECATED USAR item_refreshTags JGF 16/17/2020*/
+/**
+ * Crea la tabla temporal necesaria para el procedimiento item_refreshTags
+ *
+ * @param vItem Articulo a modificar
+ * @param temporary table tmp.item(id) del articulo
+ **/
 	DROP TEMPORARY TABLE IF EXISTS tmp.item;
+
 	CREATE TEMPORARY TABLE tmp.item
 		SELECT vItem id;
 	CALL item_refreshTags();
+
 	DROP TEMPORARY TABLE tmp.item;
 END ;;
 DELIMITER ;
@@ -55079,9 +57613,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -55093,7 +57627,13 @@ BEGIN
  * @param vDated max date to filter
  * @param vItemFk item id
  **/
+	
+
+	DECLARE vIsLogifloraDay BOOLEAN;
+
 	SET vDated = TIMESTAMP(DATE(vDated), '00:00:00');
+
+	SELECT vn.isLogifloraDay(vDated, vWarehouseFk) INTO vIsLogifloraDay ;
     
 	DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
 	CREATE TEMPORARY TABLE tmp.itemList
@@ -55107,10 +57647,12 @@ BEGIN
                         AND (vItemFk IS NULL OR itemFk = vItemFk)
 				UNION ALL
 				SELECT itemFk, quantity 
-                FROM itemEntryIn
-					WHERE landed >= CURDATE() AND landed < vDated
-						AND warehouseInFk = vWarehouseFk
-                        AND (vItemFk IS NULL OR itemFk = vItemFk)
+                FROM itemEntryIn i
+                	LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk 
+					WHERE i.landed >= CURDATE() AND i.landed < vDated
+						AND i.warehouseInFk = vWarehouseFk
+                        AND (vItemFk IS NULL OR i.itemFk = vItemFk)
+                        AND (ISNULL(wf.entryFk) OR vIsLogifloraDay)
 				UNION ALL
 				SELECT itemFk, quantity 
                 FROM itemEntryOut
@@ -56873,12 +59415,6 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `ledger_doCompensation`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10))
 BEGIN
-	
-/**
- * Hay una versión en salix que machacará toda esta función/procedimiento avisa
- * a jgallego de los cambios que quieres hacer.
- */
-	
 /**
  * Compensa un pago o un recibo insertando en contabilidad
  *
@@ -56908,6 +59444,7 @@ BEGIN
 	
 	SET @vAmount1:= 0.0;
 	SET @vAmount2:= 0.0;
+
     INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id) 
 		VALUES ( 	vNewBookEntry, 
 					vDated, 
@@ -56915,8 +59452,8 @@ BEGIN
 					vCompensationAccount, 
 					vConcept, 
 					@vAmount1:= IF(
-						(vIsOriginalAClient OR NOT vIsOriginalAClient)
-						AND vAmount > 0, 
+						(vIsOriginalAClient AND vAmount > 0) OR 
+						(NOT vIsOriginalAClient AND vAmount < 0), 
 						0, 
 						ABS(vAmount)
 					),
@@ -56948,7 +59485,7 @@ BEGIN
 	    SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci;
 		SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation';
 	
-		INSERT INTO vn2008.pago (fecha, dueDated, id_proveedor, importe, id_banco, pay_met_id, concepte, empresa_id, conciliado)
+		INSERT INTO payment (received, dueDated, supplierFk, amount, bankFk, payMethodFk, concept, companyFk, isConciliated)
 			VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE);
     END IF;
 END ;;
@@ -59711,6 +62248,40 @@ BEGIN
 				GROUP BY t.routeFk) sub ON r.Id_Ruta = sub.routeFk
 		SET r.greuge = sub.greuge / r.Bultos;
  
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `saleBuy_Add` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `saleBuy_Add`(vSaleFk INT, vBuyFk INT)
+BEGIN
+	
+	DECLARE isFood BOOLEAN;
+
+	IF (SELECT COUNT(*) 
+			FROM vn.sale s
+				JOIN vn.item i ON i.id = s.itemFk
+				JOIN vn.itemType it ON it.id = i.typeFk 
+				JOIN vn.itemCategory ic ON ic.id = it.categoryFk 
+			WHERE s.id = vSaleFk
+				AND ic.code = 'pets') THEN 
+			
+		INSERT INTO vn.saleBuy (saleFk, buyFk)
+			VALUES(vSaleFk, vBuyFk);
+		
+	END IF;
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -59792,77 +62363,77 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingMake`(IN `vTicketFk` INT, IN `vSectorFk` INT)
-BEGIN
-  
-    SET @rest:= CAST(0 AS DECIMAL(10,0));
-    SET @saleFk := CAST(0 AS DECIMAL(10,0));
-    SET @reserved := CAST(0 AS DECIMAL(10,0));
-    
-    UPDATE vn.itemShelving ish
-		JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id
-			JOIN sale s ON s.id = sis.saleFk
-        SET ish.visible =  sis.quantity + ish.visible,
-			ish.available = sis.quantity + ish.visible
-        WHERE s.ticketFk = vTicketFk;
-        
-    DELETE sis.*
-		FROM saleItemShelving sis
-			JOIN sale s ON s.id = sis.saleFk
-		WHERE s.ticketFk = vTicketFk;
-    
-	INSERT INTO saleItemShelving(	saleFk, 
-									itemShelvingFk,
-									quantity,
-                                    ubication)
-		SELECT saleFk, 
-			   itemShelvingFk,
-               CAST(Reserved as DECIMAL(10,0)) as Reserved,
-               ubication
-			FROM
-				(SELECT saleFk, 
-						itemShelvingFk, 
-                        ubication,
-						@rest := IF(@saleFk = saleFk, @rest, quantity) as Falta,
-						@reserved := IF(available < @rest, available, IF(@rest < packing,0,@rest)) as Reserved,
-						@rest := @rest - @reserved,
-						@saleFk := saleFk
-					FROM
-						(	SELECT  s.id as saleFk, 
-									ish.created,
-									ish.id as itemShelvingFk, 
-									ish.available,
-									s.quantity,
-									ish.packing,
-                                    CONCAT(p.`column`, '-',p.`row`,': ', sh.code ) as ubication
-								FROM vn.sale s
-									JOIN vn.ticket t ON t.id = s.ticketFk
-									JOIN vn.sector sc ON sc.warehouseFk = t.warehouseFk
-									JOIN vn.parking p ON p.sectorFk = sc.id
-									JOIN vn.shelving sh ON sh.parkingFk = p.id
-									JOIN vn.itemShelving ish ON ish.shelvingFk = sh.code AND ish.itemFk = s.itemFk 
-								WHERE t.id = vTicketFk
-									AND sc.id = vSectorFk
-                                    AND s.quantity MOD ish.packing = 0
-                                    AND s.quantity >= ish.packing
-								ORDER BY 	s.id, 
-											sh.priority DESC, 
-											ish.packing DESC, 
-											ish.created 
-						) sub
-				) sub2
-		WHERE Reserved > 0;
-     
-		UPDATE vn.itemShelving ish
-			JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id
-            JOIN vn.sale s ON s.id = sis.saleFk
-            SET ish.available = ish.visible - sis.quantity,
-				ish.visible = ish.visible - sis.quantity
-            WHERE s.ticketFk = vTicketFk
-				AND s.isPicked = FALSE;
-            
-		CALL vn.saleItemShelvingIsPicked(vTicketFk, TRUE);
-
-
+BEGIN
+  
+    SET @rest:= CAST(0 AS DECIMAL(10,0));
+    SET @saleFk := CAST(0 AS DECIMAL(10,0));
+    SET @reserved := CAST(0 AS DECIMAL(10,0));
+    
+    UPDATE vn.itemShelving ish
+		JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id
+			JOIN sale s ON s.id = sis.saleFk
+        SET ish.visible =  sis.quantity + ish.visible,
+			ish.available = sis.quantity + ish.visible
+        WHERE s.ticketFk = vTicketFk;
+        
+    DELETE sis.*
+		FROM saleItemShelving sis
+			JOIN sale s ON s.id = sis.saleFk
+		WHERE s.ticketFk = vTicketFk;
+    
+	INSERT INTO saleItemShelving(	saleFk, 
+									itemShelvingFk,
+									quantity,
+                                    ubication)
+		SELECT saleFk, 
+			   itemShelvingFk,
+               CAST(Reserved as DECIMAL(10,0)) as Reserved,
+               ubication
+			FROM
+				(SELECT saleFk, 
+						itemShelvingFk, 
+                        ubication,
+						@rest := IF(@saleFk = saleFk, @rest, quantity) as Falta,
+						@reserved := IF(available < @rest, available, IF(@rest < packing,0,@rest)) as Reserved,
+						@rest := @rest - @reserved,
+						@saleFk := saleFk
+					FROM
+						(	SELECT  s.id as saleFk, 
+									ish.created,
+									ish.id as itemShelvingFk, 
+									ish.available,
+									s.quantity,
+									ish.packing,
+                                    CONCAT(p.`column`, '-',p.`row`,': ', sh.code ) as ubication
+								FROM vn.sale s
+									JOIN vn.ticket t ON t.id = s.ticketFk
+									JOIN vn.sector sc ON sc.warehouseFk = t.warehouseFk
+									JOIN vn.parking p ON p.sectorFk = sc.id
+									JOIN vn.shelving sh ON sh.parkingFk = p.id
+									JOIN vn.itemShelving ish ON ish.shelvingFk = sh.code AND ish.itemFk = s.itemFk 
+								WHERE t.id = vTicketFk
+									AND sc.id = vSectorFk
+                                    AND s.quantity MOD ish.packing = 0
+                                    AND s.quantity >= ish.packing
+								ORDER BY 	s.id, 
+											sh.priority DESC, 
+											ish.packing DESC, 
+											ish.created 
+						) sub
+				) sub2
+		WHERE Reserved > 0;
+     
+		UPDATE vn.itemShelving ish
+			JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id
+            JOIN vn.sale s ON s.id = sis.saleFk
+            SET ish.available = ish.visible - sis.quantity,
+				ish.visible = ish.visible - sis.quantity
+            WHERE s.ticketFk = vTicketFk
+				AND s.isPicked = FALSE;
+            
+		CALL vn.saleItemShelvingIsPicked(vTicketFk, TRUE);
+
+
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -60465,6 +63036,138 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sale_calculateComponent__2` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `sale_calculateComponent__2`()
+proc: BEGIN
+/**
+ * Actualiza los componentes
+ *
+ * @param vSale Delivery date
+ * @param vOption indica en que componente pone el descuadre, NULL en casos habituales
+ */  
+	DECLARE vShipped DATE; 
+	DECLARE vWarehouseFk SMALLINT;
+    DECLARE vAgencyModeFk INT;
+    DECLARE vAddressFk INT;
+    DECLARE vTicketFk BIGINT;
+    DECLARE vItemFk BIGINT;
+    DECLARE vLanded DATE; 
+    DECLARE vIsEditable BOOLEAN;
+    DECLARE vZoneFk INTEGER;
+	
+	DECLARE vSaleFk INTEGER;
+    DECLARE v_done BOOL DEFAULT FALSE;
+    
+	DECLARE vCur CURSOR FOR
+		select id from tmp.ticketRose;
+        
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE; 
+	   
+	OPEN vCur;
+
+	l: LOOP
+		SET v_done = FALSE;
+		FETCH vCur INTO vSaleFk; 
+		
+		IF v_done THEN
+			LEAVE l;
+		END IF;
+		
+		SELECT t.refFk IS NULL AND (IFNULL(ts.alertLevel, 0) = 0 OR s.price = 0), 
+					s.ticketFk, 
+					s.itemFk , 
+					t.zoneFk, 
+					t.warehouseFk, 
+					t.shipped, 
+					t.addressFk, 
+					t.agencyModeFk, 
+					t.landed
+				INTO vIsEditable, 
+					vTicketFk, 
+					vItemFk, 
+					vZoneFk, 
+					vWarehouseFk, 
+					vShipped, 
+					vAddressFk, 
+					vAgencyModeFk, 
+					vLanded
+			FROM ticket t
+				JOIN sale s ON s.ticketFk = t.id
+				LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+			WHERE s.id = vSaleFk;
+
+		
+     CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
+
+		IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) > 0 THEN   
+        
+			IF vLanded IS NULL OR vZoneFk IS NULL THEN
+
+				UPDATE ticket t
+					SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
+					WHERE t.id = vTicketFk AND t.landed IS NULL;
+
+				IF vZoneFk IS NULL THEN
+					SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
+					UPDATE ticket t
+						SET t.zoneFk = vZoneFk
+						WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
+				END IF;
+				DROP TEMPORARY TABLE tmp.zoneGetLanded;
+				
+			END IF;
+
+			-- rellena la tabla buyUltimate con la ultima compra	
+			CALL buyUltimate (vWarehouseFk, vShipped);  
+			
+			DELETE FROM tmp.buyUltimate WHERE itemFk != vItemFk;
+			
+			DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+			CREATE TEMPORARY TABLE tmp.ticketLot 
+				SELECT vWarehouseFk warehouseFk, NULL available, vItemFk itemFk, buyFk, vZoneFk zoneFk
+						FROM tmp.buyUltimate
+						WHERE itemFk = vItemFk;
+							
+			CALL catalog_componentPrepare();           
+			CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
+			DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+			CREATE TEMPORARY TABLE tmp.sale
+							(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+				SELECT vSaleFk saleFk,vWarehouseFk warehouseFk;
+			/*
+			IF vOption IS NULL THEN
+				SET vOption = IF(vIsEditable, 1, 6);
+			END IF;
+			*/
+			
+			CALL ticketComponentUpdateSale(1); 
+			CALL catalog_componentPurge();
+			
+			DROP TEMPORARY TABLE tmp.buyUltimate;
+			DROP TEMPORARY TABLE tmp.sale;
+		
+		ELSE
+			INSERT INTO  tmp.ticketFail (id) values (vSaleFk);
+		END IF;
+        
+   	END LOOP;
+	CLOSE vCur; 
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `sale_checkNoComponents` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -60603,33 +63306,33 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `scanTreeCreate__`()
-BEGIN
-	CALL nestTree(
-		'vn2008', 
-		'scan', 
-		'vn2008', 
-		'scanTree'
-	);		
-
-	UPDATE vn2008.scanTree st
-		JOIN (
-			SELECT 	sl.scan_id, 
-					MAX(sl.odbc_date) lastScanned, 
-					COUNT(DISTINCT t.routeFk) routeCount, 
-					MIN(t.routeFk) mod 1000 as minRoute, 
-					MAX(t.routeFk) mod 1000 as maxRoute,
-					COUNT(sl.scan_line_id) as scanned
-				FROM vn2008.scan_line sl
-					JOIN expedition e ON e.id = sl.`code`
-					JOIN ticket t ON t.id = e.ticketFk
-				WHERE t.routeFk
-				GROUP BY sl.scan_id
-		) rs ON rs.scan_id = st.id
-		SET st.lastScanned = rs.lastScanned,
-			st.routeCount = rs.routeCount,
-            st.minRoute = rs.minRoute,
-            st.maxRoute = IF(rs.minRoute != rs.maxRoute, rs.maxRoute,NULL),
-            st.scanned = rs.scanned;
+BEGIN
+	CALL nestTree(
+		'vn2008', 
+		'scan', 
+		'vn2008', 
+		'scanTree'
+	);		
+
+	UPDATE vn2008.scanTree st
+		JOIN (
+			SELECT 	sl.scan_id, 
+					MAX(sl.odbc_date) lastScanned, 
+					COUNT(DISTINCT t.routeFk) routeCount, 
+					MIN(t.routeFk) mod 1000 as minRoute, 
+					MAX(t.routeFk) mod 1000 as maxRoute,
+					COUNT(sl.scan_line_id) as scanned
+				FROM vn2008.scan_line sl
+					JOIN expedition e ON e.id = sl.`code`
+					JOIN ticket t ON t.id = e.ticketFk
+				WHERE t.routeFk
+				GROUP BY sl.scan_id
+		) rs ON rs.scan_id = st.id
+		SET st.lastScanned = rs.lastScanned,
+			st.routeCount = rs.routeCount,
+            st.minRoute = rs.minRoute,
+            st.maxRoute = IF(rs.minRoute != rs.maxRoute, rs.maxRoute,NULL),
+            st.scanned = rs.scanned;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -61316,6 +64019,7 @@ BEGIN
 	DECLARE vWarehouse INT DEFAULT 7;
 	DECLARE vRuben INT;
 	DECLARE vClaudi INT;
+	DECLARE vJose INT;
 
 	SELECT w.id INTO vRuben
 		FROM vn.worker w
@@ -61325,12 +64029,16 @@ BEGIN
 		FROM vn.worker w
 		WHERE w.code = 'CSR';
     
+	SELECT w.id INTO vJose
+		FROM vn.worker w
+		WHERE w.code = 'ATJ';
+	
 	CALL stockTraslation(vDate);
 
-	SELECT Volumen INTO vVolume FROM vn2008.Cubos WHERE Id_Cubo = 'cc' LIMIT 1;
+	-- SELECT Volumen INTO vVolume FROM vn2008.Cubos WHERE Id_Cubo = 'cc' LIMIT 1;
     
 	INSERT INTO stockBuyed(user, buyed, `date`)
-		SELECT tr.user_id, SUM(0.6 * ( amount / c.packing ) * vn.buy_getVolume(Id_Compra))/vVolume buyed, vDate
+		SELECT tr.user_id, SUM(( amount / c.packing ) * vn.buy_getVolume(Id_Compra)) / vc.espai / 1000000 buyed, vDate
 			FROM tmp_item i
 				JOIN vn2008.Articles a ON a.Id_Article = i.item_id
 				JOIN vn2008.Tipos t ON a.tipo_id = t.tipo_id
@@ -61338,34 +64046,51 @@ BEGIN
                 JOIN vn2008.Trabajadores tr ON tr.Id_Trabajador = t.Id_Trabajador
                 JOIN vn2008.t_item_last_buy ilb ON ilb.item_id = Id_Article AND ilb.warehouse_id = vWarehouse
                 JOIN vn2008.Compres c ON c.Id_compra = ilb.buy_id
+                JOIN vn.volumeConfig vc
                 WHERE r.display <> 0
 			GROUP BY tr.Id_Trabajador
             ON DUPLICATE KEY UPDATE buyed = VALUES(buyed);
          
    INSERT INTO stockBuyed(USER, buyed, `date`)
-   		SELECT vRuben, @amount := SUM(ic.cm3 * io.amount / 2400000), vDate
+   		SELECT vRuben, @amount := SUM(ic.cm3 * io.amount / vc.espai / 1000000), vDate
    			FROM vn2008.item_out io
    				JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
    				JOIN vn.ticket t ON t.id = io.ticketFk 
    				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 
+   				JOIN vn.volumeConfig vc
 				WHERE dat = vDate 
 					AND warehouse_id = vWarehouse
 					AND c.country = 'Francia'
 				ON DUPLICATE KEY UPDATE	buyed = buyed + @amount;
-			
-	 INSERT INTO stockBuyed(USER, buyed, `date`)
-   		SELECT vClaudi, @amount := SUM(ic.cm3 * io.amount / 2400000), vDate
+	
+	INSERT INTO stockBuyed(USER, buyed, `date`)
+   		SELECT vJose, @amount := SUM(ic.cm3 * io.amount / vc.espai / 1000000), vDate
    			FROM vn2008.item_out io
    				JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
    				JOIN vn.ticket t ON t.id = io.ticketFk 
    				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 
+   				JOIN vn.volumeConfig vc
+				WHERE dat = vDate 
+					AND warehouse_id = vWarehouse
+					AND c.country = 'Holanda'
+				ON DUPLICATE KEY UPDATE	buyed = buyed + @amount;
+			
+	 INSERT INTO stockBuyed(USER, buyed, `date`)
+   		SELECT vClaudi, @amount := SUM(ic.cm3 * io.amount / vc.espai / 1000000), vDate
+   			FROM vn2008.item_out io
+   				JOIN vn.itemCost ic ON ic.itemFk = io.item_id AND ic.warehouseFk = vWarehouse
+   				JOIN vn.ticket t ON t.id = io.ticketFk 
+   				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 
+   				JOIN vn.volumeConfig vc
 				WHERE dat BETWEEN vDate AND util.dayend(vDate) 
 					AND warehouse_id = vWarehouse
-					AND c.country != 'Francia'
+					AND c.country NOT IN ('Francia','Holanda')
 				ON DUPLICATE KEY UPDATE	buyed = buyed + @amount;
 
 
@@ -64349,9 +67074,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -64370,7 +67095,9 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.ticketTotal
 		(INDEX (ticketFk))
 		ENGINE = MEMORY
-		SELECT t.ticketFk, IFNULL(SUM(ta.taxableBase + ta.tax), 0.0) AS total
+		SELECT t.ticketFk, 
+				IFNULL(SUM(ta.taxableBase + ta.tax), 0.0) AS total,
+				SUM(ta.taxableBase) totalWithoutVat
 			FROM tmp.ticket t
 				LEFT JOIN tmp.ticketAmount ta ON t.ticketFk = ta.ticketFk
 			GROUP BY ticketFk;
@@ -64505,25 +67232,25 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`z-developer`@`%` PROCEDURE `ticketManaToPromo`(vTicketFk INT)
-BEGIN
-	
-	DECLARE vManaComponent INT;
-	
-	DECLARE vPromoComponent INT;
-
-	SELECT id INTO vManaComponent
-		FROM vn.component c 
-		WHERE c.code = 'mana';
-	
-	SELECT id INTO vPromoComponent
-		FROM vn.component c 
-		WHERE c.code = 'floramondoPromo';
-	
-	UPDATE vn.saleComponent sc
-		JOIN vn.sale s ON s.id = sc.saleFk 
-			SET componentFk = vPromoComponent
-		WHERE componentFk = vManaComponent
-			AND s.ticketFk = vTicketFk;
+BEGIN
+	
+	DECLARE vManaComponent INT;
+	
+	DECLARE vPromoComponent INT;
+
+	SELECT id INTO vManaComponent
+		FROM vn.component c 
+		WHERE c.code = 'mana';
+	
+	SELECT id INTO vPromoComponent
+		FROM vn.component c 
+		WHERE c.code = 'floramondoPromo';
+	
+	UPDATE vn.saleComponent sc
+		JOIN vn.sale s ON s.id = sc.saleFk 
+			SET componentFk = vPromoComponent
+		WHERE componentFk = vManaComponent
+			AND s.ticketFk = vTicketFk;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -66342,6 +69069,67 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_doRecalc` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_doRecalc`()
+proc: BEGIN
+/**
+ * Recalculates modified ticket.
+ */
+	
+	DECLARE vDone BOOL;
+	DECLARE vTicketFk INT;
+
+	DECLARE cCur CURSOR FOR
+		SELECT ticketFk FROM ticketRecalc;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET vDone = TRUE;
+        
+	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+    BEGIN
+		DO RELEASE_LOCK('vn.ticket_doRecalc');
+		ROLLBACK;
+        RESIGNAL;
+	END;
+
+	IF !GET_LOCK('vn.ticket_doRecalc', 0) THEN
+		LEAVE proc;
+	END IF;
+
+	OPEN cCur;
+
+	myLoop: LOOP
+		SET vDone = FALSE;
+		FETCH cCur INTO vTicketFk;
+
+		IF vDone THEN
+			LEAVE myLoop;
+		END IF;
+
+		START TRANSACTION;
+        CALL ticket_recalc(vTicketFk);
+        COMMIT;
+
+		DELETE FROM ticketRecalc WHERE ticketFk = vTicketFk;
+	END LOOP;
+
+	CLOSE cCur;
+	DO RELEASE_LOCK('vn.ticket_doRecalc');
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticket_getShip` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -66688,6 +69476,45 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_recalc` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`z-sysadmin`@`%` PROCEDURE `ticket_recalc`(vTicketId INT)
+BEGIN
+/**
+ * Calcula y guarda el total con/sin IVA en un ticket.
+ *
+ * @param vTicketId Identificador del ticket
+ */
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+	CREATE TEMPORARY TABLE tmp.ticket
+		ENGINE = MEMORY
+		SELECT vTicketId ticketFk;
+
+	CALL ticketGetTotal;
+
+	UPDATE ticket t
+			JOIN tmp.ticketTotal tt ON tt.ticketFk = t.id
+		SET t.totalWithVat = tt.total,
+			t.totalWithoutVat = tt.totalWithoutVat;
+
+	DROP TEMPORARY TABLE
+		tmp.ticket,
+		tmp.ticketTotal;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticket_recalcComponents` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -66957,6 +69784,34 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_requestRecalc` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_requestRecalc`(vSelf INT)
+proc: BEGIN
+/**
+ * Adds a request to recalculate the ticket total.
+ *
+ * @param vSelf The ticket identifier
+ */
+	IF vSelf IS NULL THEN
+		LEAVE proc;
+	END IF;
+
+	INSERT IGNORE INTO ticketRecalc SET ticketFk = vSelf;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticket_WeightDeclaration` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -67389,9 +70244,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -67404,36 +70259,36 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
     
 	CREATE TEMPORARY TABLE tmp.timeControlCalculate
-	  SELECT  userFk,
-			  dated,
-			  IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds,
-			  SEC_TO_TIME(@timeWork ) timeWorkSexagesimal,    
-			  @timeWork / 3600 timeWorkDecimal,
-			  timed
-			FROM (SELECT SUM(timeWork) timeWork, 
-						 userFk, 
-						 dated,
-						 GROUP_CONCAT(DATE_FORMAT(sub.timed,"%H:%i")  ORDER BY sub.timed ASC SEPARATOR ' - ') timed
-					FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk ),
-								 IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE ),
-								 IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd ),
-								 IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed), 
-								 IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork,
-								 IF(direction='in', @vDated := DATE(wtc.timed), @vDated :=@vDated) dated,
-								 wtc.timed timed,
-								 wtc.userFk,
-								 direction
-							FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
-										FROM workerTimeControl wtc
-											JOIN tmp.`user` w ON w.userFk = wtc.userFk
-										WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo 
-										ORDER BY userFk, timed ASC
-								  ) wtc
-							WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo 
-						 ) sub
-					GROUP BY userFk, dated
-				 )sub2;
-
+        SELECT
+            userFk,
+            dated,
+            IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds,
+            SEC_TO_TIME(@timeWork ) timeWorkSexagesimal,
+            @timeWork / 3600 timeWorkDecimal,
+            timed
+            FROM (SELECT SUM(timeWork) timeWork,
+                    userFk,
+                    dated,
+                    GROUP_CONCAT(DATE_FORMAT(sub.timed,"%H:%i")  ORDER BY sub.timed ASC SEPARATOR ' - ') timed
+                    FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk),
+                        IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE),
+                        IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd),
+                        IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed),
+                        IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork,
+                        IF(direction='in', @vDated := DATE(wtc.timed), @vDated :=@vDated) dated,
+                        wtc.timed timed,
+                        wtc.userFk,
+                        direction
+                        FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
+                                FROM workerTimeControl wtc
+                                    JOIN tmp.`user` w ON w.userFk = wtc.userFk
+                                WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo
+                                ORDER BY userFk, timed ASC
+                            ) wtc
+                    WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo
+                    ) sub
+                GROUP BY userFk, dated
+            )sub2;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -67667,6 +70522,49 @@ proc: BEGIN
  */
 CALL vn.workerTimeControl_check(vUserFk,vDated,vTabletFk);
 	
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `travelVolume` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`z-developer`@`%` PROCEDURE `travelVolume`(vTravelFk INT)
+BEGIN
+	
+	SELECT 	w1.name AS ORI, 
+			w2.name AS DES, 
+			tr.shipped shipment,
+			tr.landed landing,
+			a.name Agencia, 
+			s.name Proveedor,
+			e.id Id_Entrada,
+			e.REF Referencia,
+			CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+			 vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.carro / 1000000 ,1) AS DECIMAL(10,2)) AS CC,
+			CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
+			 vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.espai / 1000000,1) AS DECIMAL(10,2)) AS espais
+	FROM vn.buy b 
+		JOIN vn.entry e ON e.id = b.entryFk 
+		JOIN vn.supplier s ON s.id = e.supplierFk 
+		JOIN vn.travel tr ON tr.id = e.travelFk 
+		JOIN vn.agencyMode a ON a.id = tr.agencyFk 
+		JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk 
+		JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk 
+		JOIN vn.volumeConfig vc 
+		JOIN vn.item i ON i.id = b.itemFk 
+		JOIN vn.itemType it ON it.id = i.typeFk
+		WHERE tr.id = vTravelFk;
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -67703,6 +70601,148 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `travel_cloneWithEntries` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `travel_cloneWithEntries`(IN vTravelFk INT, IN vDateStart DATE, IN vDateEnd DATE,
+                                                    IN vRef VARCHAR(255), OUT vNewTravelFk INT)
+BEGIN
+	DECLARE vEntryNew INT;
+	DECLARE vDone BOOLEAN DEFAULT FALSE;
+	DECLARE vAuxEntryFk INT;
+	DECLARE vRsEntry CURSOR FOR
+		SELECT e.id
+			FROM entry e
+				JOIN travel t 
+					ON t.id = e.travelFk
+			WHERE e.travelFk = vTravelFk;
+		
+	 DECLARE vRsBuy CURSOR FOR
+		SELECT b.*
+			FROM buy b
+				JOIN entry  e 
+				ON  b.entryFk = e.id
+		WHERE 	e.travelFk = vNewTravelFk and b.entryFk=vNewTravelFk
+		ORDER BY e.id;
+		
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION 
+		BEGIN 
+			ROLLBACK;
+			RESIGNAL;
+		END;
+		  
+	START TRANSACTION;
+		  
+	INSERT INTO travel (shipped,landed, warehouseInFk, warehouseOutFk, agencyFk, ref, isDelivered, isReceived, m3, kg)
+		SELECT vDateStart, vDateEnd,warehouseInFk, warehouseOutFk, agencyFk, vRef, isDelivered, isReceived, m3, kg
+			FROM travel
+			WHERE id = vTravelFk;
+		
+	SET vNewTravelFk = LAST_INSERT_ID();
+	SET vDone = FALSE;	 
+	OPEN vRsEntry ;
+	FETCH vRsEntry INTO vAuxEntryFk;
+	
+		WHILE NOT vDone DO
+			INSERT INTO entry (supplierFk,
+								ref,
+								isInventory,
+								isConfirmed, 
+								isOrdered,
+								isRaid,
+								commission,
+								created,
+								evaNotes,
+								travelFk,
+								currencyFk,
+								companyFk,
+								gestDocFk, 
+								invoiceInFk)
+					 SELECT supplierFk,
+							ref,
+							isInventory,
+							isConfirmed, 
+							isOrdered,
+							isRaid,
+							commission,
+							created,
+							evaNotes,
+							vNewTravelFk,
+							currencyFk,
+							companyFk,
+							gestDocFk, 
+							invoiceInFk
+					FROM entry
+					WHERE id = vAuxEntryFk;
+								
+			SET vEntryNew  = LAST_INSERT_ID();
+			
+						
+				 INSERT INTO buy (entryFk,
+									itemFk,
+									quantity,
+									buyingValue,
+									packageFk,
+									stickers,
+									freightValue,
+									packageValue,
+									comissionValue,
+									packing,
+									`grouping`,
+									groupingMode,
+									location,
+									price1,
+									price2,
+									price3,
+									minPrice,
+									producer,
+									printedStickers,
+									isChecked,
+									weight)
+							SELECT vEntryNew,
+									itemFk,
+									quantity,
+									buyingValue,
+									packageFk,
+									stickers,
+									freightValue,
+									packageValue,
+									comissionValue,
+									packing,
+									`grouping`,
+									groupingMode,
+									location,
+									price1,
+									price2,
+									price3,
+									minPrice,
+									producer,
+									printedStickers,
+									isChecked,
+									weight
+								FROM buy
+								WHERE entryFk = vAuxEntryFk;       
+								
+						  
+			FETCH vRsEntry INTO vAuxEntryFk;
+		END WHILE;
+	CLOSE vRsEntry;
+	COMMIT;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `travel_doRecalc` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -69358,7 +72398,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_checkTest`(vUserFk INT, vTabletFk VARCHAR(100), vTimed DATETIME)
+CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_checkTest`(vUserFk INT, vTimed DATETIME, vTabletFk VARCHAR(100))
 BEGIN
 
 /**
@@ -69367,46 +72407,46 @@ BEGIN
  * @return Retorna si encuentra un problema 'odd','maxTimeWork','breakDay','breakWeek' ;
  * En caso de tener algun problema retorna el primero que encuentra
  */
-    DECLARE vLastIn DATETIME ;
-    DECLARE vLastOut DATETIME ;
-    DECLARE vDayWorkMax INT;
-    DECLARE vDayBreak INT;
-    DECLARE vWeekBreak INT ;
-    DECLARE vWeekMaxBreak INT;     
+	DECLARE vLastIn DATETIME ;
+	DECLARE vLastOut DATETIME ;
+	DECLARE vDayWorkMax INT;
+	DECLARE vDayBreak INT;
+	DECLARE vWeekBreak INT ;
+	DECLARE vWeekMaxBreak INT;
 	DECLARE vWeekScope INT;
-    DECLARE vWeekMaxScope INT;
-    DECLARE vDayStayMax INT;
+	DECLARE vWeekMaxScope INT;
+	DECLARE vDayStayMax INT;
 	DECLARE vAskInOut INT;
-    DECLARE vTimedWorked INT;
-    DECLARE vCalendarStateType VARCHAR(20) DEFAULT NULL;
-    DECLARE vDepartmentFk INT;
-    DECLARE vTo VARCHAR(50) DEFAULT NULL;
-    DECLARE vUserName VARCHAR(50) DEFAULT NULL;
-    DECLARE vBody VARCHAR(255) DEFAULT NULL;
-   
+	DECLARE vTimedWorked INT;
+	DECLARE vCalendarStateType VARCHAR(20) DEFAULT NULL;
+	DECLARE vDepartmentFk INT;
+	DECLARE vTo VARCHAR(50) DEFAULT NULL;
+	DECLARE vUserName VARCHAR(50) DEFAULT NULL;
+	DECLARE vBody VARCHAR(255) DEFAULT NULL;
+
 	IF (vTimed IS NULL) THEN 
 		SET vTimed = NOW();
 	END IF;
 	
 	SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax, weekMaxBreak, weekMaxScope, askInOut
-		INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax,  vWeekMaxBreak, vWeekMaxScope, vAskInOut
+		INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax, vWeekMaxBreak, vWeekMaxScope, vAskInOut
 		FROM vn.workerTimeControlParams;
 
 	SELECT MAX(timed) INTO vLastIn
 		FROM vn.workerTimeControl 
 		WHERE userFk = vUserFk AND 
-			  direction = 'in';
-        
+			direction = 'in';
+
 	SELECT MAX(timed) INTO vLastOut
 		FROM vn.workerTimeControl 
-		WHERE userFk = vUserFk  AND 
-			  direction = 'out'; 
- 
+		WHERE userFk = vUserFk AND 
+			direction = 'out'; 
+
 	
-    SELECT email INTO vTo
+	SELECT email INTO vTo
 		FROM account.user w
-        WHERE w.id = (SELECT bossFk FROM vn.worker WHERE id = vUserFk);
-        
+		WHERE w.id = (SELECT bossFk FROM vn.worker WHERE id = vUserFk);
+
 	SELECT CONCAT(firstName,' ',lastName) INTO vUserName
 		FROM vn.worker w
 		WHERE w.id = vUserFk;
@@ -69418,21 +72458,21 @@ BEGIN
 				JOIN postgresql.person p ON p.person_id = pr.person_id
 				JOIN vn.worker w ON w.id = p.id_trabajador
 			WHERE w.userFk = vUserFk AND 
-				  b.date_start <= CURDATE() AND 
-				  IFNULL(b.date_end,CURDATE()) >= CURDATE()
+				b.date_start <= CURDATE() AND 
+				IFNULL(b.date_end,CURDATE()) >= CURDATE()
 		) = 0 THEN
 		-- ENVIAMOS CORREO AL BOSSFK
 		SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No hay un contrato en vigor") INTO vBody;
 		CALL vn.mail_insert(vTo,vTo,'error al fichar',vBody);
-		CALL util.throw("No hay un contrato en vigor");  
+		CALL util.throw("No hay un contrato en vigor");
 	END IF;
-        
+
 	-- VERIFICAR DEPARTAMENTO
-	/*IF vTabletFk IS NOT NULL  THEN
+	/*IF vTabletFk IS NOT NULL THEN
 		IF ( SELECT COUNT(*)
 					FROM vn.tabletDepartment td
-						JOIN vn.workerTimeControlUserInfo wtcu ON  wtcu.departmentFk = td.departmentFk
-					WHERE td.tabletFk = vTabletFk AND  wtcu.userFk = vUserFk
+						JOIN vn.workerTimeControlUserInfo wtcu ON wtcu.departmentFk = td.departmentFk
+					WHERE td.tabletFk = vTabletFk AND wtcu.userFk = vUserFk
 			) = 0 THEN
 				-- ENVIAMOS CORREO AL BOSSFK
 				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No perteneces a este departamento.") INTO vBody;
@@ -69448,23 +72488,23 @@ BEGIN
 			JOIN postgresql. business_labour bl ON b.business_id = bl.business_id
 			JOIN postgresql.professional_category pc ON bl.professional_category_id = pc.professional_category_id
 		WHERE p.id_trabajador = vUserFk AND 
-			  b.date_start <= DATE(vTimed) AND 
-			  IFNULL(b.date_end, DATE(vTimed)) >=  DATE(vTimed);
+			b.date_start <= DATE(vTimed) AND 
+			IFNULL(b.date_end, DATE(vTimed)) >= DATE(vTimed);
 	-- VERIFICAR DESCANSO DIARIO 
 	-- 12 / 9 horas dependiendo del valor de vDayBreak
 	IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN 
 		-- ENVIAMOS CORREO AL BOSSFK
-		SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos ",  FORMAT(vDayBreak/3600,0) ," h") INTO vBody;
+		SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos ", FORMAT(vDayBreak/3600,0) ," h") INTO vBody;
 		CALL vn.mail_insert(vTo,vTo,'error al fichar',vBody);
-		CALL util.throw(CONCAT("Descansos ",  FORMAT(vDayBreak/3600,0) ," h"));
-	END IF;   
+		CALL util.throw(CONCAT("Descansos ", FORMAT(vDayBreak/3600,0) ," h"));
+	END IF;
 	
-	-- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ
-	IF (SELECT MOD(COUNT(*),2) -- <>0        
+	-- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ
+	IF (SELECT MOD(COUNT(*),2) -- <>0
 			FROM vn.workerTimeControl 
 			WHERE userFk = vUserFk AND 
-				  timed >= vLastIn
-		) THEN    
+				timed >= vLastIn
+		) THEN
 		-- ENVIAMOS CORREO AL BOSSFK
 		SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Dias con fichadas impares") INTO vBody;
 		CALL vn.mail_insert(vTo,vTo,'error al fichar',vBody);
@@ -69478,9 +72518,9 @@ BEGIN
 			JOIN postgresql.person p ON p.person_id = pr.person_id
 			JOIN postgresql.calendar_state cs USING(calendar_state_id)
 			JOIN vn.worker w ON w.id = p.id_trabajador
-		WHERE ce.date = CURDATE() AND  
-			  cs.isAllowedToWork = FALSE AND 
-			  w.userFk = vUserFk
+		WHERE ce.date = CURDATE() AND
+			cs.isAllowedToWork = FALSE AND 
+			w.userFk = vUserFk
 		LIMIT 1;
 	
 	IF(LENGTH(vCalendarStateType)) THEN
@@ -69496,40 +72536,40 @@ BEGIN
 	
 	DROP TEMPORARY TABLE IF EXISTS tmp.trash;
 	CREATE TEMPORARY TABLE tmp.trash
-		SELECT  IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
+		SELECT IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
 				@vLastTimed:= UNIX_TIMESTAMP(timed)
 			FROM workerTimeControl 
 			WHERE timed>= (vTimed - INTERVAL vWeekScope SECOND) AND 
-				  userFk= vUserFk AND 
-				  direction IN ('in','out')
-		ORDER BY timed ASC;   
+				userFk= vUserFk AND 
+				direction IN ('in','out')
+		ORDER BY timed ASC;
 		
-		IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA     
+		IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
 			SET @vHasBreakWeek:= FALSE;
 			SET @vLastTimed:= UNIX_TIMESTAMP((vTimed - INTERVAL vWeekMaxScope SECOND)); 
 			DROP TEMPORARY TABLE tmp.trash; 
 			CREATE TEMPORARY TABLE tmp.trash
-				SELECT  IF(vWeekMaxBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
+				SELECT IF(vWeekMaxBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
 						@vLastTimed:= UNIX_TIMESTAMP(timed)
 					FROM workerTimeControl 
 					WHERE timed>= (vTimed - INTERVAL vWeekMaxScope SECOND) AND 
-						  userFk= vUserFk AND 
-						  direction IN ('in','out')
-					ORDER BY timed ASC;   
-			IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) < vWeekMaxBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA     
+						userFk= vUserFk AND 
+						direction IN ('in','out')
+					ORDER BY timed ASC;
+			IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) < vWeekMaxBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
 				-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos ",  FORMAT(vWeekMaxBreak/3600,0) ," h") INTO vBody;
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos ", FORMAT(vWeekMaxBreak/3600,0) ," h") INTO vBody;
 				CALL vn.mail_insert(vTo,vTo,'error al fichar',vBody);
-				CALL util.throw(CONCAT( "Descansos ",  FORMAT(vWeekMaxBreak/3600,0) ," h")); 
+				CALL util.throw(CONCAT( "Descansos ", FORMAT(vWeekMaxBreak/3600,0) ," h")); 
 			END IF;
 			-- ENVIAMOS CORREO AL BOSSFK
-			SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos ",  FORMAT(vWeekBreak/3600,0) ," h") INTO vBody;
+			SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos ", FORMAT(vWeekBreak/3600,0) ," h") INTO vBody;
 			CALL vn.mail_insert(vTo,vTo,'error al fichar',vBody);
-			CALL util.warn(CONCAT( "Descansos ",  FORMAT(vWeekBreak/3600,0) ," h")); 
+			CALL util.warn(CONCAT( "Descansos ", FORMAT(vWeekBreak/3600,0) ," h")); 
 		END IF;
-	DROP TEMPORARY TABLE tmp.trash;    
-  
-	-- Preguntar dirección de la fichada
+	DROP TEMPORARY TABLE tmp.trash;
+
+	-- Preguntar dirección de la fichada
 	IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastIn) >= vAskInOut AND (SELECT MOD(COUNT(*),2) 
 				FROM vn.workerTimeControl WHERE userFk = vUserFk AND timed >= vLastIn) THEN
 		CALL util.warn("AskInOut");
@@ -71164,6 +74204,254 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `worker_calculateSalaryRoleDelivery` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `worker_calculateSalaryRoleDelivery`(vWorkerFk INTEGER,vDateFrom DATE,vDateTo DATE)
+BEGIN
+/**
+ * Calcula el salario de trabajadores para los departamentos de reparto, paletizado
+ *
+ * @param vDateFrom 
+ * @param vDateTo 
+ * @param vWorkerFk 
+ * @return tmp.workerSalaryRoleDelivery 
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.workerSalaryRoleDelivery;
+
+	CREATE TEMPORARY TABLE tmp.workerSalaryRoleDelivery
+		SELECT  w.id workerFk,
+				r.created dated,
+				r.id,
+				SUM(t.packages) packages, 
+				CAST(time_to_sec(TIMEDIFF( DATE_FORMAT(r.finished, '%H:%i:%s'),DATE_FORMAT(r.time, '%H:%i:%s'))) / (60 * 60) AS DECIMAL(10, 1)) hours , 
+				r.kmEnd-r.kmStart km,
+				r.m3 m3Delivery, 
+				CAST(r.m3/loadWorker AS DECIMAL(10,2)) m3Load,
+				CAST(rc.m3Distribution*m3 AS DECIMAL(10,2)) amountDelivery           ,
+				CASE loadWorker
+					WHEN 1 THEN CAST(r.m3/ loadWorker*rc.load1m3 AS DECIMAL(10,2))
+					WHEN 2 THEN CAST(r.m3/ loadWorker*rc.load2m3 AS DECIMAL(10,2))
+					WHEN 3 THEN CAST(r.m3/ loadWorker*rc.load3m3 AS DECIMAL(10,2))
+					WHEN 4 THEN CAST(r.m3/ loadWorker*rc.load4m3 AS DECIMAL(10,2))
+					WHEN 5 THEN CAST(r.m3/ loadWorker*rc.load5m3 AS DECIMAL(10,2))
+					ELSE CAST(r.m3/ loadWorker*rc.load6m3 AS DECIMAL(10,2))
+				END amountLoad,
+				rc.kmRate*(r.kmEnd-r.kmStart) amountKm,  
+				w.code,
+				CAST('' AS CHAR(45)) description,
+				CAST( 0 AS DECIMAL(10,2)) extra
+			FROM ticket t
+				LEFT JOIN route r ON t.routeFk = r.id
+				LEFT JOIN worker w ON w.id = r.workerFk
+				LEFT JOIN routeConfig rc ON TRUE
+				LEFT JOIN (SELECT rw.routeFk, COUNT(rw.workerFk) loadWorker
+								FROM routeLoadWorker rw
+									JOIN routeLoadWorker rw2 ON rw.routeFk = rw2.routeFk AND rw2.workerFk = vWorkerFk
+								GROUP BY rw2.routeFk
+							) sub ON sub.routeFk=r.id	
+			WHERE r.created BETWEEN vDateFrom AND vDateTo AND w.id = vWorkerFk
+			GROUP BY r.id;
+	
+	INSERT INTO tmp.workerSalaryRoleDelivery
+		SELECT w.id workerFk,
+				r.created dated,
+				r.id,
+				SUM(t.packages) packages, 
+				NULL hours, 
+				r.kmEnd-r.kmStart km,
+				NULL m3Delivery, 
+				CAST(r.m3/loadWorker AS DECIMAL(10,2)) m3Load,
+				NULL amountDelivery,
+				CASE loadWorker
+					WHEN 1 THEN CAST(r.m3/ loadWorker*rc.load1m3 AS DECIMAL(10,2))
+					WHEN 2 THEN CAST(r.m3/ loadWorker*rc.load2m3 AS DECIMAL(10,2))
+					WHEN 3 THEN CAST(r.m3/ loadWorker*rc.load3m3 AS DECIMAL(10,2))
+					WHEN 4 THEN CAST(r.m3/ loadWorker*rc.load4m3 AS DECIMAL(10,2))
+					WHEN 5 THEN CAST(r.m3/ loadWorker*rc.load5m3 AS DECIMAL(10,2))
+				ELSE        CAST(r.m3/ loadWorker*rc.load6m3 AS DECIMAL(10,2))
+				END amountLoad,
+				NULL amountKm,  
+				w.code,
+				NULL description,
+				NULL extra
+			FROM (SELECT rw.routeFk, COUNT(rw.workerFk) loadWorker
+					FROM routeLoadWorker rw
+						JOIN routeLoadWorker rw2 ON rw.routeFk = rw2.routeFk AND rw2.workerFk = vWorkerFk
+					GROUP BY rw2.routeFk) sub 
+				LEFT JOIN route r ON sub.routeFk = r.id	
+				LEFT JOIN ticket t ON t.routeFk = r.id
+				LEFT JOIN worker w ON w.id = r.workerFk
+				LEFT JOIN routeConfig rc ON TRUE
+			WHERE r.created BETWEEN vDateFrom AND vDateTo AND w.id <> vWorkerFk
+			GROUP BY r.id;
+
+	INSERT INTO tmp.workerSalaryRoleDelivery
+		SELECT workerFk,
+				dated,
+				NULL id, 
+				NULL packages, 
+				NULL hours, 
+				NULL km,
+				NULL m3Delivery, 
+				NULL m3Load,
+				NULL amountDelivery,
+				NULL amountLoad,  
+				NULL amountKm,  
+				NULL workerCode,
+				GROUP_CONCAT(ra.name) description,
+				CAST(SUM(rc.price) AS DECIMAL(9,2)) extra
+			FROM routeComplement rc
+				JOIN routeAction ra ON rc.routeActionFk=ra.id		
+			WHERE dated BETWEEN vDateFrom AND vDateTo AND workerFk=vWorkerFk
+			GROUP BY dated;
+
+	CALL timeBusiness_calculateByWorker(vWorkerFk, vDateFrom, vDateTo);
+
+	INSERT INTO tmp.workerSalaryRoleDelivery
+		SELECT w.id workerFk,
+				tb.dated,
+				NULL id, 
+				NULL packages, 
+				NULL hours, 
+				NULL km,
+				NULL m3Delivery, 
+				NULL m3Load,
+				NULL amountDelivery,
+				NULL amountLoad,  
+				NULL amountKm,  
+				NULL workerCode,
+				tb.type COLLATE utf8_general_ci description,
+				CASE
+					WHEN tb.type  = 'Vacaciones 1/2 día' OR tb.type = 'Permiso retribuido 1/2 día' 
+						THEN CAST(((12 * blp.importepactado) / (52 * tb.hoursWeek)) * 4 AS DECIMAL(10,2))
+					WHEN tb.type = 'Vacaciones'  OR tb.type = 'Baja enfermedad común' OR tb.type = 'Permiso retribuido' OR tb.type = 'Festivo'
+						THEN CAST(((12 * blp.importepactado) / (52 * tb.hoursWeek)) * 8 AS DECIMAL(10,2))
+				END extra
+			FROM worker w
+				JOIN tmp.timeBusinessCalculate tb ON tb.userFk = w.id
+                JOIN postgresql.business_labour_payroll blp ON blp.business_id = tb.businessFk
+				JOIN time tm ON tm.dated = tb.dated
+			WHERE tb.dated BETWEEN vDateFrom AND vDateTo AND 
+				w.id = vWorkerFk AND 
+				tb.type IN ('Vacaciones 1/2 día', 'Vacaciones', 'Baja enfermedad común','Festivo','Permiso retribuido 1/2 día','Permiso retribuido')
+			GROUP BY tb.dated;
+	
+	INSERT INTO tmp.workerSalaryRoleDelivery	
+		SELECT sub.workerFk workerFk,
+				r.created dated, 
+				NULL id, 
+				NULL packages, 
+				NULL hours, 
+				NULL km,
+				SUM(r.m3) m3Delivery, 
+				NULL m3Load,
+				NULL amountDelivery,
+				CAST( (SUM(r.m3)*sub.percentage /100) * rc.m3Management AS DECIMAL (10,2) ) amountLoad,  
+				NULL amountKm,  
+				NULL workerCode,
+				'Gestión de la distribución' description,
+				NULL extra
+			FROM route r
+				JOIN agencyMode am ON am.id= r.agencyModeFk
+				JOIN agency a ON a.id = am.agencyFk
+				JOIN (SELECT percentage,workerFk ,dated
+						FROM routeUserPercentage ru 
+						WHERE workerFk = vWorkerFk AND ru.dated <= vDateTo
+						ORDER BY dated DESC LIMIT 1     
+					  ) sub 
+				JOIN  workerLabour wl  ON r.created BETWEEN wl.started AND IFNULL(wl.ended, CURDATE()) AND wl.workerFk = sub.workerFk AND a.workCenterFk = wl.workCenterFk         
+				JOIN department v ON v.id = departmentFk
+				JOIN routeConfig rc       
+			WHERE r.m3>0 AND created BETWEEN vDateFrom AND vDateTo AND 
+				am.name NOT LIKE "REC_%" AND 
+                v.name= "REPARTO"
+			GROUP BY  r.created;	
+		
+	INSERT INTO tmp.workerSalaryRoleDelivery		
+		SELECT sub.workerFk workerFk,
+				r.created dated, 
+				NULL id, 
+				NULL packages, 
+				NULL hours, 
+				NULL km,
+				SUM(r.m3) m3Delivery, 
+				NULL m3Load,
+				NULL amountDelivery,
+				CAST( (SUM(r.m3)*sub.percentage /100) * rc.m3Palletization AS DECIMAL (10,2) ) amountLoad,  
+				NULL amountKm,  
+				NULL workerCode,
+				'Gestión de paletizado' description,
+				NULL extra
+			FROM route r
+				JOIN agencyMode am ON am.id= r.agencyModeFk
+				JOIN agency a ON a.id = am.agencyFk
+				JOIN (SELECT percentage,workerFk ,dated
+							FROM routeUserPercentage ru 
+							WHERE workerFk = vWorkerFk AND ru.dated <= vDateTo
+							ORDER BY dated DESC LIMIT 1     
+					) sub
+				JOIN routeConfig rc 
+				JOIN  workerLabour wl  ON r.created BETWEEN wl.started AND IFNULL(wl.ended, CURDATE()) AND 
+					wl.workerFk = sub.workerFk 
+				JOIN department v ON v.id = departmentFk
+			WHERE r.m3>0 AND 
+				r.created BETWEEN vDateFrom AND vDateTo AND 
+                am.name NOT LIKE "REC_%" AND 
+                v.name= "PALETIZADO"
+			GROUP BY  r.created;
+		
+	DROP TEMPORARY TABLE IF EXISTS tmp.daysToRateHoliday;
+		CREATE TEMPORARY TABLE tmp.daysToRateHoliday
+			SELECT *
+				FROM tmp.workerSalaryRoleDelivery tb
+					WHERE (tb.description IN ('Festivo') OR dayofweek(tb.dated)=1) AND tb.extra = 0 ;
+                
+	INSERT INTO tmp.workerSalaryRoleDelivery (workerFk,dated,id,packages,hours,km,m3Delivery,m3Load,amountDelivery,amountLoad,AmountKm,code,description, extra)
+		  SELECT workerFk, 
+				dated, 
+				d.id, 
+				packages, 
+				hours, 
+				km, 
+				m3Delivery, 
+				m3Load, 
+				amountDelivery * r.rateHoliday, 
+				amountLoad * r.rateHoliday, 
+				AmountKm * r.rateHoliday, 
+				code, 
+				CONCAT('Plus festivo: ',description), 
+				extra
+			FROM tmp.daysToRateHoliday d 
+				LEFT JOIN routeConfig r ON TRUE;
+	
+    DROP TEMPORARY TABLE IF EXISTS tmp.daysToDelete;
+	CREATE TEMPORARY TABLE tmp.daysToDelete
+		SELECT dated
+			FROM tmp.workerSalaryRoleDelivery d
+				WHERE d.description IN ('Baja enfermedad común');
+    
+	DELETE d 
+		FROM tmp.workerSalaryRoleDelivery d
+			JOIN tmp.daysToDelete dd on dd.dated = d.dated
+		WHERE d.description NOT IN ('Baja enfermedad común');
+
+	DROP TEMPORARY TABLE tmp.daysToRateHoliday;
+	DROP TEMPORARY TABLE tmp.daysToDelete;
+    DROP TEMPORARY TABLE tmp.timeBusinessCalculate;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `worker_getHierarchy` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -71289,6 +74577,52 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `worker_getProductionErrors`(vDepartment VARCHAR(25), vStateCode VARCHAR(25) CHARSET utf8, vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.total;
+
+	CREATE TEMPORARY TABLE tmp.total
+		ENGINE = MEMORY
+		SELECT tt.workerFk, Count(tt.ticketFk) AS CuentaDeId_Ticket
+			FROM state s
+				JOIN ticketTracking  tt ON s.id = tt.stateFk
+				JOIN ticket t ON tt.ticketFk = t.id
+				JOIN worker w ON tt.workerFk = w.id
+			WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND s.code = vStateCode
+			GROUP BY tt.workerFk;
+
+	SELECT w.code, w.firstName, w.lastName, CAST(tmp.total.CuentaDeId_Ticket AS DECIMAL(10,0)) AS Totaltickets, CAST(sub.CuentaDeTicketFk AS DECIMAL(10,0)) AS Fallos
+		FROM  tmp.total
+		JOIN worker w ON w.id = tmp.total.workerFk
+		LEFT JOIN (
+			SELECT COUNT(c.ticketFk) AS CuentaDeTicketFk, cd.workerFk
+				FROM claimDevelopment cd
+					JOIN claim c ON cd.claimFk = c.id
+					JOIN ticket t ON c.ticketFk = t.id
+					JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
+                WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND cr.description=vDepartment
+				GROUP BY cd.workerFk
+                )sub ON  tmp.total.workerFk = sub.workerFk;
+    
+	DROP TEMPORARY TABLE tmp.total;   
+    
+ END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `worker_getProductionErrors__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `worker_getProductionErrors__`(vDepartment VARCHAR(25), vStateCode VARCHAR(25) CHARSET utf8, vDatedFrom DATETIME, vDatedTo DATETIME)
 BEGIN
 
 DROP TEMPORARY TABLE IF EXISTS tmp.total;
@@ -73391,9 +76725,9 @@ DROP TABLE IF EXISTS `inter`;
 CREATE TABLE `inter` (
   `inter_id` int(11) NOT NULL AUTO_INCREMENT,
   `state_id` tinyint(3) unsigned NOT NULL,
-  `fallo_id` int(10) unsigned NOT NULL DEFAULT '21',
+  `fallo_id` int(10) unsigned NOT NULL DEFAULT 21,
   `nota` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `odbc_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `odbc_date` timestamp NULL DEFAULT current_timestamp(),
   `Id_Ticket` int(11) DEFAULT NULL,
   `Id_Trabajador` int(11) DEFAULT NULL,
   `Id_Supervisor` int(11) DEFAULT NULL,
@@ -73612,6 +76946,7 @@ USE `account`;
 -- Final view structure for view `accountDovecot`
 --
 
+/*!50001 DROP TABLE IF EXISTS `accountDovecot`*/;
 /*!50001 DROP VIEW IF EXISTS `accountDovecot`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73621,7 +76956,7 @@ USE `account`;
 /*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `accountDovecot` AS select `u`.`name` AS `name`,`u`.`password` AS `password` from (`user` `u` join `account` `a` on((`a`.`id` = `u`.`id`))) where `u`.`active` */;
+/*!50001 VIEW `accountDovecot` AS select `u`.`name` AS `name`,`u`.`password` AS `password` from (`user` `u` join `account` `a` on(`a`.`id` = `u`.`id`)) where `u`.`active` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73630,6 +76965,7 @@ USE `account`;
 -- Final view structure for view `emailUser`
 --
 
+/*!50001 DROP TABLE IF EXISTS `emailUser`*/;
 /*!50001 DROP VIEW IF EXISTS `emailUser`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73648,6 +76984,7 @@ USE `account`;
 -- Final view structure for view `myRole`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myRole`*/;
 /*!50001 DROP VIEW IF EXISTS `myRole`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73657,7 +76994,7 @@ USE `account`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myRole` AS select `r`.`inheritsFrom` AS `id` from (`roleRole` `r` join `user` `u` on((`u`.`role` = `r`.`role`))) where (`u`.`id` = `myUser_getId`()) */;
+/*!50001 VIEW `myRole` AS select `r`.`inheritsFrom` AS `id` from (`roleRole` `r` join `user` `u` on(`u`.`role` = `r`.`role`)) where `u`.`id` = `myUser_getId`() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73666,6 +77003,7 @@ USE `account`;
 -- Final view structure for view `myUser`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myUser`*/;
 /*!50001 DROP VIEW IF EXISTS `myUser`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73675,7 +77013,7 @@ USE `account`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myUser` AS select `u`.`id` AS `id`,`u`.`name` AS `name`,`u`.`active` AS `active`,`u`.`email` AS `email`,`u`.`nickname` AS `nickname`,`u`.`lang` AS `lang`,`u`.`role` AS `role`,`u`.`recoverPass` AS `recoverPass` from `user` `u` where (`u`.`name` = `myUserGetName`()) */
+/*!50001 VIEW `myUser` AS select `u`.`id` AS `id`,`u`.`name` AS `name`,`u`.`active` AS `active`,`u`.`email` AS `email`,`u`.`nickname` AS `nickname`,`u`.`lang` AS `lang`,`u`.`role` AS `role`,`u`.`recoverPass` AS `recoverPass` from `user` `u` where `u`.`name` = `myUserGetName`() */
 /*!50002 WITH CASCADED CHECK OPTION */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -73691,6 +77029,7 @@ USE `bs`;
 -- Final view structure for view `bajasLaborales`
 --
 
+/*!50001 DROP TABLE IF EXISTS `bajasLaborales`*/;
 /*!50001 DROP VIEW IF EXISTS `bajasLaborales`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73700,7 +77039,7 @@ USE `bs`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `bajasLaborales` AS select `p`.`firstname` AS `firstname`,`p`.`name` AS `name`,`b`.`business_id` AS `business_id`,max(`ce`.`date`) AS `lastDate`,max(ifnull(`b`.`date_end`,curdate())) AS `endContract`,`cs`.`type` AS `type`,cast(count(0) as decimal(10,0)) AS `dias`,`w`.`userFk` AS `userFk` from (((((`postgresql`.`calendar_employee` `ce` join `postgresql`.`business` `b` on((`b`.`business_id` = `ce`.`business_id`))) join `postgresql`.`profile` `pr` on((`pr`.`profile_id` = `b`.`client_id`))) join `postgresql`.`person` `p` on((`p`.`person_id` = `pr`.`person_id`))) join `postgresql`.`calendar_state` `cs` on((`cs`.`calendar_state_id` = `ce`.`calendar_state_id`))) join `vn`.`worker` `w` on((`w`.`id` = `p`.`id_trabajador`))) where ((`ce`.`date` >= (curdate() + interval -(1) year)) and (`cs`.`type` not in ('Vacaciones','Vacaciones 1/2 día','Compensar','Festivo'))) group by `p`.`firstname`,`p`.`name`,`cs`.`type` having (`endContract` >= curdate()) */;
+/*!50001 VIEW `bajasLaborales` AS select `p`.`firstname` AS `firstname`,`p`.`name` AS `name`,`b`.`business_id` AS `business_id`,max(`ce`.`date`) AS `lastDate`,max(ifnull(`b`.`date_end`,curdate())) AS `endContract`,`cs`.`type` AS `type`,cast(count(0) as decimal(10,0)) AS `dias`,`w`.`userFk` AS `userFk` from (((((`postgresql`.`calendar_employee` `ce` join `postgresql`.`business` `b` on(`b`.`business_id` = `ce`.`business_id`)) join `postgresql`.`profile` `pr` on(`pr`.`profile_id` = `b`.`client_id`)) join `postgresql`.`person` `p` on(`p`.`person_id` = `pr`.`person_id`)) join `postgresql`.`calendar_state` `cs` on(`cs`.`calendar_state_id` = `ce`.`calendar_state_id`)) join `vn`.`worker` `w` on(`w`.`id` = `p`.`id_trabajador`)) where `ce`.`date` >= curdate() + interval -1 year and `cs`.`type` not in ('Vacaciones','Vacaciones 1/2 día','Compensar','Festivo') group by `p`.`firstname`,`p`.`name`,`cs`.`type` having `endContract` >= curdate() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73709,6 +77048,7 @@ USE `bs`;
 -- Final view structure for view `lastIndicators`
 --
 
+/*!50001 DROP TABLE IF EXISTS `lastIndicators`*/;
 /*!50001 DROP VIEW IF EXISTS `lastIndicators`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73718,7 +77058,7 @@ USE `bs`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `lastIndicators` AS select `i`.`updated` AS `updated`,`i`.`lastYearSales` AS `lastYearSales`,(`i`.`lastYearSales` - `yi`.`lastYearSales`) AS `incLastYearSales`,`i`.`totalGreuge` AS `totalGreuge`,(`i`.`totalGreuge` - `yi`.`totalGreuge`) AS `incTotalGreuge`,`i`.`latePaymentRate` AS `latePaymentRate`,(`i`.`latePaymentRate` - `yi`.`latePaymentRate`) AS `incLatePaymentRate`,`i`.`countEmployee` AS `countEmployee`,(`i`.`countEmployee` - `yi`.`countEmployee`) AS `incCountEmployee`,`i`.`averageMana` AS `averageMana`,(`i`.`averageMana` - `yi`.`averageMana`) AS `incAverageMana`,`i`.`bankingPool` AS `bankingPool`,(`i`.`bankingPool` - `yi`.`bankingPool`) AS `incbankingPool`,`i`.`lastMonthActiveClients` AS `lastMonthActiveClients`,(`i`.`lastMonthActiveClients` - `yi`.`lastMonthActiveClients`) AS `incLastMonthActiveClients`,`i`.`lastMonthLostClients` AS `lastMonthLostClients`,(`i`.`lastMonthLostClients` - `yi`.`lastMonthLostClients`) AS `incLastMonthLostClients`,`i`.`lastMonthNewClients` AS `lastMonthNewClients`,(`i`.`lastMonthNewClients` - `yi`.`lastMonthNewClients`) AS `incLastMonthNewClients`,`i`.`lastMonthWebBuyingRate` AS `lastMonthWebBuyingRate`,(`i`.`lastMonthWebBuyingRate` - `yi`.`lastMonthWebBuyingRate`) AS `incLastMonthWebBuyingRate`,`i`.`productionHours` AS `productionHours`,`i`.`dailyWorkersCost` AS `dailyWorkersCost`,`i`.`volumeM3` AS `volumeM3`,`i`.`salesValue` AS `salesValue`,`i`.`valueM3` AS `valueM3`,`i`.`hoursM3` AS `hoursM3`,`i`.`workerCostM3` AS `workerCostM3`,`i`.`salesWorkersCostRate` AS `salesWorkersCostRate`,`i`.`thisWeekSales` AS `thisWeekSales`,`i`.`lastYearWeekSales` AS `lastYearWeekSales` from (`indicators` `i` join `indicators` `yi` on((`yi`.`updated` = (select (max(`indicators`.`updated`) + interval -(1) day) from `indicators`)))) where (`i`.`updated` = (select max(`indicators`.`updated`) from `indicators`)) */;
+/*!50001 VIEW `lastIndicators` AS select `i`.`updated` AS `updated`,`i`.`lastYearSales` AS `lastYearSales`,`i`.`lastYearSales` - `yi`.`lastYearSales` AS `incLastYearSales`,`i`.`totalGreuge` AS `totalGreuge`,`i`.`totalGreuge` - `yi`.`totalGreuge` AS `incTotalGreuge`,`i`.`latePaymentRate` AS `latePaymentRate`,`i`.`latePaymentRate` - `yi`.`latePaymentRate` AS `incLatePaymentRate`,`i`.`countEmployee` AS `countEmployee`,`i`.`countEmployee` - `yi`.`countEmployee` AS `incCountEmployee`,`i`.`averageMana` AS `averageMana`,`i`.`averageMana` - `yi`.`averageMana` AS `incAverageMana`,`i`.`bankingPool` AS `bankingPool`,`i`.`bankingPool` - `yi`.`bankingPool` AS `incbankingPool`,`i`.`lastMonthActiveClients` AS `lastMonthActiveClients`,`i`.`lastMonthActiveClients` - `yi`.`lastMonthActiveClients` AS `incLastMonthActiveClients`,`i`.`lastMonthLostClients` AS `lastMonthLostClients`,`i`.`lastMonthLostClients` - `yi`.`lastMonthLostClients` AS `incLastMonthLostClients`,`i`.`lastMonthNewClients` AS `lastMonthNewClients`,`i`.`lastMonthNewClients` - `yi`.`lastMonthNewClients` AS `incLastMonthNewClients`,`i`.`lastMonthWebBuyingRate` AS `lastMonthWebBuyingRate`,`i`.`lastMonthWebBuyingRate` - `yi`.`lastMonthWebBuyingRate` AS `incLastMonthWebBuyingRate`,`i`.`productionHours` AS `productionHours`,`i`.`dailyWorkersCost` AS `dailyWorkersCost`,`i`.`volumeM3` AS `volumeM3`,`i`.`salesValue` AS `salesValue`,`i`.`valueM3` AS `valueM3`,`i`.`hoursM3` AS `hoursM3`,`i`.`workerCostM3` AS `workerCostM3`,`i`.`salesWorkersCostRate` AS `salesWorkersCostRate`,`i`.`thisWeekSales` AS `thisWeekSales`,`i`.`lastYearWeekSales` AS `lastYearWeekSales` from (`indicators` `i` join `indicators` `yi` on(`yi`.`updated` = (select max(`indicators`.`updated`) + interval -1 day from `indicators`))) where `i`.`updated` = (select max(`indicators`.`updated`) from `indicators`) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73727,6 +77067,7 @@ USE `bs`;
 -- Final view structure for view `m3Silla`
 --
 
+/*!50001 DROP TABLE IF EXISTS `m3Silla`*/;
 /*!50001 DROP VIEW IF EXISTS `m3Silla`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73736,7 +77077,7 @@ USE `bs`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `m3Silla` AS select `m3`.`fecha` AS `fecha`,`m3`.`year` AS `year`,`m3`.`month` AS `month`,`m3`.`week` AS `week`,`m3`.`day` AS `day`,`m3`.`dayName` AS `dayName`,cast(sum(`m3`.`m3`) as decimal(10,0)) AS `Volumen`,cast(sum(`m3`.`euros`) as decimal(10,0)) AS `Euros` from `m3` where (`m3`.`warehouseFk` in (1,44)) group by `m3`.`fecha` */;
+/*!50001 VIEW `m3Silla` AS select `m3`.`fecha` AS `fecha`,`m3`.`year` AS `year`,`m3`.`month` AS `month`,`m3`.`week` AS `week`,`m3`.`day` AS `day`,`m3`.`dayName` AS `dayName`,cast(sum(`m3`.`m3`) as decimal(10,0)) AS `Volumen`,cast(sum(`m3`.`euros`) as decimal(10,0)) AS `Euros` from `m3` where `m3`.`warehouseFk` in (1,44) group by `m3`.`fecha` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73745,6 +77086,7 @@ USE `bs`;
 -- Final view structure for view `m3analisis`
 --
 
+/*!50001 DROP TABLE IF EXISTS `m3analisis`*/;
 /*!50001 DROP VIEW IF EXISTS `m3analisis`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73754,7 +77096,7 @@ USE `bs`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `m3analisis` AS select `m`.`fecha` AS `fecha`,`m`.`year` AS `year`,`m`.`month` AS `month`,`m`.`week` AS `week`,`m`.`day` AS `day`,`m`.`dayName` AS `dayName`,`m`.`Volumen` AS `Volumen`,`m`.`Euros` AS `Euros`,`h`.`Departamento` AS `Departamento`,`h`.`Horas` AS `Horas`,`h`.`Salarios` AS `Salarios`,(`h`.`Horas` / `m`.`Volumen`) AS `tiempoM3`,(`m`.`Euros` / `m`.`Volumen`) AS `valorM3`,(`h`.`Salarios` / `m`.`Volumen`) AS `costeLaboralM3`,(`h`.`Salarios` / `m`.`Euros`) AS `costeEuros`,(`h`.`Salarios` / `h`.`Horas`) AS `precioHora` from (`bs`.`m3Silla` `m` join `bs`.`horasSilla` `h` on((`h`.`Fecha` = `m`.`fecha`))) */;
+/*!50001 VIEW `m3analisis` AS select `m`.`fecha` AS `fecha`,`m`.`year` AS `year`,`m`.`month` AS `month`,`m`.`week` AS `week`,`m`.`day` AS `day`,`m`.`dayName` AS `dayName`,`m`.`Volumen` AS `Volumen`,`m`.`Euros` AS `Euros`,`h`.`Departamento` AS `Departamento`,`h`.`Horas` AS `Horas`,`h`.`Salarios` AS `Salarios`,`h`.`Horas` / `m`.`Volumen` AS `tiempoM3`,`m`.`Euros` / `m`.`Volumen` AS `valorM3`,`h`.`Salarios` / `m`.`Volumen` AS `costeLaboralM3`,`h`.`Salarios` / `m`.`Euros` AS `costeEuros`,`h`.`Salarios` / `h`.`Horas` AS `precioHora` from (`bs`.`m3Silla` `m` join `bs`.`horasSilla` `h` on(`h`.`Fecha` = `m`.`fecha`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73763,6 +77105,7 @@ USE `bs`;
 -- Final view structure for view `manaCustomer`
 --
 
+/*!50001 DROP TABLE IF EXISTS `manaCustomer`*/;
 /*!50001 DROP VIEW IF EXISTS `manaCustomer`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73781,6 +77124,7 @@ USE `bs`;
 -- Final view structure for view `manaSpellersExcluded`
 --
 
+/*!50001 DROP TABLE IF EXISTS `manaSpellersExcluded`*/;
 /*!50001 DROP VIEW IF EXISTS `manaSpellersExcluded`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73799,6 +77143,7 @@ USE `bs`;
 -- Final view structure for view `mana_spellers`
 --
 
+/*!50001 DROP TABLE IF EXISTS `mana_spellers`*/;
 /*!50001 DROP VIEW IF EXISTS `mana_spellers`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73817,6 +77162,7 @@ USE `bs`;
 -- Final view structure for view `mana_spellers_excluded`
 --
 
+/*!50001 DROP TABLE IF EXISTS `mana_spellers_excluded`*/;
 /*!50001 DROP VIEW IF EXISTS `mana_spellers_excluded`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73835,6 +77181,7 @@ USE `bs`;
 -- Final view structure for view `mermas__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `mermas__`*/;
 /*!50001 DROP VIEW IF EXISTS `mermas__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73844,7 +77191,7 @@ USE `bs`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `mermas__` AS select `w`.`code` AS `Comprador`,`it`.`name` AS `Familia`,`i`.`id` AS `Referencia`,`i`.`name` AS `Item`,`s`.`quantity` AS `Cantidad`,(((`b`.`buyingValue` + `b`.`freightValue`) + `b`.`comissionValue`) + `b`.`packageValue`) AS `Coste_Unitario`,(`s`.`quantity` * (((`b`.`buyingValue` + `b`.`freightValue`) + `b`.`comissionValue`) + `b`.`packageValue`)) AS `Importe`,`c`.`name` AS `Cliente`,`s`.`ticketFk` AS `ticketFk`,`t`.`shipped` AS `Fecha` from (((((((`vn`.`worker` `w` join `vn`.`itemType` `it` on((`it`.`workerFk` = `w`.`id`))) join `vn`.`item` `i` on((`i`.`typeFk` = `it`.`id`))) join `vn`.`sale` `s` on((`s`.`itemFk` = `i`.`id`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`client` `c` on((`c`.`id` = `t`.`clientFk`))) left join `bi`.`Last_buy_id__` `lb` on(((`lb`.`Id_Article` = `s`.`itemFk`) and (`lb`.`warehouse_id` = `t`.`warehouseFk`)))) left join `vn`.`buy` `b` on((`b`.`id` = `lb`.`Id_Compra`))) where ((`t`.`shipped` > '2018-01-01') and (`c`.`isRelevant` or (`c`.`id` in (200,400)))) */;
+/*!50001 VIEW `mermas__` AS select `w`.`code` AS `Comprador`,`it`.`name` AS `Familia`,`i`.`id` AS `Referencia`,`i`.`name` AS `Item`,`s`.`quantity` AS `Cantidad`,`b`.`buyingValue` + `b`.`freightValue` + `b`.`comissionValue` + `b`.`packageValue` AS `Coste_Unitario`,`s`.`quantity` * (`b`.`buyingValue` + `b`.`freightValue` + `b`.`comissionValue` + `b`.`packageValue`) AS `Importe`,`c`.`name` AS `Cliente`,`s`.`ticketFk` AS `ticketFk`,`t`.`shipped` AS `Fecha` from (((((((`vn`.`worker` `w` join `vn`.`itemType` `it` on(`it`.`workerFk` = `w`.`id`)) join `vn`.`item` `i` on(`i`.`typeFk` = `it`.`id`)) join `vn`.`sale` `s` on(`s`.`itemFk` = `i`.`id`)) join `vn`.`ticket` `t` on(`t`.`id` = `s`.`ticketFk`)) join `vn`.`client` `c` on(`c`.`id` = `t`.`clientFk`)) left join `bi`.`Last_buy_id__` `lb` on(`lb`.`Id_Article` = `s`.`itemFk` and `lb`.`warehouse_id` = `t`.`warehouseFk`)) left join `vn`.`buy` `b` on(`b`.`id` = `lb`.`Id_Compra`)) where `t`.`shipped` > '2018-01-01' and (`c`.`isRelevant` <> 0 or `c`.`id` in (200,400)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73853,6 +77200,7 @@ USE `bs`;
 -- Final view structure for view `v_ventas__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `v_ventas__`*/;
 /*!50001 DROP VIEW IF EXISTS `v_ventas__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73862,7 +77210,7 @@ USE `bs`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `v_ventas__` AS select (`bs`.`ventas`.`importe` * `Movimientos`.`Cantidad`) AS `importe`,`bs`.`ventas`.`recargo` AS `recargo`,`time`.`year` AS `year`,`time`.`month` AS `month`,`time`.`week` AS `week`,`time`.`day` AS `day` from ((`bs`.`ventas` join `vn2008`.`time` on((`time`.`date` = `bs`.`ventas`.`fecha`))) join `vn2008`.`Movimientos` on((`bs`.`ventas`.`Id_Movimiento` = `Movimientos`.`Id_Movimiento`))) group by `time`.`date` */;
+/*!50001 VIEW `v_ventas__` AS select `bs`.`ventas`.`importe` * `Movimientos`.`Cantidad` AS `importe`,`bs`.`ventas`.`recargo` AS `recargo`,`time`.`year` AS `year`,`time`.`month` AS `month`,`time`.`week` AS `week`,`time`.`day` AS `day` from ((`bs`.`ventas` join `vn2008`.`time` on(`time`.`date` = `bs`.`ventas`.`fecha`)) join `vn2008`.`Movimientos` on(`bs`.`ventas`.`Id_Movimiento` = `Movimientos`.`Id_Movimiento`)) group by `time`.`date` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73871,6 +77219,7 @@ USE `bs`;
 -- Final view structure for view `workerMana`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerMana`*/;
 /*!50001 DROP VIEW IF EXISTS `workerMana`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73907,6 +77256,7 @@ USE `hedera`;
 -- Final view structure for view `mainAccountBank`
 --
 
+/*!50001 DROP TABLE IF EXISTS `mainAccountBank`*/;
 /*!50001 DROP VIEW IF EXISTS `mainAccountBank`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73916,7 +77266,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `mainAccountBank` AS select `e`.`name` AS `name`,`a`.`iban` AS `iban` from ((`hedera`.`mainAccount` `c` join `vn`.`supplierAccount` `a` on((`a`.`id` = `c`.`accountFk`))) join `vn`.`bankEntity` `e` on((`e`.`id` = `a`.`bankEntityFk`))) */;
+/*!50001 VIEW `mainAccountBank` AS select `e`.`name` AS `name`,`a`.`iban` AS `iban` from ((`hedera`.`mainAccount` `c` join `vn`.`supplierAccount` `a` on(`a`.`id` = `c`.`accountFk`)) join `vn`.`bankEntity` `e` on(`e`.`id` = `a`.`bankEntityFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73925,6 +77275,7 @@ USE `hedera`;
 -- Final view structure for view `myAddress`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myAddress`*/;
 /*!50001 DROP VIEW IF EXISTS `myAddress`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73934,7 +77285,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myAddress` AS select `t`.`id` AS `id`,`t`.`clientFk` AS `clientFk`,`t`.`street` AS `street`,`t`.`city` AS `city`,`t`.`postalCode` AS `postalCode`,`t`.`provinceFk` AS `provinceFk`,`t`.`nickname` AS `nickname`,`t`.`isDefaultAddress` AS `isDefaultAddress`,`t`.`isActive` AS `isActive`,`t`.`longitude` AS `longitude`,`t`.`latitude` AS `latitude`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`agencyModeFk` AS `agencyModeFk` from `vn`.`address` `t` where (`t`.`clientFk` = `account`.`myUser_getId`()) */
+/*!50001 VIEW `myAddress` AS select `t`.`id` AS `id`,`t`.`clientFk` AS `clientFk`,`t`.`street` AS `street`,`t`.`city` AS `city`,`t`.`postalCode` AS `postalCode`,`t`.`provinceFk` AS `provinceFk`,`t`.`nickname` AS `nickname`,`t`.`isDefaultAddress` AS `isDefaultAddress`,`t`.`isActive` AS `isActive`,`t`.`longitude` AS `longitude`,`t`.`latitude` AS `latitude`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`agencyModeFk` AS `agencyModeFk` from `vn`.`address` `t` where `t`.`clientFk` = `account`.`myUser_getId`() */
 /*!50002 WITH CASCADED CHECK OPTION */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -73944,6 +77295,7 @@ USE `hedera`;
 -- Final view structure for view `myBasket`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myBasket`*/;
 /*!50001 DROP VIEW IF EXISTS `myBasket`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73953,7 +77305,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myBasket` AS select `o`.`id` AS `id`,`o`.`date_make` AS `made`,`o`.`date_send` AS `sent`,`o`.`customer_id` AS `clientFk`,`o`.`delivery_method_id` AS `deliveryMethodFk`,`o`.`agency_id` AS `agencyModeFk`,`o`.`address_id` AS `addressFk`,`o`.`company_id` AS `companyFk`,`o`.`note` AS `notes` from `hedera`.`order` `o` where (`o`.`id` = `MYBASKET_GETID`()) */
+/*!50001 VIEW `myBasket` AS select `o`.`id` AS `id`,`o`.`date_make` AS `made`,`o`.`date_send` AS `sent`,`o`.`customer_id` AS `clientFk`,`o`.`delivery_method_id` AS `deliveryMethodFk`,`o`.`agency_id` AS `agencyModeFk`,`o`.`address_id` AS `addressFk`,`o`.`company_id` AS `companyFk`,`o`.`note` AS `notes` from `hedera`.`order` `o` where `o`.`id` = `MYBASKET_GETID`() */
 /*!50002 WITH CASCADED CHECK OPTION */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -73963,6 +77315,7 @@ USE `hedera`;
 -- Final view structure for view `myBasketDefaults`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myBasketDefaults`*/;
 /*!50001 DROP VIEW IF EXISTS `myBasketDefaults`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73972,7 +77325,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myBasketDefaults` AS select coalesce(`dm`.`code`,`cm`.`code`) AS `deliveryMethod`,coalesce(`ad`.`agencyModeFk`,`oc`.`defaultAgencyFk`) AS `agencyModeFk`,`c`.`defaultAddressFk` AS `addressFk`,`oc`.`defaultAgencyFk` AS `defaultAgencyFk` from ((((((`hedera`.`orderConfig` `oc` join `vn`.`agencyMode` `ca` on((`ca`.`id` = `oc`.`defaultAgencyFk`))) join `vn`.`deliveryMethod` `cm` on((`cm`.`id` = `ca`.`deliveryMethodFk`))) left join `vn`.`client` `c` on((`c`.`id` = `account`.`myUser_getId`()))) left join `vn`.`address` `ad` on((`ad`.`id` = `c`.`defaultAddressFk`))) left join `vn`.`agencyMode` `a` on((`a`.`id` = `ad`.`agencyModeFk`))) left join `vn`.`deliveryMethod` `dm` on((`dm`.`id` = `a`.`deliveryMethodFk`))) */;
+/*!50001 VIEW `myBasketDefaults` AS select coalesce(`dm`.`code`,`cm`.`code`) AS `deliveryMethod`,coalesce(`ad`.`agencyModeFk`,`oc`.`defaultAgencyFk`) AS `agencyModeFk`,`c`.`defaultAddressFk` AS `addressFk`,`oc`.`defaultAgencyFk` AS `defaultAgencyFk` from ((((((`hedera`.`orderConfig` `oc` join `vn`.`agencyMode` `ca` on(`ca`.`id` = `oc`.`defaultAgencyFk`)) join `vn`.`deliveryMethod` `cm` on(`cm`.`id` = `ca`.`deliveryMethodFk`)) left join `vn`.`client` `c` on(`c`.`id` = `account`.`myUser_getId`())) left join `vn`.`address` `ad` on(`ad`.`id` = `c`.`defaultAddressFk`)) left join `vn`.`agencyMode` `a` on(`a`.`id` = `ad`.`agencyModeFk`)) left join `vn`.`deliveryMethod` `dm` on(`dm`.`id` = `a`.`deliveryMethodFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -73981,6 +77334,7 @@ USE `hedera`;
 -- Final view structure for view `myBasketItem`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myBasketItem`*/;
 /*!50001 DROP VIEW IF EXISTS `myBasketItem`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -73990,7 +77344,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myBasketItem` AS select `r`.`id` AS `id`,`r`.`orderFk` AS `orderFk`,`r`.`warehouseFk` AS `warehouseFk`,`r`.`itemFk` AS `itemFk`,`r`.`amount` AS `amount`,`r`.`price` AS `price` from `hedera`.`orderRow` `r` where (`r`.`orderFk` = `MYBASKET_GETID`()) */
+/*!50001 VIEW `myBasketItem` AS select `r`.`id` AS `id`,`r`.`orderFk` AS `orderFk`,`r`.`warehouseFk` AS `warehouseFk`,`r`.`itemFk` AS `itemFk`,`r`.`amount` AS `amount`,`r`.`price` AS `price` from `hedera`.`orderRow` `r` where `r`.`orderFk` = `MYBASKET_GETID`() */
 /*!50002 WITH CASCADED CHECK OPTION */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -74000,6 +77354,7 @@ USE `hedera`;
 -- Final view structure for view `myClient`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myClient`*/;
 /*!50001 DROP VIEW IF EXISTS `myClient`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74009,7 +77364,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myClient` AS select `c`.`id` AS `id`,`c`.`isToBeMailed` AS `isToBeMailed`,`c`.`defaultAddressFk` AS `defaultAddressFk`,`c`.`credit` AS `credit` from `vn`.`client` `c` where (`c`.`id` = `account`.`myUser_getId`()) */
+/*!50001 VIEW `myClient` AS select `c`.`id` AS `id`,`c`.`isToBeMailed` AS `isToBeMailed`,`c`.`defaultAddressFk` AS `defaultAddressFk`,`c`.`credit` AS `credit` from `vn`.`client` `c` where `c`.`id` = `account`.`myUser_getId`() */
 /*!50002 WITH CASCADED CHECK OPTION */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -74019,6 +77374,7 @@ USE `hedera`;
 -- Final view structure for view `myInvoice`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myInvoice`*/;
 /*!50001 DROP VIEW IF EXISTS `myInvoice`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74028,7 +77384,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myInvoice` AS select `i`.`id` AS `id`,`i`.`ref` AS `ref`,`i`.`issued` AS `issued`,`i`.`amount` AS `amount`,`i`.`hasPdf` AS `hasPdf` from `vn`.`invoiceOut` `i` where (`i`.`clientFk` = `account`.`myUser_getId`()) */;
+/*!50001 VIEW `myInvoice` AS select `i`.`id` AS `id`,`i`.`ref` AS `ref`,`i`.`issued` AS `issued`,`i`.`amount` AS `amount`,`i`.`hasPdf` AS `hasPdf` from `vn`.`invoiceOut` `i` where `i`.`clientFk` = `account`.`myUser_getId`() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74037,6 +77393,7 @@ USE `hedera`;
 -- Final view structure for view `myMenu`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myMenu`*/;
 /*!50001 DROP VIEW IF EXISTS `myMenu`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74046,7 +77403,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myMenu` AS select `t`.`id` AS `id`,`t`.`path` AS `path`,`t`.`description` AS `description`,`t`.`parentFk` AS `parentFk` from (`hedera`.`menu` `t` join `account`.`myRole` `r` on((`r`.`id` = `t`.`roleFk`))) order by `t`.`parentFk`,`t`.`displayOrder`,`t`.`id` */;
+/*!50001 VIEW `myMenu` AS select `t`.`id` AS `id`,`t`.`path` AS `path`,`t`.`description` AS `description`,`t`.`parentFk` AS `parentFk` from (`hedera`.`menu` `t` join `account`.`myRole` `r` on(`r`.`id` = `t`.`roleFk`)) order by `t`.`parentFk`,`t`.`displayOrder`,`t`.`id` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74055,6 +77412,7 @@ USE `hedera`;
 -- Final view structure for view `myOrder`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myOrder`*/;
 /*!50001 DROP VIEW IF EXISTS `myOrder`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74064,7 +77422,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myOrder` AS select `o`.`id` AS `id`,`o`.`date_send` AS `landed`,`o`.`customer_id` AS `clientFk`,`o`.`delivery_method_id` AS `deliveryMethodFk`,`o`.`agency_id` AS `agencyModeFk`,`o`.`address_id` AS `addressFk`,`o`.`company_id` AS `companyFk`,`o`.`note` AS `note`,`o`.`source_app` AS `sourceApp`,`o`.`confirmed` AS `isConfirmed`,`o`.`date_make` AS `created`,`o`.`first_row_stamp` AS `firstRowStamp`,`o`.`confirm_date` AS `confirmed` from `hedera`.`order` `o` where (`o`.`customer_id` = `account`.`myUser_getId`()) */;
+/*!50001 VIEW `myOrder` AS select `o`.`id` AS `id`,`o`.`date_send` AS `landed`,`o`.`customer_id` AS `clientFk`,`o`.`delivery_method_id` AS `deliveryMethodFk`,`o`.`agency_id` AS `agencyModeFk`,`o`.`address_id` AS `addressFk`,`o`.`company_id` AS `companyFk`,`o`.`note` AS `note`,`o`.`source_app` AS `sourceApp`,`o`.`confirmed` AS `isConfirmed`,`o`.`date_make` AS `created`,`o`.`first_row_stamp` AS `firstRowStamp`,`o`.`confirm_date` AS `confirmed` from `hedera`.`order` `o` where `o`.`customer_id` = `account`.`myUser_getId`() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74073,6 +77431,7 @@ USE `hedera`;
 -- Final view structure for view `myOrderRow`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myOrderRow`*/;
 /*!50001 DROP VIEW IF EXISTS `myOrderRow`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74082,7 +77441,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myOrderRow` AS select `orw`.`id` AS `id`,`orw`.`order_id` AS `Fk`,`orw`.`item_id` AS `itemFk`,`orw`.`warehouse_id` AS `warehouseFk`,`orw`.`shipment` AS `shipped`,`orw`.`amount` AS `amount`,`orw`.`price` AS `price`,`orw`.`rate` AS `rate`,`orw`.`created` AS `created`,`orw`.`Id_Movimiento` AS `saleFk` from (`hedera`.`order_row` `orw` join `hedera`.`myOrder` `o` on((`o`.`id` = `orw`.`order_id`))) */
+/*!50001 VIEW `myOrderRow` AS select `orw`.`id` AS `id`,`orw`.`order_id` AS `Fk`,`orw`.`item_id` AS `itemFk`,`orw`.`warehouse_id` AS `warehouseFk`,`orw`.`shipment` AS `shipped`,`orw`.`amount` AS `amount`,`orw`.`price` AS `price`,`orw`.`rate` AS `rate`,`orw`.`created` AS `created`,`orw`.`Id_Movimiento` AS `saleFk` from (`hedera`.`order_row` `orw` join `hedera`.`myOrder` `o` on(`o`.`id` = `orw`.`order_id`)) */
 /*!50002 WITH CASCADED CHECK OPTION */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -74092,6 +77451,7 @@ USE `hedera`;
 -- Final view structure for view `myOrderTicket`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myOrderTicket`*/;
 /*!50001 DROP VIEW IF EXISTS `myOrderTicket`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74101,7 +77461,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myOrderTicket` AS select `o`.`id` AS `orderFk`,`ot`.`ticketFk` AS `ticketFk` from (`hedera`.`myOrder` `o` join `hedera`.`orderTicket` `ot` on((`ot`.`orderFk` = `o`.`id`))) */;
+/*!50001 VIEW `myOrderTicket` AS select `o`.`id` AS `orderFk`,`ot`.`ticketFk` AS `ticketFk` from (`hedera`.`myOrder` `o` join `hedera`.`orderTicket` `ot` on(`ot`.`orderFk` = `o`.`id`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74110,6 +77470,7 @@ USE `hedera`;
 -- Final view structure for view `myTicket`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myTicket`*/;
 /*!50001 DROP VIEW IF EXISTS `myTicket`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74119,7 +77480,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myTicket` AS select `t`.`id` AS `id`,`t`.`clientFk` AS `clientFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`shipped` AS `shipped`,`t`.`landed` AS `landed`,`t`.`nickname` AS `nickname`,`t`.`agencyModeFk` AS `agencyModeFk`,`t`.`refFk` AS `refFk`,`t`.`addressFk` AS `addressFk`,`t`.`location` AS `location`,`t`.`companyFk` AS `companyFk` from `vn`.`ticket` `t` where (`t`.`clientFk` = `account`.`myUser_getId`()) */;
+/*!50001 VIEW `myTicket` AS select `t`.`id` AS `id`,`t`.`clientFk` AS `clientFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`shipped` AS `shipped`,`t`.`landed` AS `landed`,`t`.`nickname` AS `nickname`,`t`.`agencyModeFk` AS `agencyModeFk`,`t`.`refFk` AS `refFk`,`t`.`addressFk` AS `addressFk`,`t`.`location` AS `location`,`t`.`companyFk` AS `companyFk` from `vn`.`ticket` `t` where `t`.`clientFk` = `account`.`myUser_getId`() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74128,6 +77489,7 @@ USE `hedera`;
 -- Final view structure for view `myTicketRow`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myTicketRow`*/;
 /*!50001 DROP VIEW IF EXISTS `myTicketRow`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74137,7 +77499,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myTicketRow` AS select `s`.`id` AS `id`,`s`.`itemFk` AS `itemFk`,`s`.`ticketFk` AS `ticketFk`,`s`.`concept` AS `concept`,`s`.`quantity` AS `quantity`,`s`.`price` AS `price`,`s`.`discount` AS `discount`,`s`.`reserved` AS `reserved`,`s`.`isPicked` AS `isPicked` from (`vn`.`sale` `s` join `hedera`.`myTicket` `t` on((`s`.`ticketFk` = `t`.`id`))) */
+/*!50001 VIEW `myTicketRow` AS select `s`.`id` AS `id`,`s`.`itemFk` AS `itemFk`,`s`.`ticketFk` AS `ticketFk`,`s`.`concept` AS `concept`,`s`.`quantity` AS `quantity`,`s`.`price` AS `price`,`s`.`discount` AS `discount`,`s`.`reserved` AS `reserved`,`s`.`isPicked` AS `isPicked` from (`vn`.`sale` `s` join `hedera`.`myTicket` `t` on(`s`.`ticketFk` = `t`.`id`)) */
 /*!50002 WITH CASCADED CHECK OPTION */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -74147,6 +77509,7 @@ USE `hedera`;
 -- Final view structure for view `myTicketService`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myTicketService`*/;
 /*!50001 DROP VIEW IF EXISTS `myTicketService`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74156,7 +77519,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myTicketService` AS select `s`.`id` AS `id`,`s`.`description` AS `description`,`s`.`quantity` AS `quantity`,`s`.`price` AS `price`,`s`.`taxClassFk` AS `taxClassFk`,`s`.`ticketFk` AS `ticketFk`,`s`.`ticketServiceTypeFk` AS `ticketServiceTypeFk` from (`vn`.`ticketService` `s` join `hedera`.`myTicket` `t` on((`s`.`ticketFk` = `t`.`id`))) */
+/*!50001 VIEW `myTicketService` AS select `s`.`id` AS `id`,`s`.`description` AS `description`,`s`.`quantity` AS `quantity`,`s`.`price` AS `price`,`s`.`taxClassFk` AS `taxClassFk`,`s`.`ticketFk` AS `ticketFk`,`s`.`ticketServiceTypeFk` AS `ticketServiceTypeFk` from (`vn`.`ticketService` `s` join `hedera`.`myTicket` `t` on(`s`.`ticketFk` = `t`.`id`)) */
 /*!50002 WITH CASCADED CHECK OPTION */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -74166,6 +77529,7 @@ USE `hedera`;
 -- Final view structure for view `myTicketState`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myTicketState`*/;
 /*!50001 DROP VIEW IF EXISTS `myTicketState`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74175,7 +77539,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myTicketState` AS select `t`.`id` AS `id`,`t`.`clientFk` AS `clientFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`shipped` AS `shipped`,`t`.`landed` AS `landed`,`t`.`nickname` AS `nickname`,`t`.`agencyModeFk` AS `agencyModeFk`,`t`.`refFk` AS `refFk`,`t`.`addressFk` AS `addressFk`,`t`.`location` AS `location`,`t`.`companyFk` AS `companyFk`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`code` AS `code` from (`vn`.`ticket` `t` left join `vn`.`ticketState` `ts` on((`ts`.`ticketFk` = `t`.`id`))) where (`t`.`clientFk` = `account`.`myUser_getId`()) */;
+/*!50001 VIEW `myTicketState` AS select `t`.`id` AS `id`,`t`.`clientFk` AS `clientFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`shipped` AS `shipped`,`t`.`landed` AS `landed`,`t`.`nickname` AS `nickname`,`t`.`agencyModeFk` AS `agencyModeFk`,`t`.`refFk` AS `refFk`,`t`.`addressFk` AS `addressFk`,`t`.`location` AS `location`,`t`.`companyFk` AS `companyFk`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`code` AS `code` from (`vn`.`ticket` `t` left join `vn`.`ticketState` `ts` on(`ts`.`ticketFk` = `t`.`id`)) where `t`.`clientFk` = `account`.`myUser_getId`() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74184,6 +77548,7 @@ USE `hedera`;
 -- Final view structure for view `myTpvTransaction`
 --
 
+/*!50001 DROP TABLE IF EXISTS `myTpvTransaction`*/;
 /*!50001 DROP VIEW IF EXISTS `myTpvTransaction`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74193,7 +77558,7 @@ USE `hedera`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `myTpvTransaction` AS select `t`.`id` AS `id`,`t`.`merchantFk` AS `merchantFk`,`t`.`clientFk` AS `clientFk`,`t`.`receiptFk` AS `receiptFk`,`t`.`amount` AS `amount`,`t`.`response` AS `response`,`t`.`status` AS `status`,`t`.`created` AS `created` from `hedera`.`tpvTransaction` `t` where (`t`.`clientFk` = `account`.`myUser_getId`()) */;
+/*!50001 VIEW `myTpvTransaction` AS select `t`.`id` AS `id`,`t`.`merchantFk` AS `merchantFk`,`t`.`clientFk` AS `clientFk`,`t`.`receiptFk` AS `receiptFk`,`t`.`amount` AS `amount`,`t`.`response` AS `response`,`t`.`status` AS `status`,`t`.`created` AS `created` from `hedera`.`tpvTransaction` `t` where `t`.`clientFk` = `account`.`myUser_getId`() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74202,6 +77567,7 @@ USE `hedera`;
 -- Final view structure for view `orderTicket`
 --
 
+/*!50001 DROP TABLE IF EXISTS `orderTicket`*/;
 /*!50001 DROP VIEW IF EXISTS `orderTicket`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74220,6 +77586,7 @@ USE `hedera`;
 -- Final view structure for view `order_component`
 --
 
+/*!50001 DROP TABLE IF EXISTS `order_component`*/;
 /*!50001 DROP VIEW IF EXISTS `order_component`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74238,6 +77605,7 @@ USE `hedera`;
 -- Final view structure for view `order_row`
 --
 
+/*!50001 DROP TABLE IF EXISTS `order_row`*/;
 /*!50001 DROP VIEW IF EXISTS `order_row`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74268,6 +77636,7 @@ USE `pbx`;
 -- Final view structure for view `cdrConf`
 --
 
+/*!50001 DROP TABLE IF EXISTS `cdrConf`*/;
 /*!50001 DROP VIEW IF EXISTS `cdrConf`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74286,6 +77655,7 @@ USE `pbx`;
 -- Final view structure for view `followmeConf`
 --
 
+/*!50001 DROP TABLE IF EXISTS `followmeConf`*/;
 /*!50001 DROP VIEW IF EXISTS `followmeConf`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74304,6 +77674,7 @@ USE `pbx`;
 -- Final view structure for view `followmeNumberConf`
 --
 
+/*!50001 DROP TABLE IF EXISTS `followmeNumberConf`*/;
 /*!50001 DROP VIEW IF EXISTS `followmeNumberConf`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74322,6 +77693,7 @@ USE `pbx`;
 -- Final view structure for view `queueConf`
 --
 
+/*!50001 DROP TABLE IF EXISTS `queueConf`*/;
 /*!50001 DROP VIEW IF EXISTS `queueConf`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74331,7 +77703,7 @@ USE `pbx`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `queueConf` AS select `q`.`name` AS `name`,`c`.`strategy` AS `strategy`,`c`.`timeout` AS `timeout`,`c`.`retry` AS `retry`,`c`.`weight` AS `weight`,`c`.`maxLen` AS `maxlen`,`c`.`ringInUse` AS `ringinuse` from (`queue` `q` join `queueConfig` `c` on((`q`.`config` = `c`.`id`))) */;
+/*!50001 VIEW `queueConf` AS select `q`.`name` AS `name`,`c`.`strategy` AS `strategy`,`c`.`timeout` AS `timeout`,`c`.`retry` AS `retry`,`c`.`weight` AS `weight`,`c`.`maxLen` AS `maxlen`,`c`.`ringInUse` AS `ringinuse` from (`queue` `q` join `queueConfig` `c` on(`q`.`config` = `c`.`id`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74340,6 +77712,7 @@ USE `pbx`;
 -- Final view structure for view `queueMemberConf`
 --
 
+/*!50001 DROP TABLE IF EXISTS `queueMemberConf`*/;
 /*!50001 DROP VIEW IF EXISTS `queueMemberConf`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74358,6 +77731,7 @@ USE `pbx`;
 -- Final view structure for view `sipConf`
 --
 
+/*!50001 DROP TABLE IF EXISTS `sipConf`*/;
 /*!50001 DROP VIEW IF EXISTS `sipConf`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74367,7 +77741,7 @@ USE `pbx`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `sipConf` AS select `s`.`user_id` AS `id`,`s`.`extension` AS `name`,NULL AS `callbackextension`,`s`.`md5Secret` AS `md5secret`,`u`.`nickname` AS `callerid`,`c`.`host` AS `host`,`c`.`deny` AS `deny`,`c`.`permit` AS `permit`,`c`.`type` AS `type`,`c`.`context` AS `context`,`c`.`incomingLimit` AS `incominglimit`,`c`.`pickupGroup` AS `pickupgroup`,`c`.`careInvite` AS `careinvite`,`c`.`insecure` AS `insecure`,`c`.`transport` AS `transport`,`c`.`nat` AS `nat`,`r`.`ipAddr` AS `ipaddr`,`r`.`regSeconds` AS `regseconds`,`r`.`port` AS `port`,`r`.`defaultUser` AS `defaultuser`,`r`.`userAgent` AS `useragent`,`r`.`lastMs` AS `lastms`,`r`.`fullContact` AS `fullcontact`,`r`.`regServer` AS `regserver` from (((`pbx`.`sip` `s` join `account`.`user` `u` on((`u`.`id` = `s`.`user_id`))) left join `pbx`.`sipReg` `r` on((`s`.`user_id` = `r`.`userId`))) join `pbx`.`sipConfig` `c`) */;
+/*!50001 VIEW `sipConf` AS select `s`.`user_id` AS `id`,`s`.`extension` AS `name`,NULL AS `callbackextension`,`s`.`md5Secret` AS `md5secret`,`u`.`nickname` AS `callerid`,`c`.`host` AS `host`,`c`.`deny` AS `deny`,`c`.`permit` AS `permit`,`c`.`type` AS `type`,`c`.`context` AS `context`,`c`.`incomingLimit` AS `incominglimit`,`c`.`pickupGroup` AS `pickupgroup`,`c`.`careInvite` AS `careinvite`,`c`.`insecure` AS `insecure`,`c`.`transport` AS `transport`,`c`.`nat` AS `nat`,`r`.`ipAddr` AS `ipaddr`,`r`.`regSeconds` AS `regseconds`,`r`.`port` AS `port`,`r`.`defaultUser` AS `defaultuser`,`r`.`userAgent` AS `useragent`,`r`.`lastMs` AS `lastms`,`r`.`fullContact` AS `fullcontact`,`r`.`regServer` AS `regserver` from (((`pbx`.`sip` `s` join `account`.`user` `u` on(`u`.`id` = `s`.`user_id`)) left join `pbx`.`sipReg` `r` on(`s`.`user_id` = `r`.`userId`)) join `pbx`.`sipConfig` `c`) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74382,6 +77756,7 @@ USE `postgresql`;
 -- Final view structure for view `calendar_employee`
 --
 
+/*!50001 DROP TABLE IF EXISTS `calendar_employee`*/;
 /*!50001 DROP VIEW IF EXISTS `calendar_employee`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74406,6 +77781,7 @@ USE `sage`;
 -- Final view structure for view `invoiceInList`
 --
 
+/*!50001 DROP TABLE IF EXISTS `invoiceInList`*/;
 /*!50001 DROP VIEW IF EXISTS `invoiceInList`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74415,7 +77791,7 @@ USE `sage`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `invoiceInList` AS select `vn`.`invoiceIn`.`id` AS `id`,`vn`.`invoiceIn`.`supplierRef` AS `supplierRef`,`vn`.`invoiceIn`.`serial` AS `serial`,`vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`issued` AS `issued`,`vn`.`invoiceIn`.`isVatDeductible` AS `isVatDeductible`,`vn`.`invoiceIn`.`serialNumber` AS `serialNumber` from `vn`.`invoiceIn` where (`vn`.`invoiceIn`.`issued` >= (date_format(curdate(),'%Y-01-01') + interval -(1) year)) union all select `vn`.`dua`.`id` AS `id`,`vn`.`dua`.`code` AS `code`,'D' AS `D`,442 AS `442`,`vn`.`dua`.`issued` AS `issued`,0 AS `FALSE`,`vn`.`dua`.`id` AS `serialNumber` from `vn`.`dua` */;
+/*!50001 VIEW `invoiceInList` AS select `vn`.`invoiceIn`.`id` AS `id`,`vn`.`invoiceIn`.`supplierRef` AS `supplierRef`,`vn`.`invoiceIn`.`serial` AS `serial`,`vn`.`invoiceIn`.`supplierFk` AS `supplierFk`,`vn`.`invoiceIn`.`issued` AS `issued`,`vn`.`invoiceIn`.`isVatDeductible` AS `isVatDeductible`,`vn`.`invoiceIn`.`serialNumber` AS `serialNumber` from `vn`.`invoiceIn` where `vn`.`invoiceIn`.`issued` >= date_format(curdate(),'%Y-01-01') + interval -1 year union all select `vn`.`dua`.`id` AS `id`,`vn`.`dua`.`code` AS `code`,'D' AS `D`,442 AS `442`,`vn`.`dua`.`issued` AS `issued`,0 AS `FALSE`,`vn`.`dua`.`id` AS `serialNumber` from `vn`.`dua` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74430,6 +77806,7 @@ USE `salix`;
 -- Final view structure for view `Account`
 --
 
+/*!50001 DROP TABLE IF EXISTS `Account`*/;
 /*!50001 DROP VIEW IF EXISTS `Account`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74448,6 +77825,7 @@ USE `salix`;
 -- Final view structure for view `Role`
 --
 
+/*!50001 DROP TABLE IF EXISTS `Role`*/;
 /*!50001 DROP VIEW IF EXISTS `Role`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74466,6 +77844,7 @@ USE `salix`;
 -- Final view structure for view `RoleMapping`
 --
 
+/*!50001 DROP TABLE IF EXISTS `RoleMapping`*/;
 /*!50001 DROP VIEW IF EXISTS `RoleMapping`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74475,7 +77854,7 @@ USE `salix`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `RoleMapping` AS select ((`u`.`id` * 1000) + `r`.`inheritsFrom`) AS `id`,'USER' AS `principalType`,`u`.`id` AS `principalId`,`r`.`inheritsFrom` AS `roleId` from (`account`.`user` `u` join `account`.`roleRole` `r` on((`r`.`role` = `u`.`role`))) */;
+/*!50001 VIEW `RoleMapping` AS select `u`.`id` * 1000 + `r`.`inheritsFrom` AS `id`,'USER' AS `principalType`,`u`.`id` AS `principalId`,`r`.`inheritsFrom` AS `roleId` from (`account`.`user` `u` join `account`.`roleRole` `r` on(`r`.`role` = `u`.`role`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74484,6 +77863,7 @@ USE `salix`;
 -- Final view structure for view `User`
 --
 
+/*!50001 DROP TABLE IF EXISTS `User`*/;
 /*!50001 DROP VIEW IF EXISTS `User`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74520,6 +77900,7 @@ USE `vn`;
 -- Final view structure for view `__coolerPathDetail`
 --
 
+/*!50001 DROP TABLE IF EXISTS `__coolerPathDetail`*/;
 /*!50001 DROP VIEW IF EXISTS `__coolerPathDetail`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74538,6 +77919,7 @@ USE `vn`;
 -- Final view structure for view `absenceType`
 --
 
+/*!50001 DROP TABLE IF EXISTS `absenceType`*/;
 /*!50001 DROP VIEW IF EXISTS `absenceType`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74556,6 +77938,7 @@ USE `vn`;
 -- Final view structure for view `accounting`
 --
 
+/*!50001 DROP TABLE IF EXISTS `accounting`*/;
 /*!50001 DROP VIEW IF EXISTS `accounting`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74574,6 +77957,7 @@ USE `vn`;
 -- Final view structure for view `agencyProvince__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `agencyProvince__`*/;
 /*!50001 DROP VIEW IF EXISTS `agencyProvince__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74592,6 +77976,7 @@ USE `vn`;
 -- Final view structure for view `annualAverageInvoiced`
 --
 
+/*!50001 DROP TABLE IF EXISTS `annualAverageInvoiced`*/;
 /*!50001 DROP VIEW IF EXISTS `annualAverageInvoiced`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74606,10 +77991,30 @@ USE `vn`;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
+--
+-- Final view structure for view `awb__`
+--
+
+/*!50001 DROP TABLE IF EXISTS `awb__`*/;
+/*!50001 DROP VIEW IF EXISTS `awb__`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
+/*!50001 VIEW `awb__` AS select `a`.`id` AS `id`,`a`.`codigo` AS `code`,`a`.`bultos` AS `package`,`a`.`peso` AS `weight`,`a`.`MYSQL_TIME` AS `created`,`a`.`transitario_id` AS `transitoryFk`,`a`.`iva_id` AS `taxFk`,`a`.`gestdoc_id` AS `docFk`,`a`.`importe` AS `amount`,`a`.`carguera_id` AS `freightFk`,`a`.`m3` AS `m3`,`a`.`stems` AS `stems`,`a`.`flight_id` AS `flightFk`,`a`.`volume_weight` AS `volumeWeight`,`a`.`hb` AS `hb`,`a`.`rate` AS `rate`,`a`.`booked` AS `booked`,`a`.`issued` AS `issued`,`a`.`operated` AS `operated`,`a`.`bookEntried` AS `bookEntried`,`a`.`invoiceInFk` AS `invoiceInFk`,`a`.`isChecked` AS `isChecked` from `vn2008`.`awb` `a` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+
 --
 -- Final view structure for view `businessCalendar`
 --
 
+/*!50001 DROP TABLE IF EXISTS `businessCalendar`*/;
 /*!50001 DROP VIEW IF EXISTS `businessCalendar`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74628,6 +78033,7 @@ USE `vn`;
 -- Final view structure for view `buyer`
 --
 
+/*!50001 DROP TABLE IF EXISTS `buyer`*/;
 /*!50001 DROP VIEW IF EXISTS `buyer`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74637,7 +78043,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `buyer` AS select distinct `u`.`id` AS `userFk`,`u`.`nickname` AS `nickname` from (`account`.`user` `u` join `vn`.`itemType` `it` on((`it`.`workerFk` = `u`.`id`))) where `u`.`active` order by `u`.`nickname` */;
+/*!50001 VIEW `buyer` AS select distinct `u`.`id` AS `userFk`,`u`.`nickname` AS `nickname` from (`account`.`user` `u` join `vn`.`itemType` `it` on(`it`.`workerFk` = `u`.`id`)) where `u`.`active` <> 0 order by `u`.`nickname` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74646,6 +78052,7 @@ USE `vn`;
 -- Final view structure for view `buyerSales`
 --
 
+/*!50001 DROP TABLE IF EXISTS `buyerSales`*/;
 /*!50001 DROP VIEW IF EXISTS `buyerSales`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74655,7 +78062,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `buyerSales` AS select `v`.`importe` AS `importe`,`w`.`code` AS `comprador`,`t`.`year` AS `año`,`t`.`week` AS `semana` from (((`bs`.`ventas` `v` join `vn`.`time` `t` on((`t`.`dated` = `v`.`fecha`))) join `vn`.`itemType` `it` on((`it`.`id` = `v`.`tipo_id`))) join `vn`.`worker` `w` on((`w`.`id` = `it`.`workerFk`))) */;
+/*!50001 VIEW `buyerSales` AS select `v`.`importe` AS `importe`,`w`.`code` AS `comprador`,`t`.`year` AS `año`,`t`.`week` AS `semana` from (((`bs`.`ventas` `v` join `vn`.`time` `t` on(`t`.`dated` = `v`.`fecha`)) join `vn`.`itemType` `it` on(`it`.`id` = `v`.`tipo_id`)) join `vn`.`worker` `w` on(`w`.`id` = `it`.`workerFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74664,6 +78071,7 @@ USE `vn`;
 -- Final view structure for view `calendar__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `calendar__`*/;
 /*!50001 DROP VIEW IF EXISTS `calendar__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74682,6 +78090,7 @@ USE `vn`;
 -- Final view structure for view `claimRatio__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `claimRatio__`*/;
 /*!50001 DROP VIEW IF EXISTS `claimRatio__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74700,6 +78109,7 @@ USE `vn`;
 -- Final view structure for view `clientManaCache__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `clientManaCache__`*/;
 /*!50001 DROP VIEW IF EXISTS `clientManaCache__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74718,6 +78128,7 @@ USE `vn`;
 -- Final view structure for view `clientRisk__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `clientRisk__`*/;
 /*!50001 DROP VIEW IF EXISTS `clientRisk__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74736,6 +78147,7 @@ USE `vn`;
 -- Final view structure for view `cmr_list`
 --
 
+/*!50001 DROP TABLE IF EXISTS `cmr_list`*/;
 /*!50001 DROP VIEW IF EXISTS `cmr_list`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74745,7 +78157,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `cmr_list` AS select `cmr`.`id` AS `cmrFk`,`cmr`.`ticketFk` AS `ticketFk`,`cmr`.`truckPlate` AS `truckPlate`,`cmr`.`observations` AS `observations`,`cmr`.`senderInstruccions` AS `senderInstruccions`,`cmr`.`paymentInstruccions` AS `paymentInstruccions`,`cmr`.`specialAgreements` AS `specialAgreements`,`cmr`.`created` AS `created`,`cmr`.`packagesList` AS `packagesList`,`aTo`.`nickname` AS `clientName`,`aTo`.`postalCode` AS `clientPostalCode`,`aTo`.`street` AS `clientStreet`,`aTo`.`city` AS `clientCity`,`pTo`.`name` AS `clientProvince`,`cTo`.`country` AS `clientCountry`,`su`.`name` AS `companyName`,`su`.`street` AS `companyStreet`,`su`.`postCode` AS `companyPostCode`,`su`.`city` AS `companyCity`,`cSu`.`country` AS `companyCountry`,concat(`aFrom`.`street`,' ',`aFrom`.`postalCode`,' ',`aFrom`.`city`,' (',`cFrom`.`country`,')') AS `warehouseAddress`,`cmr`.`created` AS `shipped`,`aTo`.`nickname` AS `clientOficialName`,`cmr`.`supplierFk` AS `supplierFk`,`aSu`.`name` AS `carrierName`,`aSu`.`street` AS `carrierStreet`,`aSu`.`postCode` AS `carrierPostCode`,`aSu`.`city` AS `carrierCity`,`cAs`.`country` AS `carrierCountry`,ifnull(`aTo`.`phone`,`client`.`phone`) AS `phone`,ifnull(`aTo`.`mobile`,`client`.`mobile`) AS `mobile`,`aTo`.`id` AS `addressFk` from (((((((((((`cmr` left join `address` `aTo` on((`aTo`.`id` = `cmr`.`addressToFk`))) left join `province` `pTo` on((`pTo`.`id` = `aTo`.`provinceFk`))) left join `country` `cTo` on((`cTo`.`id` = `pTo`.`countryFk`))) left join `client` on((`client`.`id` = `aTo`.`clientFk`))) left join `supplier` `su` on((`su`.`id` = `cmr`.`companyFk`))) left join `country` `cSu` on((`cSu`.`id` = `su`.`countryFk`))) left join `address` `aFrom` on((`aFrom`.`id` = `cmr`.`addressFromFk`))) left join `province` `pFrom` on((`pFrom`.`id` = `aFrom`.`provinceFk`))) left join `country` `cFrom` on((`cFrom`.`id` = `pFrom`.`countryFk`))) left join `supplier` `aSu` on((`aSu`.`id` = `cmr`.`supplierFk`))) left join `country` `cAs` on((`cAs`.`id` = `aSu`.`countryFk`))) */;
+/*!50001 VIEW `cmr_list` AS select `cmr`.`id` AS `cmrFk`,`cmr`.`ticketFk` AS `ticketFk`,`cmr`.`truckPlate` AS `truckPlate`,`cmr`.`observations` AS `observations`,`cmr`.`senderInstruccions` AS `senderInstruccions`,`cmr`.`paymentInstruccions` AS `paymentInstruccions`,`cmr`.`specialAgreements` AS `specialAgreements`,`cmr`.`created` AS `created`,`cmr`.`packagesList` AS `packagesList`,`aTo`.`nickname` AS `clientName`,`aTo`.`postalCode` AS `clientPostalCode`,`aTo`.`street` AS `clientStreet`,`aTo`.`city` AS `clientCity`,`pTo`.`name` AS `clientProvince`,`cTo`.`country` AS `clientCountry`,`su`.`name` AS `companyName`,`su`.`street` AS `companyStreet`,`su`.`postCode` AS `companyPostCode`,`su`.`city` AS `companyCity`,`cSu`.`country` AS `companyCountry`,concat(`aFrom`.`street`,' ',`aFrom`.`postalCode`,' ',`aFrom`.`city`,' (',`cFrom`.`country`,')') AS `warehouseAddress`,`cmr`.`created` AS `shipped`,`aTo`.`nickname` AS `clientOficialName`,`cmr`.`supplierFk` AS `supplierFk`,`aSu`.`name` AS `carrierName`,`aSu`.`street` AS `carrierStreet`,`aSu`.`postCode` AS `carrierPostCode`,`aSu`.`city` AS `carrierCity`,`cAs`.`country` AS `carrierCountry`,ifnull(`aTo`.`phone`,`client`.`phone`) AS `phone`,ifnull(`aTo`.`mobile`,`client`.`mobile`) AS `mobile`,`aTo`.`id` AS `addressFk` from (((((((((((`cmr` left join `address` `aTo` on(`aTo`.`id` = `cmr`.`addressToFk`)) left join `province` `pTo` on(`pTo`.`id` = `aTo`.`provinceFk`)) left join `country` `cTo` on(`cTo`.`id` = `pTo`.`countryFk`)) left join `client` on(`client`.`id` = `aTo`.`clientFk`)) left join `supplier` `su` on(`su`.`id` = `cmr`.`companyFk`)) left join `country` `cSu` on(`cSu`.`id` = `su`.`countryFk`)) left join `address` `aFrom` on(`aFrom`.`id` = `cmr`.`addressFromFk`)) left join `province` `pFrom` on(`pFrom`.`id` = `aFrom`.`provinceFk`)) left join `country` `cFrom` on(`cFrom`.`id` = `pFrom`.`countryFk`)) left join `supplier` `aSu` on(`aSu`.`id` = `cmr`.`supplierFk`)) left join `country` `cAs` on(`cAs`.`id` = `aSu`.`countryFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74754,6 +78166,7 @@ USE `vn`;
 -- Final view structure for view `collectionReportSource`
 --
 
+/*!50001 DROP TABLE IF EXISTS `collectionReportSource`*/;
 /*!50001 DROP VIEW IF EXISTS `collectionReportSource`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74763,7 +78176,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `collectionReportSource` AS select `tc`.`collectionFk` AS `collectionFk`,`tc`.`ticketFk` AS `ticketFk`,`s`.`itemFk` AS `itemFk`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`s`.`quantity` AS `quantity`,`ip`.`code` AS `nicho`,`tc`.`level` AS `level` from (((((`collection` `c` join `ticketCollection` `tc` on((`tc`.`collectionFk` = `c`.`id`))) join `ticket` `t` on((`t`.`id` = `tc`.`ticketFk`))) join `sale` `s` on((`s`.`ticketFk` = `t`.`id`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) left join `itemPlacement` `ip` on(((`ip`.`itemFk` = `s`.`itemFk`) and (`ip`.`warehouseFk` = `t`.`warehouseFk`)))) */;
+/*!50001 VIEW `collectionReportSource` AS select `tc`.`collectionFk` AS `collectionFk`,`tc`.`ticketFk` AS `ticketFk`,`s`.`itemFk` AS `itemFk`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`s`.`quantity` AS `quantity`,`ip`.`code` AS `nicho`,`tc`.`level` AS `level` from (((((`collection` `c` join `ticketCollection` `tc` on(`tc`.`collectionFk` = `c`.`id`)) join `ticket` `t` on(`t`.`id` = `tc`.`ticketFk`)) join `sale` `s` on(`s`.`ticketFk` = `t`.`id`)) join `item` `i` on(`i`.`id` = `s`.`itemFk`)) left join `itemPlacement` `ip` on(`ip`.`itemFk` = `s`.`itemFk` and `ip`.`warehouseFk` = `t`.`warehouseFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74772,6 +78185,7 @@ USE `vn`;
 -- Final view structure for view `componentRate__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `componentRate__`*/;
 /*!50001 DROP VIEW IF EXISTS `componentRate__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74790,6 +78204,7 @@ USE `vn`;
 -- Final view structure for view `componentTypeRate__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `componentTypeRate__`*/;
 /*!50001 DROP VIEW IF EXISTS `componentTypeRate__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74808,6 +78223,7 @@ USE `vn`;
 -- Final view structure for view `componentType__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `componentType__`*/;
 /*!50001 DROP VIEW IF EXISTS `componentType__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74826,6 +78242,7 @@ USE `vn`;
 -- Final view structure for view `component__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `component__`*/;
 /*!50001 DROP VIEW IF EXISTS `component__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74844,6 +78261,7 @@ USE `vn`;
 -- Final view structure for view `defaulter`
 --
 
+/*!50001 DROP TABLE IF EXISTS `defaulter`*/;
 /*!50001 DROP VIEW IF EXISTS `defaulter`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74862,6 +78280,7 @@ USE `vn`;
 -- Final view structure for view `departmentTree`
 --
 
+/*!50001 DROP TABLE IF EXISTS `departmentTree`*/;
 /*!50001 DROP VIEW IF EXISTS `departmentTree`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74871,7 +78290,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `departmentTree` AS select `node`.`id` AS `id`,concat(repeat(repeat(' ',5),(count(`parent`.`id`) - 1)),`node`.`name`) AS `dep` from (`department` `node` join `department` `parent`) where (`node`.`lft` between `parent`.`lft` and `parent`.`rgt`) group by `node`.`id` order by `node`.`lft` */;
+/*!50001 VIEW `departmentTree` AS select `node`.`id` AS `id`,concat(repeat(repeat(' ',5),count(`parent`.`id`) - 1),`node`.`name`) AS `dep` from (`department` `node` join `department` `parent`) where `node`.`lft` between `parent`.`lft` and `parent`.`rgt` group by `node`.`id` order by `node`.`lft` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74880,6 +78299,7 @@ USE `vn`;
 -- Final view structure for view `ediGenus`
 --
 
+/*!50001 DROP TABLE IF EXISTS `ediGenus`*/;
 /*!50001 DROP VIEW IF EXISTS `ediGenus`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74898,6 +78318,7 @@ USE `vn`;
 -- Final view structure for view `ediSpecie`
 --
 
+/*!50001 DROP TABLE IF EXISTS `ediSpecie`*/;
 /*!50001 DROP VIEW IF EXISTS `ediSpecie`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74916,6 +78337,7 @@ USE `vn`;
 -- Final view structure for view `entryList`
 --
 
+/*!50001 DROP TABLE IF EXISTS `entryList`*/;
 /*!50001 DROP VIEW IF EXISTS `entryList`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74925,7 +78347,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `entryList` AS select `e`.`id` AS `entryFk`,if(`tr`.`isReceived`,' x','') AS `isHere`,`tr`.`landed` AS `landed`,ifnull(`s`.`nickname`,`s`.`name`) AS `supplier`,`e`.`ref` AS `entryRef`,`a`.`name` AS `agency`,`tr`.`ref` AS `travelRef`,`tr`.`appointment` AS `appointment`,`e`.`supplierFk` AS `supplierFk`,`tr`.`warehouseInFk` AS `warehouseInFk` from (((`entry` `e` join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) join `supplier` `s` on((`s`.`id` = `e`.`supplierFk`))) left join `agency` `a` on((`tr`.`agencyFk` = `a`.`id`))) where (`tr`.`landed` between (curdate() + interval -(1) week) and (curdate() + interval 3 month)) order by (`tr`.`landed` < (curdate() + interval 3 day)),`tr`.`landed` desc,`s`.`name`,`e`.`id` desc */;
+/*!50001 VIEW `entryList` AS select `e`.`id` AS `entryFk`,if(`tr`.`isReceived`,' x','') AS `isHere`,`tr`.`landed` AS `landed`,ifnull(`s`.`nickname`,`s`.`name`) AS `supplier`,`e`.`ref` AS `entryRef`,`a`.`name` AS `agency`,`tr`.`ref` AS `travelRef`,`tr`.`appointment` AS `appointment`,`e`.`supplierFk` AS `supplierFk`,`tr`.`warehouseInFk` AS `warehouseInFk` from (((`entry` `e` join `travel` `tr` on(`tr`.`id` = `e`.`travelFk`)) join `supplier` `s` on(`s`.`id` = `e`.`supplierFk`)) left join `agency` `a` on(`tr`.`agencyFk` = `a`.`id`)) where `tr`.`landed` between curdate() + interval -1 week and curdate() + interval 3 month order by `tr`.`landed` < curdate() + interval 3 day,`tr`.`landed` desc,`s`.`name`,`e`.`id` desc */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74934,6 +78356,7 @@ USE `vn`;
 -- Final view structure for view `exchangeInsuranceEntry`
 --
 
+/*!50001 DROP TABLE IF EXISTS `exchangeInsuranceEntry`*/;
 /*!50001 DROP VIEW IF EXISTS `exchangeInsuranceEntry`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74943,7 +78366,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `exchangeInsuranceEntry` AS select max(`tr`.`landed`) AS `dated`,cast(sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) as decimal(10,2)) AS `Dolares`,cast((sum(((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`)) / sum(((((100 + `e`.`commission`) / 100) * (`b`.`buyingValue` + `b`.`freightValue`)) * `b`.`quantity`))) as decimal(10,4)) AS `rate` from ((`entry` `e` join `buy` `b` on((`e`.`id` = `b`.`entryFk`))) join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) where ((`tr`.`landed` between '2016-01-31' and curdate()) and (`e`.`commission` < 0) and (`e`.`currencyFk` = 2)) group by month(`tr`.`landed`),year(`tr`.`landed`) */;
+/*!50001 VIEW `exchangeInsuranceEntry` AS select max(`tr`.`landed`) AS `dated`,cast(sum((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`) as decimal(10,2)) AS `Dolares`,cast(sum((`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`) / sum((100 + `e`.`commission`) / 100 * (`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity`) as decimal(10,4)) AS `rate` from ((`entry` `e` join `buy` `b` on(`e`.`id` = `b`.`entryFk`)) join `travel` `tr` on(`tr`.`id` = `e`.`travelFk`)) where `tr`.`landed` between '2016-01-31' and curdate() and `e`.`commission` < 0 and `e`.`currencyFk` = 2 group by month(`tr`.`landed`),year(`tr`.`landed`) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74952,6 +78375,7 @@ USE `vn`;
 -- Final view structure for view `exchangeInsuranceIn`
 --
 
+/*!50001 DROP TABLE IF EXISTS `exchangeInsuranceIn`*/;
 /*!50001 DROP VIEW IF EXISTS `exchangeInsuranceIn`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74961,7 +78385,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `exchangeInsuranceIn` AS select `exchangeInsuranceInPrevious`.`dated` AS `dated`,sum(`exchangeInsuranceInPrevious`.`amount`) AS `amount`,cast((sum((`exchangeInsuranceInPrevious`.`amount` * `exchangeInsuranceInPrevious`.`rate`)) / sum(`exchangeInsuranceInPrevious`.`amount`)) as decimal(10,4)) AS `rate` from `vn`.`exchangeInsuranceInPrevious` group by `exchangeInsuranceInPrevious`.`dated` */;
+/*!50001 VIEW `exchangeInsuranceIn` AS select `exchangeInsuranceInPrevious`.`dated` AS `dated`,sum(`exchangeInsuranceInPrevious`.`amount`) AS `amount`,cast(sum(`exchangeInsuranceInPrevious`.`amount` * `exchangeInsuranceInPrevious`.`rate`) / sum(`exchangeInsuranceInPrevious`.`amount`) as decimal(10,4)) AS `rate` from `vn`.`exchangeInsuranceInPrevious` group by `exchangeInsuranceInPrevious`.`dated` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74970,6 +78394,7 @@ USE `vn`;
 -- Final view structure for view `exchangeInsuranceOut`
 --
 
+/*!50001 DROP TABLE IF EXISTS `exchangeInsuranceOut`*/;
 /*!50001 DROP VIEW IF EXISTS `exchangeInsuranceOut`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -74979,7 +78404,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `exchangeInsuranceOut` AS select `p`.`received` AS `received`,sum(`p`.`divisa`) AS `divisa`,(sum(`p`.`divisa`) / sum(`p`.`amount`)) AS `rate` from (`payment` `p` join `bank` `b` on((`b`.`id` = `p`.`bankFk`))) where ((`p`.`currencyFk` = 2) and (`b`.`cash` = 0) and (`p`.`supplierFk` <> 2213)) group by `p`.`received` */;
+/*!50001 VIEW `exchangeInsuranceOut` AS select `p`.`received` AS `received`,sum(`p`.`divisa`) AS `divisa`,sum(`p`.`divisa`) / sum(`p`.`amount`) AS `rate` from (`payment` `p` join `bank` `b` on(`b`.`id` = `p`.`bankFk`)) where `p`.`currencyFk` = 2 and `b`.`cash` = 0 and `p`.`supplierFk` <> 2213 group by `p`.`received` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -74988,6 +78413,7 @@ USE `vn`;
 -- Final view structure for view `exchangeReportSourcePrevious`
 --
 
+/*!50001 DROP TABLE IF EXISTS `exchangeReportSourcePrevious`*/;
 /*!50001 DROP VIEW IF EXISTS `exchangeReportSourcePrevious`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75006,6 +78432,7 @@ USE `vn`;
 -- Final view structure for view `expeditionCommon`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionCommon`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionCommon`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75015,7 +78442,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionCommon` AS select `et`.`id` AS `truckFk`,`et`.`ETD` AS `etd`,ifnull(ucase(`et`.`description`),'SIN ESCANEAR') AS `description`,`es`.`palletFk` AS `palletFk`,`t`.`routeFk` AS `routeFk`,`es`.`id` AS `scanFk`,`e`.`id` AS `expeditionFk`,`r`.`expeditionTruckFk` AS `expeditionTruckFk`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `lastPacked`,`t`.`id` AS `ticketFk` from (((((`vn`.`ticket` `t` left join `vn`.`expedition` `e` on((`t`.`id` = `e`.`ticketFk`))) left join `vn`.`expeditionScan` `es` on((`e`.`id` = `es`.`expeditionFk`))) left join `vn`.`expeditionPallet` `ep` on((`es`.`palletFk` = `ep`.`id`))) left join `vn`.`routesMonitor` `r` on((`r`.`routeFk` = `t`.`routeFk`))) left join `vn`.`expeditionTruck` `et` on((`et`.`id` = `r`.`expeditionTruckFk`))) where ((`t`.`shipped` >= curdate()) and (`t`.`routeFk` <> 0)) */;
+/*!50001 VIEW `expeditionCommon` AS select `et`.`id` AS `truckFk`,`et`.`ETD` AS `etd`,ifnull(ucase(`et`.`description`),'SIN ESCANEAR') AS `description`,`es`.`palletFk` AS `palletFk`,`t`.`routeFk` AS `routeFk`,`es`.`id` AS `scanFk`,`e`.`id` AS `expeditionFk`,`r`.`expeditionTruckFk` AS `expeditionTruckFk`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `lastPacked`,`t`.`id` AS `ticketFk` from (((((`vn`.`ticket` `t` left join `vn`.`expedition` `e` on(`t`.`id` = `e`.`ticketFk`)) left join `vn`.`expeditionScan` `es` on(`e`.`id` = `es`.`expeditionFk`)) left join `vn`.`expeditionPallet` `ep` on(`es`.`palletFk` = `ep`.`id`)) left join `vn`.`routesMonitor` `r` on(`r`.`routeFk` = `t`.`routeFk`)) left join `vn`.`expeditionTruck` `et` on(`et`.`id` = `r`.`expeditionTruckFk`)) where `t`.`shipped` >= curdate() and `t`.`routeFk` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75024,6 +78451,7 @@ USE `vn`;
 -- Final view structure for view `expeditionPallet_Print`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionPallet_Print`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionPallet_Print`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75033,7 +78461,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionPallet_Print` AS select `et2`.`description` AS `truck`,`t`.`routeFk` AS `routeFk`,`r`.`description` AS `zone`,count(`es`.`id`) AS `eti`,`ep`.`id` AS `palletFk`,(`et`.`id` <=> `rm`.`expeditionTruckFk`) AS `isMatch`,`t`.`warehouseFk` AS `warehouseFk` from (((((((`vn`.`expeditionTruck` `et` join `vn`.`expeditionPallet` `ep` on((`ep`.`truckFk` = `et`.`id`))) join `vn`.`expeditionScan` `es` on((`es`.`palletFk` = `ep`.`id`))) join `vn`.`expedition` `e` on((`e`.`id` = `es`.`expeditionFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `vn`.`route` `r` on((`r`.`id` = `t`.`routeFk`))) left join `vn2008`.`Rutas_monitor` `rm` on((`rm`.`Id_Ruta` = `r`.`id`))) left join `vn`.`expeditionTruck` `et2` on((`et2`.`id` = `rm`.`expeditionTruckFk`))) where (`ep`.`isPrint` = 0) group by `ep`.`id`,`t`.`routeFk` */;
+/*!50001 VIEW `expeditionPallet_Print` AS select `et2`.`description` AS `truck`,`t`.`routeFk` AS `routeFk`,`r`.`description` AS `zone`,count(`es`.`id`) AS `eti`,`ep`.`id` AS `palletFk`,`et`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,`t`.`warehouseFk` AS `warehouseFk` from (((((((`vn`.`expeditionTruck` `et` join `vn`.`expeditionPallet` `ep` on(`ep`.`truckFk` = `et`.`id`)) join `vn`.`expeditionScan` `es` on(`es`.`palletFk` = `ep`.`id`)) join `vn`.`expedition` `e` on(`e`.`id` = `es`.`expeditionFk`)) join `vn`.`ticket` `t` on(`t`.`id` = `e`.`ticketFk`)) join `vn`.`route` `r` on(`r`.`id` = `t`.`routeFk`)) left join `vn2008`.`Rutas_monitor` `rm` on(`rm`.`Id_Ruta` = `r`.`id`)) left join `vn`.`expeditionTruck` `et2` on(`et2`.`id` = `rm`.`expeditionTruckFk`)) where `ep`.`isPrint` = 0 group by `ep`.`id`,`t`.`routeFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75042,6 +78470,7 @@ USE `vn`;
 -- Final view structure for view `expeditionRoute_Monitor`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionRoute_Monitor`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionRoute_Monitor`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75051,7 +78480,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionRoute_Monitor` AS select `r`.`id` AS `routeFk`,count(distinct if(isnull(`e`.`id`),`t`.`id`,NULL)) AS `tickets`,count(distinct `e`.`id`) AS `expeditions`,count(distinct `es`.`id`) AS `scanned`,max(`e`.`created`) AS `lastPacked` from ((((((`vn`.`route` `r` join `vn`.`routesMonitor` `rm` on((`r`.`id` = `rm`.`routeFk`))) join `vn`.`expeditionTruck` `et` on((`et`.`id` = `rm`.`expeditionTruckFk`))) join `vn`.`ticket` `t` on((`t`.`routeFk` = `r`.`id`))) left join `vn`.`expedition` `e` on((`e`.`ticketFk` = `t`.`id`))) left join `vn`.`expeditionScan` `es` on((`es`.`expeditionFk` = `e`.`id`))) left join `vn`.`stowaway` `st` on((`st`.`id` = `t`.`id`))) where ((`et`.`ETD` >= curdate()) and isnull(`st`.`id`)) group by `r`.`id` */;
+/*!50001 VIEW `expeditionRoute_Monitor` AS select `r`.`id` AS `routeFk`,count(distinct if(`e`.`id` is null,`t`.`id`,NULL)) AS `tickets`,count(distinct `e`.`id`) AS `expeditions`,count(distinct `es`.`id`) AS `scanned`,max(`e`.`created`) AS `lastPacked` from ((((((`vn`.`route` `r` join `vn`.`routesMonitor` `rm` on(`r`.`id` = `rm`.`routeFk`)) join `vn`.`expeditionTruck` `et` on(`et`.`id` = `rm`.`expeditionTruckFk`)) join `vn`.`ticket` `t` on(`t`.`routeFk` = `r`.`id`)) left join `vn`.`expedition` `e` on(`e`.`ticketFk` = `t`.`id`)) left join `vn`.`expeditionScan` `es` on(`es`.`expeditionFk` = `e`.`id`)) left join `vn`.`stowaway` `st` on(`st`.`id` = `t`.`id`)) where `et`.`ETD` >= curdate() and `st`.`id` is null group by `r`.`id` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75060,6 +78489,7 @@ USE `vn`;
 -- Final view structure for view `expeditionRoute_freeTickets`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionRoute_freeTickets`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionRoute_freeTickets`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75069,7 +78499,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionRoute_freeTickets` AS select `t`.`routeFk` AS `routeFk`,`tss`.`ticket` AS `ticket`,`s`.`name` AS `code`,`w`.`name` AS `almacen`,`tss`.`updated` AS `updated` from ((((`vn`.`ticketStateToday` `tss` join `vn`.`ticket` `t` on((`t`.`id` = `tss`.`ticket`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`state` `s` on((`s`.`id` = `tss`.`state`))) left join `vn`.`stowaway` `st` on((`st`.`id` = `t`.`id`))) where ((ifnull(`t`.`packages`,0) = 0) and isnull(`st`.`id`)) */;
+/*!50001 VIEW `expeditionRoute_freeTickets` AS select `t`.`routeFk` AS `routeFk`,`tss`.`ticket` AS `ticket`,`s`.`name` AS `code`,`w`.`name` AS `almacen`,`tss`.`updated` AS `updated` from ((((`vn`.`ticketStateToday` `tss` join `vn`.`ticket` `t` on(`t`.`id` = `tss`.`ticket`)) join `vn`.`warehouse` `w` on(`w`.`id` = `t`.`warehouseFk`)) join `vn`.`state` `s` on(`s`.`id` = `tss`.`state`)) left join `vn`.`stowaway` `st` on(`st`.`id` = `t`.`id`)) where ifnull(`t`.`packages`,0) = 0 and `st`.`id` is null */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75078,6 +78508,7 @@ USE `vn`;
 -- Final view structure for view `expeditionScan_Monitor`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionScan_Monitor`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionScan_Monitor`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75087,7 +78518,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionScan_Monitor` AS select `et`.`id` AS `truckFk`,`et`.`ETD` AS `ETD`,`et`.`description` AS `description`,`ep`.`id` AS `palletFk`,`ep`.`position` AS `position`,`ep`.`built` AS `built`,`es`.`id` AS `scanFk`,`es`.`expeditionFk` AS `expeditionFk`,`es`.`scanned` AS `scanned` from ((`expeditionTruck` `et` left join `expeditionPallet` `ep` on((`ep`.`truckFk` = `et`.`id`))) left join `expeditionScan` `es` on((`es`.`palletFk` = `ep`.`id`))) */;
+/*!50001 VIEW `expeditionScan_Monitor` AS select `et`.`id` AS `truckFk`,`et`.`ETD` AS `ETD`,`et`.`description` AS `description`,`ep`.`id` AS `palletFk`,`ep`.`position` AS `position`,`ep`.`built` AS `built`,`es`.`id` AS `scanFk`,`es`.`expeditionFk` AS `expeditionFk`,`es`.`scanned` AS `scanned` from ((`expeditionTruck` `et` left join `expeditionPallet` `ep` on(`ep`.`truckFk` = `et`.`id`)) left join `expeditionScan` `es` on(`es`.`palletFk` = `ep`.`id`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75096,6 +78527,7 @@ USE `vn`;
 -- Final view structure for view `expeditionTimeExpended`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionTimeExpended`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionTimeExpended`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75105,7 +78537,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionTimeExpended` AS select `e`.`ticketFk` AS `ticketFk`,min(`e`.`created`) AS `started`,max(`e`.`created`) AS `finished`,max(`e`.`counter`) AS `cajas`,`w`.`code` AS `code`,`t`.`warehouseFk` AS `warehouseFk` from ((`expedition` `e` join `worker` `w` on((`w`.`id` = `e`.`workerFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) where (`e`.`created` > curdate()) group by `e`.`ticketFk` */;
+/*!50001 VIEW `expeditionTimeExpended` AS select `e`.`ticketFk` AS `ticketFk`,min(`e`.`created`) AS `started`,max(`e`.`created`) AS `finished`,max(`e`.`counter`) AS `cajas`,`w`.`code` AS `code`,`t`.`warehouseFk` AS `warehouseFk` from ((`expedition` `e` join `worker` `w` on(`w`.`id` = `e`.`workerFk`)) join `ticket` `t` on(`t`.`id` = `e`.`ticketFk`)) where `e`.`created` > curdate() group by `e`.`ticketFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75114,6 +78546,7 @@ USE `vn`;
 -- Final view structure for view `expeditionTruck_Control`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionTruck_Control`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionTruck_Control`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75123,7 +78556,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionTruck_Control` AS select `e`.`truckFk` AS `id`,`e`.`etd` AS `ETD`,`e`.`description` AS `description`,count(distinct if(isnull(`e`.`expeditionFk`),`e`.`ticketFk`,NULL)) AS `ticketsSinBultos`,count(distinct `e`.`palletFk`) AS `pallets`,count(distinct `e`.`routeFk`) AS `routes`,count(distinct `e`.`scanFk`) AS `scans`,count(distinct `e`.`expeditionFk`) AS `expeditions`,sum((`e`.`truckFk` <> `e`.`expeditionTruckFk`)) AS `fallos`,max(`e`.`lastPacked`) AS `lastPacked` from `vn`.`expeditionCommon` `e` group by `e`.`truckFk` order by `fallos` desc,`e`.`etd` */;
+/*!50001 VIEW `expeditionTruck_Control` AS select `e`.`truckFk` AS `id`,`e`.`etd` AS `ETD`,`e`.`description` AS `description`,count(distinct if(`e`.`expeditionFk` is null,`e`.`ticketFk`,NULL)) AS `ticketsSinBultos`,count(distinct `e`.`palletFk`) AS `pallets`,count(distinct `e`.`routeFk`) AS `routes`,count(distinct `e`.`scanFk`) AS `scans`,count(distinct `e`.`expeditionFk`) AS `expeditions`,sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`,max(`e`.`lastPacked`) AS `lastPacked` from `vn`.`expeditionCommon` `e` group by `e`.`truckFk` order by sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) desc,`e`.`etd` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75132,6 +78565,7 @@ USE `vn`;
 -- Final view structure for view `expeditionTruck_Control_Detail`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionTruck_Control_Detail`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionTruck_Control_Detail`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75141,7 +78575,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionTruck_Control_Detail` AS select `e`.`truckFk` AS `id`,`e`.`etd` AS `ETD`,`e`.`description` AS `destino`,`e`.`palletFk` AS `pallet`,count(distinct `e`.`routeFk`) AS `routes`,count(distinct `e`.`scanFk`) AS `scans`,count(distinct `e`.`expeditionTruckFk`) AS `destinos`,sum((`e`.`truckFk` <> `e`.`expeditionTruckFk`)) AS `fallos`,max(`e`.`lastPacked`) AS `lastPacked` from `vn`.`expeditionCommon` `e` group by `e`.`truckFk`,`e`.`palletFk` order by `fallos` desc,`e`.`etd`,`e`.`truckFk` */;
+/*!50001 VIEW `expeditionTruck_Control_Detail` AS select `e`.`truckFk` AS `id`,`e`.`etd` AS `ETD`,`e`.`description` AS `destino`,`e`.`palletFk` AS `pallet`,count(distinct `e`.`routeFk`) AS `routes`,count(distinct `e`.`scanFk`) AS `scans`,count(distinct `e`.`expeditionTruckFk`) AS `destinos`,sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`,max(`e`.`lastPacked`) AS `lastPacked` from `vn`.`expeditionCommon` `e` group by `e`.`truckFk`,`e`.`palletFk` order by sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) desc,`e`.`etd`,`e`.`truckFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75150,6 +78584,7 @@ USE `vn`;
 -- Final view structure for view `expeditionTruck_Control_Detail_Pallet`
 --
 
+/*!50001 DROP TABLE IF EXISTS `expeditionTruck_Control_Detail_Pallet`*/;
 /*!50001 DROP VIEW IF EXISTS `expeditionTruck_Control_Detail_Pallet`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75159,7 +78594,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `expeditionTruck_Control_Detail_Pallet` AS select `e`.`truckFk` AS `id`,`e`.`etd` AS `ETD`,`e`.`description` AS `destino`,`e`.`palletFk` AS `pallet`,`e`.`routeFk` AS `route`,count(distinct `e`.`scanFk`) AS `scans`,`et`.`description` AS `destinos`,sum((`e`.`truckFk` <> `e`.`expeditionTruckFk`)) AS `fallos`,`e`.`expeditionTruckFk` AS `expeditionTruckFk`,max(`e`.`lastPacked`) AS `lastPacked` from (`vn`.`expeditionCommon` `e` left join `vn`.`expeditionTruck` `et` on((`et`.`id` = `e`.`expeditionTruckFk`))) group by `e`.`truckFk`,`e`.`palletFk`,`e`.`routeFk` order by `fallos` desc,`e`.`palletFk` */;
+/*!50001 VIEW `expeditionTruck_Control_Detail_Pallet` AS select `e`.`truckFk` AS `id`,`e`.`etd` AS `ETD`,`e`.`description` AS `destino`,`e`.`palletFk` AS `pallet`,`e`.`routeFk` AS `route`,count(distinct `e`.`scanFk`) AS `scans`,`et`.`description` AS `destinos`,sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`,`e`.`expeditionTruckFk` AS `expeditionTruckFk`,max(`e`.`lastPacked`) AS `lastPacked` from (`vn`.`expeditionCommon` `e` left join `vn`.`expeditionTruck` `et` on(`et`.`id` = `e`.`expeditionTruckFk`)) group by `e`.`truckFk`,`e`.`palletFk`,`e`.`routeFk` order by sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) desc,`e`.`palletFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75168,6 +78603,7 @@ USE `vn`;
 -- Final view structure for view `firstTicketShipped`
 --
 
+/*!50001 DROP TABLE IF EXISTS `firstTicketShipped`*/;
 /*!50001 DROP VIEW IF EXISTS `firstTicketShipped`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75177,7 +78613,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `firstTicketShipped` AS select min(`ticket`.`shipped`) AS `shipped`,`ticket`.`clientFk` AS `clientFk` from `ticket` where (`ticket`.`shipped` > '2001-01-01') group by `ticket`.`clientFk` */;
+/*!50001 VIEW `firstTicketShipped` AS select min(`ticket`.`shipped`) AS `shipped`,`ticket`.`clientFk` AS `clientFk` from `ticket` where `ticket`.`shipped` > '2001-01-01' group by `ticket`.`clientFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75186,6 +78622,7 @@ USE `vn`;
 -- Final view structure for view `floraHollandBuyedItems`
 --
 
+/*!50001 DROP TABLE IF EXISTS `floraHollandBuyedItems`*/;
 /*!50001 DROP VIEW IF EXISTS `floraHollandBuyedItems`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75195,7 +78632,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `floraHollandBuyedItems` AS select `b`.`itemFk` AS `itemFk`,`i`.`longName` AS `longName`,`b`.`quantity` AS `quantity`,`b`.`buyingValue` AS `buyingValue`,`tr`.`landed` AS `landed`,`e`.`companyFk` AS `companyFk` from (((((`buy` `b` join `item` `i` on((`b`.`itemFk` = `i`.`id`))) join `itemType` `it` on((`it`.`id` = `i`.`typeFk`))) join `itemCategory` `ic` on((`ic`.`id` = `it`.`categoryFk`))) join `entry` `e` on((`e`.`id` = `b`.`entryFk`))) join `travel` `tr` on(((`tr`.`id` = `e`.`travelFk`) and (`ic`.`id` not in (8,6)) and (`b`.`buyingValue` <> 0) and (`b`.`quantity` <> 0) and (`e`.`supplierFk` in (1664,1665,1666,1465,1433))))) */;
+/*!50001 VIEW `floraHollandBuyedItems` AS select `b`.`itemFk` AS `itemFk`,`i`.`longName` AS `longName`,`b`.`quantity` AS `quantity`,`b`.`buyingValue` AS `buyingValue`,`tr`.`landed` AS `landed`,`e`.`companyFk` AS `companyFk` from (((((`buy` `b` join `item` `i` on(`b`.`itemFk` = `i`.`id`)) join `itemType` `it` on(`it`.`id` = `i`.`typeFk`)) join `itemCategory` `ic` on(`ic`.`id` = `it`.`categoryFk`)) join `entry` `e` on(`e`.`id` = `b`.`entryFk`)) join `travel` `tr` on(`tr`.`id` = `e`.`travelFk` and `ic`.`id` not in (8,6) and `b`.`buyingValue` <> 0 and `b`.`quantity` <> 0 and `e`.`supplierFk` in (1664,1665,1666,1465,1433))) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75204,6 +78641,7 @@ USE `vn`;
 -- Final view structure for view `holidayDetail__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `holidayDetail__`*/;
 /*!50001 DROP VIEW IF EXISTS `holidayDetail__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75222,6 +78660,7 @@ USE `vn`;
 -- Final view structure for view `holidayLegend__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `holidayLegend__`*/;
 /*!50001 DROP VIEW IF EXISTS `holidayLegend__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75240,6 +78679,7 @@ USE `vn`;
 -- Final view structure for view `holidayType__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `holidayType__`*/;
 /*!50001 DROP VIEW IF EXISTS `holidayType__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75258,6 +78698,7 @@ USE `vn`;
 -- Final view structure for view `holiday__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `holiday__`*/;
 /*!50001 DROP VIEW IF EXISTS `holiday__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75276,6 +78717,7 @@ USE `vn`;
 -- Final view structure for view `inkL10n`
 --
 
+/*!50001 DROP TABLE IF EXISTS `inkL10n`*/;
 /*!50001 DROP VIEW IF EXISTS `inkL10n`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75285,7 +78727,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `inkL10n` AS select `k`.`id` AS `id`,ifnull(`i`.`name`,`k`.`name`) AS `name` from (`ink` `k` left join `inkI18n` `i` on(((`i`.`inkFk` = `k`.`id`) and (`i`.`lang` = `util`.`lang`())))) */;
+/*!50001 VIEW `inkL10n` AS select `k`.`id` AS `id`,ifnull(`i`.`name`,`k`.`name`) AS `name` from (`ink` `k` left join `inkI18n` `i` on(`i`.`inkFk` = `k`.`id` and `i`.`lang` = `util`.`lang`())) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75294,6 +78736,7 @@ USE `vn`;
 -- Final view structure for view `invoiceCorrectionDataSource`
 --
 
+/*!50001 DROP TABLE IF EXISTS `invoiceCorrectionDataSource`*/;
 /*!50001 DROP VIEW IF EXISTS `invoiceCorrectionDataSource`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75303,7 +78746,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `invoiceCorrectionDataSource` AS select `s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`s`.`price` AS `price`,`s`.`discount` AS `discount`,`t`.`refFk` AS `refFk`,`s`.`id` AS `saleFk`,`t`.`shipped` AS `shipped` from (`sale` `s` join `ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) */;
+/*!50001 VIEW `invoiceCorrectionDataSource` AS select `s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`s`.`price` AS `price`,`s`.`discount` AS `discount`,`t`.`refFk` AS `refFk`,`s`.`id` AS `saleFk`,`t`.`shipped` AS `shipped` from (`sale` `s` join `ticket` `t` on(`t`.`id` = `s`.`ticketFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75312,6 +78755,7 @@ USE `vn`;
 -- Final view structure for view `invoiceInAwb__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `invoiceInAwb__`*/;
 /*!50001 DROP VIEW IF EXISTS `invoiceInAwb__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75330,6 +78774,7 @@ USE `vn`;
 -- Final view structure for view `invoiceInDueDay__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `invoiceInDueDay__`*/;
 /*!50001 DROP VIEW IF EXISTS `invoiceInDueDay__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75348,6 +78793,7 @@ USE `vn`;
 -- Final view structure for view `invoiceInEntry__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `invoiceInEntry__`*/;
 /*!50001 DROP VIEW IF EXISTS `invoiceInEntry__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75366,6 +78812,7 @@ USE `vn`;
 -- Final view structure for view `invoiceInIntrastat__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `invoiceInIntrastat__`*/;
 /*!50001 DROP VIEW IF EXISTS `invoiceInIntrastat__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75384,6 +78831,7 @@ USE `vn`;
 -- Final view structure for view `invoiceIn__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `invoiceIn__`*/;
 /*!50001 DROP VIEW IF EXISTS `invoiceIn__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75402,6 +78850,7 @@ USE `vn`;
 -- Final view structure for view `itemBotanicalWithGenus`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemBotanicalWithGenus`*/;
 /*!50001 DROP VIEW IF EXISTS `itemBotanicalWithGenus`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75411,7 +78860,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemBotanicalWithGenus` AS select `ib`.`itemFk` AS `itemFk`,ifnull(`ib`.`botanical`,concat(`g`.`latinGenusName`,' ',ifnull(`s`.`latinSpeciesName`,''))) AS `ediBotanic` from ((`vn`.`itemBotanical` `ib` left join `vn`.`ediGenus` `g` on((`g`.`id` = `ib`.`genusFk`))) left join `vn`.`ediSpecie` `s` on((`s`.`id` = `ib`.`specieFk`))) */;
+/*!50001 VIEW `itemBotanicalWithGenus` AS select `ib`.`itemFk` AS `itemFk`,ifnull(`ib`.`botanical`,concat(`g`.`latinGenusName`,' ',ifnull(`s`.`latinSpeciesName`,''))) AS `ediBotanic` from ((`vn`.`itemBotanical` `ib` left join `vn`.`ediGenus` `g` on(`g`.`id` = `ib`.`genusFk`)) left join `vn`.`ediSpecie` `s` on(`s`.`id` = `ib`.`specieFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75420,6 +78869,7 @@ USE `vn`;
 -- Final view structure for view `itemCategoryL10n`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemCategoryL10n`*/;
 /*!50001 DROP VIEW IF EXISTS `itemCategoryL10n`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75429,7 +78879,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemCategoryL10n` AS select `c`.`id` AS `id`,ifnull(`i`.`name`,`c`.`name`) AS `name` from (`itemCategory` `c` left join `itemCategoryI18n` `i` on(((`i`.`categoryFk` = `c`.`id`) and (`i`.`lang` = `util`.`lang`())))) */;
+/*!50001 VIEW `itemCategoryL10n` AS select `c`.`id` AS `id`,ifnull(`i`.`name`,`c`.`name`) AS `name` from (`itemCategory` `c` left join `itemCategoryI18n` `i` on(`i`.`categoryFk` = `c`.`id` and `i`.`lang` = `util`.`lang`())) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75438,6 +78888,7 @@ USE `vn`;
 -- Final view structure for view `itemColor`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemColor`*/;
 /*!50001 DROP VIEW IF EXISTS `itemColor`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75447,7 +78898,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemColor` AS select `it`.`itemFk` AS `itemFk`,`it`.`value` AS `color` from (`itemTag` `it` join `tag` `t` on((`t`.`id` = `it`.`tagFk`))) where (`t`.`code` = 'COLOR') */;
+/*!50001 VIEW `itemColor` AS select `it`.`itemFk` AS `itemFk`,`it`.`value` AS `color` from (`itemTag` `it` join `tag` `t` on(`t`.`id` = `it`.`tagFk`)) where `t`.`code` = 'COLOR' */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75456,6 +78907,7 @@ USE `vn`;
 -- Final view structure for view `itemEntryIn`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemEntryIn`*/;
 /*!50001 DROP VIEW IF EXISTS `itemEntryIn`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75465,7 +78917,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemEntryIn` AS select `t`.`warehouseInFk` AS `warehouseInFk`,`t`.`landed` AS `landed`,`b`.`itemFk` AS `itemFk`,`b`.`quantity` AS `quantity`,`t`.`isReceived` AS `isReceived`,`e`.`isRaid` AS `isVirtualStock`,`e`.`id` AS `entryFk` from ((`buy` `b` join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`e`.`travelFk` = `t`.`id`))) where ((`e`.`isInventory` = 0) and (`b`.`quantity` <> 0)) */;
+/*!50001 VIEW `itemEntryIn` AS select `t`.`warehouseInFk` AS `warehouseInFk`,`t`.`landed` AS `landed`,`b`.`itemFk` AS `itemFk`,`b`.`quantity` AS `quantity`,`t`.`isReceived` AS `isReceived`,`e`.`isRaid` AS `isVirtualStock`,`e`.`id` AS `entryFk` from ((`buy` `b` join `entry` `e` on(`b`.`entryFk` = `e`.`id`)) join `travel` `t` on(`e`.`travelFk` = `t`.`id`)) where `e`.`isInventory` = 0 and `b`.`quantity` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75474,6 +78926,7 @@ USE `vn`;
 -- Final view structure for view `itemEntryOut`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemEntryOut`*/;
 /*!50001 DROP VIEW IF EXISTS `itemEntryOut`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75483,7 +78936,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemEntryOut` AS select `t`.`warehouseOutFk` AS `warehouseOutFk`,`t`.`shipped` AS `shipped`,`b`.`itemFk` AS `itemFk`,-(`b`.`quantity`) AS `quantity`,`t`.`isDelivered` AS `isDelivered`,`e`.`id` AS `entryFk` from ((`buy` `b` join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`e`.`travelFk` = `t`.`id`))) where ((`e`.`isInventory` = 0) and (`e`.`isRaid` = 0) and (`b`.`quantity` <> 0)) */;
+/*!50001 VIEW `itemEntryOut` AS select `t`.`warehouseOutFk` AS `warehouseOutFk`,`t`.`shipped` AS `shipped`,`b`.`itemFk` AS `itemFk`,-`b`.`quantity` AS `quantity`,`t`.`isDelivered` AS `isDelivered`,`e`.`id` AS `entryFk` from ((`buy` `b` join `entry` `e` on(`b`.`entryFk` = `e`.`id`)) join `travel` `t` on(`e`.`travelFk` = `t`.`id`)) where `e`.`isInventory` = 0 and `e`.`isRaid` = 0 and `b`.`quantity` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75492,6 +78945,7 @@ USE `vn`;
 -- Final view structure for view `itemPlacementSupplyList`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemPlacementSupplyList`*/;
 /*!50001 DROP VIEW IF EXISTS `itemPlacementSupplyList`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75501,7 +78955,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemPlacementSupplyList` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,ifnull(`isps`.`created`,`ips`.`created`) AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,(`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0))) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,`ips`.`sectorFk` AS `sectorFk` from ((((`itemPlacementSupply` `ips` join `item` `i` on((`i`.`id` = `ips`.`itemFk`))) left join `worker` `w` on((`w`.`userFk` = `ips`.`userFk`))) left join `worker` `rw` on((`rw`.`userFk` = `ips`.`repoUserFk`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemPlacementSupplyFk` = `ips`.`id`))) where (`ips`.`created` >= curdate()) group by `ips`.`priority`,`ips`.`id`,`ips`.`sectorFk` */;
+/*!50001 VIEW `itemPlacementSupplyList` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,ifnull(`isps`.`created`,`ips`.`created`) AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0)) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,`ips`.`sectorFk` AS `sectorFk` from ((((`itemPlacementSupply` `ips` join `item` `i` on(`i`.`id` = `ips`.`itemFk`)) left join `worker` `w` on(`w`.`userFk` = `ips`.`userFk`)) left join `worker` `rw` on(`rw`.`userFk` = `ips`.`repoUserFk`)) left join `itemShelvingPlacementSupply` `isps` on(`isps`.`itemPlacementSupplyFk` = `ips`.`id`)) where `ips`.`created` >= curdate() group by `ips`.`priority`,`ips`.`id`,`ips`.`sectorFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75510,6 +78964,7 @@ USE `vn`;
 -- Final view structure for view `itemProductor`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemProductor`*/;
 /*!50001 DROP VIEW IF EXISTS `itemProductor`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75519,7 +78974,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemProductor` AS select `it`.`itemFk` AS `itemFk`,`it`.`value` AS `productor` from (`itemTag` `it` join `tag` `t` on((`t`.`id` = `it`.`tagFk`))) where (`t`.`code` = 'PRODUCER') */;
+/*!50001 VIEW `itemProductor` AS select `it`.`itemFk` AS `itemFk`,`it`.`value` AS `productor` from (`itemTag` `it` join `tag` `t` on(`t`.`id` = `it`.`tagFk`)) where `t`.`code` = 'PRODUCER' */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75528,6 +78983,7 @@ USE `vn`;
 -- Final view structure for view `itemShelvingAvailable`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemShelvingAvailable`*/;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingAvailable`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75537,7 +78993,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,0 AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`stock`.`visible` AS `available`,`stock`.`sectorFk` AS `sectorFk`,`stock`.`shelvingFk` AS `matricula`,`stock`.`parkingFk` AS `parking`,`stock`.`itemShelvingFk` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`stock`.`grouping` AS `grouping`,`stock`.`packing` AS `packing`,`z`.`hour` AS `hour`,`st`.`isPreviousPreparable` AS `isPreviousPreparable`,`sv`.`physicalVolume` AS `physicalVolume`,`t`.`warehouseFk` AS `warehouseFk` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`agencyMode` `am` on((`am`.`id` = `t`.`agencyModeFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelvingStock` `stock` on((`stock`.`itemFk` = `i`.`id`))) left join `vn`.`saleTracking` `stk` on((`stk`.`saleFk` = `s`.`id`))) left join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`saleVolume` `sv` on((`sv`.`saleFk` = `s`.`id`))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(curdate())) and isnull(`stk`.`id`) and (`stock`.`visible` > 0) and isnull(`stk`.`saleFk`) and `st`.`isPreviousPreparable`) */;
+/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,0 AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`stock`.`visible` AS `available`,`stock`.`sectorFk` AS `sectorFk`,`stock`.`shelvingFk` AS `matricula`,`stock`.`parkingFk` AS `parking`,`stock`.`itemShelvingFk` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`stock`.`grouping` AS `grouping`,`stock`.`packing` AS `packing`,`z`.`hour` AS `hour`,`st`.`isPreviousPreparable` AS `isPreviousPreparable`,`sv`.`physicalVolume` AS `physicalVolume`,`t`.`warehouseFk` AS `warehouseFk` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on(`t`.`id` = `s`.`ticketFk`)) join `vn`.`agencyMode` `am` on(`am`.`id` = `t`.`agencyModeFk`)) join `vn`.`ticketStateToday` `tst` on(`tst`.`ticket` = `t`.`id`)) join `vn`.`state` `st` on(`st`.`id` = `tst`.`state`)) join `vn`.`item` `i` on(`i`.`id` = `s`.`itemFk`)) join `vn`.`itemShelvingStock` `stock` on(`stock`.`itemFk` = `i`.`id`)) left join `vn`.`saleTracking` `stk` on(`stk`.`saleFk` = `s`.`id`)) left join `vn`.`zone` `z` on(`z`.`id` = `t`.`zoneFk`)) left join `vn`.`saleVolume` `sv` on(`sv`.`saleFk` = `s`.`id`)) where `t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(curdate()) and `stk`.`id` is null and `stock`.`visible` > 0 and `stk`.`saleFk` is null and `st`.`isPreviousPreparable` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75546,6 +79002,7 @@ USE `vn`;
 -- Final view structure for view `itemShelvingList`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemShelvingList`*/;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingList`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75555,7 +79012,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingList` AS select `ish`.`shelvingFk` AS `shelvingFk`,`ish`.`visible` AS `visible`,`ish`.`created` AS `created`,`pk`.`code` AS `parking`,`ish`.`itemFk` AS `itemFk`,`i`.`longName` AS `longName`,`i`.`size` AS `size`,`i`.`subName` AS `subName`,`sh`.`parked` AS `parked` from (((`itemShelving` `ish` join `shelving` `sh` on((`sh`.`code` = `ish`.`shelvingFk`))) join `item` `i` on((`i`.`id` = `ish`.`itemFk`))) left join `parking` `pk` on((`pk`.`id` = `sh`.`parkingFk`))) order by `ish`.`created` */;
+/*!50001 VIEW `itemShelvingList` AS select `ish`.`shelvingFk` AS `shelvingFk`,`ish`.`visible` AS `visible`,`ish`.`created` AS `created`,`pk`.`code` AS `parking`,`ish`.`itemFk` AS `itemFk`,`i`.`longName` AS `longName`,`i`.`size` AS `size`,`i`.`subName` AS `subName`,`sh`.`parked` AS `parked` from (((`itemShelving` `ish` join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) join `item` `i` on(`i`.`id` = `ish`.`itemFk`)) left join `parking` `pk` on(`pk`.`id` = `sh`.`parkingFk`)) order by `ish`.`created` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75564,6 +79021,7 @@ USE `vn`;
 -- Final view structure for view `itemShelvingPlacementSupplyStock`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemShelvingPlacementSupplyStock`*/;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingPlacementSupplyStock`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75573,7 +79031,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingPlacementSupplyStock` AS select `ish`.`id` AS `itemShelvingFk`,`ish`.`itemFk` AS `itemFk`,`ish`.`quantity` AS `quantity`,`ish`.`packing` AS `packing`,`ish`.`visible` AS `stock`,`i`.`longName` AS `longName`,`i`.`size` AS `size`,`i`.`subName` AS `subName`,`sh`.`code` AS `shelving`,`p`.`code` AS `parking`,`ish`.`created` AS `created`,ifnull(`sh`.`priority`,1) AS `priority`,`p`.`id` AS `parkingFk`,`p`.`sectorFk` AS `sectorFk` from (((`itemShelving` `ish` join `shelving` `sh` on((`sh`.`code` = `ish`.`shelvingFk`))) left join `parking` `p` on((`p`.`id` = `sh`.`parkingFk`))) join `item` `i` on((`i`.`id` = `ish`.`itemFk`))) group by `ish`.`id` */;
+/*!50001 VIEW `itemShelvingPlacementSupplyStock` AS select `ish`.`id` AS `itemShelvingFk`,`ish`.`itemFk` AS `itemFk`,`ish`.`quantity` AS `quantity`,`ish`.`packing` AS `packing`,`ish`.`visible` AS `stock`,`i`.`longName` AS `longName`,`i`.`size` AS `size`,`i`.`subName` AS `subName`,`sh`.`code` AS `shelving`,`p`.`code` AS `parking`,`ish`.`created` AS `created`,ifnull(`sh`.`priority`,1) AS `priority`,`p`.`id` AS `parkingFk`,`p`.`sectorFk` AS `sectorFk` from (((`itemShelving` `ish` join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) left join `parking` `p` on(`p`.`id` = `sh`.`parkingFk`)) join `item` `i` on(`i`.`id` = `ish`.`itemFk`)) group by `ish`.`id` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75582,6 +79040,7 @@ USE `vn`;
 -- Final view structure for view `itemShelvingPlacementSupplyStock__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemShelvingPlacementSupplyStock__`*/;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingPlacementSupplyStock__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75591,7 +79050,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingPlacementSupplyStock__` AS select `ish`.`id` AS `itemShelvingFk`,`ish`.`itemFk` AS `itemFk`,`ish`.`quantity` AS `quantity`,`ish`.`packing` AS `packing`,`ish`.`visible` AS `stock`,`i`.`longName` AS `longName`,`i`.`size` AS `size`,`i`.`subName` AS `subName`,`sh`.`code` AS `shelving`,`p`.`code` AS `parking`,`ish`.`created` AS `created`,ifnull(`sh`.`priority`,1) AS `priority` from (((((`itemShelving` `ish` join `shelving` `sh` on((`sh`.`code` = `ish`.`shelvingFk`))) left join `parking` `p` on((`p`.`id` = `sh`.`parkingFk`))) join `item` `i` on((`i`.`id` = `ish`.`itemFk`))) left join `itemShelvingSale` `iss` on((`iss`.`itemShelvingFk` = `ish`.`id`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemShelvingFk` = `ish`.`id`))) group by `ish`.`id` */;
+/*!50001 VIEW `itemShelvingPlacementSupplyStock__` AS select `ish`.`id` AS `itemShelvingFk`,`ish`.`itemFk` AS `itemFk`,`ish`.`quantity` AS `quantity`,`ish`.`packing` AS `packing`,`ish`.`visible` AS `stock`,`i`.`longName` AS `longName`,`i`.`size` AS `size`,`i`.`subName` AS `subName`,`sh`.`code` AS `shelving`,`p`.`code` AS `parking`,`ish`.`created` AS `created`,ifnull(`sh`.`priority`,1) AS `priority` from (((((`itemShelving` `ish` join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) left join `parking` `p` on(`p`.`id` = `sh`.`parkingFk`)) join `item` `i` on(`i`.`id` = `ish`.`itemFk`)) left join `itemShelvingSale` `iss` on(`iss`.`itemShelvingFk` = `ish`.`id`)) left join `itemShelvingPlacementSupply` `isps` on(`isps`.`itemShelvingFk` = `ish`.`id`)) group by `ish`.`id` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75600,6 +79059,7 @@ USE `vn`;
 -- Final view structure for view `itemShelvingSaleSum`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemShelvingSaleSum`*/;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingSaleSum`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75609,7 +79069,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingSaleSum` AS select `iss`.`id` AS `id`,`iss`.`itemShelvingFk` AS `itemShelvingFk`,`iss`.`saleFk` AS `saleFk`,sum(`iss`.`quantity`) AS `quantity`,`iss`.`created` AS `created`,`p`.`sectorFk` AS `sectorFk` from (((`itemShelvingSale` `iss` join `itemShelving` `ish` on((`ish`.`id` = `iss`.`itemShelvingFk`))) join `shelving` `sh` on((`sh`.`code` = `ish`.`shelvingFk`))) join `parking` `p` on((`p`.`id` = `sh`.`parkingFk`))) group by `iss`.`saleFk` */;
+/*!50001 VIEW `itemShelvingSaleSum` AS select `iss`.`id` AS `id`,`iss`.`itemShelvingFk` AS `itemShelvingFk`,`iss`.`saleFk` AS `saleFk`,sum(`iss`.`quantity`) AS `quantity`,`iss`.`created` AS `created`,`p`.`sectorFk` AS `sectorFk` from (((`itemShelvingSale` `iss` join `itemShelving` `ish` on(`ish`.`id` = `iss`.`itemShelvingFk`)) join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) join `parking` `p` on(`p`.`id` = `sh`.`parkingFk`)) group by `iss`.`saleFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75618,6 +79078,7 @@ USE `vn`;
 -- Final view structure for view `itemShelvingStock`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemShelvingStock`*/;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingStock`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75627,7 +79088,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingStock` AS select `ish`.`itemFk` AS `itemFk`,sum(`ish`.`visible`) AS `visible`,min(`ish`.`packing`) AS `packing`,min(`ish`.`grouping`) AS `grouping`,`s`.`description` AS `sector`,sum(`ish`.`visible`) AS `visibleOriginal`,sum(`issr`.`removed`) AS `removed`,`p`.`sectorFk` AS `sectorFk`,`s`.`warehouseFk` AS `warehouseFk`,`ish`.`shelvingFk` AS `shelvingFk`,`p`.`code` AS `parkingCode`,`sh`.`parkingFk` AS `parkingFk`,`ish`.`id` AS `itemShelvingFk`,`ish`.`created` AS `created` from ((((`itemShelving` `ish` left join `shelving` `sh` on((`sh`.`code` = `ish`.`shelvingFk`))) left join `parking` `p` on((`p`.`id` = `sh`.`parkingFk`))) left join `sector` `s` on((`s`.`id` = `p`.`sectorFk`))) left join `itemShelvingStockRemoved` `issr` on((`issr`.`itemShelvingFk` = `ish`.`id`))) where ((`ish`.`visible` <> 0) and `p`.`sectorFk`) group by `ish`.`itemFk`,`p`.`sectorFk` */;
+/*!50001 VIEW `itemShelvingStock` AS select `ish`.`itemFk` AS `itemFk`,sum(`ish`.`visible`) AS `visible`,min(`ish`.`packing`) AS `packing`,min(`ish`.`grouping`) AS `grouping`,`s`.`description` AS `sector`,sum(`ish`.`visible`) AS `visibleOriginal`,sum(`issr`.`removed`) AS `removed`,`p`.`sectorFk` AS `sectorFk`,`s`.`warehouseFk` AS `warehouseFk`,`ish`.`shelvingFk` AS `shelvingFk`,`p`.`code` AS `parkingCode`,`sh`.`parkingFk` AS `parkingFk`,`ish`.`id` AS `itemShelvingFk`,`ish`.`created` AS `created` from ((((`itemShelving` `ish` left join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) left join `parking` `p` on(`p`.`id` = `sh`.`parkingFk`)) left join `sector` `s` on(`s`.`id` = `p`.`sectorFk`)) left join `itemShelvingStockRemoved` `issr` on(`issr`.`itemShelvingFk` = `ish`.`id`)) where `ish`.`visible` <> 0 and `p`.`sectorFk` <> 0 group by `ish`.`itemFk`,`p`.`sectorFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75636,6 +79097,7 @@ USE `vn`;
 -- Final view structure for view `itemShelvingStockFull`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemShelvingStockFull`*/;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingStockFull`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75645,7 +79107,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingStockFull` AS select `ish`.`itemFk` AS `itemFk`,`ish`.`visible` AS `quantity`,`ish`.`packing` AS `packing`,`ish`.`grouping` AS `grouping`,`s`.`description` AS `sector`,`issr`.`removed` AS `removed`,`p`.`sectorFk` AS `sectorFk`,`s`.`warehouseFk` AS `warehouseFk`,`ish`.`shelvingFk` AS `shelvingFk`,`p`.`code` AS `parkingCode`,`sh`.`parkingFk` AS `parkingFk`,`ish`.`id` AS `itemShelvingFk`,`ish`.`created` AS `created` from ((((`itemShelving` `ish` join `shelving` `sh` on((`sh`.`code` = `ish`.`shelvingFk`))) join `parking` `p` on((`p`.`id` = `sh`.`parkingFk`))) join `sector` `s` on((`s`.`id` = `p`.`sectorFk`))) left join `itemShelvingStockRemoved` `issr` on((`issr`.`itemShelvingFk` = `ish`.`id`))) */;
+/*!50001 VIEW `itemShelvingStockFull` AS select `ish`.`itemFk` AS `itemFk`,`ish`.`visible` AS `quantity`,`ish`.`packing` AS `packing`,`ish`.`grouping` AS `grouping`,`s`.`description` AS `sector`,`issr`.`removed` AS `removed`,`p`.`sectorFk` AS `sectorFk`,`s`.`warehouseFk` AS `warehouseFk`,`ish`.`shelvingFk` AS `shelvingFk`,`p`.`code` AS `parkingCode`,`sh`.`parkingFk` AS `parkingFk`,`ish`.`id` AS `itemShelvingFk`,`ish`.`created` AS `created` from ((((`itemShelving` `ish` join `shelving` `sh` on(`sh`.`code` = `ish`.`shelvingFk`)) join `parking` `p` on(`p`.`id` = `sh`.`parkingFk`)) join `sector` `s` on(`s`.`id` = `p`.`sectorFk`)) left join `itemShelvingStockRemoved` `issr` on(`issr`.`itemShelvingFk` = `ish`.`id`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75654,6 +79116,7 @@ USE `vn`;
 -- Final view structure for view `itemShelvingStockRemoved`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemShelvingStockRemoved`*/;
 /*!50001 DROP VIEW IF EXISTS `itemShelvingStockRemoved`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75663,7 +79126,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingStockRemoved` AS select `ish`.`id` AS `itemShelvingFk`,`ish`.`itemFk` AS `itemFk`,(sum(ifnull(`iss`.`quantity`,0)) + sum(ifnull(`isps`.`quantity`,0))) AS `removed` from ((`itemShelving` `ish` left join `itemShelvingSale` `iss` on((`iss`.`itemShelvingFk` = `ish`.`id`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemShelvingFk` = `ish`.`id`))) group by `ish`.`id` */;
+/*!50001 VIEW `itemShelvingStockRemoved` AS select `ish`.`id` AS `itemShelvingFk`,`ish`.`itemFk` AS `itemFk`,sum(ifnull(`iss`.`quantity`,0)) + sum(ifnull(`isps`.`quantity`,0)) AS `removed` from ((`itemShelving` `ish` left join `itemShelvingSale` `iss` on(`iss`.`itemShelvingFk` = `ish`.`id`)) left join `itemShelvingPlacementSupply` `isps` on(`isps`.`itemShelvingFk` = `ish`.`id`)) group by `ish`.`id` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75672,6 +79135,7 @@ USE `vn`;
 -- Final view structure for view `itemTagged`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemTagged`*/;
 /*!50001 DROP VIEW IF EXISTS `itemTagged`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75690,6 +79154,7 @@ USE `vn`;
 -- Final view structure for view `itemTicketOut`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemTicketOut`*/;
 /*!50001 DROP VIEW IF EXISTS `itemTicketOut`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75699,7 +79164,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemTicketOut` AS select `t`.`warehouseFk` AS `warehouseFk`,`t`.`shipped` AS `shipped`,`s`.`itemFk` AS `itemFk`,-(`s`.`quantity`) AS `quantity`,`s`.`isPicked` AS `isPicked`,`s`.`reserved` AS `reserved`,`t`.`refFk` AS `refFk`,`s`.`id` AS `saleFk`,`s`.`ticketFk` AS `ticketFk` from (`sale` `s` join `ticket` `t` on((`s`.`ticketFk` = `t`.`id`))) where (`s`.`quantity` <> 0) */;
+/*!50001 VIEW `itemTicketOut` AS select `t`.`warehouseFk` AS `warehouseFk`,`t`.`shipped` AS `shipped`,`s`.`itemFk` AS `itemFk`,-`s`.`quantity` AS `quantity`,`s`.`isPicked` AS `isPicked`,`s`.`reserved` AS `reserved`,`t`.`refFk` AS `refFk`,`s`.`id` AS `saleFk`,`s`.`ticketFk` AS `ticketFk` from (`sale` `s` join `ticket` `t` on(`s`.`ticketFk` = `t`.`id`)) where `s`.`quantity` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75708,6 +79173,7 @@ USE `vn`;
 -- Final view structure for view `itemTypeL10n`
 --
 
+/*!50001 DROP TABLE IF EXISTS `itemTypeL10n`*/;
 /*!50001 DROP VIEW IF EXISTS `itemTypeL10n`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75717,7 +79183,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemTypeL10n` AS select `t`.`id` AS `id`,ifnull(`i`.`name`,`t`.`name`) AS `name` from (`itemType` `t` left join `itemTypeI18n` `i` on(((`i`.`typeFk` = `t`.`id`) and (`i`.`lang` = `util`.`LANG`())))) */;
+/*!50001 VIEW `itemTypeL10n` AS select `t`.`id` AS `id`,ifnull(`i`.`name`,`t`.`name`) AS `name` from (`itemType` `t` left join `itemTypeI18n` `i` on(`i`.`typeFk` = `t`.`id` and `i`.`lang` = `util`.`LANG`())) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75726,6 +79192,7 @@ USE `vn`;
 -- Final view structure for view `item_Free_Id`
 --
 
+/*!50001 DROP TABLE IF EXISTS `item_Free_Id`*/;
 /*!50001 DROP VIEW IF EXISTS `item_Free_Id`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75735,7 +79202,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `item_Free_Id` AS select (`i1`.`id` + 1) AS `newId` from (`item` `i1` left join `item` `i2` on(((`i1`.`id` + 1) = `i2`.`id`))) where (isnull(`i2`.`id`) and (`i1`.`id` > 400000)) */;
+/*!50001 VIEW `item_Free_Id` AS select `i1`.`id` + 1 AS `newId` from (`item` `i1` left join `item` `i2` on(`i1`.`id` + 1 = `i2`.`id`)) where `i2`.`id` is null and `i1`.`id` > 400000 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75744,6 +79211,7 @@ USE `vn`;
 -- Final view structure for view `labelInfo`
 --
 
+/*!50001 DROP TABLE IF EXISTS `labelInfo`*/;
 /*!50001 DROP VIEW IF EXISTS `labelInfo`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75753,7 +79221,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `labelInfo` AS select `i`.`id` AS `itemId`,`i`.`name` AS `itemName`,`b`.`stickers` AS `stickers`,`b`.`printedStickers` AS `life`,`i`.`inkFk` AS `colorCode`,`i`.`stems` AS `stems`,`i`.`category` AS `category`,`i`.`subName` AS `productor`,`b`.`packing` AS `packing`,`clb`.`warehouse_id` AS `warehouse_id`,`i`.`size` AS `size`,`b`.`isPickedOff` AS `isPickedOff`,`e`.`evaNotes` AS `notes`,`w`.`name` AS `wh_in`,`e`.`id` AS `entryId`,`b`.`id` AS `buyId` from (((((`vn`.`buy` `b` join `vn`.`item` `i` on((`i`.`id` = `b`.`itemFk`))) join `cache`.`last_buy` `clb` on((`clb`.`item_id` = `i`.`id`))) join `vn`.`entry` `e` on((`e`.`id` = `b`.`entryFk`))) left join `vn`.`travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) join `vn`.`warehouse` `w` on((`w`.`id` = `tr`.`warehouseInFk`))) */;
+/*!50001 VIEW `labelInfo` AS select `i`.`id` AS `itemId`,`i`.`name` AS `itemName`,`b`.`stickers` AS `stickers`,`b`.`printedStickers` AS `life`,`i`.`inkFk` AS `colorCode`,`i`.`stems` AS `stems`,`i`.`category` AS `category`,`i`.`subName` AS `productor`,`b`.`packing` AS `packing`,`clb`.`warehouse_id` AS `warehouse_id`,`i`.`size` AS `size`,`b`.`isPickedOff` AS `isPickedOff`,`e`.`evaNotes` AS `notes`,`w`.`name` AS `wh_in`,`e`.`id` AS `entryId`,`b`.`id` AS `buyId` from (((((`vn`.`buy` `b` join `vn`.`item` `i` on(`i`.`id` = `b`.`itemFk`)) join `cache`.`last_buy` `clb` on(`clb`.`item_id` = `i`.`id`)) join `vn`.`entry` `e` on(`e`.`id` = `b`.`entryFk`)) left join `vn`.`travel` `tr` on(`tr`.`id` = `e`.`travelFk`)) join `vn`.`warehouse` `w` on(`w`.`id` = `tr`.`warehouseInFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75762,6 +79230,7 @@ USE `vn`;
 -- Final view structure for view `lastHourProduction`
 --
 
+/*!50001 DROP TABLE IF EXISTS `lastHourProduction`*/;
 /*!50001 DROP VIEW IF EXISTS `lastHourProduction`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75771,7 +79240,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `lastHourProduction` AS select `t`.`warehouseFk` AS `warehouseFk`,greatest(10,cast(sum(`sv`.`volume`) as decimal(5,1))) AS `m3` from (((((((`vn`.`saleTracking` `st` join `vn`.`saleVolume` `sv` on((`sv`.`saleFk` = `st`.`saleFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `sv`.`ticketFk`))) join `vn`.`state` `s` on((`s`.`id` = `st`.`stateFk`))) join `account`.`user` `u` on((`u`.`id` = `st`.`workerFk`))) join `account`.`role` `r` on((`r`.`id` = `u`.`role`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`warehouseAlias` `wa` on((`wa`.`id` = `w`.`aliasFk`))) where ((`st`.`created` > (now() + interval -(1) hour)) and (`s`.`code` = 'CHECKED') and (`r`.`name` <> 'salesPerson') and (`wa`.`name` = 'Silla')) */;
+/*!50001 VIEW `lastHourProduction` AS select `t`.`warehouseFk` AS `warehouseFk`,greatest(10,cast(sum(`sv`.`volume`) as decimal(5,1))) AS `m3` from (((((((`vn`.`saleTracking` `st` join `vn`.`saleVolume` `sv` on(`sv`.`saleFk` = `st`.`saleFk`)) join `vn`.`ticket` `t` on(`t`.`id` = `sv`.`ticketFk`)) join `vn`.`state` `s` on(`s`.`id` = `st`.`stateFk`)) join `account`.`user` `u` on(`u`.`id` = `st`.`workerFk`)) join `account`.`role` `r` on(`r`.`id` = `u`.`role`)) join `vn`.`warehouse` `w` on(`w`.`id` = `t`.`warehouseFk`)) join `vn`.`warehouseAlias` `wa` on(`wa`.`id` = `w`.`aliasFk`)) where `st`.`created` > current_timestamp() + interval -1 hour and `s`.`code` = 'CHECKED' and `r`.`name` <> 'salesPerson' and `wa`.`name` = 'Silla' */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75780,6 +79249,7 @@ USE `vn`;
 -- Final view structure for view `lastTopClaims`
 --
 
+/*!50001 DROP TABLE IF EXISTS `lastTopClaims`*/;
 /*!50001 DROP VIEW IF EXISTS `lastTopClaims`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75789,7 +79259,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `lastTopClaims` AS select `s`.`itemFk` AS `itemFk`,`i`.`longName` AS `itemName`,`it`.`name` AS `itemTypeName`,count(0) AS `claimsNumber`,round(sum(((((`cb`.`quantity` * `s`.`price`) * (1 - ((`c`.`responsibility` - 1) / 4))) * (100 - `s`.`discount`)) / 100)),2) AS `claimedAmount`,round(sum((((`cb`.`quantity` * `s`.`price`) * (100 - `s`.`discount`)) / 100)),2) AS `totalAmount` from ((((`claim` `c` join `claimBeginning` `cb` on((`cb`.`claimFk` = `c`.`id`))) join `sale` `s` on((`s`.`id` = `cb`.`saleFk`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `itemType` `it` on((`it`.`id` = `i`.`typeFk`))) where (`c`.`created` >= (curdate() + interval -(1) week)) group by `s`.`itemFk` having (((`claimedAmount` > 100) and (`claimsNumber` > 2)) or (`claimsNumber` > 4)) order by `claimsNumber` desc */;
+/*!50001 VIEW `lastTopClaims` AS select `s`.`itemFk` AS `itemFk`,`i`.`longName` AS `itemName`,`it`.`name` AS `itemTypeName`,count(0) AS `claimsNumber`,round(sum(`cb`.`quantity` * `s`.`price` * (1 - (`c`.`responsibility` - 1) / 4) * (100 - `s`.`discount`) / 100),2) AS `claimedAmount`,round(sum(`cb`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100),2) AS `totalAmount` from ((((`claim` `c` join `claimBeginning` `cb` on(`cb`.`claimFk` = `c`.`id`)) join `sale` `s` on(`s`.`id` = `cb`.`saleFk`)) join `item` `i` on(`i`.`id` = `s`.`itemFk`)) join `itemType` `it` on(`it`.`id` = `i`.`typeFk`)) where `c`.`created` >= curdate() + interval -1 week group by `s`.`itemFk` having `claimedAmount` > 100 and `claimsNumber` > 2 or `claimsNumber` > 4 order by count(0) desc */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75798,6 +79268,7 @@ USE `vn`;
 -- Final view structure for view `mistake`
 --
 
+/*!50001 DROP TABLE IF EXISTS `mistake`*/;
 /*!50001 DROP VIEW IF EXISTS `mistake`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75807,7 +79278,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `mistake` AS select `wr`.`code` AS `revisador`,`s`.`concept` AS `concept`,`w`.`code` AS `sacador`,`w`.`firstName` AS `firstName`,`w`.`lastName` AS `lastName`,`mt`.`description` AS `description`,cast(`iss`.`created` as date) AS `created`,`w`.`id` AS `workerFk` from (((((`saleMistake` `sm` join `mistakeType` `mt` on((`mt`.`id` = `sm`.`typeFk`))) join `worker` `wr` on((`wr`.`id` = `sm`.`userFk`))) join `sale` `s` on((`s`.`id` = `sm`.`saleFk`))) join `itemShelvingSale` `iss` on((`iss`.`saleFk` = `sm`.`saleFk`))) join `worker` `w` on((`w`.`id` = `iss`.`userFk`))) */;
+/*!50001 VIEW `mistake` AS select `wr`.`code` AS `revisador`,`s`.`concept` AS `concept`,`w`.`code` AS `sacador`,`w`.`firstName` AS `firstName`,`w`.`lastName` AS `lastName`,`mt`.`description` AS `description`,cast(`iss`.`created` as date) AS `created`,`w`.`id` AS `workerFk` from (((((`saleMistake` `sm` join `mistakeType` `mt` on(`mt`.`id` = `sm`.`typeFk`)) join `worker` `wr` on(`wr`.`id` = `sm`.`userFk`)) join `sale` `s` on(`s`.`id` = `sm`.`saleFk`)) join `itemShelvingSale` `iss` on(`iss`.`saleFk` = `sm`.`saleFk`)) join `worker` `w` on(`w`.`id` = `iss`.`userFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75816,6 +79287,7 @@ USE `vn`;
 -- Final view structure for view `mistakeRatio`
 --
 
+/*!50001 DROP TABLE IF EXISTS `mistakeRatio`*/;
 /*!50001 DROP VIEW IF EXISTS `mistakeRatio`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75825,7 +79297,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `mistakeRatio` AS select `wr`.`code` AS `revisador`,`w`.`code` AS `sacador`,`w`.`firstName` AS `firstName`,`w`.`lastName` AS `lastName`,`mt`.`description` AS `description`,cast(`iss`.`created` as date) AS `created`,`w`.`id` AS `workerFk`,`sm`.`saleFk` AS `saleFk` from ((((`itemShelvingSale` `iss` join `worker` `w` on((`w`.`id` = `iss`.`userFk`))) left join `saleMistake` `sm` on((`iss`.`saleFk` = `sm`.`saleFk`))) left join `mistakeType` `mt` on((`mt`.`id` = `sm`.`typeFk`))) left join `worker` `wr` on((`wr`.`id` = `sm`.`userFk`))) */;
+/*!50001 VIEW `mistakeRatio` AS select `wr`.`code` AS `revisador`,`w`.`code` AS `sacador`,`w`.`firstName` AS `firstName`,`w`.`lastName` AS `lastName`,`mt`.`description` AS `description`,cast(`iss`.`created` as date) AS `created`,`w`.`id` AS `workerFk`,`sm`.`saleFk` AS `saleFk` from ((((`itemShelvingSale` `iss` join `worker` `w` on(`w`.`id` = `iss`.`userFk`)) left join `saleMistake` `sm` on(`iss`.`saleFk` = `sm`.`saleFk`)) left join `mistakeType` `mt` on(`mt`.`id` = `sm`.`typeFk`)) left join `worker` `wr` on(`wr`.`id` = `sm`.`userFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75834,6 +79306,7 @@ USE `vn`;
 -- Final view structure for view `newBornSales`
 --
 
+/*!50001 DROP TABLE IF EXISTS `newBornSales`*/;
 /*!50001 DROP VIEW IF EXISTS `newBornSales`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75843,7 +79316,26 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `newBornSales` AS select `v`.`importe` AS `amount`,`c`.`salesPersonFk` AS `userFk`,`v`.`fecha` AS `dated`,`cn`.`firstShipped` AS `firstShipped` from (((`bs`.`clientNewBorn` `cn` join `bs`.`ventas` `v` on((((`cn`.`firstShipped` + interval 1 year) > `v`.`fecha`) and (`v`.`Id_Cliente` = `cn`.`clientFk`)))) join `vn`.`client` `c` on((`c`.`id` = `v`.`Id_Cliente`))) join `account`.`user` `u` on((`u`.`id` = `c`.`salesPersonFk`))) where ((`u`.`role` = 18) and (`u`.`name` not in ('ismaelalcolea','ruben'))) */;
+/*!50001 VIEW `newBornSales` AS select `v`.`importe` AS `amount`,`v`.`Id_Cliente` AS `clientFk`,`c`.`salesPersonFk` AS `userFk`,`v`.`fecha` AS `dated`,`cn`.`firstShipped` AS `firstShipped` from ((((`bs`.`clientNewBorn` `cn` join `bs`.`ventas` `v` on(`cn`.`firstShipped` + interval 1 year > `v`.`fecha` and `v`.`Id_Cliente` = `cn`.`clientFk`)) join `vn`.`client` `c` on(`c`.`id` = `v`.`Id_Cliente`)) join `account`.`user` `u` on(`u`.`id` = `c`.`salesPersonFk`)) join `account`.`role` `r` on(`r`.`id` = `u`.`role`)) where `r`.`name` = 'salesPerson' and `u`.`name` not in ('ismaelalcolea','ruben') */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+
+--
+-- Final view structure for view `newBornSales__`
+--
+
+/*!50001 DROP TABLE IF EXISTS `newBornSales__`*/;
+/*!50001 DROP VIEW IF EXISTS `newBornSales__`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8mb4 */;
+/*!50001 SET character_set_results     = utf8mb4 */;
+/*!50001 SET collation_connection      = utf8mb4_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
+/*!50001 VIEW `newBornSales__` AS select `v`.`importe` AS `amount`,`v`.`Id_Cliente` AS `clientFk`,`c`.`salesPersonFk` AS `userFk`,`v`.`fecha` AS `dated`,`cn`.`firstShipped` AS `firstShipped` from (((`bs`.`clientNewBorn` `cn` join `bs`.`ventas` `v` on(`cn`.`firstShipped` + interval 1 year > `v`.`fecha` and `v`.`Id_Cliente` = `cn`.`clientFk`)) join `vn`.`client` `c` on(`c`.`id` = `v`.`Id_Cliente`)) join `account`.`user` `u` on(`u`.`id` = `c`.`salesPersonFk`)) where `u`.`role` = 18 and `u`.`name` not in ('ismaelalcolea','ruben') */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75852,6 +79344,7 @@ USE `vn`;
 -- Final view structure for view `originL10n`
 --
 
+/*!50001 DROP TABLE IF EXISTS `originL10n`*/;
 /*!50001 DROP VIEW IF EXISTS `originL10n`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75861,7 +79354,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `originL10n` AS select `o`.`id` AS `id`,ifnull(`i`.`name`,`o`.`name`) AS `name` from (`origin` `o` left join `originI18n` `i` on(((`i`.`originFk` = `o`.`id`) and (`i`.`lang` = `util`.`lang`())))) */;
+/*!50001 VIEW `originL10n` AS select `o`.`id` AS `id`,ifnull(`i`.`name`,`o`.`name`) AS `name` from (`origin` `o` left join `originI18n` `i` on(`i`.`originFk` = `o`.`id` and `i`.`lang` = `util`.`lang`())) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75870,6 +79363,7 @@ USE `vn`;
 -- Final view structure for view `packageEquivalentItem`
 --
 
+/*!50001 DROP TABLE IF EXISTS `packageEquivalentItem`*/;
 /*!50001 DROP VIEW IF EXISTS `packageEquivalentItem`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75879,7 +79373,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `packageEquivalentItem` AS select `i`.`itemFk` AS `itemFk`,`ie`.`itemFk` AS `equivalentFk` from ((`packageEquivalent` `pe` join `packaging` `i` on((`i`.`id` = `pe`.`packageFk`))) join `packaging` `ie` on((`ie`.`id` = `pe`.`equivalentFk`))) */;
+/*!50001 VIEW `packageEquivalentItem` AS select `i`.`itemFk` AS `itemFk`,`ie`.`itemFk` AS `equivalentFk` from ((`packageEquivalent` `pe` join `packaging` `i` on(`i`.`id` = `pe`.`packageFk`)) join `packaging` `ie` on(`ie`.`id` = `pe`.`equivalentFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75888,6 +79382,7 @@ USE `vn`;
 -- Final view structure for view `payment__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `payment__`*/;
 /*!50001 DROP VIEW IF EXISTS `payment__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75906,6 +79401,7 @@ USE `vn`;
 -- Final view structure for view `personMedia`
 --
 
+/*!50001 DROP TABLE IF EXISTS `personMedia`*/;
 /*!50001 DROP VIEW IF EXISTS `personMedia`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75915,7 +79411,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `personMedia` AS select `p`.`id_trabajador` AS `workerFk`,`m`.`value` AS `mediaValue` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `po` on((`po`.`person_id` = `p`.`person_id`))) join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil personal') */;
+/*!50001 VIEW `personMedia` AS select `p`.`id_trabajador` AS `workerFk`,`m`.`value` AS `mediaValue` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `po` on(`po`.`person_id` = `p`.`person_id`)) join `postgresql`.`profile_media` `pom` on(`pom`.`profile_id` = `po`.`profile_id`)) join `postgresql`.`media` `m` on(`m`.`media_id` = `pom`.`media_id`)) join `postgresql`.`media_type` `mt` on(`mt`.`media_type_id` = `m`.`media_type_id`)) where `mt`.`name` = 'movil personal' */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75924,6 +79420,7 @@ USE `vn`;
 -- Final view structure for view `productionVolume`
 --
 
+/*!50001 DROP TABLE IF EXISTS `productionVolume`*/;
 /*!50001 DROP VIEW IF EXISTS `productionVolume`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75933,7 +79430,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `productionVolume` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,ifnull(((`p`.`width` * `p`.`height`) * `p`.`depth`),94500)) AS `cm3`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `created` from (((`expedition` `e` left join `packaging` `p` on((`p`.`itemFk` = `e`.`itemFk`))) join `ticket` `t` on((`t`.`id` = `e`.`ticketFk`))) join `client` `c` on((`c`.`id` = `t`.`clientFk`))) where ((`e`.`created` between curdate() and `util`.`dayend`(curdate())) and `c`.`isRelevant`) */;
+/*!50001 VIEW `productionVolume` AS select hour(`e`.`created`) AS `hora`,minute(`e`.`created`) AS `minuto`,ifnull(`p`.`volume`,ifnull(`p`.`width` * `p`.`height` * `p`.`depth`,94500)) AS `cm3`,`t`.`warehouseFk` AS `warehouseFk`,`e`.`created` AS `created` from (((`expedition` `e` left join `packaging` `p` on(`p`.`itemFk` = `e`.`itemFk`)) join `ticket` `t` on(`t`.`id` = `e`.`ticketFk`)) join `client` `c` on(`c`.`id` = `t`.`clientFk`)) where `e`.`created` between curdate() and `util`.`dayend`(curdate()) and `c`.`isRelevant` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75942,6 +79439,7 @@ USE `vn`;
 -- Final view structure for view `productionVolume_LastHour`
 --
 
+/*!50001 DROP TABLE IF EXISTS `productionVolume_LastHour`*/;
 /*!50001 DROP VIEW IF EXISTS `productionVolume_LastHour`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75951,7 +79449,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `productionVolume_LastHour` AS select cast(sum((`productionVolume`.`cm3` / 1000000)) as decimal(10,0)) AS `m3`,`productionVolume`.`warehouseFk` AS `warehouseFk` from `productionVolume` where ((`productionVolume`.`created` > (now() + interval -(1) hour)) and (`productionVolume`.`warehouseFk` in (1,44,60))) group by `productionVolume`.`warehouseFk` */;
+/*!50001 VIEW `productionVolume_LastHour` AS select cast(sum(`productionVolume`.`cm3` / 1000000) as decimal(10,0)) AS `m3`,`productionVolume`.`warehouseFk` AS `warehouseFk` from `productionVolume` where `productionVolume`.`created` > current_timestamp() + interval -1 hour and `productionVolume`.`warehouseFk` in (1,44,60) group by `productionVolume`.`warehouseFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75960,6 +79458,7 @@ USE `vn`;
 -- Final view structure for view `rankingNewBornByQuarter__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `rankingNewBornByQuarter__`*/;
 /*!50001 DROP VIEW IF EXISTS `rankingNewBornByQuarter__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75969,7 +79468,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `rankingNewBornByQuarter__` AS select sum(`v`.`importe`) AS `total`,`u`.`name` AS `name`,now() AS `time_sec`,`u`.`id` AS `userFk` from (((`bs`.`clientNewBorn` `cn` join `bs`.`ventas` `v` on((((`cn`.`firstShipped` + interval 1 year) > `v`.`fecha`) and (`v`.`Id_Cliente` = `cn`.`clientFk`)))) join `vn`.`client` `c` on((`c`.`id` = `v`.`Id_Cliente`))) join `account`.`user` `u` on((`u`.`id` = `c`.`salesPersonFk`))) where ((`v`.`fecha` >= '2020-07-01') and (`cn`.`firstShipped` >= '2019-07-01') and (`u`.`role` = 18) and (`u`.`name` not in ('ismaelalcolea','ruben'))) group by `u`.`id` order by sum(`v`.`importe`) desc limit 20 */;
+/*!50001 VIEW `rankingNewBornByQuarter__` AS select sum(`v`.`importe`) AS `total`,`u`.`name` AS `name`,current_timestamp() AS `time_sec`,`u`.`id` AS `userFk` from (((`bs`.`clientNewBorn` `cn` join `bs`.`ventas` `v` on(`cn`.`firstShipped` + interval 1 year > `v`.`fecha` and `v`.`Id_Cliente` = `cn`.`clientFk`)) join `vn`.`client` `c` on(`c`.`id` = `v`.`Id_Cliente`)) join `account`.`user` `u` on(`u`.`id` = `c`.`salesPersonFk`)) where `v`.`fecha` >= '2020-07-01' and `cn`.`firstShipped` >= '2019-07-01' and `u`.`role` = 18 and `u`.`name` not in ('ismaelalcolea','ruben') group by `u`.`id` order by sum(`v`.`importe`) desc limit 20 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75978,6 +79477,7 @@ USE `vn`;
 -- Final view structure for view `rankingSellingByQuarter__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `rankingSellingByQuarter__`*/;
 /*!50001 DROP VIEW IF EXISTS `rankingSellingByQuarter__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -75987,7 +79487,26 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `rankingSellingByQuarter__` AS select sum(`v`.`importe`) AS `importe`,`u`.`name` AS `name`,`u`.`id` AS `userFk`,now() AS `time_sec` from (`bs`.`vendedores` `v` join `account`.`user` `u` on((`u`.`id` = `v`.`Id_Trabajador`))) where ((`v`.`año` = year(curdate())) and (quarter(concat(year(curdate()),'-',`v`.`mes`,'-01')) = quarter(curdate())) and (`u`.`name` not in ('ismaelalcolea','ruben'))) group by `v`.`Id_Trabajador` order by sum(`v`.`importe`) desc limit 15 */;
+/*!50001 VIEW `rankingSellingByQuarter__` AS select sum(`v`.`importe`) AS `importe`,`u`.`name` AS `name`,`u`.`id` AS `userFk`,current_timestamp() AS `time_sec` from (`bs`.`vendedores` `v` join `account`.`user` `u` on(`u`.`id` = `v`.`Id_Trabajador`)) where `v`.`año` = year(curdate()) and quarter(concat(year(curdate()),'-',`v`.`mes`,'-01')) = quarter(curdate()) and `u`.`name` not in ('ismaelalcolea','ruben') group by `v`.`Id_Trabajador` order by sum(`v`.`importe`) desc limit 15 */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+
+--
+-- Final view structure for view `rate__`
+--
+
+/*!50001 DROP TABLE IF EXISTS `rate__`*/;
+/*!50001 DROP VIEW IF EXISTS `rate__`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
+/*!50001 VIEW `rate__` AS select `r`.`tarifa_id` AS `id`,`r`.`fecha` AS `dated`,`r`.`warehouse_id` AS `warehouseFk`,`r`.`t0` AS `rate0`,`r`.`t1` AS `rate1`,`r`.`t2` AS `rate2`,`r`.`t3` AS `rate3` from `vn2008`.`tarifas` `r` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -75996,6 +79515,7 @@ USE `vn`;
 -- Final view structure for view `role`
 --
 
+/*!50001 DROP TABLE IF EXISTS `role`*/;
 /*!50001 DROP VIEW IF EXISTS `role`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76014,6 +79534,7 @@ USE `vn`;
 -- Final view structure for view `routesMonitor`
 --
 
+/*!50001 DROP TABLE IF EXISTS `routesMonitor`*/;
 /*!50001 DROP VIEW IF EXISTS `routesMonitor`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76032,6 +79553,7 @@ USE `vn`;
 -- Final view structure for view `saleFreight__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `saleFreight__`*/;
 /*!50001 DROP VIEW IF EXISTS `saleFreight__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76041,25 +79563,64 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleFreight__` AS select `s`.`ticketFk` AS `ticketFk`,`t`.`clientFk` AS `clientFk`,`t`.`routeFk` AS `routeFk`,`s`.`id` AS `saleFk`,`t`.`zoneFk` AS `zoneFk`,`t`.`companyFk` AS `companyFk`,`t`.`shipped` AS `shipped`,`t`.`zonePrice` AS `price`,((((`s`.`quantity` * `r`.`cm3`) * `t`.`zonePrice`) * `i`.`compression`) / `cb`.`volume`) AS `freight` from ((((`vn`.`sale` `s` join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`packaging` `cb` on((`cb`.`id` = '94'))) join `bi`.`rotacion` `r` on(((`r`.`Id_Article` = `s`.`itemFk`) and (`r`.`warehouse_id` = `t`.`warehouseFk`)))) */;
+/*!50001 VIEW `saleFreight__` AS select `s`.`ticketFk` AS `ticketFk`,`t`.`clientFk` AS `clientFk`,`t`.`routeFk` AS `routeFk`,`s`.`id` AS `saleFk`,`t`.`zoneFk` AS `zoneFk`,`t`.`companyFk` AS `companyFk`,`t`.`shipped` AS `shipped`,`t`.`zonePrice` AS `price`,`s`.`quantity` * `r`.`cm3` * `t`.`zonePrice` * `i`.`compression` / `cb`.`volume` AS `freight` from ((((`vn`.`sale` `s` join `vn`.`item` `i` on(`i`.`id` = `s`.`itemFk`)) join `vn`.`ticket` `t` on(`t`.`id` = `s`.`ticketFk`)) join `vn`.`packaging` `cb` on(`cb`.`id` = '94')) join `bi`.`rotacion` `r` on(`r`.`Id_Article` = `s`.`itemFk` and `r`.`warehouse_id` = `t`.`warehouseFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
 --
--- Final view structure for view `saleMistake_list`
+-- Final view structure for view `saleMistakeList`
 --
 
-/*!50001 DROP VIEW IF EXISTS `saleMistake_list`*/;
+/*!50001 DROP TABLE IF EXISTS `saleMistakeList`*/;
+/*!50001 DROP VIEW IF EXISTS `saleMistakeList`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8 */;
-/*!50001 SET character_set_results     = utf8 */;
-/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 SET character_set_client      = utf8mb4 */;
+/*!50001 SET character_set_results     = utf8mb4 */;
+/*!50001 SET collation_connection      = utf8mb4_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
+/*!50001 VIEW `saleMistakeList` AS select `st`.`saleFk` AS `saleFk`,`st`.`workerFk` AS `workerFk`,concat(`w2`.`firstName`,' ',`w2`.`lastName`) AS `sacador`,`st`.`created` AS `created`,concat(`w`.`firstName`,' ',`w`.`lastName`) AS `revisador`,`mt`.`description` AS `description`,`sm`.`created` AS `controlled` from (((((`vn`.`saleTracking` `st` join `vn`.`worker` `w2` on(`w2`.`id` = `st`.`workerFk`)) join `vncontrol`.`accion` `a` on(`a`.`accion_id` = `st`.`actionFk` and `a`.`accion` = 'SACAR')) left join `vn`.`saleMistake` `sm` on(`st`.`saleFk` = `sm`.`saleFk`)) left join `vn`.`mistakeType` `mt` on(`mt`.`id` = `sm`.`typeFk`)) left join `vn`.`worker` `w` on(`w`.`id` = `sm`.`userFk`)) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+
+--
+-- Final view structure for view `saleMistake_list__`
+--
+
+/*!50001 DROP TABLE IF EXISTS `saleMistake_list__`*/;
+/*!50001 DROP VIEW IF EXISTS `saleMistake_list__`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8mb4 */;
+/*!50001 SET character_set_results     = utf8mb4 */;
+/*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`z-developer`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleMistake_list` AS select `st`.`saleFk` AS `saleFk`,concat(`w2`.`firstName`,' ',`w2`.`lastName`) AS `sacador`,`st`.`created` AS `created`,concat(`w`.`firstName`,' ',`w`.`lastName`) AS `revisador`,`mt`.`description` AS `description`,`sm`.`created` AS `controlled` from (((((`vn`.`saleTracking` `st` join `vn`.`worker` `w2` on((`w2`.`id` = `st`.`workerFk`))) join `vncontrol`.`accion` `a` on(((`a`.`accion_id` = `st`.`actionFk`) and (`a`.`accion` = 'SACAR')))) left join `vn`.`saleMistake` `sm` on((`st`.`saleFk` = `sm`.`saleFk`))) left join `vn`.`mistakeType` `mt` on((`mt`.`id` = `sm`.`typeFk`))) left join `vn`.`worker` `w` on((`w`.`id` = `sm`.`userFk`))) where (`st`.`created` > '2020-10-01') */;
+/*!50001 VIEW `saleMistake_list__` AS select `st`.`saleFk` AS `saleFk`,concat(`w2`.`firstName`,' ',`w2`.`lastName`) AS `sacador`,`st`.`created` AS `created`,concat(`w`.`firstName`,' ',`w`.`lastName`) AS `revisador`,`mt`.`description` AS `description`,`sm`.`created` AS `controlled` from (((((`vn`.`saleTracking` `st` join `vn`.`worker` `w2` on(`w2`.`id` = `st`.`workerFk`)) join `vncontrol`.`accion` `a` on(`a`.`accion_id` = `st`.`actionFk` and `a`.`accion` = 'SACAR')) left join `vn`.`saleMistake` `sm` on(`st`.`saleFk` = `sm`.`saleFk`)) left join `vn`.`mistakeType` `mt` on(`mt`.`id` = `sm`.`typeFk`)) left join `vn`.`worker` `w` on(`w`.`id` = `sm`.`userFk`)) where `st`.`created` > '2020-10-01' */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+
+--
+-- Final view structure for view `saleMistake_list__2`
+--
+
+/*!50001 DROP TABLE IF EXISTS `saleMistake_list__2`*/;
+/*!50001 DROP VIEW IF EXISTS `saleMistake_list__2`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8mb4 */;
+/*!50001 SET character_set_results     = utf8mb4 */;
+/*!50001 SET collation_connection      = utf8mb4_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
+/*!50001 VIEW `saleMistake_list__2` AS select `st`.`saleFk` AS `saleFk`,`st`.`workerFk` AS `workerFk`,concat(`w2`.`firstName`,' ',`w2`.`lastName`) AS `sacador`,`st`.`created` AS `created`,concat(`w`.`firstName`,' ',`w`.`lastName`) AS `revisador`,`mt`.`description` AS `description`,`sm`.`created` AS `controlled` from (((((`vn`.`saleTracking` `st` join `vn`.`worker` `w2` on(`w2`.`id` = `st`.`workerFk`)) join `vncontrol`.`accion` `a` on(`a`.`accion_id` = `st`.`actionFk` and `a`.`accion` = 'SACAR')) left join `vn`.`saleMistake` `sm` on(`st`.`saleFk` = `sm`.`saleFk`)) left join `vn`.`mistakeType` `mt` on(`mt`.`id` = `sm`.`typeFk`)) left join `vn`.`worker` `w` on(`w`.`id` = `sm`.`userFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76068,6 +79629,7 @@ USE `vn`;
 -- Final view structure for view `saleValue`
 --
 
+/*!50001 DROP TABLE IF EXISTS `saleValue`*/;
 /*!50001 DROP VIEW IF EXISTS `saleValue`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76077,7 +79639,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleValue` AS select `wh`.`name` AS `warehouse`,`c`.`name` AS `client`,`c`.`typeFk` AS `clientTypeFk`,`u`.`name` AS `buyer`,`it`.`name` AS `family`,`s`.`itemFk` AS `itemFk`,`s`.`concept` AS `concept`,`s`.`quantity` AS `quantity`,(((`b`.`buyingValue` + `b`.`freightValue`) + `b`.`comissionValue`) + `b`.`packageValue`) AS `cost`,((((`b`.`buyingValue` + `b`.`freightValue`) + `b`.`comissionValue`) + `b`.`packageValue`) * `s`.`quantity`) AS `value`,`tm`.`year` AS `year`,`tm`.`week` AS `week` from (((((((((`vn`.`sale` `s` join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemType` `it` on((`it`.`id` = `i`.`typeFk`))) join `account`.`user` `u` on((`u`.`id` = `it`.`workerFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`client` `c` on((`c`.`id` = `t`.`clientFk`))) join `vn`.`warehouse` `wh` on((`wh`.`id` = `t`.`warehouseFk`))) join `vn`.`time` `tm` on((`tm`.`dated` = cast(`t`.`shipped` as date)))) join `cache`.`last_buy` `lb` on(((`lb`.`item_id` = `i`.`id`) and (`lb`.`warehouse_id` = `wh`.`id`)))) join `vn`.`buy` `b` on((`b`.`id` = `lb`.`buy_id`))) where `wh`.`isManaged` */;
+/*!50001 VIEW `saleValue` AS select `wh`.`name` AS `warehouse`,`c`.`name` AS `client`,`c`.`typeFk` AS `clientTypeFk`,`u`.`name` AS `buyer`,`it`.`name` AS `family`,`s`.`itemFk` AS `itemFk`,`s`.`concept` AS `concept`,`s`.`quantity` AS `quantity`,`b`.`buyingValue` + `b`.`freightValue` + `b`.`comissionValue` + `b`.`packageValue` AS `cost`,(`b`.`buyingValue` + `b`.`freightValue` + `b`.`comissionValue` + `b`.`packageValue`) * `s`.`quantity` AS `value`,`tm`.`year` AS `year`,`tm`.`week` AS `week` from (((((((((`vn`.`sale` `s` join `vn`.`item` `i` on(`i`.`id` = `s`.`itemFk`)) join `vn`.`itemType` `it` on(`it`.`id` = `i`.`typeFk`)) join `account`.`user` `u` on(`u`.`id` = `it`.`workerFk`)) join `vn`.`ticket` `t` on(`t`.`id` = `s`.`ticketFk`)) join `vn`.`client` `c` on(`c`.`id` = `t`.`clientFk`)) join `vn`.`warehouse` `wh` on(`wh`.`id` = `t`.`warehouseFk`)) join `vn`.`time` `tm` on(`tm`.`dated` = cast(`t`.`shipped` as date))) join `cache`.`last_buy` `lb` on(`lb`.`item_id` = `i`.`id` and `lb`.`warehouse_id` = `wh`.`id`)) join `vn`.`buy` `b` on(`b`.`id` = `lb`.`buy_id`)) where `wh`.`isManaged` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76086,6 +79648,7 @@ USE `vn`;
 -- Final view structure for view `saleVolume`
 --
 
+/*!50001 DROP TABLE IF EXISTS `saleVolume`*/;
 /*!50001 DROP VIEW IF EXISTS `saleVolume`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76095,7 +79658,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleVolume` AS select `s`.`ticketFk` AS `ticketFk`,`s`.`id` AS `saleFk`,round(((`ic`.`cm3delivery` * `s`.`quantity`) / 1000),0) AS `litros`,`t`.`routeFk` AS `routeFk`,`t`.`shipped` AS `shipped`,`t`.`landed` AS `landed`,((`s`.`quantity` * `ic`.`cm3delivery`) / 1000000) AS `volume`,((`s`.`quantity` * `ic`.`grams`) / 1000) AS `physicalWeight`,(((`s`.`quantity` * `ic`.`cm3delivery`) * greatest(`i`.`density`,167)) / 1000000) AS `weight`,((`s`.`quantity` * `ic`.`cm3delivery`) / 1000000) AS `physicalVolume`,(((`s`.`quantity` * `ic`.`cm3delivery`) * ifnull(`t`.`zonePrice`,`z`.`price`)) / `cb`.`volume`) AS `freight`,`t`.`zoneFk` AS `zoneFk`,`t`.`clientFk` AS `clientFk`,`s`.`isPicked` AS `isPicked` from (((((`sale` `s` join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `zone` `z` on((`z`.`id` = `t`.`zoneFk`))) join `packaging` `cb` on((`cb`.`id` = '94'))) join `itemCost` `ic` on(((`ic`.`itemFk` = `s`.`itemFk`) and (`ic`.`warehouseFk` = `t`.`warehouseFk`)))) */;
+/*!50001 VIEW `saleVolume` AS select `s`.`ticketFk` AS `ticketFk`,`s`.`id` AS `saleFk`,round(`ic`.`cm3delivery` * `s`.`quantity` / 1000,0) AS `litros`,`t`.`routeFk` AS `routeFk`,`t`.`shipped` AS `shipped`,`t`.`landed` AS `landed`,`s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `volume`,`s`.`quantity` * `ic`.`grams` / 1000 AS `physicalWeight`,`s`.`quantity` * `ic`.`cm3delivery` * greatest(`i`.`density`,167) / 1000000 AS `weight`,`s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `physicalVolume`,`s`.`quantity` * `ic`.`cm3delivery` * ifnull(`t`.`zonePrice`,`z`.`price`) / `cb`.`volume` AS `freight`,`t`.`zoneFk` AS `zoneFk`,`t`.`clientFk` AS `clientFk`,`s`.`isPicked` AS `isPicked` from (((((`sale` `s` join `item` `i` on(`i`.`id` = `s`.`itemFk`)) join `ticket` `t` on(`t`.`id` = `s`.`ticketFk`)) join `zone` `z` on(`z`.`id` = `t`.`zoneFk`)) join `packaging` `cb` on(`cb`.`id` = '94')) join `itemCost` `ic` on(`ic`.`itemFk` = `s`.`itemFk` and `ic`.`warehouseFk` = `t`.`warehouseFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76104,6 +79667,7 @@ USE `vn`;
 -- Final view structure for view `saleVolume_Today_VNH`
 --
 
+/*!50001 DROP TABLE IF EXISTS `saleVolume_Today_VNH`*/;
 /*!50001 DROP VIEW IF EXISTS `saleVolume_Today_VNH`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76113,7 +79677,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`z-developer`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `saleVolume_Today_VNH` AS select `t`.`nickname` AS `Cliente`,`p`.`name` AS `Provincia`,`c`.`country` AS `Pais`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `volume` from (((((`saleVolume` `sv` join `ticket` `t` on((`t`.`id` = `sv`.`ticketFk`))) join `address` `a` on((`a`.`id` = `t`.`addressFk`))) join `province` `p` on((`p`.`id` = `a`.`provinceFk`))) join `country` `c` on((`c`.`id` = `p`.`countryFk`))) join `warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) where ((`w`.`name` = 'VNH') and (`t`.`shipped` between curdate() and `util`.`dayend`(curdate()))) group by `t`.`nickname`,`p`.`name` */;
+/*!50001 VIEW `saleVolume_Today_VNH` AS select `t`.`nickname` AS `Cliente`,`p`.`name` AS `Provincia`,`c`.`country` AS `Pais`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `volume` from (((((`saleVolume` `sv` join `ticket` `t` on(`t`.`id` = `sv`.`ticketFk`)) join `address` `a` on(`a`.`id` = `t`.`addressFk`)) join `province` `p` on(`p`.`id` = `a`.`provinceFk`)) join `country` `c` on(`c`.`id` = `p`.`countryFk`)) join `warehouse` `w` on(`w`.`id` = `t`.`warehouseFk`)) where `w`.`name` = 'VNH' and `t`.`shipped` between curdate() and `util`.`dayend`(curdate()) group by `t`.`nickname`,`p`.`name` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76122,6 +79686,7 @@ USE `vn`;
 -- Final view structure for view `sale_freightComponent`
 --
 
+/*!50001 DROP TABLE IF EXISTS `sale_freightComponent`*/;
 /*!50001 DROP VIEW IF EXISTS `sale_freightComponent`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76131,7 +79696,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `sale_freightComponent` AS select `t`.`id` AS `ticketFk`,(`sc`.`value` * `s`.`quantity`) AS `amount`,`t`.`shipped` AS `shipped` from ((((`ticket` `t` straight_join `sale` `s` on((`t`.`id` = `s`.`ticketFk`))) join `saleComponent` `sc` on((`sc`.`saleFk` = `s`.`id`))) join `component` `c` on((`c`.`id` = `sc`.`componentFk`))) join `componentType` `ct` on(((`ct`.`id` = `c`.`typeFk`) and (`ct`.`type` = 'agencia')))) */;
+/*!50001 VIEW `sale_freightComponent` AS select `t`.`id` AS `ticketFk`,`sc`.`value` * `s`.`quantity` AS `amount`,`t`.`shipped` AS `shipped` from ((((`ticket` `t` straight_join `sale` `s` on(`t`.`id` = `s`.`ticketFk`)) join `saleComponent` `sc` on(`sc`.`saleFk` = `s`.`id`)) join `component` `c` on(`c`.`id` = `sc`.`componentFk`)) join `componentType` `ct` on(`ct`.`id` = `c`.`typeFk` and `ct`.`type` = 'agencia')) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76140,6 +79705,7 @@ USE `vn`;
 -- Final view structure for view `salesPersonSince`
 --
 
+/*!50001 DROP TABLE IF EXISTS `salesPersonSince`*/;
 /*!50001 DROP VIEW IF EXISTS `salesPersonSince`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76149,7 +79715,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPersonSince` AS select `p`.`id_trabajador` AS `workerFk`,min(`b`.`date_start`) AS `started` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) left join `postgresql`.`business` `b` on((`pr`.`profile_id` = `b`.`client_id`))) left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `postgresql`.`professional_category` `pc` on((`pc`.`professional_category_id` = `bl`.`professional_category_id`))) where (`pc`.`category_name` = 'Aux ventas') group by `p`.`id_trabajador` */;
+/*!50001 VIEW `salesPersonSince` AS select `p`.`id_trabajador` AS `workerFk`,min(`b`.`date_start`) AS `started` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on(`pr`.`person_id` = `p`.`person_id`)) left join `postgresql`.`business` `b` on(`pr`.`profile_id` = `b`.`client_id`)) left join `postgresql`.`business_labour` `bl` on(`b`.`business_id` = `bl`.`business_id`)) join `postgresql`.`professional_category` `pc` on(`pc`.`professional_category_id` = `bl`.`professional_category_id`)) where `pc`.`category_name` = 'Aux ventas' group by `p`.`id_trabajador` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76158,6 +79724,7 @@ USE `vn`;
 -- Final view structure for view `salesPreparedLastHour`
 --
 
+/*!50001 DROP TABLE IF EXISTS `salesPreparedLastHour`*/;
 /*!50001 DROP VIEW IF EXISTS `salesPreparedLastHour`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76167,7 +79734,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPreparedLastHour` AS select `t`.`warehouseFk` AS `warehouseFk`,`st`.`saleFk` AS `saleFk`,`st`.`isChecked` AS `isChecked`,`st`.`originalQuantity` AS `originalQuantity`,`a`.`accion` AS `accion`,`st`.`created` AS `created`,`e`.`code` AS `code`,`w`.`firstName` AS `firstname`,`w`.`lastName` AS `lastName`,`w`.`code` AS `workerCode`,((`ic`.`cm3delivery` * `s`.`quantity`) / 1000) AS `litros`,`s`.`concept` AS `concept`,`d`.`name` AS `departmentName` from (((((((((`vn`.`saleTracking` `st` left join `vn`.`salesPreviousPreparated` `prevPrepSales` on((`prevPrepSales`.`saleFk` = `st`.`saleFk`))) join `vn`.`sale` `s` on((`s`.`id` = `st`.`saleFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`itemCost` `ic` on(((`ic`.`warehouseFk` = `t`.`warehouseFk`) and (`ic`.`itemFk` = `s`.`itemFk`)))) join `vn`.`worker` `w` on((`w`.`id` = `st`.`workerFk`))) join `vn`.`state` `e` on((`e`.`id` = `st`.`stateFk`))) join `vncontrol`.`accion` `a` on((`a`.`accion_id` = `st`.`actionFk`))) join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `st`.`workerFk`))) join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) where ((`st`.`created` > (now() + interval -(1) hour)) and isnull(`prevPrepSales`.`saleFk`) and (not((`d`.`name` like 'EQUIPO%')))) */;
+/*!50001 VIEW `salesPreparedLastHour` AS select `t`.`warehouseFk` AS `warehouseFk`,`st`.`saleFk` AS `saleFk`,`st`.`isChecked` AS `isChecked`,`st`.`originalQuantity` AS `originalQuantity`,`a`.`accion` AS `accion`,`st`.`created` AS `created`,`e`.`code` AS `code`,`w`.`firstName` AS `firstname`,`w`.`lastName` AS `lastName`,`w`.`code` AS `workerCode`,`ic`.`cm3delivery` * `s`.`quantity` / 1000 AS `litros`,`s`.`concept` AS `concept`,`d`.`name` AS `departmentName` from (((((((((`vn`.`saleTracking` `st` left join `vn`.`salesPreviousPreparated` `prevPrepSales` on(`prevPrepSales`.`saleFk` = `st`.`saleFk`)) join `vn`.`sale` `s` on(`s`.`id` = `st`.`saleFk`)) join `vn`.`ticket` `t` on(`t`.`id` = `s`.`ticketFk`)) join `vn`.`itemCost` `ic` on(`ic`.`warehouseFk` = `t`.`warehouseFk` and `ic`.`itemFk` = `s`.`itemFk`)) join `vn`.`worker` `w` on(`w`.`id` = `st`.`workerFk`)) join `vn`.`state` `e` on(`e`.`id` = `st`.`stateFk`)) join `vncontrol`.`accion` `a` on(`a`.`accion_id` = `st`.`actionFk`)) join `vn`.`workerDepartment` `wd` on(`wd`.`workerFk` = `st`.`workerFk`)) join `vn`.`department` `d` on(`d`.`id` = `wd`.`departmentFk`)) where `st`.`created` > current_timestamp() + interval -1 hour and `prevPrepSales`.`saleFk` is null and `d`.`name`  not like 'EQUIPO%' */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76176,6 +79743,7 @@ USE `vn`;
 -- Final view structure for view `salesPreviousPreparated`
 --
 
+/*!50001 DROP TABLE IF EXISTS `salesPreviousPreparated`*/;
 /*!50001 DROP VIEW IF EXISTS `salesPreviousPreparated`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76185,7 +79753,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `salesPreviousPreparated` AS select `st`.`saleFk` AS `saleFk` from (`saleTracking` `st` join `state` `e` on((`e`.`id` = `st`.`stateFk`))) where ((`st`.`created` > curdate()) and (`e`.`code` like 'PREVIOUS_PREPARATION')) */;
+/*!50001 VIEW `salesPreviousPreparated` AS select `st`.`saleFk` AS `saleFk` from (`saleTracking` `st` join `state` `e` on(`e`.`id` = `st`.`stateFk`)) where `st`.`created` > curdate() and `e`.`code` like 'PREVIOUS_PREPARATION' */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76194,6 +79762,7 @@ USE `vn`;
 -- Final view structure for view `supplierPackaging`
 --
 
+/*!50001 DROP TABLE IF EXISTS `supplierPackaging`*/;
 /*!50001 DROP VIEW IF EXISTS `supplierPackaging`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76203,7 +79772,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `supplierPackaging` AS select `e`.`supplierFk` AS `supplierFk`,`b`.`itemFk` AS `itemFk`,`i`.`longName` AS `longName`,`s`.`name` AS `supplier`,`b`.`entryFk` AS `entryFk`,`tr`.`landed` AS `landed`,-(least(`b`.`quantity`,0)) AS `out`,greatest(`b`.`quantity`,0) AS `in`,`w`.`name` AS `almacen` from ((((((`buy` `b` join `item` `i` on((`i`.`id` = `b`.`itemFk`))) join `packaging` `p` on((`p`.`itemFk` = `i`.`id`))) join `entry` `e` on((`e`.`id` = `b`.`entryFk`))) join `supplier` `s` on((`s`.`id` = `e`.`supplierFk`))) join `travel` `tr` on((`tr`.`id` = `e`.`travelFk`))) join `warehouse` `w` on((`w`.`id` = `tr`.`warehouseInFk`))) where `p`.`isPackageReturnable` */;
+/*!50001 VIEW `supplierPackaging` AS select `e`.`supplierFk` AS `supplierFk`,`b`.`itemFk` AS `itemFk`,`i`.`longName` AS `longName`,`s`.`name` AS `supplier`,`b`.`entryFk` AS `entryFk`,`tr`.`landed` AS `landed`,-least(`b`.`quantity`,0) AS `out`,greatest(`b`.`quantity`,0) AS `in`,`w`.`name` AS `almacen` from ((((((`buy` `b` join `item` `i` on(`i`.`id` = `b`.`itemFk`)) join `packaging` `p` on(`p`.`itemFk` = `i`.`id`)) join `entry` `e` on(`e`.`id` = `b`.`entryFk`)) join `supplier` `s` on(`s`.`id` = `e`.`supplierFk`)) join `travel` `tr` on(`tr`.`id` = `e`.`travelFk`)) join `warehouse` `w` on(`w`.`id` = `tr`.`warehouseInFk`)) where `p`.`isPackageReturnable` <> 0 */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76212,6 +79781,7 @@ USE `vn`;
 -- Final view structure for view `tagL10n`
 --
 
+/*!50001 DROP TABLE IF EXISTS `tagL10n`*/;
 /*!50001 DROP VIEW IF EXISTS `tagL10n`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76221,7 +79791,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `tagL10n` AS select `t`.`id` AS `id`,ifnull(`i`.`name`,`t`.`name`) AS `name` from (`tag` `t` left join `tagI18n` `i` on(((`i`.`tagFk` = `t`.`id`) and (`i`.`lang` = `util`.`LANG`())))) */;
+/*!50001 VIEW `tagL10n` AS select `t`.`id` AS `id`,ifnull(`i`.`name`,`t`.`name`) AS `name` from (`tag` `t` left join `tagI18n` `i` on(`i`.`tagFk` = `t`.`id` and `i`.`lang` = `util`.`LANG`())) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76230,6 +79800,7 @@ USE `vn`;
 -- Final view structure for view `ticketGetVolume__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `ticketGetVolume__`*/;
 /*!50001 DROP VIEW IF EXISTS `ticketGetVolume__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76239,7 +79810,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketGetVolume__` AS select `s`.`ticketFk` AS `ticketFk`,`t`.`routeFk` AS `routeFk`,`s`.`id` AS `saleFk`,`t`.`shipped` AS `shipped`,(((`s`.`quantity` * `r`.`cm3`) * `i`.`compression`) / 1000000) AS `volume` from (((`vn`.`sale` `s` join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `bi`.`rotacion` `r` on(((`r`.`Id_Article` = `s`.`itemFk`) and (`r`.`warehouse_id` = `t`.`warehouseFk`)))) */;
+/*!50001 VIEW `ticketGetVolume__` AS select `s`.`ticketFk` AS `ticketFk`,`t`.`routeFk` AS `routeFk`,`s`.`id` AS `saleFk`,`t`.`shipped` AS `shipped`,`s`.`quantity` * `r`.`cm3` * `i`.`compression` / 1000000 AS `volume` from (((`vn`.`sale` `s` join `vn`.`item` `i` on(`i`.`id` = `s`.`itemFk`)) join `vn`.`ticket` `t` on(`t`.`id` = `s`.`ticketFk`)) join `bi`.`rotacion` `r` on(`r`.`Id_Article` = `s`.`itemFk` and `r`.`warehouse_id` = `t`.`warehouseFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76248,6 +79819,7 @@ USE `vn`;
 -- Final view structure for view `ticketNotInvoiced`
 --
 
+/*!50001 DROP TABLE IF EXISTS `ticketNotInvoiced`*/;
 /*!50001 DROP VIEW IF EXISTS `ticketNotInvoiced`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76257,7 +79829,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketNotInvoiced` AS select `t`.`companyFk` AS `companyFk`,`cm`.`code` AS `companyCode`,`t`.`clientFk` AS `clientFk`,`c`.`name` AS `clientName`,`t`.`shipped` AS `shipped`,cast(sum((((`s`.`quantity` * `s`.`price`) * (100 - `s`.`discount`)) / 100)) as decimal(10,2)) AS `value` from (((`ticket` `t` join `sale` `s` on((`s`.`ticketFk` = `t`.`id`))) join `client` `c` on((`c`.`id` = `t`.`clientFk`))) join `company` `cm` on((`cm`.`id` = `t`.`companyFk`))) where (isnull(`t`.`refFk`) and (`t`.`shipped` > '2017-01-01')) group by `t`.`id` */;
+/*!50001 VIEW `ticketNotInvoiced` AS select `t`.`companyFk` AS `companyFk`,`cm`.`code` AS `companyCode`,`t`.`clientFk` AS `clientFk`,`c`.`name` AS `clientName`,`t`.`shipped` AS `shipped`,cast(sum(`s`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100) as decimal(10,2)) AS `value` from (((`ticket` `t` join `sale` `s` on(`s`.`ticketFk` = `t`.`id`)) join `client` `c` on(`c`.`id` = `t`.`clientFk`)) join `company` `cm` on(`cm`.`id` = `t`.`companyFk`)) where `t`.`refFk` is null and `t`.`shipped` > '2017-01-01' group by `t`.`id` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76266,6 +79838,7 @@ USE `vn`;
 -- Final view structure for view `ticketPreviousPreparingList`
 --
 
+/*!50001 DROP TABLE IF EXISTS `ticketPreviousPreparingList`*/;
 /*!50001 DROP VIEW IF EXISTS `ticketPreviousPreparingList`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76275,7 +79848,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketPreviousPreparingList` AS select `t`.`id` AS `ticketFk`,`w`.`code` AS `code`,count(`st`.`id`) AS `saleLines`,sum((`st`.`isChecked` <> 0)) AS `alreadyMadeSaleLines`,(sum((`st`.`isChecked` <> 0)) / count(`st`.`id`)) AS `madeRate`,`st`.`created` AS `created`,`i`.`sectorFk` AS `sectorFk`,`p`.`code` AS `parking` from (((((((`ticket` `t` join `sale` `s` on((`s`.`ticketFk` = `t`.`id`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `saleTracking` `st` on((`st`.`saleFk` = `s`.`id`))) join `state` on((`state`.`id` = `st`.`stateFk`))) left join `worker` `w` on((`w`.`id` = `st`.`workerFk`))) left join `ticketParking` `tp` on((`tp`.`ticketFk` = `t`.`id`))) left join `parking` `p` on((`p`.`id` = `tp`.`parkingFk`))) where ((`state`.`code` = 'PREVIOUS_PREPARATION') and (`t`.`shipped` >= (curdate() + interval -(1) day))) group by `s`.`ticketFk`,`i`.`sectorFk` */;
+/*!50001 VIEW `ticketPreviousPreparingList` AS select `t`.`id` AS `ticketFk`,`w`.`code` AS `code`,count(`st`.`id`) AS `saleLines`,sum(`st`.`isChecked` <> 0) AS `alreadyMadeSaleLines`,sum(`st`.`isChecked` <> 0) / count(`st`.`id`) AS `madeRate`,`st`.`created` AS `created`,`i`.`sectorFk` AS `sectorFk`,`p`.`code` AS `parking` from (((((((`ticket` `t` join `sale` `s` on(`s`.`ticketFk` = `t`.`id`)) join `item` `i` on(`i`.`id` = `s`.`itemFk`)) join `saleTracking` `st` on(`st`.`saleFk` = `s`.`id`)) join `state` on(`state`.`id` = `st`.`stateFk`)) left join `worker` `w` on(`w`.`id` = `st`.`workerFk`)) left join `ticketParking` `tp` on(`tp`.`ticketFk` = `t`.`id`)) left join `parking` `p` on(`p`.`id` = `tp`.`parkingFk`)) where `state`.`code` = 'PREVIOUS_PREPARATION' and `t`.`shipped` >= curdate() + interval -1 day group by `s`.`ticketFk`,`i`.`sectorFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76284,6 +79857,7 @@ USE `vn`;
 -- Final view structure for view `ticketState`
 --
 
+/*!50001 DROP TABLE IF EXISTS `ticketState`*/;
 /*!50001 DROP VIEW IF EXISTS `ticketState`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76293,7 +79867,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketState` AS select `i`.`odbc_date` AS `updated`,`i`.`state_id` AS `stateFk`,`i`.`Id_Trabajador` AS `workerFk`,`tls`.`ticketFk` AS `ticketFk`,`s`.`id` AS `state`,`s`.`order` AS `productionOrder`,`s`.`alertLevel` AS `alertLevel`,`s`.`code` AS `code`,`tls`.`ticketFk` AS `ticket`,`i`.`Id_Trabajador` AS `worker`,`s`.`isPreviousPreparable` AS `isPreviousPreparable`,`s`.`isPicked` AS `isPicked` from ((`vn`.`ticketLastState` `tls` join `vncontrol`.`inter` `i` on((`i`.`inter_id` = `tls`.`ticketTrackingFk`))) join `vn`.`state` `s` on((`s`.`id` = `i`.`state_id`))) */;
+/*!50001 VIEW `ticketState` AS select `i`.`odbc_date` AS `updated`,`i`.`state_id` AS `stateFk`,`i`.`Id_Trabajador` AS `workerFk`,`tls`.`ticketFk` AS `ticketFk`,`s`.`id` AS `state`,`s`.`order` AS `productionOrder`,`s`.`alertLevel` AS `alertLevel`,`s`.`code` AS `code`,`tls`.`ticketFk` AS `ticket`,`i`.`Id_Trabajador` AS `worker`,`s`.`isPreviousPreparable` AS `isPreviousPreparable`,`s`.`isPicked` AS `isPicked` from ((`vn`.`ticketLastState` `tls` join `vncontrol`.`inter` `i` on(`i`.`inter_id` = `tls`.`ticketTrackingFk`)) join `vn`.`state` `s` on(`s`.`id` = `i`.`state_id`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76302,6 +79876,7 @@ USE `vn`;
 -- Final view structure for view `ticketStateToday`
 --
 
+/*!50001 DROP TABLE IF EXISTS `ticketStateToday`*/;
 /*!50001 DROP VIEW IF EXISTS `ticketStateToday`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76311,7 +79886,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `ticketStateToday` AS select `ts`.`ticket` AS `ticket`,`ts`.`state` AS `state`,`ts`.`productionOrder` AS `productionOrder`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`worker` AS `worker`,`ts`.`code` AS `code`,`ts`.`updated` AS `updated`,`ts`.`isPicked` AS `isPicked` from (`vn`.`ticketState` `ts` join `vn`.`ticket` `t` on((`t`.`id` = `ts`.`ticket`))) where (`t`.`shipped` between curdate() and `MIDNIGHT`(curdate())) */;
+/*!50001 VIEW `ticketStateToday` AS select `ts`.`ticket` AS `ticket`,`ts`.`state` AS `state`,`ts`.`productionOrder` AS `productionOrder`,`ts`.`alertLevel` AS `alertLevel`,`ts`.`worker` AS `worker`,`ts`.`code` AS `code`,`ts`.`updated` AS `updated`,`ts`.`isPicked` AS `isPicked` from (`vn`.`ticketState` `ts` join `vn`.`ticket` `t` on(`t`.`id` = `ts`.`ticket`)) where `t`.`shipped` between curdate() and `MIDNIGHT`(curdate()) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76320,6 +79895,7 @@ USE `vn`;
 -- Final view structure for view `ticketTracking`
 --
 
+/*!50001 DROP TABLE IF EXISTS `ticketTracking`*/;
 /*!50001 DROP VIEW IF EXISTS `ticketTracking`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76338,6 +79914,7 @@ USE `vn`;
 -- Final view structure for view `time__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `time__`*/;
 /*!50001 DROP VIEW IF EXISTS `time__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76356,6 +79933,7 @@ USE `vn`;
 -- Final view structure for view `tr2`
 --
 
+/*!50001 DROP TABLE IF EXISTS `tr2`*/;
 /*!50001 DROP VIEW IF EXISTS `tr2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76374,6 +79952,7 @@ USE `vn`;
 -- Final view structure for view `user`
 --
 
+/*!50001 DROP TABLE IF EXISTS `user`*/;
 /*!50001 DROP VIEW IF EXISTS `user`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76392,6 +79971,7 @@ USE `vn`;
 -- Final view structure for view `workerCalendar`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerCalendar`*/;
 /*!50001 DROP VIEW IF EXISTS `workerCalendar`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76401,7 +79981,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerCalendar` AS select `ce`.`business_id` AS `businessFk`,`p`.`id_trabajador` AS `workerFk`,`ce`.`calendar_state_id` AS `absenceTypeFk`,`ce`.`date` AS `dated` from (((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`calendar_employee` `ce` on((`ce`.`business_id` = `b`.`business_id`))) */;
+/*!50001 VIEW `workerCalendar` AS select `ce`.`business_id` AS `businessFk`,`p`.`id_trabajador` AS `workerFk`,`ce`.`calendar_state_id` AS `absenceTypeFk`,`ce`.`date` AS `dated` from (((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on(`pr`.`person_id` = `p`.`person_id`)) join `postgresql`.`business` `b` on(`b`.`client_id` = `pr`.`profile_id`)) join `postgresql`.`calendar_employee` `ce` on(`ce`.`business_id` = `b`.`business_id`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76410,6 +79990,7 @@ USE `vn`;
 -- Final view structure for view `workerDepartment`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerDepartment`*/;
 /*!50001 DROP VIEW IF EXISTS `workerDepartment`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76419,7 +80000,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerDepartment` AS select `p`.`id_trabajador` AS `workerFk`,`d`.`id` AS `departmentFk` from (((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) left join (`postgresql`.`business` `b` left join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) on((`pr`.`profile_id` = `b`.`client_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) where ((isnull(`b`.`date_end`) and (`b`.`date_start` <= curdate())) or ((`b`.`date_end` >= curdate()) and (`b`.`date_start` <= curdate()))) */;
+/*!50001 VIEW `workerDepartment` AS select `p`.`id_trabajador` AS `workerFk`,`d`.`id` AS `departmentFk` from (((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on(`pr`.`person_id` = `p`.`person_id`)) left join (`postgresql`.`business` `b` left join `postgresql`.`business_labour` `bl` on(`b`.`business_id` = `bl`.`business_id`)) on(`pr`.`profile_id` = `b`.`client_id`)) join `vn`.`department` `d` on(`d`.`id` = `bl`.`department_id`)) where `b`.`date_end` is null and `b`.`date_start` <= curdate() or `b`.`date_end` >= curdate() and `b`.`date_start` <= curdate() */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76428,6 +80009,7 @@ USE `vn`;
 -- Final view structure for view `workerLabour`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerLabour`*/;
 /*!50001 DROP VIEW IF EXISTS `workerLabour`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76437,7 +80019,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerLabour` AS select `b`.`business_id` AS `businessFk`,`p`.`id_trabajador` AS `workerFk`,`bl`.`workcenter_id` AS `workCenterFk`,`b`.`date_start` AS `started`,`b`.`date_end` AS `ended`,`d`.`id` AS `departmentFk` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on((`pr`.`person_id` = `p`.`person_id`))) join `postgresql`.`business` `b` on((`b`.`client_id` = `pr`.`profile_id`))) join `postgresql`.`business_labour` `bl` on((`b`.`business_id` = `bl`.`business_id`))) join `vn`.`department` `d` on((`d`.`id` = `bl`.`department_id`))) order by `b`.`date_start` desc */;
+/*!50001 VIEW `workerLabour` AS select `b`.`business_id` AS `businessFk`,`p`.`id_trabajador` AS `workerFk`,`bl`.`workcenter_id` AS `workCenterFk`,`b`.`date_start` AS `started`,`b`.`date_end` AS `ended`,`d`.`id` AS `departmentFk` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `pr` on(`pr`.`person_id` = `p`.`person_id`)) join `postgresql`.`business` `b` on(`b`.`client_id` = `pr`.`profile_id`)) join `postgresql`.`business_labour` `bl` on(`b`.`business_id` = `bl`.`business_id`)) join `vn`.`department` `d` on(`d`.`id` = `bl`.`department_id`)) order by `b`.`date_start` desc */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76446,6 +80028,7 @@ USE `vn`;
 -- Final view structure for view `workerMana__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerMana__`*/;
 /*!50001 DROP VIEW IF EXISTS `workerMana__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76464,6 +80047,7 @@ USE `vn`;
 -- Final view structure for view `workerMedia`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerMedia`*/;
 /*!50001 DROP VIEW IF EXISTS `workerMedia`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76473,7 +80057,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerMedia` AS select `p`.`id_trabajador` AS `workerFk`,`m`.`value` AS `mediaValue` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `po` on((`po`.`person_id` = `p`.`person_id`))) join `postgresql`.`profile_media` `pom` on((`pom`.`profile_id` = `po`.`profile_id`))) join `postgresql`.`media` `m` on((`m`.`media_id` = `pom`.`media_id`))) join `postgresql`.`media_type` `mt` on((`mt`.`media_type_id` = `m`.`media_type_id`))) where (`mt`.`name` = 'movil empresa') */;
+/*!50001 VIEW `workerMedia` AS select `p`.`id_trabajador` AS `workerFk`,`m`.`value` AS `mediaValue` from ((((`postgresql`.`person` `p` join `postgresql`.`profile` `po` on(`po`.`person_id` = `p`.`person_id`)) join `postgresql`.`profile_media` `pom` on(`pom`.`profile_id` = `po`.`profile_id`)) join `postgresql`.`media` `m` on(`m`.`media_id` = `pom`.`media_id`)) join `postgresql`.`media_type` `mt` on(`mt`.`media_type_id` = `m`.`media_type_id`)) where `mt`.`name` = 'movil empresa' */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76482,6 +80066,7 @@ USE `vn`;
 -- Final view structure for view `workerSpeedExpedition`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerSpeedExpedition`*/;
 /*!50001 DROP VIEW IF EXISTS `workerSpeedExpedition`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76491,7 +80076,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerSpeedExpedition` AS select `sv`.`ticketFk` AS `ticketFk`,sum(`sv`.`litros`) AS `litros`,sum(if((`sub`.`started` > (now() + interval -(1) hour)),`sv`.`litros`,0)) AS `literLastHour`,cast(((60 * sum(`sv`.`litros`)) / time_to_sec(timediff(max(`sub`.`finished`),min(`sub`.`started`)))) as decimal(10,1)) AS `litersByMinute`,`sub`.`code` AS `workerCode`,`sub`.`cajas` AS `cajas`,`sub`.`warehouseFk` AS `warehouseFk` from (`saleVolume` `sv` join `expeditionTimeExpended` `sub` on((`sub`.`ticketFk` = `sv`.`ticketFk`))) group by `workerCode` */;
+/*!50001 VIEW `workerSpeedExpedition` AS select `sv`.`ticketFk` AS `ticketFk`,sum(`sv`.`litros`) AS `litros`,sum(if(`sub`.`started` > current_timestamp() + interval -1 hour,`sv`.`litros`,0)) AS `literLastHour`,cast(60 * sum(`sv`.`litros`) / time_to_sec(timediff(max(`sub`.`finished`),min(`sub`.`started`))) as decimal(10,1)) AS `litersByMinute`,`sub`.`code` AS `workerCode`,`sub`.`cajas` AS `cajas`,`sub`.`warehouseFk` AS `warehouseFk` from (`saleVolume` `sv` join `expeditionTimeExpended` `sub` on(`sub`.`ticketFk` = `sv`.`ticketFk`)) group by `sub`.`code` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76500,6 +80085,7 @@ USE `vn`;
 -- Final view structure for view `workerSpeedSaleTracking`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerSpeedSaleTracking`*/;
 /*!50001 DROP VIEW IF EXISTS `workerSpeedSaleTracking`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76509,7 +80095,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerSpeedSaleTracking` AS select `salesPreparedLastHour`.`warehouseFk` AS `warehouseFk`,`salesPreparedLastHour`.`accion` AS `accion`,`salesPreparedLastHour`.`workerCode` AS `workerCode`,sum(`salesPreparedLastHour`.`litros`) AS `sumaLitros`,min(`salesPreparedLastHour`.`created`) AS `started`,max(`salesPreparedLastHour`.`created`) AS `finished`,sum(if((`salesPreparedLastHour`.`created` >= (now() + interval -(1) hour)),`salesPreparedLastHour`.`litros`,0)) AS `sumaLitrosLastHour`,cast(((60 * sum(`salesPreparedLastHour`.`litros`)) / time_to_sec(timediff(max(`salesPreparedLastHour`.`created`),min(`salesPreparedLastHour`.`created`)))) as decimal(10,1)) AS `litersByMinute`,`salesPreparedLastHour`.`departmentName` AS `departmentName` from `vn`.`salesPreparedLastHour` group by `salesPreparedLastHour`.`warehouseFk`,`salesPreparedLastHour`.`accion`,`salesPreparedLastHour`.`workerCode` */;
+/*!50001 VIEW `workerSpeedSaleTracking` AS select `salesPreparedLastHour`.`warehouseFk` AS `warehouseFk`,`salesPreparedLastHour`.`accion` AS `accion`,`salesPreparedLastHour`.`workerCode` AS `workerCode`,sum(`salesPreparedLastHour`.`litros`) AS `sumaLitros`,min(`salesPreparedLastHour`.`created`) AS `started`,max(`salesPreparedLastHour`.`created`) AS `finished`,sum(if(`salesPreparedLastHour`.`created` >= current_timestamp() + interval -1 hour,`salesPreparedLastHour`.`litros`,0)) AS `sumaLitrosLastHour`,cast(60 * sum(`salesPreparedLastHour`.`litros`) / time_to_sec(timediff(max(`salesPreparedLastHour`.`created`),min(`salesPreparedLastHour`.`created`))) as decimal(10,1)) AS `litersByMinute`,`salesPreparedLastHour`.`departmentName` AS `departmentName` from `vn`.`salesPreparedLastHour` group by `salesPreparedLastHour`.`warehouseFk`,`salesPreparedLastHour`.`accion`,`salesPreparedLastHour`.`workerCode` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76518,6 +80104,7 @@ USE `vn`;
 -- Final view structure for view `workerTeamCollegues`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerTeamCollegues`*/;
 /*!50001 DROP VIEW IF EXISTS `workerTeamCollegues`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76527,7 +80114,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerTeamCollegues` AS select distinct `w`.`workerFk` AS `workerFk`,`t`.`workerFk` AS `collegueFk` from (`workerTeam` `w` join `workerTeam` `t` on((`w`.`team` = `t`.`team`))) */;
+/*!50001 VIEW `workerTeamCollegues` AS select distinct `w`.`workerFk` AS `workerFk`,`t`.`workerFk` AS `collegueFk` from (`workerTeam` `w` join `workerTeam` `t` on(`w`.`team` = `t`.`team`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76536,6 +80123,7 @@ USE `vn`;
 -- Final view structure for view `workerTimeControlUserInfo`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerTimeControlUserInfo`*/;
 /*!50001 DROP VIEW IF EXISTS `workerTimeControlUserInfo`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76545,7 +80133,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerTimeControlUserInfo` AS select `u`.`id` AS `userFk`,`w`.`firstName` AS `name`,`w`.`lastName` AS `surname`,`u`.`name` AS `user`,`u`.`password` AS `password`,`u`.`bcryptPassword` AS `bcryptPassword`,`wd`.`departmentFk` AS `departmentFk`,left(`w`.`fi`,8) AS `dni` from ((`account`.`user` `u` join `vn`.`worker` `w` on((`w`.`userFk` = `u`.`id`))) left join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `w`.`id`))) */;
+/*!50001 VIEW `workerTimeControlUserInfo` AS select `u`.`id` AS `userFk`,`w`.`firstName` AS `name`,`w`.`lastName` AS `surname`,`u`.`name` AS `user`,`u`.`password` AS `password`,`u`.`bcryptPassword` AS `bcryptPassword`,`wd`.`departmentFk` AS `departmentFk`,left(`w`.`fi`,8) AS `dni` from ((`account`.`user` `u` join `vn`.`worker` `w` on(`w`.`userFk` = `u`.`id`)) left join `vn`.`workerDepartment` `wd` on(`wd`.`workerFk` = `w`.`id`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76554,6 +80142,7 @@ USE `vn`;
 -- Final view structure for view `workerTimeControlWorking`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerTimeControlWorking`*/;
 /*!50001 DROP VIEW IF EXISTS `workerTimeControlWorking`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76563,7 +80152,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerTimeControlWorking` AS select `wtc`.`userFk` AS `userFk`,`wtc`.`timed` AS `timed`,`w`.`firstName` AS `name`,`w`.`lastName` AS `surname`,`pm`.`mediaValue` AS `phone`,`wm`.`mediaValue` AS `workerPhone`,`d`.`name` AS `department`,`wc`.`name` AS `workerCenter`,count(`wtc`.`order`) AS `maxOrder` from (((((((`vn`.`workerTimeControl` `wtc` join `vn`.`worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) left join `vn`.`personMedia` `pm` on((`pm`.`workerFk` = `w`.`id`))) left join `vn`.`workerMedia` `wm` on((`wm`.`workerFk` = `w`.`id`))) left join `vn`.`workerDepartment` `wd` on((`wd`.`workerFk` = `w`.`id`))) left join `vn`.`department` `d` on((`d`.`id` = `wd`.`departmentFk`))) left join `vn`.`workerLabour` `wl` on((`wl`.`businessFk` = (select `wl2`.`businessFk` from `vn`.`workerLabour` `wl2` where (`wl2`.`workerFk` = `w`.`id`) order by `wl2`.`started` desc limit 1)))) left join `vn`.`workCenter` `wc` on((`wc`.`id` = `wl`.`workCenterFk`))) where (cast(`wtc`.`timed` as date) = curdate()) group by `wtc`.`userFk` having ((`maxOrder` % 2) = 1) order by `wtc`.`timed` desc */;
+/*!50001 VIEW `workerTimeControlWorking` AS select `wtc`.`userFk` AS `userFk`,`wtc`.`timed` AS `timed`,`w`.`firstName` AS `name`,`w`.`lastName` AS `surname`,`pm`.`mediaValue` AS `phone`,`wm`.`mediaValue` AS `workerPhone`,`d`.`name` AS `department`,`wc`.`name` AS `workerCenter`,count(`wtc`.`order`) AS `maxOrder` from (((((((`vn`.`workerTimeControl` `wtc` join `vn`.`worker` `w` on(`w`.`userFk` = `wtc`.`userFk`)) left join `vn`.`personMedia` `pm` on(`pm`.`workerFk` = `w`.`id`)) left join `vn`.`workerMedia` `wm` on(`wm`.`workerFk` = `w`.`id`)) left join `vn`.`workerDepartment` `wd` on(`wd`.`workerFk` = `w`.`id`)) left join `vn`.`department` `d` on(`d`.`id` = `wd`.`departmentFk`)) left join `vn`.`workerLabour` `wl` on(`wl`.`businessFk` = (select `wl2`.`businessFk` from `vn`.`workerLabour` `wl2` where `wl2`.`workerFk` = `w`.`id` order by `wl2`.`started` desc limit 1))) left join `vn`.`workCenter` `wc` on(`wc`.`id` = `wl`.`workCenterFk`)) where cast(`wtc`.`timed` as date) = curdate() group by `wtc`.`userFk` having `maxOrder` MOD 2 = 1 order by `wtc`.`timed` desc */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76572,6 +80161,7 @@ USE `vn`;
 -- Final view structure for view `workerTimeControl_Journey__`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerTimeControl_Journey__`*/;
 /*!50001 DROP VIEW IF EXISTS `workerTimeControl_Journey__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76581,7 +80171,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerTimeControl_Journey__` AS select `wtc`.`userFk` AS `userFk`,cast(`wtc`.`timed` as date) AS `dated`,cast(sum((if((`wtc`.`order` % 2),-(1),1) * (hour(`wtc`.`timed`) + (minute(`wtc`.`timed`) / 60)))) as decimal(10,2)) AS `Journey`,dayname(`wtc`.`timed`) AS `dayName`,`w`.`lastName` AS `name`,`w`.`firstName` AS `firstname` from (`workerTimeControl` `wtc` join `worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) group by cast(`wtc`.`timed` as date),`wtc`.`userFk` */;
+/*!50001 VIEW `workerTimeControl_Journey__` AS select `wtc`.`userFk` AS `userFk`,cast(`wtc`.`timed` as date) AS `dated`,cast(sum(if(`wtc`.`order` MOD 2,-1,1) * (hour(`wtc`.`timed`) + minute(`wtc`.`timed`) / 60)) as decimal(10,2)) AS `Journey`,dayname(`wtc`.`timed`) AS `dayName`,`w`.`lastName` AS `name`,`w`.`firstName` AS `firstname` from (`workerTimeControl` `wtc` join `worker` `w` on(`w`.`userFk` = `wtc`.`userFk`)) group by cast(`wtc`.`timed` as date),`wtc`.`userFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76590,6 +80180,7 @@ USE `vn`;
 -- Final view structure for view `workerTimeJourneyNG`
 --
 
+/*!50001 DROP TABLE IF EXISTS `workerTimeJourneyNG`*/;
 /*!50001 DROP VIEW IF EXISTS `workerTimeJourneyNG`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76599,7 +80190,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerTimeJourneyNG` AS select `wtc`.`userFk` AS `userFk`,cast(`wtc`.`timed` as date) AS `dated`,(if((`wtc`.`order` % 2),-(1),1) * (hour(`wtc`.`timed`) + (minute(`wtc`.`timed`) / 60))) AS `Journey`,dayname(`wtc`.`timed`) AS `dayName`,`w`.`lastName` AS `name`,`w`.`firstName` AS `firstname` from (`workerTimeControl` `wtc` join `worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) */;
+/*!50001 VIEW `workerTimeJourneyNG` AS select `wtc`.`userFk` AS `userFk`,cast(`wtc`.`timed` as date) AS `dated`,if(`wtc`.`order` MOD 2,-1,1) * (hour(`wtc`.`timed`) + minute(`wtc`.`timed`) / 60) AS `Journey`,dayname(`wtc`.`timed`) AS `dayName`,`w`.`lastName` AS `name`,`w`.`firstName` AS `firstname` from (`workerTimeControl` `wtc` join `worker` `w` on(`w`.`userFk` = `wtc`.`userFk`)) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76608,6 +80199,7 @@ USE `vn`;
 -- Final view structure for view `zoneEstimatedDelivery`
 --
 
+/*!50001 DROP TABLE IF EXISTS `zoneEstimatedDelivery`*/;
 /*!50001 DROP VIEW IF EXISTS `zoneEstimatedDelivery`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76617,7 +80209,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `zoneEstimatedDelivery` AS select `t`.`zoneFk` AS `zoneFk`,cast((curdate() + interval ((hour(`zc`.`hour`) * 60) + minute(`zc`.`hour`)) minute) as time) AS `hourTheoretical`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `totalVolume`,cast(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0)) as decimal(5,1)) AS `remainingVolume`,greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)) AS `speed`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `hourEffective`,floor(((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)))) AS `minutesLess`,cast((`zc`.`hour` + interval ((-(sum(if((`s`.`alertLevel` < 2),`sv`.`volume`,0))) * 60) / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) minute) as time) AS `etc` from ((((((((`vn`.`ticket` `t` join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `s` on((`s`.`id` = `tst`.`state`))) join `vn`.`saleVolume` `sv` on((`sv`.`ticketFk` = `t`.`id`))) left join `vn`.`lastHourProduction` `lhp` on((`lhp`.`warehouseFk` = `t`.`warehouseFk`))) join `vn`.`warehouse` `w` on((`w`.`id` = `t`.`warehouseFk`))) join `vn`.`warehouseAlias` `wa` on((`wa`.`id` = `w`.`aliasFk`))) left join `vn`.`zoneClosure` `zc` on(((`zc`.`zoneFk` = `t`.`zoneFk`) and (`zc`.`dated` = curdate())))) left join `cache`.`departure_limit` `dl` on(((`dl`.`warehouse_id` = `t`.`warehouseFk`) and (`dl`.`fecha` = curdate())))) where ((`w`.`hasConfectionTeam` = 1) and (cast(`t`.`shipped` as date) = curdate())) group by `t`.`zoneFk` */;
+/*!50001 VIEW `zoneEstimatedDelivery` AS select `t`.`zoneFk` AS `zoneFk`,cast(curdate() + interval hour(`zc`.`hour`) * 60 + minute(`zc`.`hour`) minute as time) AS `hourTheoretical`,cast(sum(`sv`.`volume`) as decimal(5,1)) AS `totalVolume`,cast(sum(if(`s`.`alertLevel` < 2,`sv`.`volume`,0)) as decimal(5,1)) AS `remainingVolume`,greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)) AS `speed`,cast(`zc`.`hour` + interval -sum(if(`s`.`alertLevel` < 2,`sv`.`volume`,0)) * 60 / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)) minute as time) AS `hourEffective`,floor(-sum(if(`s`.`alertLevel` < 2,`sv`.`volume`,0)) * 60 / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0))) AS `minutesLess`,cast(`zc`.`hour` + interval -sum(if(`s`.`alertLevel` < 2,`sv`.`volume`,0)) * 60 / greatest(ifnull(`lhp`.`m3`,0),ifnull(`dl`.`minSpeed`,0)) minute as time) AS `etc` from ((((((((`vn`.`ticket` `t` join `vn`.`ticketStateToday` `tst` on(`tst`.`ticket` = `t`.`id`)) join `vn`.`state` `s` on(`s`.`id` = `tst`.`state`)) join `vn`.`saleVolume` `sv` on(`sv`.`ticketFk` = `t`.`id`)) left join `vn`.`lastHourProduction` `lhp` on(`lhp`.`warehouseFk` = `t`.`warehouseFk`)) join `vn`.`warehouse` `w` on(`w`.`id` = `t`.`warehouseFk`)) join `vn`.`warehouseAlias` `wa` on(`wa`.`id` = `w`.`aliasFk`)) left join `vn`.`zoneClosure` `zc` on(`zc`.`zoneFk` = `t`.`zoneFk` and `zc`.`dated` = curdate())) left join `cache`.`departure_limit` `dl` on(`dl`.`warehouse_id` = `t`.`warehouseFk` and `dl`.`fecha` = curdate())) where `w`.`hasConfectionTeam` = 1 and cast(`t`.`shipped` as date) = curdate() group by `t`.`zoneFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -76626,6 +80218,7 @@ USE `vn`;
 -- Final view structure for view `zone_ETD`
 --
 
+/*!50001 DROP TABLE IF EXISTS `zone_ETD`*/;
 /*!50001 DROP VIEW IF EXISTS `zone_ETD`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -76655,4 +80248,4 @@ USE `vncontrol`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26  9:22:21
+-- Dump completed on 2021-03-02  7:45:42
diff --git a/db/export-data.sh b/db/export-data.sh
index 5980b5c29..1e071c565 100755
--- a/db/export-data.sh
+++ b/db/export-data.sh
@@ -39,9 +39,12 @@ TABLES=(
     vn
     alertLevel
     bookingPlanner
+    cplusInvoiceType472
     cplusInvoiceType477
+    cplusRectificationType
     cplusSubjectOp
     cplusTaxBreak
+    cplusTrascendency472
     pgc
     time
     claimResponsible
@@ -54,6 +57,7 @@ TABLES=(
     department
     component
     componentType
+    continent
 )
 dump_tables ${TABLES[@]}
 
diff --git a/db/export-structure.sh b/db/export-structure.sh
index 36d41ea18..9c5ca6177 100755
--- a/db/export-structure.sh
+++ b/db/export-structure.sh
@@ -31,7 +31,6 @@ IGNORETABLES=(
     --ignore-table=vn.agencyModeZone
     --ignore-table=vn.agencyProvince
     --ignore-table=vn.agencyWarehouse
-    --ignore-table=vn.awb
     --ignore-table=vn.botanicExport__
     --ignore-table=vn.clientDefaultCompany
     --ignore-table=vn.color
@@ -39,6 +38,7 @@ IGNORETABLES=(
     --ignore-table=vn.comparativeFilter
     --ignore-table=vn.coolerPath
     --ignore-table=vn.coolerPathDetail
+    --ignore-table=vn.config__
     --ignore-table=vn.department__
     --ignore-table=vn.doc
     --ignore-table=vn.entity
@@ -49,13 +49,8 @@ IGNORETABLES=(
     --ignore-table=vn.grant
     --ignore-table=vn.grantGroup
     --ignore-table=vn.invoiceCorrection__
-    --ignore-table=vn.invoiceIn
-    --ignore-table=vn.invoiceInAwb
-    --ignore-table=vn.invoiceInDueDay
-    --ignore-table=vn.invoiceInEntry
-    --ignore-table=vn.invoiceInIntrastat
-    --ignore-table=vn.invoiceInTax
     --ignore-table=vn.itemTaxCountrySpain
+    --ignore-table=vn.itemFreeNumber__
     --ignore-table=vn.mail__
     --ignore-table=vn.manaSpellers
     --ignore-table=vn.outgoingInvoiceKk
@@ -69,7 +64,6 @@ IGNORETABLES=(
     --ignore-table=vn.printingQueue
     --ignore-table=vn.printServerQueue__
     --ignore-table=vn.promissoryNote
-    --ignore-table=vn.rate
     --ignore-table=vn.referenceRate__
     --ignore-table=vn.routesControl
     --ignore-table=vn.salesToPrePrepare
@@ -78,6 +72,7 @@ IGNORETABLES=(
     --ignore-table=vn.ticketeToPreparePrepared
     --ignore-table=vn.ticketObservation__
     --ignore-table=vn.ticketRequest__
+    --ignore-table=vn.ticket_print__
     --ignore-table=vn.ticketToPrepare
     --ignore-table=vn.till__
     --ignore-table=vn.travelThermograph__
diff --git a/front/core/components/contextmenu/index.js b/front/core/components/contextmenu/index.js
index add5a8b66..aa2d1a16b 100755
--- a/front/core/components/contextmenu/index.js
+++ b/front/core/components/contextmenu/index.js
@@ -29,7 +29,7 @@ export default class Contextmenu {
                 if (!event.defaultPrevented)
                     event.preventDefault();
 
-                if (!this.isFilterEnabled()) return;
+                if (!this.isMenuEnabled()) return;
 
                 const parent = this.$.contextmenu;
                 parent.style.top = event.pageY + 'px';
@@ -121,13 +121,31 @@ export default class Contextmenu {
         return isEnabled != 'false';
     }
 
+    isMenuEnabled() {
+        if (!this.rowHeader) return true;
+        const isEnabled = this.rowHeader.getAttribute('menu-enabled');
+
+        return isEnabled != 'false';
+    }
+
     /**
      * Returns true if filter
-     * by selection is allowed
+     * by selection is enabled and
+     * the menu can be interacted
      *
      * @return {Boolean}
      */
     isFilterAllowed() {
+        return this.isActionAllowed() && this.isFilterEnabled();
+    }
+
+    /**
+     * Returns true if the
+     * context menu can be interacted
+     *
+     * @return {Boolean}
+     */
+    isActionAllowed() {
         if (!this.target) return false;
         const isTableCell = this.target.closest('vn-td, .vn-td');
 
@@ -179,9 +197,13 @@ export default class Contextmenu {
         if (!where) return;
 
         const whereKeys = Object.keys(where);
-        for (let key of whereKeys)
+        for (let key of whereKeys) {
             removeProp(where, filterKey, key);
 
+            if (!Object.keys(where))
+                delete userFilter.where;
+        }
+
         function removeProp(instance, findProp, prop) {
             if (prop == findProp)
                 delete instance[prop];
@@ -208,6 +230,16 @@ export default class Contextmenu {
         const userParams = this.model.userParams;
         this.model.applyFilter(null, userParams);
     }
+
+    /**
+     * Copies the current field
+     * value to the clipboard
+     */
+    copyValue() {
+        const cell = angular.element(this.cell);
+        if (navigator && navigator.clipboard)
+            navigator.clipboard.writeText(cell.text());
+    }
 }
 
 Contextmenu.$inject = ['$element', '$scope', '$transclude'];
diff --git a/front/module-import.js b/front/module-import.js
index a726e2cc7..888a6ce7b 100755
--- a/front/module-import.js
+++ b/front/module-import.js
@@ -16,6 +16,7 @@ export default function moduleImport(moduleName) {
     case 'travel'       : return import('travel/front');
     case 'worker'       : return import('worker/front');
     case 'invoiceOut'   : return import('invoiceOut/front');
+    case 'invoiceIn'   : return import('invoiceIn/front');
     case 'route'        : return import('route/front');
     case 'entry'        : return import('entry/front');
     case 'account'      : return import('account/front');
diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index 98384df83..f2d81ee23 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -43,6 +43,7 @@ Workers: Trabajadores
 Routes: Rutas
 Locator: Localizador
 Invoices out: Facturas emitidas
+Invoices in: Fact. recibidas
 Entries: Entradas
 Users: Usuarios
 Suppliers: Proveedores
diff --git a/jest-front.js b/jest-front.js
index 3b481ad7c..7a692f57c 100644
--- a/jest-front.js
+++ b/jest-front.js
@@ -6,6 +6,7 @@ import './modules/zone/front/module.js';
 import './modules/claim/front/module.js';
 import './modules/client/front/module.js';
 import './modules/invoiceOut/front/module.js';
+import './modules/invoiceIn/front/module.js';
 import './modules/item/front/module.js';
 import './modules/order/front/module.js';
 import './modules/route/front/module.js';
diff --git a/modules/invoiceIn/back/methods/invoice-in/filter.js b/modules/invoiceIn/back/methods/invoice-in/filter.js
new file mode 100644
index 000000000..20680f153
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/filter.js
@@ -0,0 +1,171 @@
+
+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('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, offset, and limit - must be a JSON-encoded string',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'search',
+                type: 'string',
+                description: 'Searchs the invoiceOut by id',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'supplierRef',
+                type: 'string',
+                description: 'The supplier reference'
+            },
+            {
+                arg: 'fi',
+                type: 'string',
+                description: 'The supplier fiscal id'
+            },
+            {
+                arg: 'serialNumber',
+                type: 'number',
+                description: 'The serial number'
+            },
+            {
+                arg: 'serial',
+                type: 'string',
+                description: 'The serial'
+            },
+            {
+                arg: 'amount',
+                type: 'number',
+                description: 'The amount'
+            },
+            {
+                arg: 'from',
+                type: 'date',
+                description: `The from date filter`
+            }, {
+                arg: 'to',
+                type: 'date',
+                description: `The to date filter`
+            },
+            {
+                arg: 'issued',
+                type: 'date',
+                description: 'The issued date'
+            },
+            {
+                arg: 'account',
+                type: 'number',
+                description: 'The account number'
+            },
+            {
+                arg: 'awbCode',
+                type: 'string',
+                description: 'The Air Waybill code'
+            },
+            {
+                arg: 'isBooked',
+                type: 'boolean',
+                description: 'Whether the the invoice is booked or not',
+            },
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/filter`,
+            verb: 'GET'
+        }
+    });
+
+    Self.filter = async(ctx, filter) => {
+        const conn = Self.dataSource.connector;
+        const args = ctx.args;
+
+        if (args && args.to) {
+            const dateTo = args.to;
+            dateTo.setHours(23, 59, 0, 0);
+        }
+
+        let where = buildFilter(ctx.args, (param, value) => {
+            switch (param) {
+            case 'search':
+                return /^\d+$/.test(value)
+                    ? {'ii.id': value}
+                    : {'s.name': {like: `%${value}%`}};
+            case 'from':
+                return {'ii.created': {gte: value}};
+            case 'to':
+                return {'ii.created': {lte: value}};
+            case 'account':
+            case 'fi':
+                return {[`s.${param}`]: value};
+            case 'supplierRef':
+            case 'serialNumber':
+            case 'serial':
+            case 'issued':
+            case 'isBooked':
+                return {[`ii.${param}`]: value};
+            case 'awbCode':
+                return {'awb.code': value};
+            }
+        });
+
+        filter = mergeFilters(filter, {where});
+
+        let stmts = [];
+        let stmt;
+
+        stmt = new ParameterizedSQL(
+            `SELECT
+                ii.id,
+                ii.serialNumber,
+                ii.serial,
+                ii.issued,
+                ii.isBooked,
+                ii.supplierRef,
+                ii.docFk AS dmsFk,
+                s.id AS supplierFk,
+                s.name AS supplierName,
+                s.account,
+                SUM(iid.amount) AS amount,
+                awb.code AS awbCode
+            FROM invoiceIn ii
+                JOIN supplier s ON s.id = ii.supplierFk
+                LEFT JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
+                LEFT JOIN duaInvoiceIn dii ON dii.invoiceInFk = ii.id
+                LEFT JOIN dua d ON d.id = dii.duaFk
+                LEFT JOIN awb ON awb.id = d.awbFk
+                LEFT JOIN company co ON co.id = ii.companyFk`
+        );
+
+        const sqlWhere = conn.makeWhere(filter.where);
+
+        stmt.merge(sqlWhere);
+        stmt.merge(`GROUP BY ii.id`);
+
+        const amount = ctx.args.amount;
+        if (amount) {
+            stmt.merge({
+                sql: `HAVING SUM(iid.amount) = ?`,
+                params: [amount],
+            });
+        }
+
+        stmt.merge(conn.makePagination(filter));
+
+        let itemsIndex = stmts.push(stmt) - 1;
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await conn.executeStmt(sql);
+        return itemsIndex === 0 ? result : result[itemsIndex];
+    };
+};
+
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
new file mode 100644
index 000000000..13b54527b
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
@@ -0,0 +1,111 @@
+const app = require('vn-loopback/server/server');
+
+describe('InvoiceIn filter()', () => {
+    it('should return the invoice in matching supplier name', async() => {
+        let ctx = {
+            args: {
+                search: 'Plants SL',
+            }
+        };
+
+        let result = await app.models.InvoiceIn.filter(ctx);
+
+        expect(result.length).toEqual(5);
+        expect(result[0].supplierName).toEqual('Plants SL');
+    });
+
+    it('should return the invoice in matching supplier reference', async() => {
+        let ctx = {
+            args: {
+                supplierRef: '1241',
+            }
+        };
+
+        let result = await app.models.InvoiceIn.filter(ctx);
+
+        expect(result.length).toEqual(1);
+        expect(result[0].supplierRef).toEqual('1241');
+    });
+
+    it('should return the invoice in matching the serial number', async() => {
+        let ctx = {
+            args: {
+                serialNumber: '1002',
+            }
+        };
+
+        let result = await app.models.InvoiceIn.filter(ctx);
+
+        expect(result.length).toEqual(1);
+        expect(result[0].serialNumber).toEqual(1002);
+    });
+
+    it('should return the invoice in matching the account', async() => {
+        let ctx = {
+            args: {
+                account: '4000020002',
+            }
+        };
+
+        let result = await app.models.InvoiceIn.filter(ctx);
+
+        expect(result.length).toEqual(5);
+        expect(result[0].account).toEqual('4000020002');
+    });
+
+    it('should return the invoice in matching the awb code', async() => {
+        let ctx = {
+            args: {
+                awbCode: '07546491432',
+            }
+        };
+
+        let result = await app.models.InvoiceIn.filter(ctx);
+        const firstRow = result[0];
+
+        expect(result.length).toEqual(1);
+        expect(firstRow.id).toEqual(7);
+        expect(firstRow.awbCode).toEqual('07546491432');
+    });
+
+    it('should return the invoice in matching the amount', async() => {
+        let ctx = {
+            args: {
+                amount: '64.23',
+            }
+        };
+
+        let result = await app.models.InvoiceIn.filter(ctx);
+
+        expect(result.length).toEqual(1);
+        expect(result[0].amount).toEqual(64.23);
+    });
+
+    it('should return the invoice in matching "from" and "to"', async() => {
+        const from = new Date();
+        const to = new Date();
+        from.setHours(0, 0, 0, 0);
+        to.setHours(23, 59, 59, 999);
+        to.setDate(to.getDate() + 1);
+        const ctx = {
+            args: {from, to}
+        };
+
+        const result = await app.models.InvoiceIn.filter(ctx);
+
+        expect(result.length).toEqual(6);
+    });
+
+    it('should return the booked invoice in', async() => {
+        let ctx = {
+            args: {
+                isBooked: true,
+            }
+        };
+
+        let result = await app.models.InvoiceIn.filter(ctx);
+
+        expect(result.length).toEqual(6);
+        expect(result[0].isBooked).toBeTruthy();
+    });
+});
diff --git a/modules/invoiceIn/back/model-config.json b/modules/invoiceIn/back/model-config.json
new file mode 100644
index 000000000..7f95924a4
--- /dev/null
+++ b/modules/invoiceIn/back/model-config.json
@@ -0,0 +1,5 @@
+{
+    "InvoiceIn": {
+        "dataSource": "vn"
+    }
+}
diff --git a/modules/invoiceIn/back/models/invoice-in.js b/modules/invoiceIn/back/models/invoice-in.js
new file mode 100644
index 000000000..278843428
--- /dev/null
+++ b/modules/invoiceIn/back/models/invoice-in.js
@@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/invoice-in/filter')(Self);
+};
diff --git a/modules/invoiceIn/back/models/invoice-in.json b/modules/invoiceIn/back/models/invoice-in.json
new file mode 100644
index 000000000..3310c4346
--- /dev/null
+++ b/modules/invoiceIn/back/models/invoice-in.json
@@ -0,0 +1,67 @@
+{
+    "name": "InvoiceIn",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "invoiceIn"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "Number",
+            "description": "Identifier"
+        },
+        "serialNumber": {
+            "type": "number"
+        },
+        "serial": {
+            "type": "string"
+        },
+        "issued": {
+            "type": "date"
+        },
+        "created": {
+            "type": "date"
+        },
+        "isBooked": {
+            "type": "boolean"
+        },
+        "booked": {
+            "type": "date"
+        },
+        "operated": {
+            "type": "date"
+        },
+        "dmsFk": {
+            "type": "number",
+            "mysql": {
+                "columnName": "docFk"
+            }
+        }
+    },
+    "relations": {
+        "company": {
+            "type": "belongsTo",
+            "model": "Company",
+            "foreignKey": "companyFk"
+        },
+        "supplier": {
+            "type": "belongsTo",
+            "model": "Supplier",
+            "foreignKey": "supplierFk"
+        },
+        "currency": {
+            "type": "belongsTo",
+            "model": "Currency",
+            "foreignKey": "currencyFk"
+        },
+        "dms": {
+            "type": "belongsTo",
+            "model": "Dms",
+            "foreignKey": "dmsFk"
+        }
+    }
+}
+
+
diff --git a/modules/invoiceIn/front/card/index.html b/modules/invoiceIn/front/card/index.html
new file mode 100644
index 000000000..aed88cbdd
--- /dev/null
+++ b/modules/invoiceIn/front/card/index.html
@@ -0,0 +1,5 @@
+<vn-portal slot="menu">
+    <vn-invoice-in-descriptor invoice-in="$ctrl.invoiceIn"></vn-invoice-in-descriptor>
+    <vn-left-menu source="card"></vn-left-menu>
+</vn-portal>
+<ui-view></ui-view>
diff --git a/modules/invoiceIn/front/card/index.js b/modules/invoiceIn/front/card/index.js
new file mode 100644
index 000000000..8c53ea8b8
--- /dev/null
+++ b/modules/invoiceIn/front/card/index.js
@@ -0,0 +1,17 @@
+import ngModule from '../module';
+import ModuleCard from 'salix/components/module-card';
+
+class Controller extends ModuleCard {
+    reload() {
+        const filter = {};
+
+        this.$http.get(`InvoiceIns/${this.$params.id}`, {filter})
+            .then(res => this.invoiceIn = res.data);
+    }
+}
+
+ngModule.vnComponent('vnInvoiceInCard', {
+    template: require('./index.html'),
+    controller: Controller
+});
+
diff --git a/modules/invoiceIn/front/card/index.spec.js b/modules/invoiceIn/front/card/index.spec.js
new file mode 100644
index 000000000..70f10f6b1
--- /dev/null
+++ b/modules/invoiceIn/front/card/index.spec.js
@@ -0,0 +1,27 @@
+import './index.js';
+
+describe('vnInvoiceIn', () => {
+    let controller;
+    let $httpBackend;
+    let data = {id: 1, name: 'fooName'};
+
+    beforeEach(ngModule('invoiceIn'));
+
+    beforeEach(inject(($componentController, _$httpBackend_, $stateParams) => {
+        $httpBackend = _$httpBackend_;
+
+        let $element = angular.element('<div></div>');
+        controller = $componentController('vnInvoiceInCard', {$element});
+
+        $stateParams.id = data.id;
+        $httpBackend.whenRoute('GET', 'InvoiceIns/:id').respond(data);
+    }));
+
+    it('should request data and set it on the controller', () => {
+        controller.reload();
+        $httpBackend.flush();
+
+        expect(controller.invoiceIn).toEqual(data);
+    });
+});
+
diff --git a/modules/invoiceIn/front/descriptor-popover/index.html b/modules/invoiceIn/front/descriptor-popover/index.html
new file mode 100644
index 000000000..e822f5250
--- /dev/null
+++ b/modules/invoiceIn/front/descriptor-popover/index.html
@@ -0,0 +1,4 @@
+<slot-descriptor>
+    <vn-invoice-in-descriptor>
+    </vn-invoice-in-descriptor>
+</slot-descriptor>
\ No newline at end of file
diff --git a/modules/invoiceIn/front/descriptor-popover/index.js b/modules/invoiceIn/front/descriptor-popover/index.js
new file mode 100644
index 000000000..97f46a32f
--- /dev/null
+++ b/modules/invoiceIn/front/descriptor-popover/index.js
@@ -0,0 +1,9 @@
+import ngModule from '../module';
+import DescriptorPopover from 'salix/components/descriptor-popover';
+
+class Controller extends DescriptorPopover {}
+
+ngModule.vnComponent('vnInvoiceInDescriptorPopover', {
+    slotTemplate: require('./index.html'),
+    controller: Controller
+});
diff --git a/modules/invoiceIn/front/descriptor/index.html b/modules/invoiceIn/front/descriptor/index.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/invoiceIn/front/descriptor/index.js b/modules/invoiceIn/front/descriptor/index.js
new file mode 100644
index 000000000..6b22dd62b
--- /dev/null
+++ b/modules/invoiceIn/front/descriptor/index.js
@@ -0,0 +1,36 @@
+import ngModule from '../module';
+import Descriptor from 'salix/components/descriptor';
+
+class Controller extends Descriptor {
+    get invoiceIn() {
+        return this.entity;
+    }
+
+    set invoiceIn(value) {
+        this.entity = value;
+    }
+
+    loadData() {
+        const filter = {
+            include: [
+                {
+                    relation: 'company',
+                    scope: {
+                        fields: ['id', 'code']
+                    }
+                }
+            ]
+        };
+
+        return this.getData(`InvoiceIns/${this.id}`, {filter})
+            .then(res => this.entity = res.data);
+    }
+}
+
+ngModule.vnComponent('vnInvoiceInDescriptor', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        invoiceIn: '<'
+    }
+});
diff --git a/modules/invoiceIn/front/descriptor/index.spec.js b/modules/invoiceIn/front/descriptor/index.spec.js
new file mode 100644
index 000000000..df72f5b45
--- /dev/null
+++ b/modules/invoiceIn/front/descriptor/index.spec.js
@@ -0,0 +1,26 @@
+import './index';
+
+describe('vnInvoiceInDescriptor', () => {
+    let controller;
+    let $httpBackend;
+
+    beforeEach(ngModule('invoiceIn'));
+
+    beforeEach(inject(($componentController, _$httpBackend_) => {
+        $httpBackend = _$httpBackend_;
+        controller = $componentController('vnInvoiceInDescriptor', {$element: null});
+    }));
+
+    describe('loadData()', () => {
+        it(`should perform a get query to store the invoice in data into the controller`, () => {
+            const id = 1;
+            const response = {id: 1};
+
+            $httpBackend.expectGET(`InvoiceIns/${id}`).respond(response);
+            controller.id = id;
+            $httpBackend.flush();
+
+            expect(controller.invoiceIn).toEqual(response);
+        });
+    });
+});
diff --git a/modules/invoiceIn/front/index.js b/modules/invoiceIn/front/index.js
new file mode 100644
index 000000000..acb341c50
--- /dev/null
+++ b/modules/invoiceIn/front/index.js
@@ -0,0 +1,8 @@
+export * from './module';
+
+import './main';
+import './index/';
+import './search-panel';
+import './card';
+import './descriptor';
+import './descriptor-popover';
diff --git a/modules/invoiceIn/front/index/index.html b/modules/invoiceIn/front/index/index.html
new file mode 100644
index 000000000..3847b307d
--- /dev/null
+++ b/modules/invoiceIn/front/index/index.html
@@ -0,0 +1,103 @@
+<vn-auto-search
+    model="model">
+</vn-auto-search>
+<vn-data-viewer
+    model="model"
+    class="vn-w-lg">
+    <vn-card>
+    <vn-table model="model">
+        <vn-thead>
+            <vn-tr>
+                <vn-th field="id">ID</vn-th>
+                <vn-th field="supplierFk">Supplier</vn-th>
+                <vn-th field="supplierRef">Supplier ref.</vn-th>
+                <vn-th field="serialNumber">Serial number</vn-th>
+                <vn-th field="serial">Serial</vn-th>
+                <vn-th field="account">Account</vn-th>
+                <vn-th field="issued" expand>Issued</vn-th>
+                <vn-th field="isBooked" center>Is booked</vn-th>
+                <vn-th field="awbCode" vn-tooltip="Air Waybill">AWB</vn-th>
+                <vn-th field="amount" filter-enabled="false">Amount</vn-th>
+                <vn-th></vn-th>
+            </vn-tr>
+        </vn-thead>
+        <vn-tbody>
+            <a ng-repeat="invoiceIn in model.data"
+                class="clickable vn-tr search-result"
+                ui-sref="invoiceIn.card.summary({id: {{::invoiceIn.id}}})">
+                <vn-td>{{::invoiceIn.id}}</vn-td>
+                <vn-td>
+                    <span
+                        class="link" 
+                        vn-click-stop="supplierDescriptor.show($event, invoiceIn.supplierFk)">
+                        {{::invoiceIn.supplierName}}
+                    </span>
+                </vn-td> 
+                <vn-td>{{::invoiceIn.supplierRef | dashIfEmpty}}</vn-td>
+                <vn-td>{{::invoiceIn.serialNumber}}</vn-td> 
+                <vn-td>{{::invoiceIn.serial}}</vn-td> 
+                <vn-td>{{::invoiceIn.account}}</vn-td> 
+                <vn-td expand>{{::invoiceIn.issued | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
+                <vn-td center>
+                    <vn-check disabled="true"
+                        ng-model="invoiceIn.isBooked">
+                    </vn-check>
+                </vn-td> 
+                <vn-td>{{::invoiceIn.awbCode}}</vn-td> 
+                <vn-td>{{::invoiceIn.amount | currency:'EUR'}}</vn-td> 
+                <vn-td shrink>
+                    <vn-icon-button
+                        vn-click-stop="$ctrl.preview(invoiceIn)"
+                        vn-tooltip="Preview"
+                        icon="preview">
+                    </vn-icon-button>
+                    <vn-icon-button
+                        ng-show="invoiceIn.dmsFk"
+                        vn-click-stop="$ctrl.openPdf(invoiceIn.dmsFk)"
+                        icon="cloud_download"
+                        title="Download PDF"
+                        vn-tooltip="Download PDF">
+                    </vn-icon-button>
+                </vn-td>
+            </a>
+        </vn-tbody>
+    </vn-table>
+    </vn-card>
+</vn-data-viewer>
+<vn-popup vn-id="summary">
+    <vn-invoice-in-summary
+        invoice-in="$ctrl.selectedinvoiceIn">
+    </vn-invoice-in-summary>
+</vn-popup>
+<vn-supplier-descriptor-popover
+    vn-id="supplierDescriptor">
+</vn-supplier-descriptor-popover>
+<vn-contextmenu vn-id="contextmenu" targets="['vn-data-viewer']" model="model"
+    expr-builder="$ctrl.exprBuilder(param, value)">
+    <slot-menu>
+        <vn-item translate
+            ng-if="contextmenu.isFilterAllowed()"
+            ng-click="contextmenu.filterBySelection()">
+            Filter by selection
+        </vn-item>
+        <vn-item translate 
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.excludeSelection()">
+            Exclude selection
+        </vn-item>
+        <vn-item translate 
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.removeFilter()">
+            Remove filter
+        </vn-item>
+        <vn-item translate 
+            ng-click="contextmenu.removeAllFilters()">
+            Remove all filters
+        </vn-item>
+        <vn-item translate 
+            ng-if="contextmenu.isActionAllowed()" 
+            ng-click="contextmenu.copyValue()">
+            Copy value
+        </vn-item>
+    </slot-menu>
+</vn-contextmenu>
diff --git a/modules/invoiceIn/front/index/index.js b/modules/invoiceIn/front/index/index.js
new file mode 100644
index 000000000..4bb0fd6a4
--- /dev/null
+++ b/modules/invoiceIn/front/index/index.js
@@ -0,0 +1,42 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+    exprBuilder(param, value) {
+        switch (param) {
+        case 'issued':
+            return {'ii.issued': {
+                between: this.dateRange(value)}
+            };
+        case 'id':
+        case 'supplierFk':
+        case 'supplierRef':
+        case 'serialNumber':
+        case 'serial':
+        case 'created':
+        case 'isBooked':
+            return {[`ii.${param}`]: value};
+        case 'account':
+        case 'fi':
+            return {[`s.${param}`]: value};
+        case 'awbCode':
+            return {'awb.code': value};
+        default:
+            return {[param]: value};
+        }
+    }
+
+    dateRange(value) {
+        const minHour = new Date(value);
+        minHour.setHours(0, 0, 0, 0);
+        const maxHour = new Date(value);
+        maxHour.setHours(23, 59, 59, 59);
+
+        return [minHour, maxHour];
+    }
+}
+
+ngModule.vnComponent('vnInvoiceInIndex', {
+    template: require('./index.html'),
+    controller: Controller
+});
diff --git a/modules/invoiceIn/front/index/locale/es.yml b/modules/invoiceIn/front/index/locale/es.yml
new file mode 100644
index 000000000..e1b354316
--- /dev/null
+++ b/modules/invoiceIn/front/index/locale/es.yml
@@ -0,0 +1,6 @@
+Created: Fecha creación
+Issued: Fecha emisión
+Supplier ref.: Ref. proveedor
+Serial number: Num. serie
+Serial: Serie
+Is booked: Conciliada
\ No newline at end of file
diff --git a/modules/invoiceIn/front/locale/es.yml b/modules/invoiceIn/front/locale/es.yml
new file mode 100644
index 000000000..02501b14a
--- /dev/null
+++ b/modules/invoiceIn/front/locale/es.yml
@@ -0,0 +1,2 @@
+InvoiceIn: Facturas recibidas
+Search invoices in by reference: Buscar facturas recibidas por referencia
\ No newline at end of file
diff --git a/modules/invoiceIn/front/main/index.html b/modules/invoiceIn/front/main/index.html
new file mode 100644
index 000000000..2dc87b2ee
--- /dev/null
+++ b/modules/invoiceIn/front/main/index.html
@@ -0,0 +1,18 @@
+<vn-crud-model
+    vn-id="model"
+    url="InvoiceIns/filter"
+    limit="20"
+    order="isBooked, issued DESC">
+</vn-crud-model>
+<vn-portal slot="topbar">
+    <vn-searchbar
+        vn-focus
+        panel="vn-invoice-in-search-panel"
+        info="Search invoices in by reference"
+        model="model">
+    </vn-searchbar>
+</vn-portal>
+<vn-portal slot="menu">
+    <vn-left-menu></vn-left-menu>
+</vn-portal>
+<ui-view></ui-view>
\ No newline at end of file
diff --git a/modules/invoiceIn/front/main/index.js b/modules/invoiceIn/front/main/index.js
new file mode 100644
index 000000000..f7b767458
--- /dev/null
+++ b/modules/invoiceIn/front/main/index.js
@@ -0,0 +1,9 @@
+import ngModule from '../module';
+import ModuleMain from 'salix/components/module-main';
+
+export default class InvoiceIn extends ModuleMain {}
+
+ngModule.vnComponent('vnInvoiceIn', {
+    controller: InvoiceIn,
+    template: require('./index.html')
+});
diff --git a/modules/invoiceIn/front/module.js b/modules/invoiceIn/front/module.js
new file mode 100644
index 000000000..4f265e8b4
--- /dev/null
+++ b/modules/invoiceIn/front/module.js
@@ -0,0 +1,3 @@
+import {ng} from 'core/vendor';
+
+export default ng.module('invoiceIn', ['vnCore']);
diff --git a/modules/invoiceIn/front/routes.json b/modules/invoiceIn/front/routes.json
new file mode 100644
index 000000000..cb11a1da7
--- /dev/null
+++ b/modules/invoiceIn/front/routes.json
@@ -0,0 +1,44 @@
+{
+    "module": "invoiceIn",
+    "name": "Invoices in",
+    "icon": "contact_support",
+    "validations" : true,
+    "dependencies": ["worker", "supplier"],
+    "menus": {
+        "main": [
+            {"state": "invoiceIn.index", "icon": "contact_support"}
+        ]
+    },
+    "routes": [
+        {
+            "url": "/invoice-in",
+            "state": "invoiceIn",
+            "abstract": true,
+            "component": "vn-invoice-in",
+            "description": "InvoiceIn"
+        },
+        {
+            "url": "/index?q",
+            "state": "invoiceIn.index",
+            "component": "vn-invoice-in-index",
+            "description": "InvoiceIn",
+            "acl": ["administrative"]
+        },
+        {
+            "url": "/:id",
+            "state": "invoiceIn.card",
+            "abstract": true,
+            "component": "vn-invoice-in-card"
+        },
+        {
+            "url": "/summary",
+            "state": "invoiceIn.card.summary",
+            "component": "vn-invoice-in-summary",
+            "description": "Summary",
+            "params": {
+                "invoice-In": "$ctrl.invoiceIn"
+            },
+            "acl": ["developer"]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/modules/invoiceIn/front/search-panel/index.html b/modules/invoiceIn/front/search-panel/index.html
new file mode 100644
index 000000000..90bb73725
--- /dev/null
+++ b/modules/invoiceIn/front/search-panel/index.html
@@ -0,0 +1,82 @@
+<div class="search-panel">
+    <form ng-submit="$ctrl.onSearch()">
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="General search"
+                ng-model="filter.search"
+                info="Search invoices in by id or supplier fiscal name"
+                vn-focus>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Supplier ref."
+                ng-model="filter.supplierRef">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Supplier fiscal id"
+                ng-model="filter.fi">
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Account"
+                ng-model="filter.account">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Amount"
+                ng-model="filter.amount">
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-date-picker
+                vn-one
+                label="From"
+                ng-model="filter.from">
+            </vn-date-picker>
+            <vn-date-picker
+                vn-one
+                label="To"
+                ng-model="filter.to">
+            </vn-date-picker>
+            <vn-date-picker
+                vn-one
+                label="Issued"
+                ng-model="filter.issued">
+            </vn-date-picker>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Serial number"
+                ng-model="filter.serialNumber">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Serial"
+                ng-model="filter.serial">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="AWB"
+                ng-model="filter.awbCode">
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-check
+                vn-one
+                triple-state="true"
+                label="Is booked"
+                ng-model="filter.isBooked">
+            </vn-check>
+        </vn-horizontal>
+        <vn-horizontal class="vn-mt-lg">
+            <vn-submit label="Search"></vn-submit>
+        </vn-horizontal>
+    </form>
+</div>
diff --git a/modules/invoiceIn/front/search-panel/index.js b/modules/invoiceIn/front/search-panel/index.js
new file mode 100644
index 000000000..a8e41b7ef
--- /dev/null
+++ b/modules/invoiceIn/front/search-panel/index.js
@@ -0,0 +1,7 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+ngModule.vnComponent('vnInvoiceInSearchPanel', {
+    template: require('./index.html'),
+    controller: SearchPanel
+});
diff --git a/modules/invoiceIn/front/search-panel/locale/es.yml b/modules/invoiceIn/front/search-panel/locale/es.yml
new file mode 100644
index 000000000..57e2944ea
--- /dev/null
+++ b/modules/invoiceIn/front/search-panel/locale/es.yml
@@ -0,0 +1,2 @@
+Supplier fiscal id: CIF proveedor
+Search invoices in by id or supplier fiscal name: Buscar facturas recibidas por id o por nombre fiscal del proveedor
\ No newline at end of file
diff --git a/modules/invoiceOut/front/card/index.spec.js b/modules/invoiceOut/front/card/index.spec.js
new file mode 100644
index 000000000..2a8d576dc
--- /dev/null
+++ b/modules/invoiceOut/front/card/index.spec.js
@@ -0,0 +1,27 @@
+import './index.js';
+
+describe('vnInvoiceOut', () => {
+    let controller;
+    let $httpBackend;
+    let data = {id: 1, name: 'fooName'};
+
+    beforeEach(ngModule('invoiceOut'));
+
+    beforeEach(inject(($componentController, _$httpBackend_, $stateParams) => {
+        $httpBackend = _$httpBackend_;
+
+        let $element = angular.element('<div></div>');
+        controller = $componentController('vnInvoiceOutCard', {$element});
+
+        $stateParams.id = data.id;
+        $httpBackend.whenRoute('GET', 'InvoiceOuts/:id').respond(data);
+    }));
+
+    it('should request data and set it on the controller', () => {
+        controller.reload();
+        $httpBackend.flush();
+
+        expect(controller.invoiceOut).toEqual(data);
+    });
+});
+
diff --git a/modules/invoiceOut/front/descriptor/index.spec.js b/modules/invoiceOut/front/descriptor/index.spec.js
new file mode 100644
index 000000000..987763b0a
--- /dev/null
+++ b/modules/invoiceOut/front/descriptor/index.spec.js
@@ -0,0 +1,26 @@
+import './index';
+
+describe('vnInvoiceOutDescriptor', () => {
+    let controller;
+    let $httpBackend;
+
+    beforeEach(ngModule('invoiceOut'));
+
+    beforeEach(inject(($componentController, _$httpBackend_) => {
+        $httpBackend = _$httpBackend_;
+        controller = $componentController('vnInvoiceOutDescriptor', {$element: null});
+    }));
+
+    describe('loadData()', () => {
+        it(`should perform a get query to store the invoice in data into the controller`, () => {
+            const id = 1;
+            const response = {id: 1};
+
+            $httpBackend.expectGET(`InvoiceOuts/${id}`).respond(response);
+            controller.id = id;
+            $httpBackend.flush();
+
+            expect(controller.invoiceOut).toEqual(response);
+        });
+    });
+});
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 4d8dea570..dd63bec27 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -91,23 +91,28 @@
     expr-builder="$ctrl.exprBuilder(param, value)">
     <slot-menu>
         <vn-item translate
-        ng-if="contextmenu.isFilterAllowed()"
-        ng-click="contextmenu.filterBySelection()">
+            ng-if="contextmenu.isFilterAllowed()"
+            ng-click="contextmenu.filterBySelection()">
             Filter by selection
         </vn-item>
         <vn-item translate 
-        ng-if="contextmenu.isFilterAllowed()" 
-        ng-click="contextmenu.excludeSelection()">
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.excludeSelection()">
             Exclude selection
         </vn-item>
         <vn-item translate 
-        ng-if="contextmenu.isFilterAllowed()" 
-        ng-click="contextmenu.removeFilter()" >
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.removeFilter()">
             Remove filter
         </vn-item>
         <vn-item translate 
-        ng-click="contextmenu.removeAllFilters()" >
+            ng-click="contextmenu.removeAllFilters()">
             Remove all filters
         </vn-item>
+        <vn-item translate 
+            ng-if="contextmenu.isActionAllowed()" 
+            ng-click="contextmenu.copyValue()">
+            Copy value
+        </vn-item>
     </slot-menu>
 </vn-contextmenu>
\ No newline at end of file
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index ffbe9a712..2da791757 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -136,23 +136,28 @@
     expr-builder="$ctrl.exprBuilder(param, value)">
     <slot-menu>
         <vn-item translate
-        ng-if="contextmenu.isFilterAllowed()"
-        ng-click="contextmenu.filterBySelection()">
+            ng-if="contextmenu.isFilterAllowed()"
+            ng-click="contextmenu.filterBySelection()">
             Filter by selection
         </vn-item>
         <vn-item translate 
-        ng-if="contextmenu.isFilterAllowed()" 
-        ng-click="contextmenu.excludeSelection()">
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.excludeSelection()">
             Exclude selection
         </vn-item>
         <vn-item translate 
-        ng-if="contextmenu.isFilterAllowed()" 
-        ng-click="contextmenu.removeFilter()" >
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.removeFilter()">
             Remove filter
         </vn-item>
         <vn-item translate 
-        ng-click="contextmenu.removeAllFilters()" >
+            ng-click="contextmenu.removeAllFilters()">
             Remove all filters
         </vn-item>
+        <vn-item translate 
+            ng-if="contextmenu.isActionAllowed()" 
+            ng-click="contextmenu.copyValue()">
+            Copy value
+        </vn-item>
     </slot-menu>
 </vn-contextmenu>
\ No newline at end of file
diff --git a/modules/supplier/front/descriptor-popover/index.html b/modules/supplier/front/descriptor-popover/index.html
new file mode 100644
index 000000000..874ba6708
--- /dev/null
+++ b/modules/supplier/front/descriptor-popover/index.html
@@ -0,0 +1,3 @@
+<slot-descriptor>
+    <vn-supplier-descriptor></vn-supplier-descriptor>
+</slot-descriptor>
\ No newline at end of file
diff --git a/modules/supplier/front/descriptor-popover/index.js b/modules/supplier/front/descriptor-popover/index.js
new file mode 100644
index 000000000..a30aa4829
--- /dev/null
+++ b/modules/supplier/front/descriptor-popover/index.js
@@ -0,0 +1,9 @@
+import ngModule from '../module';
+import DescriptorPopover from 'salix/components/descriptor-popover';
+
+class Controller extends DescriptorPopover {}
+
+ngModule.vnComponent('vnSupplierDescriptorPopover', {
+    slotTemplate: require('./index.html'),
+    controller: Controller
+});
diff --git a/modules/supplier/front/descriptor/index.js b/modules/supplier/front/descriptor/index.js
index 197285f57..df9fe2155 100644
--- a/modules/supplier/front/descriptor/index.js
+++ b/modules/supplier/front/descriptor/index.js
@@ -23,7 +23,7 @@ class Controller extends Descriptor {
         to.setDate(to.getDate() + 10);
 
         return JSON.stringify({
-            supplierFk: this.supplier.id,
+            supplierFk: this.id,
             from,
             to
         });
@@ -65,7 +65,7 @@ class Controller extends Descriptor {
             ]
         };
 
-        return this.getData(`Suppliers/${this.supplier.id}`, {filter})
+        return this.getData(`Suppliers/${this.id}`, {filter})
             .then(res => this.supplier = res.data);
     }
 }
diff --git a/modules/supplier/front/index.js b/modules/supplier/front/index.js
index 80c49a8b4..9c5cd4195 100644
--- a/modules/supplier/front/index.js
+++ b/modules/supplier/front/index.js
@@ -3,6 +3,7 @@ export * from './module';
 import './main';
 import './card';
 import './descriptor';
+import './descriptor-popover';
 import './index/';
 import './search-panel';
 import './summary';
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 4243ef1ab..b47ff86c0 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -195,23 +195,28 @@
     expr-builder="$ctrl.exprBuilder(param, value)">
     <slot-menu>
         <vn-item translate
-        ng-if="contextmenu.isFilterAllowed()"
-        ng-click="contextmenu.filterBySelection()">
+            ng-if="contextmenu.isFilterAllowed()"
+            ng-click="contextmenu.filterBySelection()">
             Filter by selection
         </vn-item>
         <vn-item translate 
-        ng-if="contextmenu.isFilterAllowed()" 
-        ng-click="contextmenu.excludeSelection()">
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.excludeSelection()">
             Exclude selection
         </vn-item>
         <vn-item translate 
-        ng-if="contextmenu.isFilterAllowed()" 
-        ng-click="contextmenu.removeFilter()" >
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.removeFilter()">
             Remove filter
         </vn-item>
         <vn-item translate 
-        ng-click="contextmenu.removeAllFilters()" >
+            ng-click="contextmenu.removeAllFilters()">
             Remove all filters
         </vn-item>
+        <vn-item translate 
+            ng-if="contextmenu.isActionAllowed()" 
+            ng-click="contextmenu.copyValue()">
+            Copy value
+        </vn-item>
     </slot-menu>
 </vn-contextmenu>
\ No newline at end of file
diff --git a/modules/ticket/front/index/locale/es.yml b/modules/ticket/front/index/locale/es.yml
index 006ac9f6e..1545c5e53 100644
--- a/modules/ticket/front/index/locale/es.yml
+++ b/modules/ticket/front/index/locale/es.yml
@@ -9,4 +9,5 @@ Filter by selection: Filtro por selección
 Exclude selection: Excluir selección
 Remove filter: Quitar filtro por selección
 Remove all filters: Eliminar todos los filtros
+Copy value: Copiar valor
 No verified data: Sin datos comprobados
\ No newline at end of file
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index 1a0f59e14..7e309da1a 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -88,23 +88,28 @@
     expr-builder="$ctrl.exprBuilder(param, value)">
     <slot-menu>
         <vn-item translate
-        ng-if="contextmenu.isFilterAllowed()"
-        ng-click="contextmenu.filterBySelection()">
+            ng-if="contextmenu.isFilterAllowed()"
+            ng-click="contextmenu.filterBySelection()">
             Filter by selection
         </vn-item>
         <vn-item translate 
-        ng-if="contextmenu.isFilterAllowed()" 
-        ng-click="contextmenu.excludeSelection()">
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.excludeSelection()">
             Exclude selection
         </vn-item>
         <vn-item translate 
-        ng-if="contextmenu.isFilterAllowed()" 
-        ng-click="contextmenu.removeFilter()" >
+            ng-if="contextmenu.isFilterAllowed()" 
+            ng-click="contextmenu.removeFilter()">
             Remove filter
         </vn-item>
         <vn-item translate 
-        ng-click="contextmenu.removeAllFilters()" >
+            ng-click="contextmenu.removeAllFilters()" >
             Remove all filters
         </vn-item>
+        <vn-item translate 
+            ng-if="contextmenu.isActionAllowed()" 
+            ng-click="contextmenu.copyValue()">
+            Copy value
+        </vn-item>
     </slot-menu>
 </vn-contextmenu>
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 926d0be5f..000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,26430 +0,0 @@
-{
-    "name": "salix-back",
-    "version": "1.0.0",
-    "lockfileVersion": 1,
-    "requires": true,
-    "dependencies": {
-        "@babel/code-frame": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-            "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
-            "dev": true,
-            "requires": {
-                "@babel/highlight": "^7.0.0"
-            }
-        },
-        "@babel/compat-data": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-            "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-            "dev": true,
-            "requires": {
-                "browserslist": "^4.12.0",
-                "invariant": "^2.2.4",
-                "semver": "^5.5.0"
-            }
-        },
-        "@babel/core": {
-            "version": "7.7.7",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.7.tgz",
-            "integrity": "sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.5.5",
-                "@babel/generator": "^7.7.7",
-                "@babel/helpers": "^7.7.4",
-                "@babel/parser": "^7.7.7",
-                "@babel/template": "^7.7.4",
-                "@babel/traverse": "^7.7.4",
-                "@babel/types": "^7.7.4",
-                "convert-source-map": "^1.7.0",
-                "debug": "^4.1.0",
-                "json5": "^2.1.0",
-                "lodash": "^4.17.13",
-                "resolve": "^1.3.2",
-                "semver": "^5.4.1",
-                "source-map": "^0.5.0"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.5.5",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-                    "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.0.0"
-                    }
-                },
-                "@babel/generator": {
-                    "version": "7.7.7",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz",
-                    "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.7.4",
-                        "jsesc": "^2.5.1",
-                        "lodash": "^4.17.13",
-                        "source-map": "^0.5.0"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz",
-                    "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.7.4",
-                        "@babel/template": "^7.7.4",
-                        "@babel/types": "^7.7.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz",
-                    "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.7.4"
-                    }
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz",
-                    "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.7.4"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.7.7",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz",
-                    "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-                    "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@babel/parser": "^7.7.4",
-                        "@babel/types": "^7.7.4"
-                    }
-                },
-                "@babel/traverse": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz",
-                    "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.5.5",
-                        "@babel/generator": "^7.7.4",
-                        "@babel/helper-function-name": "^7.7.4",
-                        "@babel/helper-split-export-declaration": "^7.7.4",
-                        "@babel/parser": "^7.7.4",
-                        "@babel/types": "^7.7.4",
-                        "debug": "^4.1.0",
-                        "globals": "^11.1.0",
-                        "lodash": "^4.17.13"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz",
-                    "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==",
-                    "dev": true,
-                    "requires": {
-                        "esutils": "^2.0.2",
-                        "lodash": "^4.17.13",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "convert-source-map": {
-                    "version": "1.7.0",
-                    "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-                    "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-                    "dev": true,
-                    "requires": {
-                        "safe-buffer": "~5.1.1"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/generator": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.0.tgz",
-            "integrity": "sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.6.0",
-                "jsesc": "^2.5.1",
-                "lodash": "^4.17.13",
-                "source-map": "^0.5.0",
-                "trim-right": "^1.0.1"
-            },
-            "dependencies": {
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-annotate-as-pure": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-            "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-builder-binary-assignment-operator-visitor": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
-            "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-explode-assignable-expression": "^7.10.4",
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-compilation-targets": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-            "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
-            "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.10.4",
-                "browserslist": "^4.12.0",
-                "invariant": "^2.2.4",
-                "levenary": "^1.1.1",
-                "semver": "^5.5.0"
-            }
-        },
-        "@babel/helper-create-class-features-plugin": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-            "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-function-name": "^7.10.4",
-                "@babel/helper-member-expression-to-functions": "^7.10.5",
-                "@babel/helper-optimise-call-expression": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4",
-                "@babel/helper-split-export-declaration": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-                    "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.10.4",
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-                    "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-create-regexp-features-plugin": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-            "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
-                "@babel/helper-regex": "^7.10.4",
-                "regexpu-core": "^4.7.0"
-            }
-        },
-        "@babel/helper-define-map": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
-            "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-function-name": "^7.10.4",
-                "@babel/types": "^7.10.5",
-                "lodash": "^4.17.19"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-                    "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.10.4",
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-explode-assignable-expression": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz",
-            "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==",
-            "dev": true,
-            "requires": {
-                "@babel/traverse": "^7.10.4",
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/generator": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-                    "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0",
-                        "jsesc": "^2.5.1",
-                        "source-map": "^0.5.0"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-                    "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.10.4",
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-                    "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/traverse": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-                    "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.0",
-                        "@babel/helper-function-name": "^7.10.4",
-                        "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.0",
-                        "@babel/types": "^7.11.0",
-                        "debug": "^4.1.0",
-                        "globals": "^11.1.0",
-                        "lodash": "^4.17.19"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-function-name": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-            "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-get-function-arity": "^7.0.0",
-                "@babel/template": "^7.1.0",
-                "@babel/types": "^7.0.0"
-            }
-        },
-        "@babel/helper-get-function-arity": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-            "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.0.0"
-            }
-        },
-        "@babel/helper-hoist-variables": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
-            "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-member-expression-to-functions": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-            "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.11.0"
-            },
-            "dependencies": {
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-module-imports": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-            "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-module-transforms": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-            "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-imports": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4",
-                "@babel/helper-simple-access": "^7.10.4",
-                "@babel/helper-split-export-declaration": "^7.11.0",
-                "@babel/template": "^7.10.4",
-                "@babel/types": "^7.11.0",
-                "lodash": "^4.17.19"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-                    "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-optimise-call-expression": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-            "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-plugin-utils": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-            "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
-            "dev": true
-        },
-        "@babel/helper-regex": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-            "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
-            "dev": true,
-            "requires": {
-                "lodash": "^4.17.19"
-            },
-            "dependencies": {
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-remap-async-to-generator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz",
-            "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
-                "@babel/helper-wrap-function": "^7.10.4",
-                "@babel/template": "^7.10.4",
-                "@babel/traverse": "^7.10.4",
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/generator": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-                    "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0",
-                        "jsesc": "^2.5.1",
-                        "source-map": "^0.5.0"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-                    "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.10.4",
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-                    "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/traverse": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-                    "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.0",
-                        "@babel/helper-function-name": "^7.10.4",
-                        "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.0",
-                        "@babel/types": "^7.11.0",
-                        "debug": "^4.1.0",
-                        "globals": "^11.1.0",
-                        "lodash": "^4.17.19"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-replace-supers": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-            "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-member-expression-to-functions": "^7.10.4",
-                "@babel/helper-optimise-call-expression": "^7.10.4",
-                "@babel/traverse": "^7.10.4",
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/generator": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-                    "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0",
-                        "jsesc": "^2.5.1",
-                        "source-map": "^0.5.0"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-                    "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.10.4",
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-                    "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/traverse": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-                    "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.0",
-                        "@babel/helper-function-name": "^7.10.4",
-                        "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.0",
-                        "@babel/types": "^7.11.0",
-                        "debug": "^4.1.0",
-                        "globals": "^11.1.0",
-                        "lodash": "^4.17.19"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-simple-access": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-            "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.10.4",
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-skip-transparent-expression-wrappers": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-            "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.11.0"
-            },
-            "dependencies": {
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-split-export-declaration": {
-            "version": "7.4.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-            "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.4.4"
-            }
-        },
-        "@babel/helper-validator-identifier": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-            "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-            "dev": true
-        },
-        "@babel/helper-wrap-function": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-            "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-function-name": "^7.10.4",
-                "@babel/template": "^7.10.4",
-                "@babel/traverse": "^7.10.4",
-                "@babel/types": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/generator": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-                    "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0",
-                        "jsesc": "^2.5.1",
-                        "source-map": "^0.5.0"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-                    "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.10.4",
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-                    "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/traverse": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-                    "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.0",
-                        "@babel/helper-function-name": "^7.10.4",
-                        "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.0",
-                        "@babel/types": "^7.11.0",
-                        "debug": "^4.1.0",
-                        "globals": "^11.1.0",
-                        "lodash": "^4.17.19"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helpers": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz",
-            "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.7.4",
-                "@babel/traverse": "^7.7.4",
-                "@babel/types": "^7.7.4"
-            },
-            "dependencies": {
-                "@babel/generator": {
-                    "version": "7.7.7",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz",
-                    "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.7.4",
-                        "jsesc": "^2.5.1",
-                        "lodash": "^4.17.13",
-                        "source-map": "^0.5.0"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz",
-                    "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.7.4",
-                        "@babel/template": "^7.7.4",
-                        "@babel/types": "^7.7.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz",
-                    "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.7.4"
-                    }
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz",
-                    "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.7.4"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.7.7",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz",
-                    "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-                    "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@babel/parser": "^7.7.4",
-                        "@babel/types": "^7.7.4"
-                    }
-                },
-                "@babel/traverse": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz",
-                    "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.5.5",
-                        "@babel/generator": "^7.7.4",
-                        "@babel/helper-function-name": "^7.7.4",
-                        "@babel/helper-split-export-declaration": "^7.7.4",
-                        "@babel/parser": "^7.7.4",
-                        "@babel/types": "^7.7.4",
-                        "debug": "^4.1.0",
-                        "globals": "^11.1.0",
-                        "lodash": "^4.17.13"
-                    },
-                    "dependencies": {
-                        "@babel/code-frame": {
-                            "version": "7.5.5",
-                            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-                            "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-                            "dev": true,
-                            "requires": {
-                                "@babel/highlight": "^7.0.0"
-                            }
-                        }
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.7.4",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz",
-                    "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==",
-                    "dev": true,
-                    "requires": {
-                        "esutils": "^2.0.2",
-                        "lodash": "^4.17.13",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/highlight": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-            "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-            "dev": true,
-            "requires": {
-                "chalk": "^2.0.0",
-                "esutils": "^2.0.2",
-                "js-tokens": "^4.0.0"
-            }
-        },
-        "@babel/parser": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz",
-            "integrity": "sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ==",
-            "dev": true
-        },
-        "@babel/plugin-proposal-async-generator-functions": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-            "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-remap-async-to-generator": "^7.10.4",
-                "@babel/plugin-syntax-async-generators": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-class-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
-            "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-dynamic-import": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-            "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-dynamic-import": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                },
-                "@babel/plugin-syntax-dynamic-import": {
-                    "version": "7.8.3",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-                    "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.8.0"
-                    }
-                }
-            }
-        },
-        "@babel/plugin-proposal-export-namespace-from": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
-            "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-json-strings": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-            "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-json-strings": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-logical-assignment-operators": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
-            "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                },
-                "@babel/plugin-syntax-logical-assignment-operators": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-                    "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.10.4"
-                    }
-                }
-            }
-        },
-        "@babel/plugin-proposal-nullish-coalescing-operator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-            "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-numeric-separator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-            "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                },
-                "@babel/plugin-syntax-numeric-separator": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-                    "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.10.4"
-                    }
-                }
-            }
-        },
-        "@babel/plugin-proposal-object-rest-spread": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-            "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-                "@babel/plugin-transform-parameters": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-optional-catch-binding": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-            "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-optional-chaining": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-            "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
-                "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-private-methods": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
-            "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-proposal-unicode-property-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-            "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-async-generators": {
-            "version": "7.8.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-bigint": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-            "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-                    "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-class-properties": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz",
-            "integrity": "sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-                    "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-dynamic-import": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz",
-            "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.0.0"
-            }
-        },
-        "@babel/plugin-syntax-export-namespace-from": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-            "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.3"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-import-meta": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz",
-            "integrity": "sha512-ypC4jwfIVF72og0dgvEcFRdOM2V9Qm1tu7RGmdZOlhsccyK0wisXmMObGuWEOd5jQ+K9wcIgSNftCpk2vkjUfQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-                    "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-json-strings": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-logical-assignment-operators": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.1.tgz",
-            "integrity": "sha512-XyHIFa9kdrgJS91CUH+ccPVTnJShr8nLGc5bG2IhGXv5p1Rd+8BleGE5yzIg2Nc1QZAdHDa0Qp4m6066OL96Iw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-                    "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-nullish-coalescing-operator": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-                    "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-numeric-separator": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz",
-            "integrity": "sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-                    "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-object-rest-spread": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-optional-catch-binding": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-optional-chaining": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-                    "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-syntax-top-level-await": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
-            "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-arrow-functions": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-            "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-async-to-generator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-            "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-imports": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-remap-async-to-generator": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-block-scoped-functions": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-            "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-block-scoping": {
-            "version": "7.11.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-            "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-classes": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-            "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
-                "@babel/helper-define-map": "^7.10.4",
-                "@babel/helper-function-name": "^7.10.4",
-                "@babel/helper-optimise-call-expression": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4",
-                "@babel/helper-split-export-declaration": "^7.10.4",
-                "globals": "^11.1.0"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-                    "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.10.4",
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                },
-                "@babel/helper-split-export-declaration": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-                    "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.11.0"
-                    }
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-computed-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-            "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-destructuring": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-            "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-dotall-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-            "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-duplicate-keys": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-            "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-exponentiation-operator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-            "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-for-of": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-            "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-function-name": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-            "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-function-name": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
-                "@babel/helper-function-name": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-                    "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-get-function-arity": "^7.10.4",
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.3",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-                    "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-            "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-member-expression-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-            "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-modules-amd": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-            "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-transforms": "^7.10.5",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "babel-plugin-dynamic-import-node": "^2.3.3"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-modules-commonjs": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-            "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-transforms": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-simple-access": "^7.10.4",
-                "babel-plugin-dynamic-import-node": "^2.3.3"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-modules-systemjs": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-            "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-hoist-variables": "^7.10.4",
-                "@babel/helper-module-transforms": "^7.10.5",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "babel-plugin-dynamic-import-node": "^2.3.3"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-modules-umd": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-            "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-transforms": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-named-capturing-groups-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-            "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4"
-            }
-        },
-        "@babel/plugin-transform-new-target": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-            "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-object-super": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-            "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-parameters": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-            "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-get-function-arity": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-property-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-            "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-regenerator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-            "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
-            "dev": true,
-            "requires": {
-                "regenerator-transform": "^0.14.2"
-            }
-        },
-        "@babel/plugin-transform-reserved-words": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-            "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-shorthand-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-            "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-spread": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-            "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-sticky-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-            "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-regex": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-template-literals": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-            "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-typeof-symbol": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-            "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-unicode-escapes": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
-            "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-unicode-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-            "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/polyfill": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.7.0.tgz",
-            "integrity": "sha512-/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==",
-            "dev": true,
-            "requires": {
-                "core-js": "^2.6.5",
-                "regenerator-runtime": "^0.13.2"
-            },
-            "dependencies": {
-                "regenerator-runtime": {
-                    "version": "0.13.3",
-                    "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-                    "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/preset-env": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz",
-            "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==",
-            "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.11.0",
-                "@babel/helper-compilation-targets": "^7.10.4",
-                "@babel/helper-module-imports": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-proposal-async-generator-functions": "^7.10.4",
-                "@babel/plugin-proposal-class-properties": "^7.10.4",
-                "@babel/plugin-proposal-dynamic-import": "^7.10.4",
-                "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-                "@babel/plugin-proposal-json-strings": "^7.10.4",
-                "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
-                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-                "@babel/plugin-proposal-numeric-separator": "^7.10.4",
-                "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-                "@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
-                "@babel/plugin-proposal-optional-chaining": "^7.11.0",
-                "@babel/plugin-proposal-private-methods": "^7.10.4",
-                "@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
-                "@babel/plugin-syntax-async-generators": "^7.8.0",
-                "@babel/plugin-syntax-class-properties": "^7.10.4",
-                "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-                "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-                "@babel/plugin-syntax-json-strings": "^7.8.0",
-                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-                "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-                "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-                "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-                "@babel/plugin-syntax-top-level-await": "^7.10.4",
-                "@babel/plugin-transform-arrow-functions": "^7.10.4",
-                "@babel/plugin-transform-async-to-generator": "^7.10.4",
-                "@babel/plugin-transform-block-scoped-functions": "^7.10.4",
-                "@babel/plugin-transform-block-scoping": "^7.10.4",
-                "@babel/plugin-transform-classes": "^7.10.4",
-                "@babel/plugin-transform-computed-properties": "^7.10.4",
-                "@babel/plugin-transform-destructuring": "^7.10.4",
-                "@babel/plugin-transform-dotall-regex": "^7.10.4",
-                "@babel/plugin-transform-duplicate-keys": "^7.10.4",
-                "@babel/plugin-transform-exponentiation-operator": "^7.10.4",
-                "@babel/plugin-transform-for-of": "^7.10.4",
-                "@babel/plugin-transform-function-name": "^7.10.4",
-                "@babel/plugin-transform-literals": "^7.10.4",
-                "@babel/plugin-transform-member-expression-literals": "^7.10.4",
-                "@babel/plugin-transform-modules-amd": "^7.10.4",
-                "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-                "@babel/plugin-transform-modules-systemjs": "^7.10.4",
-                "@babel/plugin-transform-modules-umd": "^7.10.4",
-                "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
-                "@babel/plugin-transform-new-target": "^7.10.4",
-                "@babel/plugin-transform-object-super": "^7.10.4",
-                "@babel/plugin-transform-parameters": "^7.10.4",
-                "@babel/plugin-transform-property-literals": "^7.10.4",
-                "@babel/plugin-transform-regenerator": "^7.10.4",
-                "@babel/plugin-transform-reserved-words": "^7.10.4",
-                "@babel/plugin-transform-shorthand-properties": "^7.10.4",
-                "@babel/plugin-transform-spread": "^7.11.0",
-                "@babel/plugin-transform-sticky-regex": "^7.10.4",
-                "@babel/plugin-transform-template-literals": "^7.10.4",
-                "@babel/plugin-transform-typeof-symbol": "^7.10.4",
-                "@babel/plugin-transform-unicode-escapes": "^7.10.4",
-                "@babel/plugin-transform-unicode-regex": "^7.10.4",
-                "@babel/preset-modules": "^0.1.3",
-                "@babel/types": "^7.11.0",
-                "browserslist": "^4.12.0",
-                "core-js-compat": "^3.6.2",
-                "invariant": "^2.2.2",
-                "levenary": "^1.1.1",
-                "semver": "^5.5.0"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-                    "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-                    "dev": true
-                },
-                "@babel/plugin-syntax-class-properties": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-                    "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.10.4"
-                    }
-                },
-                "@babel/plugin-syntax-dynamic-import": {
-                    "version": "7.8.3",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-                    "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.8.0"
-                    }
-                },
-                "@babel/plugin-syntax-logical-assignment-operators": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-                    "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.10.4"
-                    }
-                },
-                "@babel/plugin-syntax-numeric-separator": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-                    "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.10.4"
-                    }
-                },
-                "@babel/types": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-                    "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/preset-modules": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-            "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.0.0",
-                "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-                "@babel/plugin-transform-dotall-regex": "^7.4.4",
-                "@babel/types": "^7.4.4",
-                "esutils": "^2.0.2"
-            }
-        },
-        "@babel/register": {
-            "version": "7.7.7",
-            "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.7.7.tgz",
-            "integrity": "sha512-S2mv9a5dc2pcpg/ConlKZx/6wXaEwHeqfo7x/QbXsdCAZm+WJC1ekVvL1TVxNsedTs5y/gG63MhJTEsmwmjtiA==",
-            "dev": true,
-            "requires": {
-                "find-cache-dir": "^2.0.0",
-                "lodash": "^4.17.13",
-                "make-dir": "^2.1.0",
-                "pirates": "^4.0.0",
-                "source-map-support": "^0.5.16"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "source-map-support": {
-                    "version": "0.5.16",
-                    "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-                    "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
-                    "dev": true,
-                    "requires": {
-                        "buffer-from": "^1.0.0",
-                        "source-map": "^0.6.0"
-                    }
-                }
-            }
-        },
-        "@babel/runtime": {
-            "version": "7.11.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-            "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
-            "dev": true,
-            "requires": {
-                "regenerator-runtime": "^0.13.4"
-            },
-            "dependencies": {
-                "regenerator-runtime": {
-                    "version": "0.13.7",
-                    "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-                    "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/runtime-corejs3": {
-            "version": "7.11.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz",
-            "integrity": "sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==",
-            "requires": {
-                "core-js-pure": "^3.0.0",
-                "regenerator-runtime": "^0.13.4"
-            },
-            "dependencies": {
-                "regenerator-runtime": {
-                    "version": "0.13.7",
-                    "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-                    "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
-                }
-            }
-        },
-        "@babel/template": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
-            "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.0.0",
-                "@babel/parser": "^7.6.0",
-                "@babel/types": "^7.6.0"
-            }
-        },
-        "@babel/traverse": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.0.tgz",
-            "integrity": "sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.5.5",
-                "@babel/generator": "^7.6.0",
-                "@babel/helper-function-name": "^7.1.0",
-                "@babel/helper-split-export-declaration": "^7.4.4",
-                "@babel/parser": "^7.6.0",
-                "@babel/types": "^7.6.0",
-                "debug": "^4.1.0",
-                "globals": "^11.1.0",
-                "lodash": "^4.17.13"
-            },
-            "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.5.5",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-                    "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.0.0"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/types": {
-            "version": "7.6.1",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz",
-            "integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
-            "dev": true,
-            "requires": {
-                "esutils": "^2.0.2",
-                "lodash": "^4.17.13",
-                "to-fast-properties": "^2.0.0"
-            },
-            "dependencies": {
-                "lodash": {
-                    "version": "4.17.20",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                    "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-                    "dev": true
-                }
-            }
-        },
-        "@bcoe/v8-coverage": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-            "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-            "dev": true
-        },
-        "@cnakazawa/watch": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
-            "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==",
-            "dev": true,
-            "requires": {
-                "exec-sh": "^0.3.2",
-                "minimist": "^1.2.0"
-            }
-        },
-        "@eslint/eslintrc": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz",
-            "integrity": "sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==",
-            "dev": true,
-            "requires": {
-                "ajv": "^6.12.4",
-                "debug": "^4.1.1",
-                "espree": "^7.3.0",
-                "globals": "^12.1.0",
-                "ignore": "^4.0.6",
-                "import-fresh": "^3.2.1",
-                "js-yaml": "^3.13.1",
-                "lodash": "^4.17.19",
-                "minimatch": "^3.0.4",
-                "strip-json-comments": "^3.1.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                },
-                "globals": {
-                    "version": "12.4.0",
-                    "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-                    "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-                    "dev": true,
-                    "requires": {
-                        "type-fest": "^0.8.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "strip-json-comments": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-                    "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-                    "dev": true
-                }
-            }
-        },
-        "@google-cloud/common": {
-            "version": "0.32.1",
-            "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.32.1.tgz",
-            "integrity": "sha512-bLdPzFvvBMtVkwsoBtygE9oUm3yrNmPa71gvOgucYI/GqvNP2tb6RYsDHPq98kvignhcgHGDI5wyNgxaCo8bKQ==",
-            "requires": {
-                "@google-cloud/projectify": "^0.3.3",
-                "@google-cloud/promisify": "^0.4.0",
-                "@types/request": "^2.48.1",
-                "arrify": "^2.0.0",
-                "duplexify": "^3.6.0",
-                "ent": "^2.2.0",
-                "extend": "^3.0.2",
-                "google-auth-library": "^3.1.1",
-                "pify": "^4.0.1",
-                "retry-request": "^4.0.0",
-                "teeny-request": "^3.11.3"
-            },
-            "dependencies": {
-                "arrify": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-                    "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
-                }
-            }
-        },
-        "@google-cloud/paginator": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-0.2.0.tgz",
-            "integrity": "sha512-2ZSARojHDhkLvQ+CS32K+iUhBsWg3AEw+uxtqblA7xoCABDyhpj99FPp35xy6A+XlzMhOSrHHaxFE+t6ZTQq0w==",
-            "requires": {
-                "arrify": "^1.0.1",
-                "extend": "^3.0.1",
-                "split-array-stream": "^2.0.0",
-                "stream-events": "^1.0.4"
-            },
-            "dependencies": {
-                "arrify": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-                    "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-                }
-            }
-        },
-        "@google-cloud/projectify": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.3.tgz",
-            "integrity": "sha512-7522YHQ4IhaafgSunsFF15nG0TGVmxgXidy9cITMe+256RgqfcrfWphiMufW+Ou4kqagW/u3yxwbzVEW3dk2Uw=="
-        },
-        "@google-cloud/promisify": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.4.0.tgz",
-            "integrity": "sha512-4yAHDC52TEMCNcMzVC8WlqnKKKq+Ssi2lXoUg9zWWkZ6U6tq9ZBRYLHHCRdfU+EU9YJsVmivwGcKYCjRGjnf4Q=="
-        },
-        "@google-cloud/storage": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-2.5.0.tgz",
-            "integrity": "sha512-q1mwB6RUebIahbA3eriRs8DbG2Ij81Ynb9k8hMqTPkmbd8/S6Z0d6hVvfPmnyvX9Ej13IcmEYIbymuq/RBLghA==",
-            "requires": {
-                "@google-cloud/common": "^0.32.0",
-                "@google-cloud/paginator": "^0.2.0",
-                "@google-cloud/promisify": "^0.4.0",
-                "arrify": "^1.0.0",
-                "async": "^2.0.1",
-                "compressible": "^2.0.12",
-                "concat-stream": "^2.0.0",
-                "date-and-time": "^0.6.3",
-                "duplexify": "^3.5.0",
-                "extend": "^3.0.0",
-                "gcs-resumable-upload": "^1.0.0",
-                "hash-stream-validation": "^0.2.1",
-                "mime": "^2.2.0",
-                "mime-types": "^2.0.8",
-                "onetime": "^5.1.0",
-                "pumpify": "^1.5.1",
-                "snakeize": "^0.1.0",
-                "stream-events": "^1.0.1",
-                "teeny-request": "^3.11.3",
-                "through2": "^3.0.0",
-                "xdg-basedir": "^3.0.0"
-            },
-            "dependencies": {
-                "arrify": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-                    "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-                },
-                "mime": {
-                    "version": "2.4.4",
-                    "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-                    "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
-                }
-            }
-        },
-        "@istanbuljs/load-nyc-config": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-            "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-            "dev": true,
-            "requires": {
-                "camelcase": "^5.3.1",
-                "find-up": "^4.1.0",
-                "get-package-type": "^0.1.0",
-                "js-yaml": "^3.13.1",
-                "resolve-from": "^5.0.0"
-            },
-            "dependencies": {
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                },
-                "path-exists": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-                    "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-                    "dev": true
-                },
-                "resolve-from": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-                    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-                    "dev": true
-                }
-            }
-        },
-        "@istanbuljs/schema": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-            "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
-            "dev": true
-        },
-        "@jest/core": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.0.1.tgz",
-            "integrity": "sha512-Xq3eqYnxsG9SjDC+WLeIgf7/8KU6rddBxH+SCt18gEpOhAGYC/Mq+YbtlNcIdwjnnT+wDseXSbU0e5X84Y4jTQ==",
-            "dev": true,
-            "requires": {
-                "@jest/console": "^26.0.1",
-                "@jest/reporters": "^26.0.1",
-                "@jest/test-result": "^26.0.1",
-                "@jest/transform": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "ansi-escapes": "^4.2.1",
-                "chalk": "^4.0.0",
-                "exit": "^0.1.2",
-                "graceful-fs": "^4.2.4",
-                "jest-changed-files": "^26.0.1",
-                "jest-config": "^26.0.1",
-                "jest-haste-map": "^26.0.1",
-                "jest-message-util": "^26.0.1",
-                "jest-regex-util": "^26.0.0",
-                "jest-resolve": "^26.0.1",
-                "jest-resolve-dependencies": "^26.0.1",
-                "jest-runner": "^26.0.1",
-                "jest-runtime": "^26.0.1",
-                "jest-snapshot": "^26.0.1",
-                "jest-util": "^26.0.1",
-                "jest-validate": "^26.0.1",
-                "jest-watcher": "^26.0.1",
-                "micromatch": "^4.0.2",
-                "p-each-series": "^2.1.0",
-                "rimraf": "^3.0.0",
-                "slash": "^3.0.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "dependencies": {
-                "@jest/console": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz",
-                    "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "jest-message-util": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "@jest/test-result": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz",
-                    "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/console": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "collect-v8-coverage": "^1.0.0"
-                    }
-                },
-                "@jest/transform": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.0.1.tgz",
-                    "integrity": "sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/core": "^7.1.0",
-                        "@jest/types": "^26.0.1",
-                        "babel-plugin-istanbul": "^6.0.0",
-                        "chalk": "^4.0.0",
-                        "convert-source-map": "^1.4.0",
-                        "fast-json-stable-stringify": "^2.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "jest-haste-map": "^26.0.1",
-                        "jest-regex-util": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "micromatch": "^4.0.2",
-                        "pirates": "^4.0.1",
-                        "slash": "^3.0.0",
-                        "source-map": "^0.6.1",
-                        "write-file-atomic": "^3.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-escapes": {
-                    "version": "4.3.1",
-                    "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-                    "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-                    "dev": true,
-                    "requires": {
-                        "type-fest": "^0.11.0"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "babel-plugin-istanbul": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-                    "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.0.0",
-                        "@istanbuljs/load-nyc-config": "^1.0.0",
-                        "@istanbuljs/schema": "^0.1.2",
-                        "istanbul-lib-instrument": "^4.0.0",
-                        "test-exclude": "^6.0.0"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "camelcase": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-                    "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "istanbul-lib-coverage": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-                    "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-                    "dev": true
-                },
-                "istanbul-lib-instrument": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-                    "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/core": "^7.7.5",
-                        "@istanbuljs/schema": "^0.1.2",
-                        "istanbul-lib-coverage": "^3.0.0",
-                        "semver": "^6.3.0"
-                    }
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "jest-haste-map": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz",
-                    "integrity": "sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@types/graceful-fs": "^4.1.2",
-                        "anymatch": "^3.0.3",
-                        "fb-watchman": "^2.0.0",
-                        "fsevents": "^2.1.2",
-                        "graceful-fs": "^4.2.4",
-                        "jest-serializer": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "jest-worker": "^26.0.0",
-                        "micromatch": "^4.0.2",
-                        "sane": "^4.0.3",
-                        "walker": "^1.0.7",
-                        "which": "^2.0.2"
-                    }
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-regex-util": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-                    "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-                    "dev": true
-                },
-                "jest-serializer": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz",
-                    "integrity": "sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.4"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "jest-validate": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.0.1.tgz",
-                    "integrity": "sha512-u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "camelcase": "^6.0.0",
-                        "chalk": "^4.0.0",
-                        "jest-get-type": "^26.0.0",
-                        "leven": "^3.1.0",
-                        "pretty-format": "^26.0.1"
-                    }
-                },
-                "jest-worker": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-                    "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-                    "dev": true,
-                    "requires": {
-                        "merge-stream": "^2.0.0",
-                        "supports-color": "^7.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "rimraf": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "test-exclude": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-                    "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-                    "dev": true,
-                    "requires": {
-                        "@istanbuljs/schema": "^0.1.2",
-                        "glob": "^7.1.4",
-                        "minimatch": "^3.0.4"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "type-fest": {
-                    "version": "0.11.0",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-                    "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-                    "dev": true
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                },
-                "write-file-atomic": {
-                    "version": "3.0.3",
-                    "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-                    "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-                    "dev": true,
-                    "requires": {
-                        "imurmurhash": "^0.1.4",
-                        "is-typedarray": "^1.0.0",
-                        "signal-exit": "^3.0.2",
-                        "typedarray-to-buffer": "^3.1.5"
-                    }
-                }
-            }
-        },
-        "@jest/environment": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.0.1.tgz",
-            "integrity": "sha512-xBDxPe8/nx251u0VJ2dFAFz2H23Y98qdIaNwnMK6dFQr05jc+Ne/2np73lOAx+5mSBO/yuQldRrQOf6hP1h92g==",
-            "dev": true,
-            "requires": {
-                "@jest/fake-timers": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "jest-mock": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/fake-timers": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.0.1.tgz",
-                    "integrity": "sha512-Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@sinonjs/fake-timers": "^6.0.1",
-                        "jest-message-util": "^26.0.1",
-                        "jest-mock": "^26.0.1",
-                        "jest-util": "^26.0.1"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-mock": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.0.1.tgz",
-                    "integrity": "sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                }
-            }
-        },
-        "@jest/globals": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.0.1.tgz",
-            "integrity": "sha512-iuucxOYB7BRCvT+TYBzUqUNuxFX1hqaR6G6IcGgEqkJ5x4htNKo1r7jk1ji9Zj8ZMiMw0oB5NaA7k5Tx6MVssA==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "expect": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "@jest/reporters": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.0.1.tgz",
-            "integrity": "sha512-NWWy9KwRtE1iyG/m7huiFVF9YsYv/e+mbflKRV84WDoJfBqUrNRyDbL/vFxQcYLl8IRqI4P3MgPn386x76Gf2g==",
-            "dev": true,
-            "requires": {
-                "@bcoe/v8-coverage": "^0.2.3",
-                "@jest/console": "^26.0.1",
-                "@jest/test-result": "^26.0.1",
-                "@jest/transform": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "chalk": "^4.0.0",
-                "collect-v8-coverage": "^1.0.0",
-                "exit": "^0.1.2",
-                "glob": "^7.1.2",
-                "graceful-fs": "^4.2.4",
-                "istanbul-lib-coverage": "^3.0.0",
-                "istanbul-lib-instrument": "^4.0.0",
-                "istanbul-lib-report": "^3.0.0",
-                "istanbul-lib-source-maps": "^4.0.0",
-                "istanbul-reports": "^3.0.2",
-                "jest-haste-map": "^26.0.1",
-                "jest-resolve": "^26.0.1",
-                "jest-util": "^26.0.1",
-                "jest-worker": "^26.0.0",
-                "node-notifier": "^7.0.0",
-                "slash": "^3.0.0",
-                "source-map": "^0.6.0",
-                "string-length": "^4.0.1",
-                "terminal-link": "^2.0.0",
-                "v8-to-istanbul": "^4.1.3"
-            },
-            "dependencies": {
-                "@jest/console": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz",
-                    "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "jest-message-util": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "@jest/test-result": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz",
-                    "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/console": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "collect-v8-coverage": "^1.0.0"
-                    }
-                },
-                "@jest/transform": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.0.1.tgz",
-                    "integrity": "sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/core": "^7.1.0",
-                        "@jest/types": "^26.0.1",
-                        "babel-plugin-istanbul": "^6.0.0",
-                        "chalk": "^4.0.0",
-                        "convert-source-map": "^1.4.0",
-                        "fast-json-stable-stringify": "^2.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "jest-haste-map": "^26.0.1",
-                        "jest-regex-util": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "micromatch": "^4.0.2",
-                        "pirates": "^4.0.1",
-                        "slash": "^3.0.0",
-                        "source-map": "^0.6.1",
-                        "write-file-atomic": "^3.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "babel-plugin-istanbul": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-                    "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.0.0",
-                        "@istanbuljs/load-nyc-config": "^1.0.0",
-                        "@istanbuljs/schema": "^0.1.2",
-                        "istanbul-lib-instrument": "^4.0.0",
-                        "test-exclude": "^6.0.0"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "istanbul-lib-coverage": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-                    "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-                    "dev": true
-                },
-                "istanbul-lib-instrument": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-                    "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/core": "^7.7.5",
-                        "@istanbuljs/schema": "^0.1.2",
-                        "istanbul-lib-coverage": "^3.0.0",
-                        "semver": "^6.3.0"
-                    }
-                },
-                "jest-haste-map": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz",
-                    "integrity": "sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@types/graceful-fs": "^4.1.2",
-                        "anymatch": "^3.0.3",
-                        "fb-watchman": "^2.0.0",
-                        "fsevents": "^2.1.2",
-                        "graceful-fs": "^4.2.4",
-                        "jest-serializer": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "jest-worker": "^26.0.0",
-                        "micromatch": "^4.0.2",
-                        "sane": "^4.0.3",
-                        "walker": "^1.0.7",
-                        "which": "^2.0.2"
-                    }
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-regex-util": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-                    "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-                    "dev": true
-                },
-                "jest-serializer": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz",
-                    "integrity": "sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.4"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "jest-worker": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-                    "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-                    "dev": true,
-                    "requires": {
-                        "merge-stream": "^2.0.0",
-                        "supports-color": "^7.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "test-exclude": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-                    "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-                    "dev": true,
-                    "requires": {
-                        "@istanbuljs/schema": "^0.1.2",
-                        "glob": "^7.1.4",
-                        "minimatch": "^3.0.4"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                },
-                "write-file-atomic": {
-                    "version": "3.0.3",
-                    "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-                    "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-                    "dev": true,
-                    "requires": {
-                        "imurmurhash": "^0.1.4",
-                        "is-typedarray": "^1.0.0",
-                        "signal-exit": "^3.0.2",
-                        "typedarray-to-buffer": "^3.1.5"
-                    }
-                }
-            }
-        },
-        "@jest/test-sequencer": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.0.1.tgz",
-            "integrity": "sha512-ssga8XlwfP8YjbDcmVhwNlrmblddMfgUeAkWIXts1V22equp2GMIHxm7cyeD5Q/B0ZgKPK/tngt45sH99yLLGg==",
-            "dev": true,
-            "requires": {
-                "@jest/test-result": "^26.0.1",
-                "graceful-fs": "^4.2.4",
-                "jest-haste-map": "^26.0.1",
-                "jest-runner": "^26.0.1",
-                "jest-runtime": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/console": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz",
-                    "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "jest-message-util": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "@jest/test-result": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz",
-                    "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/console": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "collect-v8-coverage": "^1.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-haste-map": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz",
-                    "integrity": "sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@types/graceful-fs": "^4.1.2",
-                        "anymatch": "^3.0.3",
-                        "fb-watchman": "^2.0.0",
-                        "fsevents": "^2.1.2",
-                        "graceful-fs": "^4.2.4",
-                        "jest-serializer": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "jest-worker": "^26.0.0",
-                        "micromatch": "^4.0.2",
-                        "sane": "^4.0.3",
-                        "walker": "^1.0.7",
-                        "which": "^2.0.2"
-                    }
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-serializer": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz",
-                    "integrity": "sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.4"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "jest-worker": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-                    "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-                    "dev": true,
-                    "requires": {
-                        "merge-stream": "^2.0.0",
-                        "supports-color": "^7.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "@jest/transform": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.0.1.tgz",
-            "integrity": "sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==",
-            "dev": true,
-            "requires": {
-                "@babel/core": "^7.1.0",
-                "@jest/types": "^26.0.1",
-                "babel-plugin-istanbul": "^6.0.0",
-                "chalk": "^4.0.0",
-                "convert-source-map": "^1.4.0",
-                "fast-json-stable-stringify": "^2.0.0",
-                "graceful-fs": "^4.2.4",
-                "jest-haste-map": "^26.0.1",
-                "jest-regex-util": "^26.0.0",
-                "jest-util": "^26.0.1",
-                "micromatch": "^4.0.2",
-                "pirates": "^4.0.1",
-                "slash": "^3.0.0",
-                "source-map": "^0.6.1",
-                "write-file-atomic": "^3.0.0"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "write-file-atomic": {
-                    "version": "3.0.3",
-                    "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-                    "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-                    "dev": true,
-                    "requires": {
-                        "imurmurhash": "^0.1.4",
-                        "is-typedarray": "^1.0.0",
-                        "signal-exit": "^3.0.2",
-                        "typedarray-to-buffer": "^3.1.5"
-                    }
-                }
-            }
-        },
-        "@jest/types": {
-            "version": "24.9.0",
-            "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-            "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-            "dev": true,
-            "requires": {
-                "@types/istanbul-lib-coverage": "^2.0.0",
-                "@types/istanbul-reports": "^1.1.1",
-                "@types/yargs": "^13.0.0"
-            }
-        },
-        "@sindresorhus/is": {
-            "version": "0.14.0",
-            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-            "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-            "dev": true
-        },
-        "@sinonjs/commons": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz",
-            "integrity": "sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==",
-            "dev": true,
-            "requires": {
-                "type-detect": "4.0.8"
-            }
-        },
-        "@sinonjs/fake-timers": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
-            "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
-            "dev": true,
-            "requires": {
-                "@sinonjs/commons": "^1.7.0"
-            }
-        },
-        "@szmarczak/http-timer": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-            "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-            "dev": true,
-            "requires": {
-                "defer-to-connect": "^1.0.1"
-            }
-        },
-        "@types/babel__core": {
-            "version": "7.1.8",
-            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.8.tgz",
-            "integrity": "sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==",
-            "dev": true,
-            "requires": {
-                "@babel/parser": "^7.1.0",
-                "@babel/types": "^7.0.0",
-                "@types/babel__generator": "*",
-                "@types/babel__template": "*",
-                "@types/babel__traverse": "*"
-            }
-        },
-        "@types/babel__generator": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.0.2.tgz",
-            "integrity": "sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.0.0"
-            }
-        },
-        "@types/babel__template": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-            "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
-            "dev": true,
-            "requires": {
-                "@babel/parser": "^7.1.0",
-                "@babel/types": "^7.0.0"
-            }
-        },
-        "@types/babel__traverse": {
-            "version": "7.0.7",
-            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz",
-            "integrity": "sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.3.0"
-            }
-        },
-        "@types/body-parser": {
-            "version": "1.17.0",
-            "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz",
-            "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==",
-            "requires": {
-                "@types/connect": "*",
-                "@types/node": "*"
-            }
-        },
-        "@types/caseless": {
-            "version": "0.12.2",
-            "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
-            "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="
-        },
-        "@types/color-name": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-            "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-            "dev": true
-        },
-        "@types/connect": {
-            "version": "3.4.32",
-            "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz",
-            "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==",
-            "requires": {
-                "@types/node": "*"
-            }
-        },
-        "@types/events": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-            "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-            "dev": true
-        },
-        "@types/express": {
-            "version": "4.17.0",
-            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz",
-            "integrity": "sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==",
-            "requires": {
-                "@types/body-parser": "*",
-                "@types/express-serve-static-core": "*",
-                "@types/serve-static": "*"
-            }
-        },
-        "@types/express-serve-static-core": {
-            "version": "4.16.7",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz",
-            "integrity": "sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==",
-            "requires": {
-                "@types/node": "*",
-                "@types/range-parser": "*"
-            }
-        },
-        "@types/glob": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-            "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
-            "dev": true,
-            "requires": {
-                "@types/events": "*",
-                "@types/minimatch": "*",
-                "@types/node": "*"
-            }
-        },
-        "@types/graceful-fs": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-            "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
-            }
-        },
-        "@types/istanbul-lib-coverage": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-            "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==",
-            "dev": true
-        },
-        "@types/istanbul-lib-report": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
-            "integrity": "sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==",
-            "dev": true,
-            "requires": {
-                "@types/istanbul-lib-coverage": "*"
-            }
-        },
-        "@types/istanbul-reports": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
-            "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
-            "dev": true,
-            "requires": {
-                "@types/istanbul-lib-coverage": "*",
-                "@types/istanbul-lib-report": "*"
-            }
-        },
-        "@types/mime": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz",
-            "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="
-        },
-        "@types/minimatch": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-            "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-            "dev": true
-        },
-        "@types/node": {
-            "version": "10.14.10",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.10.tgz",
-            "integrity": "sha512-V8wj+w2YMNvGuhgl/MA5fmTxgjmVHVoasfIaxMMZJV6Y8Kk+Ydpi1z2whoShDCJ2BuNVoqH/h1hrygnBxkrw/Q=="
-        },
-        "@types/normalize-package-data": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-            "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-            "dev": true
-        },
-        "@types/prettier": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.1.tgz",
-            "integrity": "sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ==",
-            "dev": true
-        },
-        "@types/range-parser": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
-            "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
-        },
-        "@types/request": {
-            "version": "2.48.4",
-            "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
-            "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
-            "requires": {
-                "@types/caseless": "*",
-                "@types/node": "*",
-                "@types/tough-cookie": "*",
-                "form-data": "^2.5.0"
-            },
-            "dependencies": {
-                "form-data": {
-                    "version": "2.5.1",
-                    "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-                    "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-                    "requires": {
-                        "asynckit": "^0.4.0",
-                        "combined-stream": "^1.0.6",
-                        "mime-types": "^2.1.12"
-                    }
-                }
-            }
-        },
-        "@types/serve-static": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz",
-            "integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==",
-            "requires": {
-                "@types/express-serve-static-core": "*",
-                "@types/mime": "*"
-            }
-        },
-        "@types/stack-utils": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-            "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
-            "dev": true
-        },
-        "@types/tough-cookie": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz",
-            "integrity": "sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ=="
-        },
-        "@types/yargs": {
-            "version": "13.0.2",
-            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
-            "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
-            "dev": true,
-            "requires": {
-                "@types/yargs-parser": "*"
-            }
-        },
-        "@types/yargs-parser": {
-            "version": "13.1.0",
-            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz",
-            "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==",
-            "dev": true
-        },
-        "@types/yauzl": {
-            "version": "2.9.1",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-            "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
-            "optional": true,
-            "requires": {
-                "@types/node": "*"
-            }
-        },
-        "@webassemblyjs/ast": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-            "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/helper-module-context": "1.8.5",
-                "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                "@webassemblyjs/wast-parser": "1.8.5"
-            }
-        },
-        "@webassemblyjs/floating-point-hex-parser": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-            "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-api-error": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-            "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-buffer": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-            "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-code-frame": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-            "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/wast-printer": "1.8.5"
-            }
-        },
-        "@webassemblyjs/helper-fsm": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-            "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-module-context": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-            "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "mamacro": "^0.0.3"
-            }
-        },
-        "@webassemblyjs/helper-wasm-bytecode": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-            "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-wasm-section": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-            "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "@webassemblyjs/helper-buffer": "1.8.5",
-                "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                "@webassemblyjs/wasm-gen": "1.8.5"
-            }
-        },
-        "@webassemblyjs/ieee754": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-            "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
-            "dev": true,
-            "requires": {
-                "@xtuc/ieee754": "^1.2.0"
-            }
-        },
-        "@webassemblyjs/leb128": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-            "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
-            "dev": true,
-            "requires": {
-                "@xtuc/long": "4.2.2"
-            }
-        },
-        "@webassemblyjs/utf8": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-            "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
-            "dev": true
-        },
-        "@webassemblyjs/wasm-edit": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-            "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "@webassemblyjs/helper-buffer": "1.8.5",
-                "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                "@webassemblyjs/helper-wasm-section": "1.8.5",
-                "@webassemblyjs/wasm-gen": "1.8.5",
-                "@webassemblyjs/wasm-opt": "1.8.5",
-                "@webassemblyjs/wasm-parser": "1.8.5",
-                "@webassemblyjs/wast-printer": "1.8.5"
-            }
-        },
-        "@webassemblyjs/wasm-gen": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-            "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                "@webassemblyjs/ieee754": "1.8.5",
-                "@webassemblyjs/leb128": "1.8.5",
-                "@webassemblyjs/utf8": "1.8.5"
-            }
-        },
-        "@webassemblyjs/wasm-opt": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-            "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "@webassemblyjs/helper-buffer": "1.8.5",
-                "@webassemblyjs/wasm-gen": "1.8.5",
-                "@webassemblyjs/wasm-parser": "1.8.5"
-            }
-        },
-        "@webassemblyjs/wasm-parser": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-            "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "@webassemblyjs/helper-api-error": "1.8.5",
-                "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                "@webassemblyjs/ieee754": "1.8.5",
-                "@webassemblyjs/leb128": "1.8.5",
-                "@webassemblyjs/utf8": "1.8.5"
-            }
-        },
-        "@webassemblyjs/wast-parser": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-            "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-                "@webassemblyjs/helper-api-error": "1.8.5",
-                "@webassemblyjs/helper-code-frame": "1.8.5",
-                "@webassemblyjs/helper-fsm": "1.8.5",
-                "@xtuc/long": "4.2.2"
-            }
-        },
-        "@webassemblyjs/wast-printer": {
-            "version": "1.8.5",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-            "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "@webassemblyjs/wast-parser": "1.8.5",
-                "@xtuc/long": "4.2.2"
-            }
-        },
-        "@xtuc/ieee754": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-            "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-            "dev": true
-        },
-        "@xtuc/long": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-            "dev": true
-        },
-        "JSONStream": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-            "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-            "requires": {
-                "jsonparse": "^1.2.0",
-                "through": ">=2.2.7 <3"
-            }
-        },
-        "abab": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-            "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
-            "dev": true
-        },
-        "abbrev": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-            "dev": true
-        },
-        "abort-controller": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-            "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-            "requires": {
-                "event-target-shim": "^5.0.0"
-            }
-        },
-        "abstract-logging": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz",
-            "integrity": "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA=="
-        },
-        "accept-language": {
-            "version": "3.0.18",
-            "resolved": "https://registry.npmjs.org/accept-language/-/accept-language-3.0.18.tgz",
-            "integrity": "sha1-9QJfF79lpGaoRYOMz5jNuHfYM4Q=",
-            "requires": {
-                "bcp47": "^1.1.2",
-                "stable": "^0.1.6"
-            }
-        },
-        "accepts": {
-            "version": "1.3.7",
-            "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-            "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-            "requires": {
-                "mime-types": "~2.1.24",
-                "negotiator": "0.6.2"
-            }
-        },
-        "acorn": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-            "dev": true
-        },
-        "acorn-globals": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-            "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-            "dev": true,
-            "requires": {
-                "acorn": "^7.1.1",
-                "acorn-walk": "^7.1.1"
-            }
-        },
-        "acorn-jsx": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-            "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-            "dev": true
-        },
-        "acorn-walk": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-            "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-            "dev": true
-        },
-        "agent-base": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-            "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-            "requires": {
-                "es6-promisify": "^5.0.0"
-            }
-        },
-        "ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-            "requires": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
-            },
-            "dependencies": {
-                "fast-deep-equal": {
-                    "version": "3.1.3",
-                    "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-                    "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-                }
-            }
-        },
-        "ajv-errors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-            "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-            "dev": true
-        },
-        "ajv-keywords": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
-            "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
-            "dev": true
-        },
-        "amdefine": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-            "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-            "dev": true
-        },
-        "angular-mocks": {
-            "version": "1.7.9",
-            "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.9.tgz",
-            "integrity": "sha512-LQRqqiV3sZ7NTHBnNmLT0bXtE5e81t97+hkJ56oU0k3dqKv1s6F+nBWRlOVzqHWPGFOiPS8ZJVdrS8DFzHyNIA==",
-            "dev": true
-        },
-        "ansi-align": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
-            "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
-            "dev": true,
-            "requires": {
-                "string-width": "^2.0.0"
-            }
-        },
-        "ansi-colors": {
-            "version": "1.1.0",
-            "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-            "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-            "dev": true,
-            "requires": {
-                "ansi-wrap": "^0.1.0"
-            }
-        },
-        "ansi-gray": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-            "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-            "dev": true,
-            "requires": {
-                "ansi-wrap": "0.1.0"
-            }
-        },
-        "ansi-html": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-            "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-            "dev": true
-        },
-        "ansi-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-            "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "ansi-styles": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-            "dev": true,
-            "requires": {
-                "color-convert": "^1.9.0"
-            }
-        },
-        "ansi-wrap": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-            "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-            "dev": true
-        },
-        "anymatch": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-            "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-            "dev": true,
-            "requires": {
-                "micromatch": "^3.1.4",
-                "normalize-path": "^2.1.1"
-            },
-            "dependencies": {
-                "normalize-path": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-                    "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-                    "dev": true,
-                    "requires": {
-                        "remove-trailing-separator": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "append-buffer": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-            "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-            "dev": true,
-            "requires": {
-                "buffer-equal": "^1.0.0"
-            }
-        },
-        "aproba": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-        },
-        "archy": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-            "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-            "dev": true
-        },
-        "are-we-there-yet": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-            "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-            "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-            }
-        },
-        "argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "requires": {
-                "sprintf-js": "~1.0.2"
-            },
-            "dependencies": {
-                "sprintf-js": {
-                    "version": "1.0.3",
-                    "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-                    "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-                }
-            }
-        },
-        "arr-diff": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-            "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-            "dev": true
-        },
-        "arr-filter": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-            "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-            "dev": true,
-            "requires": {
-                "make-iterator": "^1.0.0"
-            }
-        },
-        "arr-flatten": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-            "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-            "dev": true
-        },
-        "arr-map": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-            "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-            "dev": true,
-            "requires": {
-                "make-iterator": "^1.0.0"
-            }
-        },
-        "arr-union": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-            "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-            "dev": true
-        },
-        "array-differ": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-            "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-            "dev": true
-        },
-        "array-each": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-            "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-            "dev": true
-        },
-        "array-find-index": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-            "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-            "dev": true
-        },
-        "array-flatten": {
-            "version": "1.1.1",
-            "resolved": "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-            "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-        },
-        "array-initial": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-            "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-            "dev": true,
-            "requires": {
-                "array-slice": "^1.0.0",
-                "is-number": "^4.0.0"
-            },
-            "dependencies": {
-                "is-number": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-                    "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-                    "dev": true
-                }
-            }
-        },
-        "array-last": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-            "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-            "dev": true,
-            "requires": {
-                "is-number": "^4.0.0"
-            },
-            "dependencies": {
-                "is-number": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-                    "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-                    "dev": true
-                }
-            }
-        },
-        "array-slice": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-            "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-            "dev": true
-        },
-        "array-sort": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-            "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-            "dev": true,
-            "requires": {
-                "default-compare": "^1.0.0",
-                "get-value": "^2.0.6",
-                "kind-of": "^5.0.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
-                }
-            }
-        },
-        "array-union": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-            "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-            "dev": true,
-            "requires": {
-                "array-uniq": "^1.0.1"
-            }
-        },
-        "array-uniq": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-            "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-            "dev": true
-        },
-        "array-unique": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-            "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-            "dev": true
-        },
-        "arrify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-            "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-            "dev": true
-        },
-        "asn1": {
-            "version": "0.2.4",
-            "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-            "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-            "requires": {
-                "safer-buffer": "~2.1.0"
-            }
-        },
-        "asn1.js": {
-            "version": "4.10.1",
-            "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-            "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-            "dev": true,
-            "requires": {
-                "bn.js": "^4.0.0",
-                "inherits": "^2.0.1",
-                "minimalistic-assert": "^1.0.0"
-            }
-        },
-        "assert": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-            "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-            "dev": true,
-            "requires": {
-                "object-assign": "^4.1.1",
-                "util": "0.10.3"
-            },
-            "dependencies": {
-                "inherits": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                    "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-                    "dev": true
-                },
-                "util": {
-                    "version": "0.10.3",
-                    "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-                    "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-                    "dev": true,
-                    "requires": {
-                        "inherits": "2.0.1"
-                    }
-                }
-            }
-        },
-        "assert-plus": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-            "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        },
-        "assign-symbols": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-            "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-            "dev": true
-        },
-        "ast-types": {
-            "version": "0.9.6",
-            "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
-            "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
-            "dev": true
-        },
-        "astral-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-            "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-            "dev": true
-        },
-        "async": {
-            "version": "2.6.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-            "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-            "requires": {
-                "lodash": "^4.17.14"
-            }
-        },
-        "async-done": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-            "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-            "dev": true,
-            "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.2",
-                "process-nextick-args": "^2.0.0",
-                "stream-exhaust": "^1.0.1"
-            }
-        },
-        "async-each": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-            "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-            "dev": true
-        },
-        "async-foreach": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-            "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-            "dev": true
-        },
-        "async-hook-jl": {
-            "version": "1.7.6",
-            "resolved": "https://registry.npmjs.org/async-hook-jl/-/async-hook-jl-1.7.6.tgz",
-            "integrity": "sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==",
-            "requires": {
-                "stack-chain": "^1.3.7"
-            }
-        },
-        "async-limiter": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-            "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
-            "dev": true
-        },
-        "async-settle": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-            "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-            "dev": true,
-            "requires": {
-                "async-done": "^1.2.2"
-            }
-        },
-        "asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-        },
-        "atob": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-            "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-            "dev": true
-        },
-        "aws-sdk": {
-            "version": "2.610.0",
-            "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.610.0.tgz",
-            "integrity": "sha512-kqcoCTKjbxrUo2KeLQR2Jw6l4PvkbHXSDk8KqF2hXcpHibiOcMXZZPVe9X+s90RC/B2+qU95M7FImp9ByMcw7A==",
-            "requires": {
-                "buffer": "4.9.1",
-                "events": "1.1.1",
-                "ieee754": "1.1.13",
-                "jmespath": "0.15.0",
-                "querystring": "0.2.0",
-                "sax": "1.2.1",
-                "url": "0.10.3",
-                "uuid": "3.3.2",
-                "xml2js": "0.4.19"
-            },
-            "dependencies": {
-                "ieee754": {
-                    "version": "1.1.13",
-                    "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-                    "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
-                },
-                "sax": {
-                    "version": "1.2.1",
-                    "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-                    "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
-                },
-                "uuid": {
-                    "version": "3.3.2",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-                    "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-                },
-                "xml2js": {
-                    "version": "0.4.19",
-                    "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-                    "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-                    "requires": {
-                        "sax": ">=0.6.0",
-                        "xmlbuilder": "~9.0.1"
-                    }
-                }
-            }
-        },
-        "aws-sign2": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-            "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-        },
-        "aws4": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-            "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
-        },
-        "babel-code-frame": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-            "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-            "dev": true,
-            "requires": {
-                "chalk": "^1.1.3",
-                "esutils": "^2.0.2",
-                "js-tokens": "^3.0.2"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "2.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-                    "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-                    "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^2.2.1",
-                        "escape-string-regexp": "^1.0.2",
-                        "has-ansi": "^2.0.0",
-                        "strip-ansi": "^3.0.0",
-                        "supports-color": "^2.0.0"
-                    }
-                },
-                "js-tokens": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-                    "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-                    "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-                    "dev": true
-                }
-            }
-        },
-        "babel-helper-call-delegate": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-            "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-            "dev": true,
-            "requires": {
-                "babel-helper-hoist-variables": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "babel-traverse": "^6.24.1",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-helper-define-map": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-            "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-            "dev": true,
-            "requires": {
-                "babel-helper-function-name": "^6.24.1",
-                "babel-runtime": "^6.26.0",
-                "babel-types": "^6.26.0",
-                "lodash": "^4.17.4"
-            }
-        },
-        "babel-helper-function-name": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-            "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-            "dev": true,
-            "requires": {
-                "babel-helper-get-function-arity": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "babel-template": "^6.24.1",
-                "babel-traverse": "^6.24.1",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-helper-get-function-arity": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-            "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-helper-hoist-variables": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-            "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-helper-optimise-call-expression": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-            "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-helper-regex": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-            "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.26.0",
-                "babel-types": "^6.26.0",
-                "lodash": "^4.17.4"
-            }
-        },
-        "babel-helper-replace-supers": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-            "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-            "dev": true,
-            "requires": {
-                "babel-helper-optimise-call-expression": "^6.24.1",
-                "babel-messages": "^6.23.0",
-                "babel-runtime": "^6.22.0",
-                "babel-template": "^6.24.1",
-                "babel-traverse": "^6.24.1",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-jest": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.0.1.tgz",
-            "integrity": "sha512-Z4GGmSNQ8pX3WS1O+6v3fo41YItJJZsVxG5gIQ+HuB/iuAQBJxMTHTwz292vuYws1LnHfwSRgoqI+nxdy/pcvw==",
-            "dev": true,
-            "requires": {
-                "@jest/transform": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "@types/babel__core": "^7.1.7",
-                "babel-plugin-istanbul": "^6.0.0",
-                "babel-preset-jest": "^26.0.0",
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.4",
-                "slash": "^3.0.0"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "babel-loader": {
-            "version": "8.0.6",
-            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-            "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
-            "dev": true,
-            "requires": {
-                "find-cache-dir": "^2.0.0",
-                "loader-utils": "^1.0.2",
-                "mkdirp": "^0.5.1",
-                "pify": "^4.0.1"
-            }
-        },
-        "babel-messages": {
-            "version": "6.23.0",
-            "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-            "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-check-es2015-constants": {
-            "version": "6.22.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-            "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-dynamic-import-node": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-            "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-            "dev": true,
-            "requires": {
-                "object.assign": "^4.1.0"
-            }
-        },
-        "babel-plugin-istanbul": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-            "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.0.0",
-                "@istanbuljs/load-nyc-config": "^1.0.0",
-                "@istanbuljs/schema": "^0.1.2",
-                "istanbul-lib-instrument": "^4.0.0",
-                "test-exclude": "^6.0.0"
-            }
-        },
-        "babel-plugin-jest-hoist": {
-            "version": "26.0.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.0.0.tgz",
-            "integrity": "sha512-+AuoehOrjt9irZL7DOt2+4ZaTM6dlu1s5TTS46JBa0/qem4dy7VNW3tMb96qeEqcIh20LD73TVNtmVEeymTG7w==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.3.3",
-                "@babel/types": "^7.3.3",
-                "@types/babel__traverse": "^7.0.6"
-            }
-        },
-        "babel-plugin-transform-es2015-arrow-functions": {
-            "version": "6.22.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-            "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-block-scoped-functions": {
-            "version": "6.22.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-            "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-block-scoping": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-            "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.26.0",
-                "babel-template": "^6.26.0",
-                "babel-traverse": "^6.26.0",
-                "babel-types": "^6.26.0",
-                "lodash": "^4.17.4"
-            }
-        },
-        "babel-plugin-transform-es2015-classes": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-            "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-            "dev": true,
-            "requires": {
-                "babel-helper-define-map": "^6.24.1",
-                "babel-helper-function-name": "^6.24.1",
-                "babel-helper-optimise-call-expression": "^6.24.1",
-                "babel-helper-replace-supers": "^6.24.1",
-                "babel-messages": "^6.23.0",
-                "babel-runtime": "^6.22.0",
-                "babel-template": "^6.24.1",
-                "babel-traverse": "^6.24.1",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-computed-properties": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-            "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0",
-                "babel-template": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-destructuring": {
-            "version": "6.23.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-            "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-duplicate-keys": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-            "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-for-of": {
-            "version": "6.23.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-            "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-function-name": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-            "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-            "dev": true,
-            "requires": {
-                "babel-helper-function-name": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-literals": {
-            "version": "6.22.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-            "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-modules-amd": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-            "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-            "dev": true,
-            "requires": {
-                "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "babel-template": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-modules-commonjs": {
-            "version": "6.26.2",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
-            "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
-            "dev": true,
-            "requires": {
-                "babel-plugin-transform-strict-mode": "^6.24.1",
-                "babel-runtime": "^6.26.0",
-                "babel-template": "^6.26.0",
-                "babel-types": "^6.26.0"
-            }
-        },
-        "babel-plugin-transform-es2015-modules-systemjs": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-            "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-            "dev": true,
-            "requires": {
-                "babel-helper-hoist-variables": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "babel-template": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-modules-umd": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-            "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-            "dev": true,
-            "requires": {
-                "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "babel-template": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-object-super": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-            "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-            "dev": true,
-            "requires": {
-                "babel-helper-replace-supers": "^6.24.1",
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-parameters": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-            "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-            "dev": true,
-            "requires": {
-                "babel-helper-call-delegate": "^6.24.1",
-                "babel-helper-get-function-arity": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "babel-template": "^6.24.1",
-                "babel-traverse": "^6.24.1",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-shorthand-properties": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-            "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-spread": {
-            "version": "6.22.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-            "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-sticky-regex": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-            "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-            "dev": true,
-            "requires": {
-                "babel-helper-regex": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-plugin-transform-es2015-template-literals": {
-            "version": "6.22.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-            "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-typeof-symbol": {
-            "version": "6.23.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-            "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0"
-            }
-        },
-        "babel-plugin-transform-es2015-unicode-regex": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-            "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-            "dev": true,
-            "requires": {
-                "babel-helper-regex": "^6.24.1",
-                "babel-runtime": "^6.22.0",
-                "regexpu-core": "^2.0.0"
-            },
-            "dependencies": {
-                "jsesc": {
-                    "version": "0.5.0",
-                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-                    "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-                    "dev": true
-                },
-                "regexpu-core": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-                    "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-                    "dev": true,
-                    "requires": {
-                        "regenerate": "^1.2.1",
-                        "regjsgen": "^0.2.0",
-                        "regjsparser": "^0.1.4"
-                    }
-                },
-                "regjsgen": {
-                    "version": "0.2.0",
-                    "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-                    "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-                    "dev": true
-                },
-                "regjsparser": {
-                    "version": "0.1.5",
-                    "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-                    "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-                    "dev": true,
-                    "requires": {
-                        "jsesc": "~0.5.0"
-                    }
-                }
-            }
-        },
-        "babel-plugin-transform-regenerator": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-            "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-            "dev": true,
-            "requires": {
-                "regenerator-transform": "^0.10.0"
-            },
-            "dependencies": {
-                "regenerator-transform": {
-                    "version": "0.10.1",
-                    "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-                    "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-                    "dev": true,
-                    "requires": {
-                        "babel-runtime": "^6.18.0",
-                        "babel-types": "^6.19.0",
-                        "private": "^0.1.6"
-                    }
-                }
-            }
-        },
-        "babel-plugin-transform-strict-mode": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-            "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.22.0",
-                "babel-types": "^6.24.1"
-            }
-        },
-        "babel-preset-current-node-syntax": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz",
-            "integrity": "sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==",
-            "dev": true,
-            "requires": {
-                "@babel/plugin-syntax-async-generators": "^7.8.4",
-                "@babel/plugin-syntax-bigint": "^7.8.3",
-                "@babel/plugin-syntax-class-properties": "^7.8.3",
-                "@babel/plugin-syntax-import-meta": "^7.8.3",
-                "@babel/plugin-syntax-json-strings": "^7.8.3",
-                "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-                "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-                "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-            },
-            "dependencies": {
-                "@babel/helper-plugin-utils": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-                    "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-                    "dev": true
-                },
-                "@babel/plugin-syntax-async-generators": {
-                    "version": "7.8.4",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-                    "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.8.0"
-                    }
-                },
-                "@babel/plugin-syntax-json-strings": {
-                    "version": "7.8.3",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-                    "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.8.0"
-                    }
-                },
-                "@babel/plugin-syntax-object-rest-spread": {
-                    "version": "7.8.3",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-                    "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.8.0"
-                    }
-                },
-                "@babel/plugin-syntax-optional-catch-binding": {
-                    "version": "7.8.3",
-                    "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-                    "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.8.0"
-                    }
-                }
-            }
-        },
-        "babel-preset-es2015": {
-            "version": "6.24.1",
-            "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
-            "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
-            "dev": true,
-            "requires": {
-                "babel-plugin-check-es2015-constants": "^6.22.0",
-                "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-                "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-                "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
-                "babel-plugin-transform-es2015-classes": "^6.24.1",
-                "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
-                "babel-plugin-transform-es2015-destructuring": "^6.22.0",
-                "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
-                "babel-plugin-transform-es2015-for-of": "^6.22.0",
-                "babel-plugin-transform-es2015-function-name": "^6.24.1",
-                "babel-plugin-transform-es2015-literals": "^6.22.0",
-                "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-                "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-                "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
-                "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
-                "babel-plugin-transform-es2015-object-super": "^6.24.1",
-                "babel-plugin-transform-es2015-parameters": "^6.24.1",
-                "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-                "babel-plugin-transform-es2015-spread": "^6.22.0",
-                "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
-                "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-                "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
-                "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
-                "babel-plugin-transform-regenerator": "^6.24.1"
-            }
-        },
-        "babel-preset-jest": {
-            "version": "26.0.0",
-            "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.0.0.tgz",
-            "integrity": "sha512-9ce+DatAa31DpR4Uir8g4Ahxs5K4W4L8refzt+qHWQANb6LhGcAEfIFgLUwk67oya2cCUd6t4eUMtO/z64ocNw==",
-            "dev": true,
-            "requires": {
-                "babel-plugin-jest-hoist": "^26.0.0",
-                "babel-preset-current-node-syntax": "^0.1.2"
-            }
-        },
-        "babel-runtime": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-            "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-            "dev": true,
-            "requires": {
-                "core-js": "^2.4.0",
-                "regenerator-runtime": "^0.11.0"
-            }
-        },
-        "babel-template": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-            "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.26.0",
-                "babel-traverse": "^6.26.0",
-                "babel-types": "^6.26.0",
-                "babylon": "^6.18.0",
-                "lodash": "^4.17.4"
-            }
-        },
-        "babel-traverse": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-            "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-            "dev": true,
-            "requires": {
-                "babel-code-frame": "^6.26.0",
-                "babel-messages": "^6.23.0",
-                "babel-runtime": "^6.26.0",
-                "babel-types": "^6.26.0",
-                "babylon": "^6.18.0",
-                "debug": "^2.6.8",
-                "globals": "^9.18.0",
-                "invariant": "^2.2.2",
-                "lodash": "^4.17.4"
-            },
-            "dependencies": {
-                "globals": {
-                    "version": "9.18.0",
-                    "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-                    "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-                    "dev": true
-                }
-            }
-        },
-        "babel-types": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-            "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-            "dev": true,
-            "requires": {
-                "babel-runtime": "^6.26.0",
-                "esutils": "^2.0.2",
-                "lodash": "^4.17.4",
-                "to-fast-properties": "^1.0.3"
-            },
-            "dependencies": {
-                "to-fast-properties": {
-                    "version": "1.0.3",
-                    "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-                    "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-                    "dev": true
-                }
-            }
-        },
-        "babylon": {
-            "version": "6.18.0",
-            "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-            "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-            "dev": true
-        },
-        "bach": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-            "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-            "dev": true,
-            "requires": {
-                "arr-filter": "^1.1.1",
-                "arr-flatten": "^1.0.1",
-                "arr-map": "^2.0.0",
-                "array-each": "^1.0.0",
-                "array-initial": "^1.0.0",
-                "array-last": "^1.1.1",
-                "async-done": "^1.2.2",
-                "async-settle": "^1.0.0",
-                "now-and-later": "^2.0.0"
-            }
-        },
-        "backoff": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
-            "integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=",
-            "requires": {
-                "precond": "0.2"
-            }
-        },
-        "balanced-match": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-            "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-        },
-        "base": {
-            "version": "0.11.2",
-            "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-            "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
-            "dev": true,
-            "requires": {
-                "cache-base": "^1.0.1",
-                "class-utils": "^0.3.5",
-                "component-emitter": "^1.2.1",
-                "define-property": "^1.0.0",
-                "isobject": "^3.0.1",
-                "mixin-deep": "^1.2.0",
-                "pascalcase": "^0.1.1"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "^1.0.0"
-                    }
-                },
-                "is-accessor-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^6.0.0"
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^6.0.0"
-                    }
-                },
-                "is-descriptor": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "^1.0.0",
-                        "is-data-descriptor": "^1.0.0",
-                        "kind-of": "^6.0.2"
-                    }
-                }
-            }
-        },
-        "base64-js": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.0.2.tgz",
-            "integrity": "sha1-R0IRyV5s8qVH20YeT2d4tR0I+mU="
-        },
-        "batch": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-            "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-            "dev": true
-        },
-        "bcp47": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/bcp47/-/bcp47-1.1.2.tgz",
-            "integrity": "sha1-NUvjMH/9CEM6ePXh4glYRfifx/4="
-        },
-        "bcrypt-pbkdf": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-            "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-            "requires": {
-                "tweetnacl": "^0.14.3"
-            }
-        },
-        "bcryptjs": {
-            "version": "2.4.3",
-            "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
-            "integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms="
-        },
-        "beeper": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-            "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-            "dev": true
-        },
-        "big.js": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-            "dev": true
-        },
-        "bigdecimal": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/bigdecimal/-/bigdecimal-0.6.1.tgz",
-            "integrity": "sha1-GFiNS08ia3cxDtBFdIWMA2pUSFs="
-        },
-        "bignumber.js": {
-            "version": "7.2.1",
-            "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz",
-            "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="
-        },
-        "binary-extensions": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-            "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-            "dev": true
-        },
-        "bl": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
-            "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
-            "requires": {
-                "readable-stream": "^2.3.5",
-                "safe-buffer": "^5.1.1"
-            }
-        },
-        "block-stream": {
-            "version": "0.0.9",
-            "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-            "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-            "dev": true,
-            "requires": {
-                "inherits": "~2.0.0"
-            }
-        },
-        "bluebird": {
-            "version": "3.5.5",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-            "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
-        },
-        "bmp-js": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz",
-            "integrity": "sha1-4Fpj95amwf8l9Hcex62twUjAcjM="
-        },
-        "bn.js": {
-            "version": "4.11.8",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-            "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-            "dev": true
-        },
-        "body-parser": {
-            "version": "1.19.0",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-            "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-            "requires": {
-                "bytes": "3.1.0",
-                "content-type": "~1.0.4",
-                "debug": "2.6.9",
-                "depd": "~1.1.2",
-                "http-errors": "1.7.2",
-                "iconv-lite": "0.4.24",
-                "on-finished": "~2.3.0",
-                "qs": "6.7.0",
-                "raw-body": "2.4.0",
-                "type-is": "~1.6.17"
-            },
-            "dependencies": {
-                "bytes": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-                    "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-                },
-                "depd": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-                    "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-                }
-            }
-        },
-        "bonjour": {
-            "version": "3.5.0",
-            "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-            "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-            "dev": true,
-            "requires": {
-                "array-flatten": "^2.1.0",
-                "deep-equal": "^1.0.1",
-                "dns-equal": "^1.0.0",
-                "dns-txt": "^2.0.2",
-                "multicast-dns": "^6.0.1",
-                "multicast-dns-service-types": "^1.1.0"
-            },
-            "dependencies": {
-                "array-flatten": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-                    "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-                    "dev": true
-                }
-            }
-        },
-        "boolbase": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-            "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-            "dev": true
-        },
-        "bops": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/bops/-/bops-1.0.0.tgz",
-            "integrity": "sha1-YxqJKPEXhBfrb3Bs9prNteWk6q0=",
-            "requires": {
-                "base64-js": "1.0.2",
-                "to-utf8": "0.0.1"
-            }
-        },
-        "bowser": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.8.1.tgz",
-            "integrity": "sha512-FxxltGKqMHkVa3KtpA+kdnxH0caHPDewccyrK3vW1bsMw6Zco4vRPmMunowX0pXlDZqhxkKSpToADQI2Sk4OeQ=="
-        },
-        "boxen": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
-            "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
-            "dev": true,
-            "requires": {
-                "ansi-align": "^2.0.0",
-                "camelcase": "^4.0.0",
-                "chalk": "^2.0.1",
-                "cli-boxes": "^1.0.0",
-                "string-width": "^2.0.0",
-                "term-size": "^1.2.0",
-                "widest-line": "^2.0.0"
-            },
-            "dependencies": {
-                "camelcase": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-                    "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-                    "dev": true
-                }
-            }
-        },
-        "brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "braces": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-            "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-            "dev": true,
-            "requires": {
-                "arr-flatten": "^1.1.0",
-                "array-unique": "^0.3.2",
-                "extend-shallow": "^2.0.1",
-                "fill-range": "^4.0.0",
-                "isobject": "^3.0.1",
-                "repeat-element": "^1.1.2",
-                "snapdragon": "^0.8.1",
-                "snapdragon-node": "^2.0.1",
-                "split-string": "^3.0.2",
-                "to-regex": "^3.0.1"
-            },
-            "dependencies": {
-                "extend-shallow": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                    "dev": true,
-                    "requires": {
-                        "is-extendable": "^0.1.0"
-                    }
-                }
-            }
-        },
-        "brorand": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-            "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-            "dev": true
-        },
-        "browser-process-hrtime": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-            "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-            "dev": true
-        },
-        "browserify-aes": {
-            "version": "1.2.0",
-            "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-            "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-            "dev": true,
-            "requires": {
-                "buffer-xor": "^1.0.3",
-                "cipher-base": "^1.0.0",
-                "create-hash": "^1.1.0",
-                "evp_bytestokey": "^1.0.3",
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "browserify-cipher": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-            "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-            "dev": true,
-            "requires": {
-                "browserify-aes": "^1.0.4",
-                "browserify-des": "^1.0.0",
-                "evp_bytestokey": "^1.0.0"
-            }
-        },
-        "browserify-des": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-            "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-            "dev": true,
-            "requires": {
-                "cipher-base": "^1.0.1",
-                "des.js": "^1.0.0",
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.1.2"
-            }
-        },
-        "browserify-rsa": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-            "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-            "dev": true,
-            "requires": {
-                "bn.js": "^4.1.0",
-                "randombytes": "^2.0.1"
-            }
-        },
-        "browserify-sign": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-            "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-            "dev": true,
-            "requires": {
-                "bn.js": "^4.1.1",
-                "browserify-rsa": "^4.0.0",
-                "create-hash": "^1.1.0",
-                "create-hmac": "^1.1.2",
-                "elliptic": "^6.0.0",
-                "inherits": "^2.0.1",
-                "parse-asn1": "^5.0.0"
-            }
-        },
-        "browserify-zlib": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-            "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-            "dev": true,
-            "requires": {
-                "pako": "~1.0.5"
-            }
-        },
-        "browserslist": {
-            "version": "4.14.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz",
-            "integrity": "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==",
-            "dev": true,
-            "requires": {
-                "caniuse-lite": "^1.0.30001111",
-                "electron-to-chromium": "^1.3.523",
-                "escalade": "^3.0.2",
-                "node-releases": "^1.1.60"
-            }
-        },
-        "bser": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz",
-            "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==",
-            "dev": true,
-            "requires": {
-                "node-int64": "^0.4.0"
-            }
-        },
-        "btoa": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
-            "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
-        },
-        "buffer": {
-            "version": "4.9.1",
-            "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-            "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-            "requires": {
-                "base64-js": "^1.0.2",
-                "ieee754": "^1.1.4",
-                "isarray": "^1.0.0"
-            }
-        },
-        "buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
-        },
-        "buffer-equal": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-            "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-            "dev": true
-        },
-        "buffer-equal-constant-time": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-            "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-        },
-        "buffer-from": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-            "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-        },
-        "buffer-indexof": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-            "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-            "dev": true
-        },
-        "buffer-xor": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-            "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-            "dev": true
-        },
-        "bufferstreams": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
-            "integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=",
-            "dev": true,
-            "requires": {
-                "readable-stream": "^1.0.33"
-            },
-            "dependencies": {
-                "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-                    "dev": true
-                },
-                "readable-stream": {
-                    "version": "1.1.14",
-                    "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-                    "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.1",
-                        "isarray": "0.0.1",
-                        "string_decoder": "~0.10.x"
-                    }
-                },
-                "string_decoder": {
-                    "version": "0.10.31",
-                    "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-                    "dev": true
-                }
-            }
-        },
-        "builtin-status-codes": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-            "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-            "dev": true
-        },
-        "bytes": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-            "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
-        },
-        "cacache": {
-            "version": "12.0.3",
-            "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-            "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
-            "dev": true,
-            "requires": {
-                "bluebird": "^3.5.5",
-                "chownr": "^1.1.1",
-                "figgy-pudding": "^3.5.1",
-                "glob": "^7.1.4",
-                "graceful-fs": "^4.1.15",
-                "infer-owner": "^1.0.3",
-                "lru-cache": "^5.1.1",
-                "mississippi": "^3.0.0",
-                "mkdirp": "^0.5.1",
-                "move-concurrently": "^1.0.1",
-                "promise-inflight": "^1.0.1",
-                "rimraf": "^2.6.3",
-                "ssri": "^6.0.1",
-                "unique-filename": "^1.1.1",
-                "y18n": "^4.0.0"
-            },
-            "dependencies": {
-                "rimraf": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-                    "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                    "dev": true
-                }
-            }
-        },
-        "cache-base": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-            "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
-            "dev": true,
-            "requires": {
-                "collection-visit": "^1.0.0",
-                "component-emitter": "^1.2.1",
-                "get-value": "^2.0.6",
-                "has-value": "^1.0.0",
-                "isobject": "^3.0.1",
-                "set-value": "^2.0.0",
-                "to-object-path": "^0.3.0",
-                "union-value": "^1.0.0",
-                "unset-value": "^1.0.0"
-            }
-        },
-        "cacheable-request": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-            "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-            "dev": true,
-            "requires": {
-                "clone-response": "^1.0.2",
-                "get-stream": "^5.1.0",
-                "http-cache-semantics": "^4.0.0",
-                "keyv": "^3.0.0",
-                "lowercase-keys": "^2.0.0",
-                "normalize-url": "^4.1.0",
-                "responselike": "^1.0.2"
-            },
-            "dependencies": {
-                "get-stream": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-                    "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-                    "dev": true,
-                    "requires": {
-                        "pump": "^3.0.0"
-                    }
-                },
-                "lowercase-keys": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-                    "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-                    "dev": true
-                }
-            }
-        },
-        "callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true
-        },
-        "camel-case": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-            "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-            "dev": true,
-            "requires": {
-                "no-case": "^2.2.0",
-                "upper-case": "^1.1.1"
-            }
-        },
-        "camelcase": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true
-        },
-        "camelcase-keys": {
-            "version": "2.1.0",
-            "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-            "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-            "dev": true,
-            "requires": {
-                "camelcase": "^2.0.0",
-                "map-obj": "^1.0.0"
-            },
-            "dependencies": {
-                "camelcase": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-                    "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-                    "dev": true
-                }
-            }
-        },
-        "camelize": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-            "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
-        },
-        "caniuse-lite": {
-            "version": "1.0.30001114",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001114.tgz",
-            "integrity": "sha512-ml/zTsfNBM+T1+mjglWRPgVsu2L76GAaADKX5f4t0pbhttEp0WMawJsHDYlFkVZkoA+89uvBRrVrEE4oqenzXQ==",
-            "dev": true
-        },
-        "canonical-json": {
-            "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/canonical-json/-/canonical-json-0.0.4.tgz",
-            "integrity": "sha1-ZXnAcsPbXEd+xB3JePvyuPQQdKM="
-        },
-        "capture-exit": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
-            "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
-            "dev": true,
-            "requires": {
-                "rsvp": "^4.8.4"
-            }
-        },
-        "capture-stack-trace": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
-            "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-            "dev": true
-        },
-        "caseless": {
-            "version": "0.12.0",
-            "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-            "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-        },
-        "chalk": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-            },
-            "dependencies": {
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
-            }
-        },
-        "char-regex": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-            "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-            "dev": true
-        },
-        "charenc": {
-            "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-            "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
-        },
-        "chokidar": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
-            "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
-            "dev": true,
-            "requires": {
-                "anymatch": "^2.0.0",
-                "async-each": "^1.0.1",
-                "braces": "^2.3.2",
-                "fsevents": "^1.2.7",
-                "glob-parent": "^3.1.0",
-                "inherits": "^2.0.3",
-                "is-binary-path": "^1.0.0",
-                "is-glob": "^4.0.0",
-                "normalize-path": "^3.0.0",
-                "path-is-absolute": "^1.0.0",
-                "readdirp": "^2.2.1",
-                "upath": "^1.1.1"
-            },
-            "dependencies": {
-                "fsevents": {
-                    "version": "1.2.13",
-                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                    "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "nan": "^2.12.1"
-                    }
-                }
-            }
-        },
-        "chownr": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-            "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="
-        },
-        "chrome-trace-event": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-            "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-            "dev": true,
-            "requires": {
-                "tslib": "^1.9.0"
-            }
-        },
-        "ci-info": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-            "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-            "dev": true
-        },
-        "cipher-base": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-            "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "class-utils": {
-            "version": "0.3.6",
-            "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-            "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
-            "dev": true,
-            "requires": {
-                "arr-union": "^3.1.0",
-                "define-property": "^0.2.5",
-                "isobject": "^3.0.0",
-                "static-extend": "^0.1.1"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "0.2.5",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "^0.1.0"
-                    }
-                }
-            }
-        },
-        "cldrjs": {
-            "version": "0.5.1",
-            "resolved": "https://registry.npmjs.org/cldrjs/-/cldrjs-0.5.1.tgz",
-            "integrity": "sha512-xyiP8uAm8K1IhmpDndZLraloW1yqu0L+HYdQ7O1aGPxx9Cr+BMnPANlNhSt++UKfxytL2hd2NPXgTjiy7k43Ew=="
-        },
-        "clean-css": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-            "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
-            "dev": true,
-            "requires": {
-                "source-map": "~0.6.0"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
-        "cli-boxes": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-            "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
-            "dev": true
-        },
-        "cliui": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-            "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-            "dev": true,
-            "requires": {
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wrap-ansi": "^2.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-                    "dev": true,
-                    "requires": {
-                        "number-is-nan": "^1.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "1.0.2",
-                    "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                    "dev": true,
-                    "requires": {
-                        "code-point-at": "^1.0.0",
-                        "is-fullwidth-code-point": "^1.0.0",
-                        "strip-ansi": "^3.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "clone": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-            "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-            "dev": true
-        },
-        "clone-buffer": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-            "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-            "dev": true
-        },
-        "clone-deep": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-            "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-            "dev": true,
-            "requires": {
-                "is-plain-object": "^2.0.4",
-                "kind-of": "^6.0.2",
-                "shallow-clone": "^3.0.0"
-            }
-        },
-        "clone-response": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-            "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-            "dev": true,
-            "requires": {
-                "mimic-response": "^1.0.0"
-            }
-        },
-        "clone-stats": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-            "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-            "dev": true
-        },
-        "cloneable-readable": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-            "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "process-nextick-args": "^2.0.0",
-                "readable-stream": "^2.3.5"
-            }
-        },
-        "cls-hooked": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz",
-            "integrity": "sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==",
-            "requires": {
-                "async-hook-jl": "^1.7.6",
-                "emitter-listener": "^1.0.1",
-                "semver": "^5.4.1"
-            }
-        },
-        "co": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-            "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-            "dev": true
-        },
-        "code-point-at": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-        },
-        "collect-v8-coverage": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-            "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-            "dev": true
-        },
-        "collection-map": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-            "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-            "dev": true,
-            "requires": {
-                "arr-map": "^2.0.2",
-                "for-own": "^1.0.0",
-                "make-iterator": "^1.0.0"
-            }
-        },
-        "collection-visit": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-            "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-            "dev": true,
-            "requires": {
-                "map-visit": "^1.0.0",
-                "object-visit": "^1.0.0"
-            }
-        },
-        "color": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
-            "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
-            "requires": {
-                "color-convert": "^1.9.1",
-                "color-string": "^1.5.4"
-            }
-        },
-        "color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-            "requires": {
-                "color-name": "1.1.3"
-            }
-        },
-        "color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "color-string": {
-            "version": "1.5.4",
-            "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz",
-            "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==",
-            "requires": {
-                "color-name": "^1.0.0",
-                "simple-swizzle": "^0.2.2"
-            }
-        },
-        "color-support": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-            "dev": true
-        },
-        "colors": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-            "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-            "dev": true
-        },
-        "combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "requires": {
-                "delayed-stream": "~1.0.0"
-            }
-        },
-        "commander": {
-            "version": "2.20.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-            "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
-        },
-        "commondir": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
-        },
-        "component-emitter": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-            "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-            "dev": true
-        },
-        "compressible": {
-            "version": "2.0.17",
-            "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
-            "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
-            "requires": {
-                "mime-db": ">= 1.40.0 < 2"
-            }
-        },
-        "compression": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-            "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-            "requires": {
-                "accepts": "~1.3.5",
-                "bytes": "3.0.0",
-                "compressible": "~2.0.16",
-                "debug": "2.6.9",
-                "on-headers": "~1.0.2",
-                "safe-buffer": "5.1.2",
-                "vary": "~1.1.2"
-            }
-        },
-        "concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-        },
-        "concat-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-            "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
-            "requires": {
-                "buffer-from": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.0.2",
-                "typedarray": "^0.0.6"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.5.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
-                    "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "concat-with-sourcemaps": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-            "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
-            "dev": true,
-            "requires": {
-                "source-map": "^0.6.1"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
-        "configstore": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
-            "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==",
-            "requires": {
-                "dot-prop": "^4.1.0",
-                "graceful-fs": "^4.1.2",
-                "make-dir": "^1.0.0",
-                "unique-string": "^1.0.0",
-                "write-file-atomic": "^2.0.0",
-                "xdg-basedir": "^3.0.0"
-            },
-            "dependencies": {
-                "make-dir": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-                    "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-                    "requires": {
-                        "pify": "^3.0.0"
-                    }
-                },
-                "pify": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-                    "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-                }
-            }
-        },
-        "connect-history-api-fallback": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-            "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-            "dev": true
-        },
-        "console-browserify": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-            "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-            "dev": true
-        },
-        "console-control-strings": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-        },
-        "consolidate": {
-            "version": "0.15.1",
-            "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-            "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-            "dev": true,
-            "requires": {
-                "bluebird": "^3.1.1"
-            }
-        },
-        "constants-browserify": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-            "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-            "dev": true
-        },
-        "content-disposition": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-            "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-            "requires": {
-                "safe-buffer": "5.1.2"
-            }
-        },
-        "content-security-policy-builder": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz",
-            "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ=="
-        },
-        "content-type": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-            "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-        },
-        "convert-source-map": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-            "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "~5.1.1"
-            }
-        },
-        "cookie": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-            "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-        },
-        "cookie-signature": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-            "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-        },
-        "copy-concurrently": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-            "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-            "dev": true,
-            "requires": {
-                "aproba": "^1.1.1",
-                "fs-write-stream-atomic": "^1.0.8",
-                "iferr": "^0.1.5",
-                "mkdirp": "^0.5.1",
-                "rimraf": "^2.5.4",
-                "run-queue": "^1.0.0"
-            },
-            "dependencies": {
-                "rimraf": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-                    "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                }
-            }
-        },
-        "copy-descriptor": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-            "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-            "dev": true
-        },
-        "copy-props": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-            "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-            "dev": true,
-            "requires": {
-                "each-props": "^1.3.0",
-                "is-plain-object": "^2.0.1"
-            }
-        },
-        "core-js": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
-            "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==",
-            "dev": true
-        },
-        "core-js-compat": {
-            "version": "3.6.5",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-            "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
-            "dev": true,
-            "requires": {
-                "browserslist": "^4.8.5",
-                "semver": "7.0.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-                    "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-                    "dev": true
-                }
-            }
-        },
-        "core-js-pure": {
-            "version": "3.6.5",
-            "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
-            "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="
-        },
-        "core-util-is": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-            "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-        },
-        "create-ecdh": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-            "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-            "dev": true,
-            "requires": {
-                "bn.js": "^4.1.0",
-                "elliptic": "^6.0.0"
-            }
-        },
-        "create-error-class": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-            "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-            "dev": true,
-            "requires": {
-                "capture-stack-trace": "^1.0.0"
-            }
-        },
-        "create-hash": {
-            "version": "1.2.0",
-            "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-            "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-            "dev": true,
-            "requires": {
-                "cipher-base": "^1.0.1",
-                "inherits": "^2.0.1",
-                "md5.js": "^1.3.4",
-                "ripemd160": "^2.0.1",
-                "sha.js": "^2.4.0"
-            }
-        },
-        "create-hmac": {
-            "version": "1.1.7",
-            "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-            "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-            "dev": true,
-            "requires": {
-                "cipher-base": "^1.0.3",
-                "create-hash": "^1.1.0",
-                "inherits": "^2.0.1",
-                "ripemd160": "^2.0.0",
-                "safe-buffer": "^5.0.1",
-                "sha.js": "^2.4.8"
-            }
-        },
-        "cross-fetch": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz",
-            "integrity": "sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==",
-            "requires": {
-                "node-fetch": "2.6.1"
-            }
-        },
-        "cross-spawn": {
-            "version": "6.0.5",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-            "requires": {
-                "nice-try": "^1.0.4",
-                "path-key": "^2.0.1",
-                "semver": "^5.5.0",
-                "shebang-command": "^1.2.0",
-                "which": "^1.2.9"
-            }
-        },
-        "crypt": {
-            "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-            "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
-        },
-        "crypto-browserify": {
-            "version": "3.12.0",
-            "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-            "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-            "dev": true,
-            "requires": {
-                "browserify-cipher": "^1.0.0",
-                "browserify-sign": "^4.0.0",
-                "create-ecdh": "^4.0.0",
-                "create-hash": "^1.1.0",
-                "create-hmac": "^1.1.0",
-                "diffie-hellman": "^5.0.0",
-                "inherits": "^2.0.1",
-                "pbkdf2": "^3.0.3",
-                "public-encrypt": "^4.0.0",
-                "randombytes": "^2.0.0",
-                "randomfill": "^1.0.3"
-            }
-        },
-        "crypto-random-string": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-            "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
-        },
-        "css-loader": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
-            "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
-            "dev": true,
-            "requires": {
-                "camelcase": "^5.2.0",
-                "icss-utils": "^4.1.0",
-                "loader-utils": "^1.2.3",
-                "normalize-path": "^3.0.0",
-                "postcss": "^7.0.14",
-                "postcss-modules-extract-imports": "^2.0.0",
-                "postcss-modules-local-by-default": "^2.0.6",
-                "postcss-modules-scope": "^2.1.0",
-                "postcss-modules-values": "^2.0.0",
-                "postcss-value-parser": "^3.3.0",
-                "schema-utils": "^1.0.0"
-            }
-        },
-        "css-select": {
-            "version": "1.2.0",
-            "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-            "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-            "dev": true,
-            "requires": {
-                "boolbase": "~1.0.0",
-                "css-what": "2.1",
-                "domutils": "1.5.1",
-                "nth-check": "~1.0.1"
-            },
-            "dependencies": {
-                "domutils": {
-                    "version": "1.5.1",
-                    "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-                    "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-                    "dev": true,
-                    "requires": {
-                        "dom-serializer": "0",
-                        "domelementtype": "1"
-                    }
-                }
-            }
-        },
-        "css-what": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-            "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-            "dev": true
-        },
-        "cssesc": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "dev": true
-        },
-        "cssom": {
-            "version": "0.4.4",
-            "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-            "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-            "dev": true
-        },
-        "cssstyle": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-            "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-            "dev": true,
-            "requires": {
-                "cssom": "~0.3.6"
-            },
-            "dependencies": {
-                "cssom": {
-                    "version": "0.3.8",
-                    "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-                    "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-                    "dev": true
-                }
-            }
-        },
-        "currently-unhandled": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-            "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-            "dev": true,
-            "requires": {
-                "array-find-index": "^1.0.1"
-            }
-        },
-        "cyclist": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-            "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-            "dev": true
-        },
-        "d": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-            "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-            "dev": true,
-            "requires": {
-                "es5-ext": "^0.10.50",
-                "type": "^1.0.1"
-            }
-        },
-        "dargs": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz",
-            "integrity": "sha1-7H6lDHhWTNNsnV7Bj2Yyn63ieCk=",
-            "dev": true
-        },
-        "dashdash": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-            "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-            "requires": {
-                "assert-plus": "^1.0.0"
-            }
-        },
-        "dasherize": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz",
-            "integrity": "sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg="
-        },
-        "data-urls": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-            "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-            "dev": true,
-            "requires": {
-                "abab": "^2.0.3",
-                "whatwg-mimetype": "^2.3.0",
-                "whatwg-url": "^8.0.0"
-            }
-        },
-        "date-and-time": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.6.3.tgz",
-            "integrity": "sha512-lcWy3AXDRJOD7MplwZMmNSRM//kZtJaLz4n6D1P5z9wEmZGBKhJRBIr1Xs9KNQJmdXPblvgffynYji4iylUTcA=="
-        },
-        "dateformat": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-            "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-            "dev": true
-        },
-        "debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "requires": {
-                "ms": "2.0.0"
-            }
-        },
-        "decamelize": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-            "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-            "dev": true
-        },
-        "decimal.js": {
-            "version": "10.2.0",
-            "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz",
-            "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==",
-            "dev": true
-        },
-        "decode-uri-component": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-            "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-            "dev": true
-        },
-        "decompress-response": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-            "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-            "dev": true,
-            "requires": {
-                "mimic-response": "^1.0.0"
-            }
-        },
-        "deep-equal": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-            "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
-        },
-        "deep-extend": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
-        },
-        "deep-is": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-            "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-            "dev": true
-        },
-        "deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-            "dev": true
-        },
-        "default-compare": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-            "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-            "dev": true,
-            "requires": {
-                "kind-of": "^5.0.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
-                }
-            }
-        },
-        "default-gateway": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-            "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-            "dev": true,
-            "requires": {
-                "execa": "^1.0.0",
-                "ip-regex": "^2.1.0"
-            }
-        },
-        "default-resolution": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-            "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-            "dev": true
-        },
-        "defer-to-connect": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-            "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-            "dev": true
-        },
-        "define-properties": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-            "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-            "dev": true,
-            "requires": {
-                "object-keys": "^1.0.12"
-            }
-        },
-        "define-property": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-            "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-            "dev": true,
-            "requires": {
-                "is-descriptor": "^1.0.2",
-                "isobject": "^3.0.1"
-            },
-            "dependencies": {
-                "is-accessor-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^6.0.0"
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^6.0.0"
-                    }
-                },
-                "is-descriptor": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "^1.0.0",
-                        "is-data-descriptor": "^1.0.0",
-                        "kind-of": "^6.0.2"
-                    }
-                }
-            }
-        },
-        "del": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-            "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-            "dev": true,
-            "requires": {
-                "globby": "^5.0.0",
-                "is-path-cwd": "^1.0.0",
-                "is-path-in-cwd": "^1.0.0",
-                "object-assign": "^4.0.1",
-                "pify": "^2.0.0",
-                "pinkie-promise": "^2.0.0",
-                "rimraf": "^2.2.8"
-            },
-            "dependencies": {
-                "pify": {
-                    "version": "2.3.0",
-                    "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                    "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                    "dev": true
-                }
-            }
-        },
-        "delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-        },
-        "delegates": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-        },
-        "denque": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz",
-            "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==",
-            "dev": true
-        },
-        "depd": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
-        "deprecate": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/deprecate/-/deprecate-1.1.0.tgz",
-            "integrity": "sha512-b5dDNQYdy2vW9WXUD8+RQlfoxvqztLLhDE+T7Gd37I5E8My7nJkKu6FmhdDeRWJ8B+yjZKuwjCta8pgi8kgSqA==",
-            "dev": true
-        },
-        "des.js": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-            "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "minimalistic-assert": "^1.0.0"
-            }
-        },
-        "destroy": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-            "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-        },
-        "detect-file": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-            "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-            "dev": true
-        },
-        "detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
-        },
-        "detect-newline": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-            "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-            "dev": true
-        },
-        "detect-node": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-            "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
-            "dev": true
-        },
-        "devtools-protocol": {
-            "version": "0.0.847576",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.847576.tgz",
-            "integrity": "sha512-0M8kobnSQE0Jmly7Mhbeq0W/PpZfnuK+WjN2ZRVPbGqYwCHCioAVp84H0TcLimgECcN5H976y5QiXMGBC9JKmg=="
-        },
-        "diff": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-            "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8="
-        },
-        "diff-sequences": {
-            "version": "26.0.0",
-            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.0.0.tgz",
-            "integrity": "sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==",
-            "dev": true
-        },
-        "diffie-hellman": {
-            "version": "5.0.3",
-            "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-            "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-            "dev": true,
-            "requires": {
-                "bn.js": "^4.1.0",
-                "miller-rabin": "^4.0.0",
-                "randombytes": "^2.0.0"
-            }
-        },
-        "dns-equal": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-            "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-            "dev": true
-        },
-        "dns-packet": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-            "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-            "dev": true,
-            "requires": {
-                "ip": "^1.1.0",
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "dns-prefetch-control": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz",
-            "integrity": "sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q=="
-        },
-        "dns-txt": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-            "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-            "dev": true,
-            "requires": {
-                "buffer-indexof": "^1.0.0"
-            }
-        },
-        "doctrine": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-            "dev": true,
-            "requires": {
-                "esutils": "^2.0.2"
-            }
-        },
-        "dom-converter": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-            "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-            "dev": true,
-            "requires": {
-                "utila": "~0.4"
-            }
-        },
-        "dom-serializer": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-            "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
-            "requires": {
-                "domelementtype": "^1.3.0",
-                "entities": "^1.1.1"
-            }
-        },
-        "domain-browser": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-            "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-            "dev": true
-        },
-        "domelementtype": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-            "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-        },
-        "domexception": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-            "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-            "dev": true,
-            "requires": {
-                "webidl-conversions": "^5.0.0"
-            },
-            "dependencies": {
-                "webidl-conversions": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-                    "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-                    "dev": true
-                }
-            }
-        },
-        "domhandler": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-            "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-            "requires": {
-                "domelementtype": "1"
-            }
-        },
-        "domutils": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-            "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-            "requires": {
-                "dom-serializer": "0",
-                "domelementtype": "1"
-            }
-        },
-        "dont-sniff-mimetype": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz",
-            "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug=="
-        },
-        "dot-prop": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
-            "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
-            "requires": {
-                "is-obj": "^1.0.0"
-            }
-        },
-        "duplex": {
-            "version": "1.0.0",
-            "resolved": "http://registry.npmjs.org/duplex/-/duplex-1.0.0.tgz",
-            "integrity": "sha1-arxcFuwX5MV4V4cnEmcAWQ06Ldo="
-        },
-        "duplexer": {
-            "version": "0.0.4",
-            "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.0.4.tgz",
-            "integrity": "sha1-r8t/H4uNdPggcmFx1dZKyeSo/yA="
-        },
-        "duplexer2": {
-            "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-            "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-            "dev": true,
-            "requires": {
-                "readable-stream": "~1.1.9"
-            },
-            "dependencies": {
-                "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-                    "dev": true
-                },
-                "readable-stream": {
-                    "version": "1.1.14",
-                    "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-                    "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.1",
-                        "isarray": "0.0.1",
-                        "string_decoder": "~0.10.x"
-                    }
-                },
-                "string_decoder": {
-                    "version": "0.10.31",
-                    "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-                    "dev": true
-                }
-            }
-        },
-        "duplexer3": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-            "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-            "dev": true
-        },
-        "duplexify": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-            "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-            "requires": {
-                "end-of-stream": "^1.0.0",
-                "inherits": "^2.0.1",
-                "readable-stream": "^2.0.0",
-                "stream-shift": "^1.0.0"
-            }
-        },
-        "each-props": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-            "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-            "dev": true,
-            "requires": {
-                "is-plain-object": "^2.0.1",
-                "object.defaults": "^1.1.0"
-            }
-        },
-        "ecc-jsbn": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-            "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-            "requires": {
-                "jsbn": "~0.1.0",
-                "safer-buffer": "^2.1.0"
-            }
-        },
-        "ecdsa-sig-formatter": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-            "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-            "requires": {
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "ee-first": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-            "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-        },
-        "ejs": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz",
-            "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="
-        },
-        "electron-to-chromium": {
-            "version": "1.3.533",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.533.tgz",
-            "integrity": "sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A==",
-            "dev": true
-        },
-        "elliptic": {
-            "version": "6.5.3",
-            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-            "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
-            "dev": true,
-            "requires": {
-                "bn.js": "^4.4.0",
-                "brorand": "^1.0.1",
-                "hash.js": "^1.0.0",
-                "hmac-drbg": "^1.0.0",
-                "inherits": "^2.0.1",
-                "minimalistic-assert": "^1.0.0",
-                "minimalistic-crypto-utils": "^1.0.0"
-            }
-        },
-        "emitter-listener": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz",
-            "integrity": "sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==",
-            "requires": {
-                "shimmer": "^1.2.0"
-            }
-        },
-        "emoji-regex": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-            "dev": true
-        },
-        "emojis-list": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-            "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-            "dev": true
-        },
-        "encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-        },
-        "encoding-japanese": {
-            "version": "1.0.30",
-            "resolved": "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-1.0.30.tgz",
-            "integrity": "sha512-bd/DFLAoJetvv7ar/KIpE3CNO8wEuyrt9Xuw6nSMiZ+Vrz/Q21BPsMHvARL2Wz6IKHKXgb+DWZqtRg1vql9cBg=="
-        },
-        "end-of-stream": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-            "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-            "requires": {
-                "once": "^1.4.0"
-            }
-        },
-        "enhanced-resolve": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
-            "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "memory-fs": "^0.5.0",
-                "tapable": "^1.0.0"
-            },
-            "dependencies": {
-                "memory-fs": {
-                    "version": "0.5.0",
-                    "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-                    "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-                    "dev": true,
-                    "requires": {
-                        "errno": "^0.1.3",
-                        "readable-stream": "^2.0.1"
-                    }
-                }
-            }
-        },
-        "enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-            "dev": true,
-            "requires": {
-                "ansi-colors": "^4.1.1"
-            },
-            "dependencies": {
-                "ansi-colors": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-                    "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-                    "dev": true
-                }
-            }
-        },
-        "ent": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-            "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
-        },
-        "entities": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-            "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-        },
-        "errno": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-            "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-            "dev": true,
-            "requires": {
-                "prr": "~1.0.1"
-            }
-        },
-        "error-ex": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-            "dev": true,
-            "requires": {
-                "is-arrayish": "^0.2.1"
-            }
-        },
-        "errs": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/errs/-/errs-0.3.2.tgz",
-            "integrity": "sha1-eYCZstvTfKK8dJ5TinwTB9C1BJk="
-        },
-        "es-abstract": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
-            "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
-            "dev": true,
-            "requires": {
-                "es-to-primitive": "^1.2.0",
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "is-callable": "^1.1.4",
-                "is-regex": "^1.0.4",
-                "object-keys": "^1.0.12"
-            }
-        },
-        "es-to-primitive": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-            "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
-            "dev": true,
-            "requires": {
-                "is-callable": "^1.1.4",
-                "is-date-object": "^1.0.1",
-                "is-symbol": "^1.0.2"
-            }
-        },
-        "es5-ext": {
-            "version": "0.10.50",
-            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
-            "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
-            "dev": true,
-            "requires": {
-                "es6-iterator": "~2.0.3",
-                "es6-symbol": "~3.1.1",
-                "next-tick": "^1.0.0"
-            }
-        },
-        "es6-iterator": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-            "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-            "dev": true,
-            "requires": {
-                "d": "1",
-                "es5-ext": "^0.10.35",
-                "es6-symbol": "^3.1.1"
-            }
-        },
-        "es6-promise": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-            "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-        },
-        "es6-promisify": {
-            "version": "5.0.0",
-            "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-            "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-            "requires": {
-                "es6-promise": "^4.0.3"
-            }
-        },
-        "es6-symbol": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-            "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-            "dev": true,
-            "requires": {
-                "d": "1",
-                "es5-ext": "~0.10.14"
-            }
-        },
-        "es6-templates": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz",
-            "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=",
-            "dev": true,
-            "requires": {
-                "recast": "~0.11.12",
-                "through": "~2.3.6"
-            }
-        },
-        "es6-weak-map": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-            "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-            "dev": true,
-            "requires": {
-                "d": "1",
-                "es5-ext": "^0.10.46",
-                "es6-iterator": "^2.0.3",
-                "es6-symbol": "^3.1.1"
-            }
-        },
-        "escalade": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz",
-            "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==",
-            "dev": true
-        },
-        "escape-goat": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-            "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-            "dev": true
-        },
-        "escape-html": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-            "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-        },
-        "escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-            "dev": true
-        },
-        "escodegen": {
-            "version": "1.14.2",
-            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz",
-            "integrity": "sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==",
-            "dev": true,
-            "requires": {
-                "esprima": "^4.0.1",
-                "estraverse": "^4.2.0",
-                "esutils": "^2.0.2",
-                "optionator": "^0.8.1",
-                "source-map": "~0.6.1"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true,
-                    "optional": true
-                }
-            }
-        },
-        "eslint": {
-            "version": "7.12.1",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz",
-            "integrity": "sha512-HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.0.0",
-                "@eslint/eslintrc": "^0.2.1",
-                "ajv": "^6.10.0",
-                "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
-                "debug": "^4.0.1",
-                "doctrine": "^3.0.0",
-                "enquirer": "^2.3.5",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^2.1.0",
-                "eslint-visitor-keys": "^2.0.0",
-                "espree": "^7.3.0",
-                "esquery": "^1.2.0",
-                "esutils": "^2.0.2",
-                "file-entry-cache": "^5.0.1",
-                "functional-red-black-tree": "^1.0.1",
-                "glob-parent": "^5.0.0",
-                "globals": "^12.1.0",
-                "ignore": "^4.0.6",
-                "import-fresh": "^3.0.0",
-                "imurmurhash": "^0.1.4",
-                "is-glob": "^4.0.0",
-                "js-yaml": "^3.13.1",
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "levn": "^0.4.1",
-                "lodash": "^4.17.19",
-                "minimatch": "^3.0.4",
-                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
-                "progress": "^2.0.0",
-                "regexpp": "^3.1.0",
-                "semver": "^7.2.1",
-                "strip-ansi": "^6.0.0",
-                "strip-json-comments": "^3.1.0",
-                "table": "^5.2.3",
-                "text-table": "^0.2.0",
-                "v8-compile-cache": "^2.0.3"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "cross-spawn": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-                    "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-                    "dev": true,
-                    "requires": {
-                        "path-key": "^3.1.0",
-                        "shebang-command": "^2.0.0",
-                        "which": "^2.0.1"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "eslint-scope": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-                    "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-                    "dev": true,
-                    "requires": {
-                        "esrecurse": "^4.3.0",
-                        "estraverse": "^4.1.1"
-                    }
-                },
-                "glob-parent": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-                    "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-glob": "^4.0.1"
-                    }
-                },
-                "globals": {
-                    "version": "12.4.0",
-                    "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-                    "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-                    "dev": true,
-                    "requires": {
-                        "type-fest": "^0.8.1"
-                    }
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "levn": {
-                    "version": "0.4.1",
-                    "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-                    "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-                    "dev": true,
-                    "requires": {
-                        "prelude-ls": "^1.2.1",
-                        "type-check": "~0.4.0"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "optionator": {
-                    "version": "0.9.1",
-                    "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-                    "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-                    "dev": true,
-                    "requires": {
-                        "deep-is": "^0.1.3",
-                        "fast-levenshtein": "^2.0.6",
-                        "levn": "^0.4.1",
-                        "prelude-ls": "^1.2.1",
-                        "type-check": "^0.4.0",
-                        "word-wrap": "^1.2.3"
-                    }
-                },
-                "path-key": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-                    "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-                    "dev": true
-                },
-                "prelude-ls": {
-                    "version": "1.2.1",
-                    "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-                    "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "7.3.2",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-                    "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-                    "dev": true
-                },
-                "shebang-command": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-                    "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-                    "dev": true,
-                    "requires": {
-                        "shebang-regex": "^3.0.0"
-                    }
-                },
-                "shebang-regex": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-                    "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.0"
-                    }
-                },
-                "strip-json-comments": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-                    "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "type-check": {
-                    "version": "0.4.0",
-                    "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-                    "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-                    "dev": true,
-                    "requires": {
-                        "prelude-ls": "^1.2.1"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "eslint-config-google": {
-            "version": "0.11.0",
-            "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.11.0.tgz",
-            "integrity": "sha512-z541Fs5TFaY7/35v/z100InQ2f3V2J7e3u/0yKrnImgsHjh6JWgSRngfC/mZepn/+XN16jUydt64k//kxXc1fw==",
-            "dev": true
-        },
-        "eslint-plugin-jasmine": {
-            "version": "2.10.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.10.1.tgz",
-            "integrity": "sha1-VzO3CedR9LxA4x4cFpib0s377Jc=",
-            "dev": true
-        },
-        "eslint-scope": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-            "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-            "dev": true,
-            "requires": {
-                "esrecurse": "^4.1.0",
-                "estraverse": "^4.1.1"
-            }
-        },
-        "eslint-utils": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-            "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-            "dev": true,
-            "requires": {
-                "eslint-visitor-keys": "^1.1.0"
-            },
-            "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                }
-            }
-        },
-        "eslint-visitor-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-            "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
-            "dev": true
-        },
-        "espree": {
-            "version": "7.3.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz",
-            "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==",
-            "dev": true,
-            "requires": {
-                "acorn": "^7.4.0",
-                "acorn-jsx": "^5.2.0",
-                "eslint-visitor-keys": "^1.3.0"
-            },
-            "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                }
-            }
-        },
-        "esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-        },
-        "esquery": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-            "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
-            "dev": true,
-            "requires": {
-                "estraverse": "^5.1.0"
-            },
-            "dependencies": {
-                "estraverse": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-                    "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-                    "dev": true
-                }
-            }
-        },
-        "esrecurse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-            "dev": true,
-            "requires": {
-                "estraverse": "^5.2.0"
-            },
-            "dependencies": {
-                "estraverse": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-                    "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-                    "dev": true
-                }
-            }
-        },
-        "estraverse": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-            "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
-        },
-        "esutils": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-            "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-            "dev": true
-        },
-        "etag": {
-            "version": "1.8.1",
-            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-            "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-        },
-        "event-target-shim": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-            "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-        },
-        "eventemitter2": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz",
-            "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI="
-        },
-        "eventemitter3": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-            "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
-            "dev": true
-        },
-        "events": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-            "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
-        },
-        "eventsource": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-            "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-            "dev": true,
-            "requires": {
-                "original": "^1.0.0"
-            }
-        },
-        "evp_bytestokey": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-            "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-            "dev": true,
-            "requires": {
-                "md5.js": "^1.3.4",
-                "safe-buffer": "^5.1.1"
-            }
-        },
-        "exec-sh": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
-            "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==",
-            "dev": true
-        },
-        "execa": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-            "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-            "requires": {
-                "cross-spawn": "^6.0.0",
-                "get-stream": "^4.0.0",
-                "is-stream": "^1.1.0",
-                "npm-run-path": "^2.0.0",
-                "p-finally": "^1.0.0",
-                "signal-exit": "^3.0.0",
-                "strip-eof": "^1.0.0"
-            }
-        },
-        "exit": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-            "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-            "dev": true
-        },
-        "expand-brackets": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-            "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-            "dev": true,
-            "requires": {
-                "debug": "^2.3.3",
-                "define-property": "^0.2.5",
-                "extend-shallow": "^2.0.1",
-                "posix-character-classes": "^0.1.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.1"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "0.2.5",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "^0.1.0"
-                    }
-                },
-                "extend-shallow": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                    "dev": true,
-                    "requires": {
-                        "is-extendable": "^0.1.0"
-                    }
-                }
-            }
-        },
-        "expand-template": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-            "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
-        },
-        "expand-tilde": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-            "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.1"
-            }
-        },
-        "expect": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/expect/-/expect-26.0.1.tgz",
-            "integrity": "sha512-QcCy4nygHeqmbw564YxNbHTJlXh47dVID2BUP52cZFpLU9zHViMFK6h07cC1wf7GYCTIigTdAXhVua8Yl1FkKg==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^26.0.1",
-                "ansi-styles": "^4.0.0",
-                "jest-get-type": "^26.0.0",
-                "jest-matcher-utils": "^26.0.1",
-                "jest-message-util": "^26.0.1",
-                "jest-regex-util": "^26.0.0"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-regex-util": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-                    "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                }
-            }
-        },
-        "expect-ct": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz",
-            "integrity": "sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g=="
-        },
-        "express": {
-            "version": "4.17.1",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-            "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-            "requires": {
-                "accepts": "~1.3.7",
-                "array-flatten": "1.1.1",
-                "body-parser": "1.19.0",
-                "content-disposition": "0.5.3",
-                "content-type": "~1.0.4",
-                "cookie": "0.4.0",
-                "cookie-signature": "1.0.6",
-                "debug": "2.6.9",
-                "depd": "~1.1.2",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "finalhandler": "~1.1.2",
-                "fresh": "0.5.2",
-                "merge-descriptors": "1.0.1",
-                "methods": "~1.1.2",
-                "on-finished": "~2.3.0",
-                "parseurl": "~1.3.3",
-                "path-to-regexp": "0.1.7",
-                "proxy-addr": "~2.0.5",
-                "qs": "6.7.0",
-                "range-parser": "~1.2.1",
-                "safe-buffer": "5.1.2",
-                "send": "0.17.1",
-                "serve-static": "1.14.1",
-                "setprototypeof": "1.1.1",
-                "statuses": "~1.5.0",
-                "type-is": "~1.6.18",
-                "utils-merge": "1.0.1",
-                "vary": "~1.1.2"
-            },
-            "dependencies": {
-                "depd": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-                    "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-                }
-            }
-        },
-        "extend": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-        },
-        "extend-shallow": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-            "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-            "dev": true,
-            "requires": {
-                "assign-symbols": "^1.0.0",
-                "is-extendable": "^1.0.1"
-            },
-            "dependencies": {
-                "is-extendable": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-                    "dev": true,
-                    "requires": {
-                        "is-plain-object": "^2.0.4"
-                    }
-                }
-            }
-        },
-        "extglob": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-            "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-            "dev": true,
-            "requires": {
-                "array-unique": "^0.3.2",
-                "define-property": "^1.0.0",
-                "expand-brackets": "^2.1.4",
-                "extend-shallow": "^2.0.1",
-                "fragment-cache": "^0.2.1",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.1"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "^1.0.0"
-                    }
-                },
-                "extend-shallow": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                    "dev": true,
-                    "requires": {
-                        "is-extendable": "^0.1.0"
-                    }
-                },
-                "is-accessor-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^6.0.0"
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^6.0.0"
-                    }
-                },
-                "is-descriptor": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "^1.0.0",
-                        "is-data-descriptor": "^1.0.0",
-                        "kind-of": "^6.0.2"
-                    }
-                }
-            }
-        },
-        "extract-zip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-            "requires": {
-                "@types/yauzl": "^2.9.1",
-                "debug": "^4.1.1",
-                "get-stream": "^5.1.0",
-                "yauzl": "^2.10.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.3.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                },
-                "get-stream": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-                    "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-                    "requires": {
-                        "pump": "^3.0.0"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "extsprintf": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-            "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-        },
-        "eyes": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
-            "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A="
-        },
-        "fancy-log": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-            "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-            "dev": true,
-            "requires": {
-                "ansi-gray": "^0.1.1",
-                "color-support": "^1.1.3",
-                "parse-node-version": "^1.0.0",
-                "time-stamp": "^1.0.0"
-            }
-        },
-        "fast-deep-equal": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-            "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
-        },
-        "fast-json-patch": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.1.0.tgz",
-            "integrity": "sha512-PipOsAKamRw7+CXtKiieehyjUeDVPJ5J7b2kdJYerEf6TSUQoD2ijpVyZ88KQm5YXziff4h762bz3+vzf56khg==",
-            "requires": {
-                "deep-equal": "^1.0.1"
-            }
-        },
-        "fast-json-stable-stringify": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-            "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-        },
-        "fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
-        },
-        "fast-safe-stringify": {
-            "version": "2.0.7",
-            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
-            "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="
-        },
-        "fast-text-encoding": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz",
-            "integrity": "sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ=="
-        },
-        "fastparse": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-            "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
-            "dev": true
-        },
-        "faye-websocket": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-            "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-            "dev": true,
-            "requires": {
-                "websocket-driver": ">=0.5.1"
-            }
-        },
-        "fb-watchman": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
-            "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
-            "dev": true,
-            "requires": {
-                "bser": "^2.0.0"
-            }
-        },
-        "fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-            "requires": {
-                "pend": "~1.2.0"
-            }
-        },
-        "feature-policy": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz",
-            "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ=="
-        },
-        "figgy-pudding": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-            "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
-            "dev": true
-        },
-        "file-entry-cache": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-            "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-            "dev": true,
-            "requires": {
-                "flat-cache": "^2.0.1"
-            }
-        },
-        "file-loader": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
-            "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
-            "dev": true,
-            "requires": {
-                "loader-utils": "^1.0.2",
-                "schema-utils": "^0.4.5"
-            },
-            "dependencies": {
-                "schema-utils": {
-                    "version": "0.4.7",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-                    "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-                    "dev": true,
-                    "requires": {
-                        "ajv": "^6.1.0",
-                        "ajv-keywords": "^3.1.0"
-                    }
-                }
-            }
-        },
-        "file-type": {
-            "version": "10.11.0",
-            "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
-            "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="
-        },
-        "filed-mimefix": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/filed-mimefix/-/filed-mimefix-0.1.3.tgz",
-            "integrity": "sha1-Cwtn0HWmP8dPJv3znH+dQxSWe7U=",
-            "requires": {
-                "mime": "^1.4.0"
-            }
-        },
-        "fill-range": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-            "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-            "dev": true,
-            "requires": {
-                "extend-shallow": "^2.0.1",
-                "is-number": "^3.0.0",
-                "repeat-string": "^1.6.1",
-                "to-regex-range": "^2.1.0"
-            },
-            "dependencies": {
-                "extend-shallow": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                    "dev": true,
-                    "requires": {
-                        "is-extendable": "^0.1.0"
-                    }
-                }
-            }
-        },
-        "finalhandler": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-            "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-            "requires": {
-                "debug": "2.6.9",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "on-finished": "~2.3.0",
-                "parseurl": "~1.3.3",
-                "statuses": "~1.5.0",
-                "unpipe": "~1.0.0"
-            }
-        },
-        "find-cache-dir": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-            "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-            "dev": true,
-            "requires": {
-                "commondir": "^1.0.1",
-                "make-dir": "^2.0.0",
-                "pkg-dir": "^3.0.0"
-            },
-            "dependencies": {
-                "make-dir": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-                    "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-                    "dev": true,
-                    "requires": {
-                        "pify": "^4.0.1",
-                        "semver": "^5.6.0"
-                    }
-                }
-            }
-        },
-        "find-up": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-            "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-            "dev": true,
-            "requires": {
-                "locate-path": "^3.0.0"
-            }
-        },
-        "findup-sync": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-            "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-            "dev": true,
-            "requires": {
-                "detect-file": "^1.0.0",
-                "is-glob": "^4.0.0",
-                "micromatch": "^3.0.4",
-                "resolve-dir": "^1.0.1"
-            }
-        },
-        "fined": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-            "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.2",
-                "is-plain-object": "^2.0.3",
-                "object.defaults": "^1.1.0",
-                "object.pick": "^1.2.0",
-                "parse-filepath": "^1.0.1"
-            }
-        },
-        "flagged-respawn": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-            "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-            "dev": true
-        },
-        "flat-cache": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-            "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-            "dev": true,
-            "requires": {
-                "flatted": "^2.0.0",
-                "rimraf": "2.6.3",
-                "write": "1.0.3"
-            },
-            "dependencies": {
-                "glob": {
-                    "version": "7.1.4",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-                    "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-                    "dev": true,
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.0.4",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                },
-                "rimraf": {
-                    "version": "2.6.3",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-                    "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                }
-            }
-        },
-        "flatted": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-            "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
-            "dev": true
-        },
-        "flush-write-stream": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-            "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.3.6"
-            }
-        },
-        "follow-redirects": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz",
-            "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==",
-            "dev": true,
-            "requires": {
-                "debug": "^3.0.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "for-in": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-            "dev": true
-        },
-        "for-own": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-            "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-            "dev": true,
-            "requires": {
-                "for-in": "^1.0.1"
-            }
-        },
-        "forever-agent": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-            "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-        },
-        "form-data": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-            "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-            "requires": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.6",
-                "mime-types": "^2.1.12"
-            }
-        },
-        "formidable": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz",
-            "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="
-        },
-        "forwarded": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-            "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-        },
-        "fragment-cache": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-            "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-            "dev": true,
-            "requires": {
-                "map-cache": "^0.2.2"
-            }
-        },
-        "frameguard": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz",
-            "integrity": "sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g=="
-        },
-        "fresh": {
-            "version": "0.5.2",
-            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-            "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-        },
-        "from2": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-            "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "readable-stream": "^2.0.0"
-            }
-        },
-        "fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-        },
-        "fs-extra": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-            "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "jsonfile": "^4.0.0",
-                "universalify": "^0.1.0"
-            }
-        },
-        "fs-mkdirp-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-            "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.11",
-                "through2": "^2.0.3"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "fs-readfile-promise": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-3.0.1.tgz",
-            "integrity": "sha512-LsSxMeaJdYH27XrW7Dmq0Gx63mioULCRel63B5VeELYLavi1wF5s0XfsIdKDFdCL9hsfQ2qBvXJszQtQJ9h17A==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.11"
-            }
-        },
-        "fs-write-stream-atomic": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-            "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "iferr": "^0.1.5",
-                "imurmurhash": "^0.1.4",
-                "readable-stream": "1 || 2"
-            }
-        },
-        "fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-        },
-        "fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-            "dev": true,
-            "optional": true
-        },
-        "fstream": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-            "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "inherits": "~2.0.0",
-                "mkdirp": ">=0.5 0",
-                "rimraf": "2"
-            }
-        },
-        "function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
-        "functional-red-black-tree": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-            "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-            "dev": true
-        },
-        "g11n-pipeline": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/g11n-pipeline/-/g11n-pipeline-2.0.6.tgz",
-            "integrity": "sha512-ykVjThha+dGKAR/F31kCUxMn7vu1JrmUkDxMs+h7TvjGbQoNx29hsw618GQKm9eT4Qo6E+8zJAnt0BT3gMtggQ==",
-            "requires": {
-                "swagger-client": "^3.8.3"
-            }
-        },
-        "gauge": {
-            "version": "2.7.4",
-            "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-            "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-            "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-                },
-                "is-fullwidth-code-point": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-                    "requires": {
-                        "number-is-nan": "^1.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "1.0.2",
-                    "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                    "requires": {
-                        "code-point-at": "^1.0.0",
-                        "is-fullwidth-code-point": "^1.0.0",
-                        "strip-ansi": "^3.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "gaxios": {
-            "version": "1.8.4",
-            "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.8.4.tgz",
-            "integrity": "sha512-BoENMnu1Gav18HcpV9IleMPZ9exM+AvUjrAOV4Mzs/vfz2Lu/ABv451iEXByKiMPn2M140uul1txXCg83sAENw==",
-            "requires": {
-                "abort-controller": "^3.0.0",
-                "extend": "^3.0.2",
-                "https-proxy-agent": "^2.2.1",
-                "node-fetch": "^2.3.0"
-            }
-        },
-        "gaze": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-            "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-            "dev": true,
-            "requires": {
-                "globule": "^1.0.0"
-            }
-        },
-        "gcp-metadata": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-1.0.0.tgz",
-            "integrity": "sha512-Q6HrgfrCQeEircnNP3rCcEgiDv7eF9+1B+1MMgpE190+/+0mjQR8PxeOaRgxZWmdDAF9EIryHB9g1moPiw1SbQ==",
-            "requires": {
-                "gaxios": "^1.0.2",
-                "json-bigint": "^0.3.0"
-            }
-        },
-        "gcs-resumable-upload": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-1.1.0.tgz",
-            "integrity": "sha512-uBz7uHqp44xjSDzG3kLbOYZDjxxR/UAGbB47A0cC907W6yd2LkcyFDTHg+bjivkHMwiJlKv4guVWcjPCk2zScg==",
-            "requires": {
-                "abort-controller": "^2.0.2",
-                "configstore": "^4.0.0",
-                "gaxios": "^1.5.0",
-                "google-auth-library": "^3.0.0",
-                "pumpify": "^1.5.1",
-                "stream-events": "^1.0.4"
-            },
-            "dependencies": {
-                "abort-controller": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-2.0.3.tgz",
-                    "integrity": "sha512-EPSq5wr2aFyAZ1PejJB32IX9Qd4Nwus+adnp7STYFM5/23nLPBazqZ1oor6ZqbH+4otaaGXTlC8RN5hq3C8w9Q==",
-                    "requires": {
-                        "event-target-shim": "^5.0.0"
-                    }
-                }
-            }
-        },
-        "generate-function": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
-            "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
-            "dev": true,
-            "requires": {
-                "is-property": "^1.0.2"
-            }
-        },
-        "get-caller-file": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-            "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-            "dev": true
-        },
-        "get-package-type": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-            "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-            "dev": true
-        },
-        "get-stdin": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-            "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-            "dev": true
-        },
-        "get-stream": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-            "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-            "requires": {
-                "pump": "^3.0.0"
-            }
-        },
-        "get-value": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-            "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-            "dev": true
-        },
-        "getpass": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-            "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-            "requires": {
-                "assert-plus": "^1.0.0"
-            }
-        },
-        "github-from-package": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-            "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
-        },
-        "glob": {
-            "version": "7.1.6",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-            "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-            "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            }
-        },
-        "glob-parent": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-            "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-            "dev": true,
-            "requires": {
-                "is-glob": "^3.1.0",
-                "path-dirname": "^1.0.0"
-            },
-            "dependencies": {
-                "is-glob": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-                    "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-                    "dev": true,
-                    "requires": {
-                        "is-extglob": "^2.1.0"
-                    }
-                }
-            }
-        },
-        "glob-stream": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-            "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-            "dev": true,
-            "requires": {
-                "extend": "^3.0.0",
-                "glob": "^7.1.1",
-                "glob-parent": "^3.1.0",
-                "is-negated-glob": "^1.0.0",
-                "ordered-read-streams": "^1.0.0",
-                "pumpify": "^1.3.5",
-                "readable-stream": "^2.1.5",
-                "remove-trailing-separator": "^1.0.1",
-                "to-absolute-glob": "^2.0.0",
-                "unique-stream": "^2.0.2"
-            },
-            "dependencies": {
-                "glob": {
-                    "version": "7.1.4",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-                    "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-                    "dev": true,
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.0.4",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                }
-            }
-        },
-        "glob-watcher": {
-            "version": "5.0.3",
-            "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-            "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
-            "dev": true,
-            "requires": {
-                "anymatch": "^2.0.0",
-                "async-done": "^1.2.0",
-                "chokidar": "^2.0.0",
-                "is-negated-glob": "^1.0.0",
-                "just-debounce": "^1.0.0",
-                "object.defaults": "^1.1.0"
-            }
-        },
-        "global-dirs": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-            "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-            "dev": true,
-            "requires": {
-                "ini": "^1.3.4"
-            }
-        },
-        "global-modules": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-            "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
-            "dev": true,
-            "requires": {
-                "global-prefix": "^1.0.1",
-                "is-windows": "^1.0.1",
-                "resolve-dir": "^1.0.0"
-            }
-        },
-        "global-prefix": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-            "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.2",
-                "homedir-polyfill": "^1.0.1",
-                "ini": "^1.3.4",
-                "is-windows": "^1.0.1",
-                "which": "^1.2.14"
-            }
-        },
-        "globalize": {
-            "version": "1.4.2",
-            "resolved": "https://registry.npmjs.org/globalize/-/globalize-1.4.2.tgz",
-            "integrity": "sha512-IfKeYI5mAITBmT5EnH8kSQB5uGson4Fkj2XtTpyEbIS7IHNfLHoeTyLJ6tfjiKC6cJXng3IhVurDk5C7ORqFhQ==",
-            "requires": {
-                "cldrjs": "^0.5.0"
-            }
-        },
-        "globals": {
-            "version": "11.12.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-            "dev": true
-        },
-        "globby": {
-            "version": "5.0.0",
-            "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-            "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-            "dev": true,
-            "requires": {
-                "array-union": "^1.0.1",
-                "arrify": "^1.0.0",
-                "glob": "^7.0.3",
-                "object-assign": "^4.0.1",
-                "pify": "^2.0.0",
-                "pinkie-promise": "^2.0.0"
-            },
-            "dependencies": {
-                "arrify": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-                    "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-                    "dev": true
-                },
-                "glob": {
-                    "version": "7.1.4",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-                    "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-                    "dev": true,
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.0.4",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                },
-                "pify": {
-                    "version": "2.3.0",
-                    "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                    "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                    "dev": true
-                }
-            }
-        },
-        "globule": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
-            "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
-            "dev": true,
-            "requires": {
-                "glob": "~7.1.1",
-                "lodash": "~4.17.12",
-                "minimatch": "~3.0.2"
-            }
-        },
-        "glogg": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-            "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-            "dev": true,
-            "requires": {
-                "sparkles": "^1.0.0"
-            }
-        },
-        "google-auth-library": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.1.2.tgz",
-            "integrity": "sha512-cDQMzTotwyWMrg5jRO7q0A4TL/3GWBgO7I7q5xGKNiiFf9SmGY/OJ1YsLMgI2MVHHsEGyrqYnbnmV1AE+Z6DnQ==",
-            "requires": {
-                "base64-js": "^1.3.0",
-                "fast-text-encoding": "^1.0.0",
-                "gaxios": "^1.2.1",
-                "gcp-metadata": "^1.0.0",
-                "gtoken": "^2.3.2",
-                "https-proxy-agent": "^2.2.1",
-                "jws": "^3.1.5",
-                "lru-cache": "^5.0.0",
-                "semver": "^5.5.0"
-            },
-            "dependencies": {
-                "base64-js": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-                    "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-                }
-            }
-        },
-        "google-p12-pem": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.4.tgz",
-            "integrity": "sha512-SwLAUJqUfTB2iS+wFfSS/G9p7bt4eWcc2LyfvmUXe7cWp6p3mpxDo6LLI29MXdU6wvPcQ/up298X7GMC5ylAlA==",
-            "requires": {
-                "node-forge": "^0.8.0",
-                "pify": "^4.0.0"
-            }
-        },
-        "got": {
-            "version": "9.6.0",
-            "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-            "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-            "dev": true,
-            "requires": {
-                "@sindresorhus/is": "^0.14.0",
-                "@szmarczak/http-timer": "^1.1.2",
-                "cacheable-request": "^6.0.0",
-                "decompress-response": "^3.3.0",
-                "duplexer3": "^0.1.4",
-                "get-stream": "^4.1.0",
-                "lowercase-keys": "^1.0.1",
-                "mimic-response": "^1.0.1",
-                "p-cancelable": "^1.0.0",
-                "to-readable-stream": "^1.0.0",
-                "url-parse-lax": "^3.0.0"
-            }
-        },
-        "graceful-fs": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
-            "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="
-        },
-        "growl": {
-            "version": "1.9.2",
-            "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-            "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8="
-        },
-        "growly": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-            "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-            "dev": true,
-            "optional": true
-        },
-        "gtoken": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.3.tgz",
-            "integrity": "sha512-EaB49bu/TCoNeQjhCYKI/CurooBKkGxIqFHsWABW0b25fobBYVTMe84A8EBVVZhl8emiUdNypil9huMOTmyAnw==",
-            "requires": {
-                "gaxios": "^1.0.4",
-                "google-p12-pem": "^1.0.0",
-                "jws": "^3.1.5",
-                "mime": "^2.2.0",
-                "pify": "^4.0.0"
-            },
-            "dependencies": {
-                "mime": {
-                    "version": "2.4.4",
-                    "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-                    "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
-                }
-            }
-        },
-        "gulp": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-            "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-            "dev": true,
-            "requires": {
-                "glob-watcher": "^5.0.3",
-                "gulp-cli": "^2.2.0",
-                "undertaker": "^1.2.1",
-                "vinyl-fs": "^3.0.0"
-            },
-            "dependencies": {
-                "concat-stream": {
-                    "version": "1.6.2",
-                    "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-                    "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-                    "dev": true,
-                    "requires": {
-                        "buffer-from": "^1.0.0",
-                        "inherits": "^2.0.3",
-                        "readable-stream": "^2.2.2",
-                        "typedarray": "^0.0.6"
-                    }
-                },
-                "gulp-cli": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
-                    "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-colors": "^1.0.1",
-                        "archy": "^1.0.0",
-                        "array-sort": "^1.0.0",
-                        "color-support": "^1.1.3",
-                        "concat-stream": "^1.6.0",
-                        "copy-props": "^2.0.1",
-                        "fancy-log": "^1.3.2",
-                        "gulplog": "^1.0.0",
-                        "interpret": "^1.1.0",
-                        "isobject": "^3.0.1",
-                        "liftoff": "^3.1.0",
-                        "matchdep": "^2.0.0",
-                        "mute-stdout": "^1.0.0",
-                        "pretty-hrtime": "^1.0.0",
-                        "replace-homedir": "^1.0.0",
-                        "semver-greatest-satisfied-range": "^1.1.0",
-                        "v8flags": "^3.0.1",
-                        "yargs": "^7.1.0"
-                    }
-                }
-            }
-        },
-        "gulp-concat": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-            "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-            "dev": true,
-            "requires": {
-                "concat-with-sourcemaps": "^1.0.0",
-                "through2": "^2.0.0",
-                "vinyl": "^2.0.0"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "gulp-env": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/gulp-env/-/gulp-env-0.4.0.tgz",
-            "integrity": "sha1-g3BkaUmjJJPcBtrZSgZDKW+q2+g=",
-            "dev": true,
-            "requires": {
-                "ini": "^1.3.4",
-                "through2": "^2.0.0"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "gulp-file": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/gulp-file/-/gulp-file-0.4.0.tgz",
-            "integrity": "sha1-RRNWoqxQicbbkaBEQlKgVDZXAGs=",
-            "dev": true,
-            "requires": {
-                "through2": "^0.4.1",
-                "vinyl": "^2.1.0"
-            },
-            "dependencies": {
-                "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-                    "dev": true
-                },
-                "object-keys": {
-                    "version": "0.4.0",
-                    "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-                    "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-                    "dev": true
-                },
-                "readable-stream": {
-                    "version": "1.0.34",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-                    "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.1",
-                        "isarray": "0.0.1",
-                        "string_decoder": "~0.10.x"
-                    }
-                },
-                "string_decoder": {
-                    "version": "0.10.31",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-                    "dev": true
-                },
-                "through2": {
-                    "version": "0.4.2",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-                    "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~1.0.17",
-                        "xtend": "~2.1.1"
-                    }
-                },
-                "xtend": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-                    "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-                    "dev": true,
-                    "requires": {
-                        "object-keys": "~0.4.0"
-                    }
-                }
-            }
-        },
-        "gulp-install": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/gulp-install/-/gulp-install-1.1.0.tgz",
-            "integrity": "sha1-k4a0bLRmm0cle2rfTj6i6DySiho=",
-            "dev": true,
-            "requires": {
-                "dargs": "^5.1.0",
-                "gulp-util": "^3.0.7",
-                "lodash.groupby": "^4.6.0",
-                "p-queue": "^1.0.0",
-                "through2": "^2.0.3",
-                "which": "^1.2.14"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "gulp-jasmine": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/gulp-jasmine/-/gulp-jasmine-4.0.0.tgz",
-            "integrity": "sha512-0UqY2fA6RCdUDJDsVym3zXYSWmt0AV7YY/6PAeKb+oGTKEgS7zZOH5w/4gcSKs+2FXiWrucQwLDvtEKIDbpF4A==",
-            "dev": true,
-            "requires": {
-                "arrify": "^1.0.1",
-                "jasmine": "^3.1.0",
-                "jasmine-terminal-reporter": "^1.0.3",
-                "plugin-error": "^1.0.1",
-                "through2": "^2.0.3"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-                    "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-                    "dev": true
-                }
-            }
-        },
-        "gulp-merge-json": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/gulp-merge-json/-/gulp-merge-json-1.3.1.tgz",
-            "integrity": "sha512-J1N//k3Kfa0RgtzuJdn1pz+ROQF2AH2gOHGhebSc7NvATIKgeRTThPlBaOK+jvYfhNVpviWILAFo8QvUgNV4ig==",
-            "dev": true,
-            "requires": {
-                "deprecate": "^1.0.0",
-                "json5": "^1.0.1",
-                "lodash.mergewith": "^4.6.1",
-                "plugin-error": "^1.0.1",
-                "through": "^2.3.8",
-                "vinyl": "^2.1.0"
-            },
-            "dependencies": {
-                "json5": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-                    "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-                    "dev": true,
-                    "requires": {
-                        "minimist": "^1.2.0"
-                    }
-                }
-            }
-        },
-        "gulp-nodemon": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/gulp-nodemon/-/gulp-nodemon-2.5.0.tgz",
-            "integrity": "sha512-vXfaP72xo2C6XOaXrNcLEM3QqDJ1x21S3x97U4YtzN2Rl2kH57++aFkAVxe6BafGRSTxs/xVfE/jNNlCv5Ym2Q==",
-            "dev": true,
-            "requires": {
-                "colors": "^1.2.1",
-                "gulp": "^4.0.0",
-                "nodemon": "^2.0.2"
-            },
-            "dependencies": {
-                "ansi-align": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-                    "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^3.0.0"
-                    },
-                    "dependencies": {
-                        "string-width": {
-                            "version": "3.1.0",
-                            "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                            "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                            "dev": true,
-                            "requires": {
-                                "emoji-regex": "^7.0.1",
-                                "is-fullwidth-code-point": "^2.0.0",
-                                "strip-ansi": "^5.1.0"
-                            }
-                        }
-                    }
-                },
-                "ansi-regex": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "binary-extensions": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-                    "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-                    "dev": true
-                },
-                "boxen": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-                    "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-align": "^3.0.0",
-                        "camelcase": "^5.3.1",
-                        "chalk": "^3.0.0",
-                        "cli-boxes": "^2.2.0",
-                        "string-width": "^4.1.0",
-                        "term-size": "^2.1.0",
-                        "type-fest": "^0.8.1",
-                        "widest-line": "^3.1.0"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    },
-                    "dependencies": {
-                        "has-flag": {
-                            "version": "4.0.0",
-                            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                            "dev": true
-                        },
-                        "supports-color": {
-                            "version": "7.1.0",
-                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                            "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                            "dev": true,
-                            "requires": {
-                                "has-flag": "^4.0.0"
-                            }
-                        }
-                    }
-                },
-                "chokidar": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-                    "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
-                    "dev": true,
-                    "requires": {
-                        "anymatch": "~3.1.1",
-                        "braces": "~3.0.2",
-                        "fsevents": "~2.1.2",
-                        "glob-parent": "~5.1.0",
-                        "is-binary-path": "~2.1.0",
-                        "is-glob": "~4.0.1",
-                        "normalize-path": "~3.0.0",
-                        "readdirp": "~3.4.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "cli-boxes": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz",
-                    "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "configstore": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-                    "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-                    "dev": true,
-                    "requires": {
-                        "dot-prop": "^5.2.0",
-                        "graceful-fs": "^4.1.2",
-                        "make-dir": "^3.0.0",
-                        "unique-string": "^2.0.0",
-                        "write-file-atomic": "^3.0.0",
-                        "xdg-basedir": "^4.0.0"
-                    }
-                },
-                "crypto-random-string": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-                    "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-                    "dev": true
-                },
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "dot-prop": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
-                    "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
-                    "dev": true,
-                    "requires": {
-                        "is-obj": "^2.0.0"
-                    }
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "fsevents": {
-                    "version": "2.1.3",
-                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-                    "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-                    "dev": true,
-                    "optional": true
-                },
-                "glob-parent": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-                    "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-glob": "^4.0.1"
-                    }
-                },
-                "global-dirs": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
-                    "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
-                    "dev": true,
-                    "requires": {
-                        "ini": "^1.3.5"
-                    }
-                },
-                "is-binary-path": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-                    "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-                    "dev": true,
-                    "requires": {
-                        "binary-extensions": "^2.0.0"
-                    }
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-installed-globally": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
-                    "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
-                    "dev": true,
-                    "requires": {
-                        "global-dirs": "^2.0.1",
-                        "is-path-inside": "^3.0.1"
-                    }
-                },
-                "is-npm": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-                    "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
-                    "dev": true
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "is-obj": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-                    "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-                    "dev": true
-                },
-                "is-path-inside": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-                    "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
-                    "dev": true
-                },
-                "latest-version": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-                    "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-                    "dev": true,
-                    "requires": {
-                        "package-json": "^6.3.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    },
-                    "dependencies": {
-                        "semver": {
-                            "version": "6.3.0",
-                            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                            "dev": true
-                        }
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "nodemon": {
-                    "version": "2.0.4",
-                    "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz",
-                    "integrity": "sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==",
-                    "dev": true,
-                    "requires": {
-                        "chokidar": "^3.2.2",
-                        "debug": "^3.2.6",
-                        "ignore-by-default": "^1.0.1",
-                        "minimatch": "^3.0.4",
-                        "pstree.remy": "^1.1.7",
-                        "semver": "^5.7.1",
-                        "supports-color": "^5.5.0",
-                        "touch": "^3.1.0",
-                        "undefsafe": "^2.0.2",
-                        "update-notifier": "^4.0.0"
-                    }
-                },
-                "package-json": {
-                    "version": "6.5.0",
-                    "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-                    "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-                    "dev": true,
-                    "requires": {
-                        "got": "^9.6.0",
-                        "registry-auth-token": "^4.0.0",
-                        "registry-url": "^5.0.0",
-                        "semver": "^6.2.0"
-                    },
-                    "dependencies": {
-                        "semver": {
-                            "version": "6.3.0",
-                            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                            "dev": true
-                        }
-                    }
-                },
-                "readdirp": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-                    "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-                    "dev": true,
-                    "requires": {
-                        "picomatch": "^2.2.1"
-                    }
-                },
-                "registry-auth-token": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz",
-                    "integrity": "sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==",
-                    "dev": true,
-                    "requires": {
-                        "rc": "^1.2.8"
-                    }
-                },
-                "registry-url": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-                    "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-                    "dev": true,
-                    "requires": {
-                        "rc": "^1.2.8"
-                    }
-                },
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                },
-                "semver-diff": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-                    "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.3.0"
-                    },
-                    "dependencies": {
-                        "semver": {
-                            "version": "6.3.0",
-                            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                            "dev": true
-                        }
-                    }
-                },
-                "string-width": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-                    "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^8.0.0",
-                        "is-fullwidth-code-point": "^3.0.0",
-                        "strip-ansi": "^6.0.0"
-                    },
-                    "dependencies": {
-                        "ansi-regex": {
-                            "version": "5.0.0",
-                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                            "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                            "dev": true
-                        },
-                        "emoji-regex": {
-                            "version": "8.0.0",
-                            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-                            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-                            "dev": true
-                        },
-                        "is-fullwidth-code-point": {
-                            "version": "3.0.0",
-                            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-                            "dev": true
-                        },
-                        "strip-ansi": {
-                            "version": "6.0.0",
-                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                            "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                            "dev": true,
-                            "requires": {
-                                "ansi-regex": "^5.0.0"
-                            }
-                        }
-                    }
-                },
-                "strip-ansi": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^4.1.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                },
-                "term-size": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
-                    "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==",
-                    "dev": true
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "unique-string": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-                    "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-                    "dev": true,
-                    "requires": {
-                        "crypto-random-string": "^2.0.0"
-                    }
-                },
-                "update-notifier": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz",
-                    "integrity": "sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==",
-                    "dev": true,
-                    "requires": {
-                        "boxen": "^4.2.0",
-                        "chalk": "^3.0.0",
-                        "configstore": "^5.0.1",
-                        "has-yarn": "^2.1.0",
-                        "import-lazy": "^2.1.0",
-                        "is-ci": "^2.0.0",
-                        "is-installed-globally": "^0.3.1",
-                        "is-npm": "^4.0.0",
-                        "is-yarn-global": "^0.3.0",
-                        "latest-version": "^5.0.0",
-                        "pupa": "^2.0.1",
-                        "semver-diff": "^3.1.1",
-                        "xdg-basedir": "^4.0.0"
-                    }
-                },
-                "widest-line": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-                    "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^4.0.0"
-                    }
-                },
-                "write-file-atomic": {
-                    "version": "3.0.3",
-                    "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-                    "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-                    "dev": true,
-                    "requires": {
-                        "imurmurhash": "^0.1.4",
-                        "is-typedarray": "^1.0.0",
-                        "signal-exit": "^3.0.2",
-                        "typedarray-to-buffer": "^3.1.5"
-                    }
-                },
-                "xdg-basedir": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-                    "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-                    "dev": true
-                }
-            }
-        },
-        "gulp-print": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/gulp-print/-/gulp-print-2.0.1.tgz",
-            "integrity": "sha1-Gs7ljqyK8tPErTMp2+RldYOTxBQ=",
-            "dev": true,
-            "requires": {
-                "gulp-util": "^3.0.6",
-                "map-stream": "~0.0.6"
-            }
-        },
-        "gulp-util": {
-            "version": "3.0.8",
-            "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-            "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-            "dev": true,
-            "requires": {
-                "array-differ": "^1.0.0",
-                "array-uniq": "^1.0.2",
-                "beeper": "^1.0.0",
-                "chalk": "^1.0.0",
-                "dateformat": "^2.0.0",
-                "fancy-log": "^1.1.0",
-                "gulplog": "^1.0.0",
-                "has-gulplog": "^0.1.0",
-                "lodash._reescape": "^3.0.0",
-                "lodash._reevaluate": "^3.0.0",
-                "lodash._reinterpolate": "^3.0.0",
-                "lodash.template": "^3.0.0",
-                "minimist": "^1.1.0",
-                "multipipe": "^0.1.2",
-                "object-assign": "^3.0.0",
-                "replace-ext": "0.0.1",
-                "through2": "^2.0.0",
-                "vinyl": "^0.5.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "2.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-                    "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "1.1.3",
-                    "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-                    "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^2.2.1",
-                        "escape-string-regexp": "^1.0.2",
-                        "has-ansi": "^2.0.0",
-                        "strip-ansi": "^3.0.0",
-                        "supports-color": "^2.0.0"
-                    }
-                },
-                "clone": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-                    "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-                    "dev": true
-                },
-                "clone-stats": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-                    "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-                    "dev": true
-                },
-                "object-assign": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-                    "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-                    "dev": true
-                },
-                "replace-ext": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-                    "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-                    "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-                    "dev": true
-                },
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "vinyl": {
-                    "version": "0.5.3",
-                    "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-                    "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-                    "dev": true,
-                    "requires": {
-                        "clone": "^1.0.0",
-                        "clone-stats": "^0.0.1",
-                        "replace-ext": "0.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "gulp-wrap": {
-            "version": "0.15.0",
-            "resolved": "https://registry.npmjs.org/gulp-wrap/-/gulp-wrap-0.15.0.tgz",
-            "integrity": "sha512-f17zkGObA+hE/FThlg55gfA0nsXbdmHK1WqzjjB2Ytq1TuhLR7JiCBJ3K4AlMzCyoFaCjfowos+VkToUNE0WTQ==",
-            "dev": true,
-            "requires": {
-                "consolidate": "^0.15.1",
-                "es6-promise": "^4.2.6",
-                "fs-readfile-promise": "^3.0.1",
-                "js-yaml": "^3.13.0",
-                "lodash": "^4.17.11",
-                "node.extend": "2.0.2",
-                "plugin-error": "^1.0.1",
-                "through2": "^3.0.1",
-                "tryit": "^1.0.1",
-                "vinyl-bufferstream": "^1.0.1"
-            }
-        },
-        "gulp-yaml": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/gulp-yaml/-/gulp-yaml-1.0.1.tgz",
-            "integrity": "sha1-AIHJMhOCe66xJzD5P97on9a+Ey0=",
-            "dev": true,
-            "requires": {
-                "bufferstreams": "1.1.0",
-                "gulp-util": "^3.0.6",
-                "js-yaml": "^3.4.3",
-                "through2": "^2.0.0",
-                "xtend": "^4.0.0"
-            },
-            "dependencies": {
-                "bufferstreams": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.0.tgz",
-                    "integrity": "sha1-BzzRIDCMBnjufXxItp4G60U4reA=",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "^2.0.2"
-                    }
-                },
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "gulplog": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-            "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-            "dev": true,
-            "requires": {
-                "glogg": "^1.0.0"
-            }
-        },
-        "handle-thing": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-            "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-            "dev": true
-        },
-        "har-schema": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-            "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-        },
-        "har-validator": {
-            "version": "5.1.3",
-            "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-            "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-            "requires": {
-                "ajv": "^6.5.5",
-                "har-schema": "^2.0.0"
-            }
-        },
-        "harmony-reflect": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.1.tgz",
-            "integrity": "sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA==",
-            "dev": true
-        },
-        "has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1"
-            }
-        },
-        "has-ansi": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-            "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-            "dev": true,
-            "requires": {
-                "ansi-regex": "^2.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                }
-            }
-        },
-        "has-flag": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-            "dev": true
-        },
-        "has-gulplog": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-            "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-            "dev": true,
-            "requires": {
-                "sparkles": "^1.0.0"
-            }
-        },
-        "has-symbols": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-            "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
-            "dev": true
-        },
-        "has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-        },
-        "has-value": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-            "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-            "dev": true,
-            "requires": {
-                "get-value": "^2.0.6",
-                "has-values": "^1.0.0",
-                "isobject": "^3.0.0"
-            }
-        },
-        "has-values": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-            "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-            "dev": true,
-            "requires": {
-                "is-number": "^3.0.0",
-                "kind-of": "^4.0.0"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-                    "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.1.5"
-                    }
-                }
-            }
-        },
-        "has-yarn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-            "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-            "dev": true
-        },
-        "hash-base": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-            "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "hash-stream-validation": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.2.tgz",
-            "integrity": "sha512-cMlva5CxWZOrlS/cY0C+9qAzesn5srhFA8IT1VPiHc9bWWBLkJfEUIZr7MWoi89oOOGmpg8ymchaOjiArsGu5A==",
-            "requires": {
-                "through2": "^2.0.0"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-                    "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-                }
-            }
-        },
-        "hash.js": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-            "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.3",
-                "minimalistic-assert": "^1.0.1"
-            }
-        },
-        "he": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
-        },
-        "helmet": {
-            "version": "3.21.2",
-            "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.21.2.tgz",
-            "integrity": "sha512-okUo+MeWgg00cKB8Csblu8EXgcIoDyb5ZS/3u0W4spCimeVuCUvVZ6Vj3O2VJ1Sxpyb8jCDvzu0L1KKT11pkIg==",
-            "requires": {
-                "depd": "2.0.0",
-                "dns-prefetch-control": "0.2.0",
-                "dont-sniff-mimetype": "1.1.0",
-                "expect-ct": "0.2.0",
-                "feature-policy": "0.3.0",
-                "frameguard": "3.1.0",
-                "helmet-crossdomain": "0.4.0",
-                "helmet-csp": "2.9.4",
-                "hide-powered-by": "1.1.0",
-                "hpkp": "2.0.0",
-                "hsts": "2.2.0",
-                "ienoopen": "1.1.0",
-                "nocache": "2.1.0",
-                "referrer-policy": "1.2.0",
-                "x-xss-protection": "1.3.0"
-            }
-        },
-        "helmet-crossdomain": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz",
-            "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA=="
-        },
-        "helmet-csp": {
-            "version": "2.9.4",
-            "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.9.4.tgz",
-            "integrity": "sha512-qUgGx8+yk7Xl8XFEGI4MFu1oNmulxhQVTlV8HP8tV3tpfslCs30OZz/9uQqsWPvDISiu/NwrrCowsZBhFADYqg==",
-            "requires": {
-                "bowser": "^2.7.0",
-                "camelize": "1.0.0",
-                "content-security-policy-builder": "2.1.0",
-                "dasherize": "2.0.0"
-            }
-        },
-        "hide-powered-by": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.1.0.tgz",
-            "integrity": "sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg=="
-        },
-        "hmac-drbg": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-            "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-            "dev": true,
-            "requires": {
-                "hash.js": "^1.0.3",
-                "minimalistic-assert": "^1.0.0",
-                "minimalistic-crypto-utils": "^1.0.1"
-            }
-        },
-        "homedir-polyfill": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-            "dev": true,
-            "requires": {
-                "parse-passwd": "^1.0.0"
-            }
-        },
-        "hosted-git-info": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-            "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
-            "dev": true
-        },
-        "hpack.js": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-            "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "obuf": "^1.0.0",
-                "readable-stream": "^2.0.1",
-                "wbuf": "^1.1.0"
-            }
-        },
-        "hpkp": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz",
-            "integrity": "sha1-EOFCJk52IVpdMMROxD3mTe5tFnI="
-        },
-        "hsts": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/hsts/-/hsts-2.2.0.tgz",
-            "integrity": "sha512-ToaTnQ2TbJkochoVcdXYm4HOCliNozlviNsg+X2XQLQvZNI/kCHR9rZxVYpJB3UPcHz80PgxRyWQ7PdU1r+VBQ==",
-            "requires": {
-                "depd": "2.0.0"
-            }
-        },
-        "html-encoding-sniffer": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-            "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-            "dev": true,
-            "requires": {
-                "whatwg-encoding": "^1.0.5"
-            }
-        },
-        "html-entities": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
-            "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
-            "dev": true
-        },
-        "html-escaper": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-            "dev": true
-        },
-        "html-loader": {
-            "version": "0.4.5",
-            "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.4.5.tgz",
-            "integrity": "sha1-X7zYfNY6XEmn/OL+VvQl4Fcpxow=",
-            "dev": true,
-            "requires": {
-                "es6-templates": "^0.2.2",
-                "fastparse": "^1.1.1",
-                "html-minifier": "^3.0.1",
-                "loader-utils": "^1.0.2",
-                "object-assign": "^4.1.0"
-            }
-        },
-        "html-loader-jest": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/html-loader-jest/-/html-loader-jest-0.2.1.tgz",
-            "integrity": "sha512-Sq9eDpsr/8kI+kyiQAL8jawa+aGRphANCeIeoLyU05DEfHd9vCi4Zz8AXUQTbqnF0TRGfVn9qN69/ox378kyGg==",
-            "dev": true,
-            "requires": {
-                "html-loader": "^0.5.1"
-            },
-            "dependencies": {
-                "html-loader": {
-                    "version": "0.5.5",
-                    "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.5.5.tgz",
-                    "integrity": "sha512-7hIW7YinOYUpo//kSYcPB6dCKoceKLmOwjEMmhIobHuWGDVl0Nwe4l68mdG/Ru0wcUxQjVMEoZpkalZ/SE7zog==",
-                    "dev": true,
-                    "requires": {
-                        "es6-templates": "^0.2.3",
-                        "fastparse": "^1.1.1",
-                        "html-minifier": "^3.5.8",
-                        "loader-utils": "^1.1.0",
-                        "object-assign": "^4.1.1"
-                    }
-                }
-            }
-        },
-        "html-minifier": {
-            "version": "3.5.21",
-            "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-            "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-            "dev": true,
-            "requires": {
-                "camel-case": "3.0.x",
-                "clean-css": "4.2.x",
-                "commander": "2.17.x",
-                "he": "1.2.x",
-                "param-case": "2.1.x",
-                "relateurl": "0.2.x",
-                "uglify-js": "3.4.x"
-            },
-            "dependencies": {
-                "commander": {
-                    "version": "2.17.1",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-                    "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-                    "dev": true
-                }
-            }
-        },
-        "html-minifier-terser": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz",
-            "integrity": "sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ==",
-            "dev": true,
-            "requires": {
-                "camel-case": "^3.0.0",
-                "clean-css": "^4.2.1",
-                "commander": "^4.0.0",
-                "he": "^1.2.0",
-                "param-case": "^2.1.1",
-                "relateurl": "^0.2.7",
-                "terser": "^4.3.9"
-            },
-            "dependencies": {
-                "commander": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz",
-                    "integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==",
-                    "dev": true
-                }
-            }
-        },
-        "html-to-text": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-5.1.1.tgz",
-            "integrity": "sha512-Bci6bD/JIfZSvG4s0gW/9mMKwBRoe/1RWLxUME/d6WUSZCdY7T60bssf/jFf7EYXRyqU4P5xdClVqiYU0/ypdA==",
-            "requires": {
-                "he": "^1.2.0",
-                "htmlparser2": "^3.10.1",
-                "lodash": "^4.17.11",
-                "minimist": "^1.2.0"
-            }
-        },
-        "html-webpack-plugin": {
-            "version": "4.0.0-beta.11",
-            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz",
-            "integrity": "sha512-4Xzepf0qWxf8CGg7/WQM5qBB2Lc/NFI7MhU59eUDTkuQp3skZczH4UA1d6oQyDEIoMDgERVhRyTdtUPZ5s5HBg==",
-            "dev": true,
-            "requires": {
-                "html-minifier-terser": "^5.0.1",
-                "loader-utils": "^1.2.3",
-                "lodash": "^4.17.15",
-                "pretty-error": "^2.1.1",
-                "tapable": "^1.1.3",
-                "util.promisify": "1.0.0"
-            }
-        },
-        "htmlparser2": {
-            "version": "3.10.1",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-            "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-            "requires": {
-                "domelementtype": "^1.3.1",
-                "domhandler": "^2.3.0",
-                "domutils": "^1.5.1",
-                "entities": "^1.1.1",
-                "inherits": "^2.0.1",
-                "readable-stream": "^3.1.1"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-                    "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "http-cache-semantics": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-            "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-            "dev": true
-        },
-        "http-deceiver": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-            "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-            "dev": true
-        },
-        "http-errors": {
-            "version": "1.7.2",
-            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-            "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-            "requires": {
-                "depd": "~1.1.2",
-                "inherits": "2.0.3",
-                "setprototypeof": "1.1.1",
-                "statuses": ">= 1.5.0 < 2",
-                "toidentifier": "1.0.0"
-            },
-            "dependencies": {
-                "depd": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-                    "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-                },
-                "inherits": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                    "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-                }
-            }
-        },
-        "http-proxy": {
-            "version": "1.18.1",
-            "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-            "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-            "dev": true,
-            "requires": {
-                "eventemitter3": "^4.0.0",
-                "follow-redirects": "^1.0.0",
-                "requires-port": "^1.0.0"
-            }
-        },
-        "http-proxy-middleware": {
-            "version": "0.19.1",
-            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-            "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-            "dev": true,
-            "requires": {
-                "http-proxy": "^1.17.0",
-                "is-glob": "^4.0.0",
-                "lodash": "^4.17.11",
-                "micromatch": "^3.1.10"
-            }
-        },
-        "http-signature": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-            "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-            "requires": {
-                "assert-plus": "^1.0.0",
-                "jsprim": "^1.2.2",
-                "sshpk": "^1.7.0"
-            }
-        },
-        "http-status": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/http-status/-/http-status-1.3.2.tgz",
-            "integrity": "sha512-vR1YTaDyi2BukI0UiH01xy92oiZi4in7r0dmSPnrZg72Vu1SzyOLalwWP5NUk1rNiB2L+XVK2lcSVOqaertX8A=="
-        },
-        "httpntlm": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
-            "integrity": "sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=",
-            "requires": {
-                "httpreq": ">=0.4.22",
-                "underscore": "~1.7.0"
-            }
-        },
-        "httpreq": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz",
-            "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8="
-        },
-        "https-browserify": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-            "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-            "dev": true
-        },
-        "https-proxy-agent": {
-            "version": "2.2.4",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-            "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-            "requires": {
-                "agent-base": "^4.3.0",
-                "debug": "^3.1.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "human-signals": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-            "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
-        },
-        "i18n": {
-            "version": "0.8.4",
-            "resolved": "https://registry.npmjs.org/i18n/-/i18n-0.8.4.tgz",
-            "integrity": "sha512-PvMcG+yqYWXrwgdmCpL+APCGa8lRY0tdlo2cXp9UeR3u4h1bJGqFsgybfmG/MqtL1iDmdaPPPLJebXGrZ1XoMQ==",
-            "requires": {
-                "debug": "*",
-                "make-plural": "^6.0.1",
-                "math-interval-parser": "^2.0.1",
-                "messageformat": "^2.3.0",
-                "mustache": "*",
-                "sprintf-js": "^1.1.2"
-            }
-        },
-        "iconv-lite": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-            "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
-            }
-        },
-        "icss-replace-symbols": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-            "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
-            "dev": true
-        },
-        "icss-utils": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-            "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-            "dev": true,
-            "requires": {
-                "postcss": "^7.0.14"
-            }
-        },
-        "identity-obj-proxy": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
-            "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
-            "dev": true,
-            "requires": {
-                "harmony-reflect": "^1.4.6"
-            }
-        },
-        "ieee754": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-        },
-        "ienoopen": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/ienoopen/-/ienoopen-1.1.0.tgz",
-            "integrity": "sha512-MFs36e/ca6ohEKtinTJ5VvAJ6oDRAYFdYXweUnGY9L9vcoqFOU4n2ZhmJ0C4z/cwGZ3YIQRSB3XZ1+ghZkY5NQ=="
-        },
-        "iferr": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-            "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-            "dev": true
-        },
-        "ignore": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-            "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-            "dev": true
-        },
-        "ignore-by-default": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
-            "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
-            "dev": true
-        },
-        "image-type": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/image-type/-/image-type-4.1.0.tgz",
-            "integrity": "sha512-CFJMJ8QK8lJvRlTCEgarL4ro6hfDQKif2HjSvYCdQZESaIPV4v9imrf7BQHK+sQeTeNeMpWciR9hyC/g8ybXEg==",
-            "requires": {
-                "file-type": "^10.10.0"
-            }
-        },
-        "imap": {
-            "version": "0.8.19",
-            "resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
-            "integrity": "sha1-NniHOTSrCc6mukh0HyhNoq9Z2NU=",
-            "requires": {
-                "readable-stream": "1.1.x",
-                "utf7": ">=1.0.2"
-            },
-            "dependencies": {
-                "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-                },
-                "readable-stream": {
-                    "version": "1.1.14",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-                    "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.1",
-                        "isarray": "0.0.1",
-                        "string_decoder": "~0.10.x"
-                    }
-                },
-                "string_decoder": {
-                    "version": "0.10.31",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-                }
-            }
-        },
-        "import-fresh": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-            "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-            "dev": true,
-            "requires": {
-                "parent-module": "^1.0.0",
-                "resolve-from": "^4.0.0"
-            }
-        },
-        "import-lazy": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-            "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-            "dev": true
-        },
-        "import-local": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-            "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-            "dev": true,
-            "requires": {
-                "pkg-dir": "^3.0.0",
-                "resolve-cwd": "^2.0.0"
-            }
-        },
-        "imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-        },
-        "in-publish": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
-            "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
-            "dev": true
-        },
-        "indent-string": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-            "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-            "dev": true,
-            "requires": {
-                "repeating": "^2.0.0"
-            }
-        },
-        "indexes-of": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-            "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-            "dev": true
-        },
-        "infer-owner": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-            "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-            "dev": true
-        },
-        "inflection": {
-            "version": "1.12.0",
-            "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
-            "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY="
-        },
-        "inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-            "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        },
-        "ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-        },
-        "internal-ip": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-            "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-            "dev": true,
-            "requires": {
-                "default-gateway": "^4.2.0",
-                "ipaddr.js": "^1.9.0"
-            }
-        },
-        "interpret": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-            "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
-            "dev": true
-        },
-        "invariant": {
-            "version": "2.2.4",
-            "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-            "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-            "dev": true,
-            "requires": {
-                "loose-envify": "^1.0.0"
-            }
-        },
-        "invert-kv": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-            "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
-        },
-        "ip": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-            "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-        },
-        "ip-regex": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-            "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-            "dev": true
-        },
-        "ipaddr.js": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-            "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
-        },
-        "is": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
-            "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
-            "dev": true
-        },
-        "is-absolute": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-            "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-            "dev": true,
-            "requires": {
-                "is-relative": "^1.0.0",
-                "is-windows": "^1.0.1"
-            }
-        },
-        "is-absolute-url": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-            "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-            "dev": true
-        },
-        "is-accessor-descriptor": {
-            "version": "0.1.6",
-            "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-            "dev": true,
-            "requires": {
-                "kind-of": "^3.0.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.1.5"
-                    }
-                }
-            }
-        },
-        "is-arrayish": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-            "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-            "dev": true
-        },
-        "is-binary-path": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-            "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-            "dev": true,
-            "requires": {
-                "binary-extensions": "^1.0.0"
-            }
-        },
-        "is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-        },
-        "is-callable": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-            "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
-            "dev": true
-        },
-        "is-ci": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-            "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-            "dev": true,
-            "requires": {
-                "ci-info": "^1.5.0"
-            }
-        },
-        "is-data-descriptor": {
-            "version": "0.1.4",
-            "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-            "dev": true,
-            "requires": {
-                "kind-of": "^3.0.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.1.5"
-                    }
-                }
-            }
-        },
-        "is-date-object": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-            "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-            "dev": true
-        },
-        "is-descriptor": {
-            "version": "0.1.6",
-            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-            "dev": true,
-            "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
-                }
-            }
-        },
-        "is-docker": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-            "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
-            "dev": true,
-            "optional": true
-        },
-        "is-extendable": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-            "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-            "dev": true
-        },
-        "is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-            "dev": true
-        },
-        "is-finite": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-            "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-            "dev": true,
-            "requires": {
-                "number-is-nan": "^1.0.0"
-            }
-        },
-        "is-fullwidth-code-point": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "is-generator-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-            "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-            "dev": true
-        },
-        "is-glob": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-            "dev": true,
-            "requires": {
-                "is-extglob": "^2.1.1"
-            }
-        },
-        "is-installed-globally": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
-            "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
-            "dev": true,
-            "requires": {
-                "global-dirs": "^0.1.0",
-                "is-path-inside": "^1.0.0"
-            }
-        },
-        "is-negated-glob": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-            "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-            "dev": true
-        },
-        "is-npm": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-            "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
-            "dev": true
-        },
-        "is-number": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-            "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-            "dev": true,
-            "requires": {
-                "kind-of": "^3.0.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.1.5"
-                    }
-                }
-            }
-        },
-        "is-obj": {
-            "version": "1.0.1",
-            "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-            "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-        },
-        "is-path-cwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-            "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-            "dev": true
-        },
-        "is-path-in-cwd": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-            "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-            "dev": true,
-            "requires": {
-                "is-path-inside": "^1.0.0"
-            }
-        },
-        "is-path-inside": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-            "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-            "dev": true,
-            "requires": {
-                "path-is-inside": "^1.0.1"
-            }
-        },
-        "is-plain-object": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
-            "dev": true,
-            "requires": {
-                "isobject": "^3.0.1"
-            }
-        },
-        "is-potential-custom-element-name": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-            "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
-            "dev": true
-        },
-        "is-property": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-            "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-            "dev": true
-        },
-        "is-redirect": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-            "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-            "dev": true
-        },
-        "is-regex": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-            "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-            "dev": true,
-            "requires": {
-                "has": "^1.0.1"
-            }
-        },
-        "is-relative": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-            "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-            "dev": true,
-            "requires": {
-                "is-unc-path": "^1.0.0"
-            }
-        },
-        "is-retry-allowed": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-            "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-            "dev": true
-        },
-        "is-stream": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-            "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-        },
-        "is-stream-ended": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz",
-            "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="
-        },
-        "is-symbol": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
-            "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
-            "dev": true,
-            "requires": {
-                "has-symbols": "^1.0.0"
-            }
-        },
-        "is-typedarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-        },
-        "is-unc-path": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-            "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-            "dev": true,
-            "requires": {
-                "unc-path-regex": "^0.1.2"
-            }
-        },
-        "is-utf8": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-            "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-            "dev": true
-        },
-        "is-valid-glob": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-            "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-            "dev": true
-        },
-        "is-windows": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-            "dev": true
-        },
-        "is-wsl": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-            "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-            "dev": true
-        },
-        "is-yarn-global": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-            "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-            "dev": true
-        },
-        "isarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
-        "isemail": {
-            "version": "2.2.1",
-            "resolved": "http://registry.npmjs.org/isemail/-/isemail-2.2.1.tgz",
-            "integrity": "sha1-A1PT2aYpUQgMJiwqoKQrjqjp4qY="
-        },
-        "isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-        },
-        "isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-        },
-        "isomorphic-form-data": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-2.0.0.tgz",
-            "integrity": "sha512-TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg==",
-            "requires": {
-                "form-data": "^2.3.2"
-            }
-        },
-        "isstream": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-            "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-        },
-        "istanbul-lib-coverage": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-            "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-            "dev": true
-        },
-        "istanbul-lib-instrument": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-            "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-            "dev": true,
-            "requires": {
-                "@babel/core": "^7.7.5",
-                "@istanbuljs/schema": "^0.1.2",
-                "istanbul-lib-coverage": "^3.0.0",
-                "semver": "^6.3.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
-            }
-        },
-        "istanbul-lib-report": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-            "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-            "dev": true,
-            "requires": {
-                "istanbul-lib-coverage": "^3.0.0",
-                "make-dir": "^3.0.0",
-                "supports-color": "^7.1.0"
-            },
-            "dependencies": {
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "istanbul-lib-coverage": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-                    "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-                    "dev": true
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "istanbul-lib-source-maps": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-            "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
-            "dev": true,
-            "requires": {
-                "debug": "^4.1.1",
-                "istanbul-lib-coverage": "^3.0.0",
-                "source-map": "^0.6.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "istanbul-lib-coverage": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-                    "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
-        "istanbul-reports": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-            "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-            "dev": true,
-            "requires": {
-                "html-escaper": "^2.0.0",
-                "istanbul-lib-report": "^3.0.0"
-            }
-        },
-        "jade": {
-            "version": "0.26.3",
-            "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-            "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
-            "requires": {
-                "commander": "0.6.1",
-                "mkdirp": "0.3.0"
-            },
-            "dependencies": {
-                "commander": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
-                    "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY="
-                },
-                "mkdirp": {
-                    "version": "0.3.0",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-                    "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4="
-                }
-            }
-        },
-        "jasmine": {
-            "version": "3.6.3",
-            "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.3.tgz",
-            "integrity": "sha512-Th91zHsbsALWjDUIiU5d/W5zaYQsZFMPTdeNmi8GivZPmAaUAK8MblSG3yQI4VMGC/abF2us7ex60NH1AAIMTA==",
-            "dev": true,
-            "requires": {
-                "glob": "^7.1.6",
-                "jasmine-core": "~3.6.0"
-            }
-        },
-        "jasmine-core": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz",
-            "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==",
-            "dev": true
-        },
-        "jasmine-reporters": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-2.3.2.tgz",
-            "integrity": "sha512-u/7AT9SkuZsUfFBLLzbErohTGNsEUCKaQbsVYnLFW1gEuL2DzmBL4n8v90uZsqIqlWvWUgian8J6yOt5Fyk/+A==",
-            "dev": true,
-            "requires": {
-                "mkdirp": "^0.5.1",
-                "xmldom": "^0.1.22"
-            },
-            "dependencies": {
-                "xmldom": {
-                    "version": "0.1.27",
-                    "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-                    "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
-                    "dev": true
-                }
-            }
-        },
-        "jasmine-spec-reporter": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-6.0.0.tgz",
-            "integrity": "sha512-MvTOVoMxDZAftQYBApIlSfKnGMzi9cj351nXeqtnZTuXffPlbONN31+Es7F+Ke4okUeQ2xISukt4U1npfzLVrQ==",
-            "dev": true,
-            "requires": {
-                "colors": "1.4.0"
-            }
-        },
-        "jasmine-terminal-reporter": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/jasmine-terminal-reporter/-/jasmine-terminal-reporter-1.0.3.tgz",
-            "integrity": "sha1-iW8eyP30v2rs3UHFA+2nNH9hUms=",
-            "dev": true,
-            "requires": {
-                "indent-string": "^2.1.0",
-                "pluralize": "^1.2.1"
-            }
-        },
-        "jayson": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/jayson/-/jayson-2.1.2.tgz",
-            "integrity": "sha512-2GejcQnEV35KYTXoBvzALIDdO/1oyEIoJHBnaJFhJhcurv0x2JqUXQW6xlDUhcNOpN9t+d2w+JGA6vOphb+5mg==",
-            "requires": {
-                "@types/node": "^10.3.5",
-                "JSONStream": "^1.3.1",
-                "commander": "^2.12.2",
-                "es6-promisify": "^5.0.0",
-                "eyes": "^0.1.8",
-                "json-stringify-safe": "^5.0.1",
-                "lodash": "^4.17.11",
-                "uuid": "^3.2.1"
-            }
-        },
-        "jest": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest/-/jest-26.0.1.tgz",
-            "integrity": "sha512-29Q54kn5Bm7ZGKIuH2JRmnKl85YRigp0o0asTc6Sb6l2ch1DCXIeZTLLFy9ultJvhkTqbswF5DEx4+RlkmCxWg==",
-            "dev": true,
-            "requires": {
-                "@jest/core": "^26.0.1",
-                "import-local": "^3.0.2",
-                "jest-cli": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/console": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz",
-                    "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "jest-message-util": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "@jest/test-result": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz",
-                    "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/console": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "collect-v8-coverage": "^1.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "camelcase": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-                    "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "cliui": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-                    "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^4.2.0",
-                        "strip-ansi": "^6.0.0",
-                        "wrap-ansi": "^6.2.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "emoji-regex": {
-                    "version": "8.0.0",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-                    "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "get-caller-file": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-                    "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-                    "dev": true
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "import-local": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-                    "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-                    "dev": true,
-                    "requires": {
-                        "pkg-dir": "^4.2.0",
-                        "resolve-cwd": "^3.0.0"
-                    }
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-fullwidth-code-point": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-                    "dev": true
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-cli": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.0.1.tgz",
-                    "integrity": "sha512-pFLfSOBcbG9iOZWaMK4Een+tTxi/Wcm34geqZEqrst9cZDkTQ1LZ2CnBrTlHWuYAiTMFr0EQeK52ScyFU8wK+w==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/core": "^26.0.1",
-                        "@jest/test-result": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "exit": "^0.1.2",
-                        "graceful-fs": "^4.2.4",
-                        "import-local": "^3.0.2",
-                        "is-ci": "^2.0.0",
-                        "jest-config": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "jest-validate": "^26.0.1",
-                        "prompts": "^2.0.1",
-                        "yargs": "^15.3.1"
-                    }
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "jest-validate": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.0.1.tgz",
-                    "integrity": "sha512-u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "camelcase": "^6.0.0",
-                        "chalk": "^4.0.0",
-                        "jest-get-type": "^26.0.0",
-                        "leven": "^3.1.0",
-                        "pretty-format": "^26.0.1"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                },
-                "path-exists": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-                    "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-                    "dev": true
-                },
-                "pkg-dir": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-                    "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-                    "dev": true,
-                    "requires": {
-                        "find-up": "^4.0.0"
-                    }
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "require-main-filename": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-                    "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-                    "dev": true
-                },
-                "resolve-cwd": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-                    "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-                    "dev": true,
-                    "requires": {
-                        "resolve-from": "^5.0.0"
-                    }
-                },
-                "resolve-from": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-                    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-                    "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^8.0.0",
-                        "is-fullwidth-code-point": "^3.0.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "which-module": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-                    "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-                    "dev": true
-                },
-                "wrap-ansi": {
-                    "version": "6.2.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "string-width": "^4.1.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "15.3.1",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-                    "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^6.0.0",
-                        "decamelize": "^1.2.0",
-                        "find-up": "^4.1.0",
-                        "get-caller-file": "^2.0.1",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^4.2.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^18.1.1"
-                    }
-                },
-                "yargs-parser": {
-                    "version": "18.1.3",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-                    "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-                    "dev": true,
-                    "requires": {
-                        "camelcase": "^5.0.0",
-                        "decamelize": "^1.2.0"
-                    },
-                    "dependencies": {
-                        "camelcase": {
-                            "version": "5.3.1",
-                            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                            "dev": true
-                        }
-                    }
-                }
-            }
-        },
-        "jest-changed-files": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.0.1.tgz",
-            "integrity": "sha512-q8LP9Sint17HaE2LjxQXL+oYWW/WeeXMPE2+Op9X3mY8IEGFVc14xRxFjUuXUbcPAlDLhtWdIEt59GdQbn76Hw==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^26.0.1",
-                "execa": "^4.0.0",
-                "throat": "^5.0.0"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "cross-spawn": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-                    "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-                    "dev": true,
-                    "requires": {
-                        "path-key": "^3.1.0",
-                        "shebang-command": "^2.0.0",
-                        "which": "^2.0.1"
-                    }
-                },
-                "execa": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz",
-                    "integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==",
-                    "dev": true,
-                    "requires": {
-                        "cross-spawn": "^7.0.0",
-                        "get-stream": "^5.0.0",
-                        "human-signals": "^1.1.1",
-                        "is-stream": "^2.0.0",
-                        "merge-stream": "^2.0.0",
-                        "npm-run-path": "^4.0.0",
-                        "onetime": "^5.1.0",
-                        "signal-exit": "^3.0.2",
-                        "strip-final-newline": "^2.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-                    "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-                    "dev": true,
-                    "requires": {
-                        "pump": "^3.0.0"
-                    }
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-                    "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-                    "dev": true
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                    "dev": true
-                },
-                "npm-run-path": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-                    "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-                    "dev": true,
-                    "requires": {
-                        "path-key": "^3.0.0"
-                    }
-                },
-                "path-key": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-                    "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-                    "dev": true
-                },
-                "shebang-command": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-                    "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-                    "dev": true,
-                    "requires": {
-                        "shebang-regex": "^3.0.0"
-                    }
-                },
-                "shebang-regex": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-                    "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "jest-config": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.0.1.tgz",
-            "integrity": "sha512-9mWKx2L1LFgOXlDsC4YSeavnblN6A4CPfXFiobq+YYLaBMymA/SczN7xYTSmLaEYHZOcB98UdoN4m5uNt6tztg==",
-            "dev": true,
-            "requires": {
-                "@babel/core": "^7.1.0",
-                "@jest/test-sequencer": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "babel-jest": "^26.0.1",
-                "chalk": "^4.0.0",
-                "deepmerge": "^4.2.2",
-                "glob": "^7.1.1",
-                "graceful-fs": "^4.2.4",
-                "jest-environment-jsdom": "^26.0.1",
-                "jest-environment-node": "^26.0.1",
-                "jest-get-type": "^26.0.0",
-                "jest-jasmine2": "^26.0.1",
-                "jest-regex-util": "^26.0.0",
-                "jest-resolve": "^26.0.1",
-                "jest-util": "^26.0.1",
-                "jest-validate": "^26.0.1",
-                "micromatch": "^4.0.2",
-                "pretty-format": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/transform": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.0.1.tgz",
-                    "integrity": "sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/core": "^7.1.0",
-                        "@jest/types": "^26.0.1",
-                        "babel-plugin-istanbul": "^6.0.0",
-                        "chalk": "^4.0.0",
-                        "convert-source-map": "^1.4.0",
-                        "fast-json-stable-stringify": "^2.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "jest-haste-map": "^26.0.1",
-                        "jest-regex-util": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "micromatch": "^4.0.2",
-                        "pirates": "^4.0.1",
-                        "slash": "^3.0.0",
-                        "source-map": "^0.6.1",
-                        "write-file-atomic": "^3.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/babel__core": {
-                    "version": "7.1.8",
-                    "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.8.tgz",
-                    "integrity": "sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/parser": "^7.1.0",
-                        "@babel/types": "^7.0.0",
-                        "@types/babel__generator": "*",
-                        "@types/babel__template": "*",
-                        "@types/babel__traverse": "*"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "babel-jest": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.0.1.tgz",
-                    "integrity": "sha512-Z4GGmSNQ8pX3WS1O+6v3fo41YItJJZsVxG5gIQ+HuB/iuAQBJxMTHTwz292vuYws1LnHfwSRgoqI+nxdy/pcvw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/transform": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/babel__core": "^7.1.7",
-                        "babel-plugin-istanbul": "^6.0.0",
-                        "babel-preset-jest": "^26.0.0",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "babel-plugin-istanbul": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-                    "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.0.0",
-                        "@istanbuljs/load-nyc-config": "^1.0.0",
-                        "@istanbuljs/schema": "^0.1.2",
-                        "istanbul-lib-instrument": "^4.0.0",
-                        "test-exclude": "^6.0.0"
-                    }
-                },
-                "babel-plugin-jest-hoist": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.0.0.tgz",
-                    "integrity": "sha512-+AuoehOrjt9irZL7DOt2+4ZaTM6dlu1s5TTS46JBa0/qem4dy7VNW3tMb96qeEqcIh20LD73TVNtmVEeymTG7w==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/template": "^7.3.3",
-                        "@babel/types": "^7.3.3",
-                        "@types/babel__traverse": "^7.0.6"
-                    }
-                },
-                "babel-preset-jest": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.0.0.tgz",
-                    "integrity": "sha512-9ce+DatAa31DpR4Uir8g4Ahxs5K4W4L8refzt+qHWQANb6LhGcAEfIFgLUwk67oya2cCUd6t4eUMtO/z64ocNw==",
-                    "dev": true,
-                    "requires": {
-                        "babel-plugin-jest-hoist": "^26.0.0",
-                        "babel-preset-current-node-syntax": "^0.1.2"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "camelcase": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-                    "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "istanbul-lib-coverage": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-                    "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-                    "dev": true
-                },
-                "istanbul-lib-instrument": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-                    "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/core": "^7.7.5",
-                        "@istanbuljs/schema": "^0.1.2",
-                        "istanbul-lib-coverage": "^3.0.0",
-                        "semver": "^6.3.0"
-                    }
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "jest-haste-map": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz",
-                    "integrity": "sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@types/graceful-fs": "^4.1.2",
-                        "anymatch": "^3.0.3",
-                        "fb-watchman": "^2.0.0",
-                        "fsevents": "^2.1.2",
-                        "graceful-fs": "^4.2.4",
-                        "jest-serializer": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "jest-worker": "^26.0.0",
-                        "micromatch": "^4.0.2",
-                        "sane": "^4.0.3",
-                        "walker": "^1.0.7",
-                        "which": "^2.0.2"
-                    }
-                },
-                "jest-regex-util": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-                    "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-                    "dev": true
-                },
-                "jest-serializer": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz",
-                    "integrity": "sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.4"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "jest-validate": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.0.1.tgz",
-                    "integrity": "sha512-u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "camelcase": "^6.0.0",
-                        "chalk": "^4.0.0",
-                        "jest-get-type": "^26.0.0",
-                        "leven": "^3.1.0",
-                        "pretty-format": "^26.0.1"
-                    }
-                },
-                "jest-worker": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-                    "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-                    "dev": true,
-                    "requires": {
-                        "merge-stream": "^2.0.0",
-                        "supports-color": "^7.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "test-exclude": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-                    "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-                    "dev": true,
-                    "requires": {
-                        "@istanbuljs/schema": "^0.1.2",
-                        "glob": "^7.1.4",
-                        "minimatch": "^3.0.4"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                },
-                "write-file-atomic": {
-                    "version": "3.0.3",
-                    "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-                    "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-                    "dev": true,
-                    "requires": {
-                        "imurmurhash": "^0.1.4",
-                        "is-typedarray": "^1.0.0",
-                        "signal-exit": "^3.0.2",
-                        "typedarray-to-buffer": "^3.1.5"
-                    }
-                }
-            }
-        },
-        "jest-diff": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.0.1.tgz",
-            "integrity": "sha512-odTcHyl5X+U+QsczJmOjWw5tPvww+y9Yim5xzqxVl/R1j4z71+fHW4g8qu1ugMmKdFdxw+AtQgs5mupPnzcIBQ==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.0.0",
-                "diff-sequences": "^26.0.0",
-                "jest-get-type": "^26.0.0",
-                "pretty-format": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-docblock": {
-            "version": "26.0.0",
-            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
-            "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
-            "dev": true,
-            "requires": {
-                "detect-newline": "^3.0.0"
-            }
-        },
-        "jest-each": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.0.1.tgz",
-            "integrity": "sha512-OTgJlwXCAR8NIWaXFL5DBbeS4QIYPuNASkzSwMCJO+ywo9BEa6TqkaSWsfR7VdbMLdgYJqSfQcIyjJCNwl5n4Q==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^26.0.1",
-                "chalk": "^4.0.0",
-                "jest-get-type": "^26.0.0",
-                "jest-util": "^26.0.1",
-                "pretty-format": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-environment-jsdom": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.0.1.tgz",
-            "integrity": "sha512-u88NJa3aptz2Xix2pFhihRBAatwZHWwSiRLBDBQE1cdJvDjPvv7ZGA0NQBxWwDDn7D0g1uHqxM8aGgfA9Bx49g==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^26.0.1",
-                "@jest/fake-timers": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "jest-mock": "^26.0.1",
-                "jest-util": "^26.0.1",
-                "jsdom": "^16.2.2"
-            },
-            "dependencies": {
-                "@jest/fake-timers": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.0.1.tgz",
-                    "integrity": "sha512-Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@sinonjs/fake-timers": "^6.0.1",
-                        "jest-message-util": "^26.0.1",
-                        "jest-mock": "^26.0.1",
-                        "jest-util": "^26.0.1"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-mock": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.0.1.tgz",
-                    "integrity": "sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                }
-            }
-        },
-        "jest-environment-node": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.0.1.tgz",
-            "integrity": "sha512-4FRBWcSn5yVo0KtNav7+5NH5Z/tEgDLp7VRQVS5tCouWORxj+nI+1tOLutM07Zb2Qi7ja+HEDoOUkjBSWZg/IQ==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^26.0.1",
-                "@jest/fake-timers": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "jest-mock": "^26.0.1",
-                "jest-util": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/fake-timers": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.0.1.tgz",
-                    "integrity": "sha512-Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@sinonjs/fake-timers": "^6.0.1",
-                        "jest-message-util": "^26.0.1",
-                        "jest-mock": "^26.0.1",
-                        "jest-util": "^26.0.1"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-mock": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.0.1.tgz",
-                    "integrity": "sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                }
-            }
-        },
-        "jest-get-type": {
-            "version": "24.9.0",
-            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-            "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
-            "dev": true
-        },
-        "jest-haste-map": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz",
-            "integrity": "sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^26.0.1",
-                "@types/graceful-fs": "^4.1.2",
-                "anymatch": "^3.0.3",
-                "fb-watchman": "^2.0.0",
-                "fsevents": "^2.1.2",
-                "graceful-fs": "^4.2.4",
-                "jest-serializer": "^26.0.0",
-                "jest-util": "^26.0.1",
-                "jest-worker": "^26.0.0",
-                "micromatch": "^4.0.2",
-                "sane": "^4.0.3",
-                "walker": "^1.0.7",
-                "which": "^2.0.2"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "jest-jasmine2": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.0.1.tgz",
-            "integrity": "sha512-ILaRyiWxiXOJ+RWTKupzQWwnPaeXPIoLS5uW41h18varJzd9/7I0QJGqg69fhTT1ev9JpSSo9QtalriUN0oqOg==",
-            "dev": true,
-            "requires": {
-                "@babel/traverse": "^7.1.0",
-                "@jest/environment": "^26.0.1",
-                "@jest/source-map": "^26.0.0",
-                "@jest/test-result": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "chalk": "^4.0.0",
-                "co": "^4.6.0",
-                "expect": "^26.0.1",
-                "is-generator-fn": "^2.0.0",
-                "jest-each": "^26.0.1",
-                "jest-matcher-utils": "^26.0.1",
-                "jest-message-util": "^26.0.1",
-                "jest-runtime": "^26.0.1",
-                "jest-snapshot": "^26.0.1",
-                "jest-util": "^26.0.1",
-                "pretty-format": "^26.0.1",
-                "throat": "^5.0.0"
-            },
-            "dependencies": {
-                "@jest/console": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz",
-                    "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "jest-message-util": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "@jest/source-map": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.0.0.tgz",
-                    "integrity": "sha512-S2Z+Aj/7KOSU2TfW0dyzBze7xr95bkm5YXNUqqCek+HE0VbNNSNzrRwfIi5lf7wvzDTSS0/ib8XQ1krFNyYgbQ==",
-                    "dev": true,
-                    "requires": {
-                        "callsites": "^3.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "source-map": "^0.6.0"
-                    }
-                },
-                "@jest/test-result": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz",
-                    "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/console": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "collect-v8-coverage": "^1.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                }
-            }
-        },
-        "jest-junit": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-8.0.0.tgz",
-            "integrity": "sha512-cuD2XM2youMjrOxOu/7H2pLfsO8LfAG4D3WsBxd9fFyI9U0uPpmr/CORH64kbIyZ47X5x1Rbzb9ovUkAEvhEEA==",
-            "dev": true,
-            "requires": {
-                "jest-validate": "^24.0.0",
-                "mkdirp": "^0.5.1",
-                "strip-ansi": "^4.0.0",
-                "xml": "^1.0.1"
-            }
-        },
-        "jest-leak-detector": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.0.1.tgz",
-            "integrity": "sha512-93FR8tJhaYIWrWsbmVN1pQ9ZNlbgRpfvrnw5LmgLRX0ckOJ8ut/I35CL7awi2ecq6Ca4lL59bEK9hr7nqoHWPA==",
-            "dev": true,
-            "requires": {
-                "jest-get-type": "^26.0.0",
-                "pretty-format": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-matcher-utils": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.0.1.tgz",
-            "integrity": "sha512-PUMlsLth0Azen8Q2WFTwnSkGh2JZ8FYuwijC8NR47vXKpsrKmA1wWvgcj1CquuVfcYiDEdj985u5Wmg7COEARw==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.0.0",
-                "jest-diff": "^26.0.1",
-                "jest-get-type": "^26.0.0",
-                "pretty-format": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-pnp-resolver": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
-            "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
-            "dev": true
-        },
-        "jest-regex-util": {
-            "version": "26.0.0",
-            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-            "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-            "dev": true
-        },
-        "jest-resolve": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.0.1.tgz",
-            "integrity": "sha512-6jWxk0IKZkPIVTvq6s72RH735P8f9eCJW3IM5CX/SJFeKq1p2cZx0U49wf/SdMlhaB/anann5J2nCJj6HrbezQ==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^26.0.1",
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.4",
-                "jest-pnp-resolver": "^1.2.1",
-                "jest-util": "^26.0.1",
-                "read-pkg-up": "^7.0.1",
-                "resolve": "^1.17.0",
-                "slash": "^3.0.0"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                },
-                "parse-json": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-                    "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "error-ex": "^1.3.1",
-                        "json-parse-better-errors": "^1.0.1",
-                        "lines-and-columns": "^1.1.6"
-                    }
-                },
-                "path-exists": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-                    "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-                    "dev": true
-                },
-                "read-pkg": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-                    "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-                    "dev": true,
-                    "requires": {
-                        "@types/normalize-package-data": "^2.4.0",
-                        "normalize-package-data": "^2.5.0",
-                        "parse-json": "^5.0.0",
-                        "type-fest": "^0.6.0"
-                    },
-                    "dependencies": {
-                        "type-fest": {
-                            "version": "0.6.0",
-                            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-                            "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-                            "dev": true
-                        }
-                    }
-                },
-                "read-pkg-up": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-                    "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-                    "dev": true,
-                    "requires": {
-                        "find-up": "^4.1.0",
-                        "read-pkg": "^5.2.0",
-                        "type-fest": "^0.8.1"
-                    }
-                },
-                "resolve": {
-                    "version": "1.17.0",
-                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-                    "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-                    "dev": true,
-                    "requires": {
-                        "path-parse": "^1.0.6"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-resolve-dependencies": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.0.1.tgz",
-            "integrity": "sha512-9d5/RS/ft0vB/qy7jct/qAhzJsr6fRQJyGAFigK3XD4hf9kIbEH5gks4t4Z7kyMRhowU6HWm/o8ILqhaHdSqLw==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^26.0.1",
-                "jest-regex-util": "^26.0.0",
-                "jest-snapshot": "^26.0.1"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "jest-regex-util": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-                    "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-runner": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.0.1.tgz",
-            "integrity": "sha512-CApm0g81b49Znm4cZekYQK67zY7kkB4umOlI2Dx5CwKAzdgw75EN+ozBHRvxBzwo1ZLYZ07TFxkaPm+1t4d8jA==",
-            "dev": true,
-            "requires": {
-                "@jest/console": "^26.0.1",
-                "@jest/environment": "^26.0.1",
-                "@jest/test-result": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "chalk": "^4.0.0",
-                "exit": "^0.1.2",
-                "graceful-fs": "^4.2.4",
-                "jest-config": "^26.0.1",
-                "jest-docblock": "^26.0.0",
-                "jest-haste-map": "^26.0.1",
-                "jest-jasmine2": "^26.0.1",
-                "jest-leak-detector": "^26.0.1",
-                "jest-message-util": "^26.0.1",
-                "jest-resolve": "^26.0.1",
-                "jest-runtime": "^26.0.1",
-                "jest-util": "^26.0.1",
-                "jest-worker": "^26.0.0",
-                "source-map-support": "^0.5.6",
-                "throat": "^5.0.0"
-            },
-            "dependencies": {
-                "@jest/console": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz",
-                    "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "jest-message-util": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "@jest/test-result": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz",
-                    "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/console": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "collect-v8-coverage": "^1.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-haste-map": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz",
-                    "integrity": "sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@types/graceful-fs": "^4.1.2",
-                        "anymatch": "^3.0.3",
-                        "fb-watchman": "^2.0.0",
-                        "fsevents": "^2.1.2",
-                        "graceful-fs": "^4.2.4",
-                        "jest-serializer": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "jest-worker": "^26.0.0",
-                        "micromatch": "^4.0.2",
-                        "sane": "^4.0.3",
-                        "walker": "^1.0.7",
-                        "which": "^2.0.2"
-                    }
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-serializer": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz",
-                    "integrity": "sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.4"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "jest-worker": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-                    "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-                    "dev": true,
-                    "requires": {
-                        "merge-stream": "^2.0.0",
-                        "supports-color": "^7.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "jest-runtime": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.0.1.tgz",
-            "integrity": "sha512-Ci2QhYFmANg5qaXWf78T2Pfo6GtmIBn2rRaLnklRyEucmPccmCKvS9JPljcmtVamsdMmkyNkVFb9pBTD6si9Lw==",
-            "dev": true,
-            "requires": {
-                "@jest/console": "^26.0.1",
-                "@jest/environment": "^26.0.1",
-                "@jest/fake-timers": "^26.0.1",
-                "@jest/globals": "^26.0.1",
-                "@jest/source-map": "^26.0.0",
-                "@jest/test-result": "^26.0.1",
-                "@jest/transform": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "@types/yargs": "^15.0.0",
-                "chalk": "^4.0.0",
-                "collect-v8-coverage": "^1.0.0",
-                "exit": "^0.1.2",
-                "glob": "^7.1.3",
-                "graceful-fs": "^4.2.4",
-                "jest-config": "^26.0.1",
-                "jest-haste-map": "^26.0.1",
-                "jest-message-util": "^26.0.1",
-                "jest-mock": "^26.0.1",
-                "jest-regex-util": "^26.0.0",
-                "jest-resolve": "^26.0.1",
-                "jest-snapshot": "^26.0.1",
-                "jest-util": "^26.0.1",
-                "jest-validate": "^26.0.1",
-                "slash": "^3.0.0",
-                "strip-bom": "^4.0.0",
-                "yargs": "^15.3.1"
-            },
-            "dependencies": {
-                "@jest/console": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz",
-                    "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "jest-message-util": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "@jest/fake-timers": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.0.1.tgz",
-                    "integrity": "sha512-Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@sinonjs/fake-timers": "^6.0.1",
-                        "jest-message-util": "^26.0.1",
-                        "jest-mock": "^26.0.1",
-                        "jest-util": "^26.0.1"
-                    }
-                },
-                "@jest/source-map": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.0.0.tgz",
-                    "integrity": "sha512-S2Z+Aj/7KOSU2TfW0dyzBze7xr95bkm5YXNUqqCek+HE0VbNNSNzrRwfIi5lf7wvzDTSS0/ib8XQ1krFNyYgbQ==",
-                    "dev": true,
-                    "requires": {
-                        "callsites": "^3.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "source-map": "^0.6.0"
-                    }
-                },
-                "@jest/test-result": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz",
-                    "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/console": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "collect-v8-coverage": "^1.0.0"
-                    }
-                },
-                "@jest/transform": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.0.1.tgz",
-                    "integrity": "sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/core": "^7.1.0",
-                        "@jest/types": "^26.0.1",
-                        "babel-plugin-istanbul": "^6.0.0",
-                        "chalk": "^4.0.0",
-                        "convert-source-map": "^1.4.0",
-                        "fast-json-stable-stringify": "^2.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "jest-haste-map": "^26.0.1",
-                        "jest-regex-util": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "micromatch": "^4.0.2",
-                        "pirates": "^4.0.1",
-                        "slash": "^3.0.0",
-                        "source-map": "^0.6.1",
-                        "write-file-atomic": "^3.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "babel-plugin-istanbul": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-                    "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-plugin-utils": "^7.0.0",
-                        "@istanbuljs/load-nyc-config": "^1.0.0",
-                        "@istanbuljs/schema": "^0.1.2",
-                        "istanbul-lib-instrument": "^4.0.0",
-                        "test-exclude": "^6.0.0"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "camelcase": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-                    "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "cliui": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-                    "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^4.2.0",
-                        "strip-ansi": "^6.0.0",
-                        "wrap-ansi": "^6.2.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "emoji-regex": {
-                    "version": "8.0.0",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-                    "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "get-caller-file": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-                    "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-                    "dev": true
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-fullwidth-code-point": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-                    "dev": true
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "istanbul-lib-coverage": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-                    "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-                    "dev": true
-                },
-                "istanbul-lib-instrument": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-                    "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/core": "^7.7.5",
-                        "@istanbuljs/schema": "^0.1.2",
-                        "istanbul-lib-coverage": "^3.0.0",
-                        "semver": "^6.3.0"
-                    }
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "jest-haste-map": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz",
-                    "integrity": "sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "@types/graceful-fs": "^4.1.2",
-                        "anymatch": "^3.0.3",
-                        "fb-watchman": "^2.0.0",
-                        "fsevents": "^2.1.2",
-                        "graceful-fs": "^4.2.4",
-                        "jest-serializer": "^26.0.0",
-                        "jest-util": "^26.0.1",
-                        "jest-worker": "^26.0.0",
-                        "micromatch": "^4.0.2",
-                        "sane": "^4.0.3",
-                        "walker": "^1.0.7",
-                        "which": "^2.0.2"
-                    }
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-mock": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.0.1.tgz",
-                    "integrity": "sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1"
-                    }
-                },
-                "jest-regex-util": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-                    "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-                    "dev": true
-                },
-                "jest-serializer": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz",
-                    "integrity": "sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.4"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "jest-validate": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.0.1.tgz",
-                    "integrity": "sha512-u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "camelcase": "^6.0.0",
-                        "chalk": "^4.0.0",
-                        "jest-get-type": "^26.0.0",
-                        "leven": "^3.1.0",
-                        "pretty-format": "^26.0.1"
-                    }
-                },
-                "jest-worker": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-                    "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-                    "dev": true,
-                    "requires": {
-                        "merge-stream": "^2.0.0",
-                        "supports-color": "^7.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                },
-                "path-exists": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-                    "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-                    "dev": true
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "require-main-filename": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-                    "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-                    "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^8.0.0",
-                        "is-fullwidth-code-point": "^3.0.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.0"
-                    }
-                },
-                "strip-bom": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-                    "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "test-exclude": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-                    "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-                    "dev": true,
-                    "requires": {
-                        "@istanbuljs/schema": "^0.1.2",
-                        "glob": "^7.1.4",
-                        "minimatch": "^3.0.4"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                },
-                "which-module": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-                    "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-                    "dev": true
-                },
-                "wrap-ansi": {
-                    "version": "6.2.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "string-width": "^4.1.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "write-file-atomic": {
-                    "version": "3.0.3",
-                    "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-                    "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-                    "dev": true,
-                    "requires": {
-                        "imurmurhash": "^0.1.4",
-                        "is-typedarray": "^1.0.0",
-                        "signal-exit": "^3.0.2",
-                        "typedarray-to-buffer": "^3.1.5"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "15.3.1",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-                    "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^6.0.0",
-                        "decamelize": "^1.2.0",
-                        "find-up": "^4.1.0",
-                        "get-caller-file": "^2.0.1",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^4.2.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^18.1.1"
-                    }
-                },
-                "yargs-parser": {
-                    "version": "18.1.3",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-                    "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-                    "dev": true,
-                    "requires": {
-                        "camelcase": "^5.0.0",
-                        "decamelize": "^1.2.0"
-                    },
-                    "dependencies": {
-                        "camelcase": {
-                            "version": "5.3.1",
-                            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                            "dev": true
-                        }
-                    }
-                }
-            }
-        },
-        "jest-serializer": {
-            "version": "26.0.0",
-            "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz",
-            "integrity": "sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.2.4"
-            },
-            "dependencies": {
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                }
-            }
-        },
-        "jest-snapshot": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.0.1.tgz",
-            "integrity": "sha512-jxd+cF7+LL+a80qh6TAnTLUZHyQoWwEHSUFJjkw35u3Gx+BZUNuXhYvDqHXr62UQPnWo2P6fvQlLjsU93UKyxA==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.0.0",
-                "@jest/types": "^26.0.1",
-                "@types/prettier": "^2.0.0",
-                "chalk": "^4.0.0",
-                "expect": "^26.0.1",
-                "graceful-fs": "^4.2.4",
-                "jest-diff": "^26.0.1",
-                "jest-get-type": "^26.0.0",
-                "jest-matcher-utils": "^26.0.1",
-                "jest-message-util": "^26.0.1",
-                "jest-resolve": "^26.0.1",
-                "make-dir": "^3.0.0",
-                "natural-compare": "^1.4.0",
-                "pretty-format": "^26.0.1",
-                "semver": "^7.3.2"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-get-type": {
-                    "version": "26.0.0",
-                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-                    "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-                    "dev": true
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    },
-                    "dependencies": {
-                        "semver": {
-                            "version": "6.3.0",
-                            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                            "dev": true
-                        }
-                    }
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "pretty-format": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
-                    "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "ansi-regex": "^5.0.0",
-                        "ansi-styles": "^4.0.0",
-                        "react-is": "^16.12.0"
-                    }
-                },
-                "react-is": {
-                    "version": "16.13.1",
-                    "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-                    "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "7.3.2",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-                    "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                }
-            }
-        },
-        "jest-util": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-            "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^26.0.1",
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.4",
-                "is-ci": "^2.0.0",
-                "make-dir": "^3.0.0"
-            },
-            "dependencies": {
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-validate": {
-            "version": "24.9.0",
-            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
-            "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^24.9.0",
-                "camelcase": "^5.3.1",
-                "chalk": "^2.0.1",
-                "jest-get-type": "^24.9.0",
-                "leven": "^3.1.0",
-                "pretty-format": "^24.9.0"
-            }
-        },
-        "jest-watcher": {
-            "version": "26.0.1",
-            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.0.1.tgz",
-            "integrity": "sha512-pdZPydsS8475f89kGswaNsN3rhP6lnC3/QDCppP7bg1L9JQz7oU9Mb/5xPETk1RHDCWeqmVC47M4K5RR7ejxFw==",
-            "dev": true,
-            "requires": {
-                "@jest/test-result": "^26.0.1",
-                "@jest/types": "^26.0.1",
-                "ansi-escapes": "^4.2.1",
-                "chalk": "^4.0.0",
-                "jest-util": "^26.0.1",
-                "string-length": "^4.0.1"
-            },
-            "dependencies": {
-                "@jest/console": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz",
-                    "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "jest-message-util": "^26.0.1",
-                        "jest-util": "^26.0.1",
-                        "slash": "^3.0.0"
-                    }
-                },
-                "@jest/test-result": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz",
-                    "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/console": "^26.0.1",
-                        "@jest/types": "^26.0.1",
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "collect-v8-coverage": "^1.0.0"
-                    }
-                },
-                "@jest/types": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
-                    "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/istanbul-lib-coverage": "^2.0.0",
-                        "@types/istanbul-reports": "^1.1.1",
-                        "@types/yargs": "^15.0.0",
-                        "chalk": "^4.0.0"
-                    }
-                },
-                "@types/yargs": {
-                    "version": "15.0.5",
-                    "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-                    "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yargs-parser": "*"
-                    }
-                },
-                "ansi-escapes": {
-                    "version": "4.3.1",
-                    "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-                    "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-                    "dev": true,
-                    "requires": {
-                        "type-fest": "^0.11.0"
-                    }
-                },
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "ci-info": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                    "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "graceful-fs": {
-                    "version": "4.2.4",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                    "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                    "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "jest-message-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz",
-                    "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "@jest/types": "^26.0.1",
-                        "@types/stack-utils": "^1.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "micromatch": "^4.0.2",
-                        "slash": "^3.0.0",
-                        "stack-utils": "^2.0.2"
-                    }
-                },
-                "jest-util": {
-                    "version": "26.0.1",
-                    "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz",
-                    "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==",
-                    "dev": true,
-                    "requires": {
-                        "@jest/types": "^26.0.1",
-                        "chalk": "^4.0.0",
-                        "graceful-fs": "^4.2.4",
-                        "is-ci": "^2.0.0",
-                        "make-dir": "^3.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "dev": true,
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "micromatch": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-                    "dev": true,
-                    "requires": {
-                        "braces": "^3.0.1",
-                        "picomatch": "^2.0.5"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "slash": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                    "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                    "dev": true
-                },
-                "stack-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-                    "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                },
-                "type-fest": {
-                    "version": "0.11.0",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-                    "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-                    "dev": true
-                }
-            }
-        },
-        "jest-worker": {
-            "version": "26.0.0",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-            "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-            "dev": true,
-            "requires": {
-                "merge-stream": "^2.0.0",
-                "supports-color": "^7.0.0"
-            },
-            "dependencies": {
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jmespath": {
-            "version": "0.15.0",
-            "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-            "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
-        },
-        "js-base64": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz",
-            "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==",
-            "dev": true
-        },
-        "js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
-        },
-        "js-yaml": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-            "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-            "dev": true,
-            "requires": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
-            }
-        },
-        "js2xmlparser": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
-            "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
-            "requires": {
-                "xmlcreate": "^1.0.1"
-            }
-        },
-        "jsbn": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-            "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-        },
-        "jsdom": {
-            "version": "16.2.2",
-            "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz",
-            "integrity": "sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==",
-            "dev": true,
-            "requires": {
-                "abab": "^2.0.3",
-                "acorn": "^7.1.1",
-                "acorn-globals": "^6.0.0",
-                "cssom": "^0.4.4",
-                "cssstyle": "^2.2.0",
-                "data-urls": "^2.0.0",
-                "decimal.js": "^10.2.0",
-                "domexception": "^2.0.1",
-                "escodegen": "^1.14.1",
-                "html-encoding-sniffer": "^2.0.1",
-                "is-potential-custom-element-name": "^1.0.0",
-                "nwsapi": "^2.2.0",
-                "parse5": "5.1.1",
-                "request": "^2.88.2",
-                "request-promise-native": "^1.0.8",
-                "saxes": "^5.0.0",
-                "symbol-tree": "^3.2.4",
-                "tough-cookie": "^3.0.1",
-                "w3c-hr-time": "^1.0.2",
-                "w3c-xmlserializer": "^2.0.0",
-                "webidl-conversions": "^6.0.0",
-                "whatwg-encoding": "^1.0.5",
-                "whatwg-mimetype": "^2.3.0",
-                "whatwg-url": "^8.0.0",
-                "ws": "^7.2.3",
-                "xml-name-validator": "^3.0.0"
-            },
-            "dependencies": {
-                "qs": {
-                    "version": "6.5.2",
-                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-                    "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-                    "dev": true
-                },
-                "request": {
-                    "version": "2.88.2",
-                    "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-                    "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-                    "dev": true,
-                    "requires": {
-                        "aws-sign2": "~0.7.0",
-                        "aws4": "^1.8.0",
-                        "caseless": "~0.12.0",
-                        "combined-stream": "~1.0.6",
-                        "extend": "~3.0.2",
-                        "forever-agent": "~0.6.1",
-                        "form-data": "~2.3.2",
-                        "har-validator": "~5.1.3",
-                        "http-signature": "~1.2.0",
-                        "is-typedarray": "~1.0.0",
-                        "isstream": "~0.1.2",
-                        "json-stringify-safe": "~5.0.1",
-                        "mime-types": "~2.1.19",
-                        "oauth-sign": "~0.9.0",
-                        "performance-now": "^2.1.0",
-                        "qs": "~6.5.2",
-                        "safe-buffer": "^5.1.2",
-                        "tough-cookie": "~2.5.0",
-                        "tunnel-agent": "^0.6.0",
-                        "uuid": "^3.3.2"
-                    },
-                    "dependencies": {
-                        "tough-cookie": {
-                            "version": "2.5.0",
-                            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-                            "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-                            "dev": true,
-                            "requires": {
-                                "psl": "^1.1.28",
-                                "punycode": "^2.1.1"
-                            }
-                        }
-                    }
-                },
-                "tough-cookie": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-                    "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-                    "dev": true,
-                    "requires": {
-                        "ip-regex": "^2.1.0",
-                        "psl": "^1.1.28",
-                        "punycode": "^2.1.1"
-                    }
-                },
-                "ws": {
-                    "version": "7.3.0",
-                    "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
-                    "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==",
-                    "dev": true
-                }
-            }
-        },
-        "jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true
-        },
-        "json-bigint": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz",
-            "integrity": "sha1-DM2RLEuCcNBfBW+9E4FLU9OCWx4=",
-            "requires": {
-                "bignumber.js": "^7.0.0"
-            }
-        },
-        "json-buffer": {
-            "version": "2.0.11",
-            "resolved": "http://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz",
-            "integrity": "sha1-PkQf2jCYvo0eMXGtWRvGKjPi1V8="
-        },
-        "json-loader": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-            "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-            "dev": true
-        },
-        "json-parse-better-errors": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-            "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-            "dev": true
-        },
-        "json-schema": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-            "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-        },
-        "json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-            "dev": true
-        },
-        "json-stringify-safe": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-            "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-        },
-        "json3": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
-            "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
-            "dev": true
-        },
-        "json5": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-            "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
-            "dev": true,
-            "requires": {
-                "minimist": "^1.2.0"
-            }
-        },
-        "jsonfile": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-            "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-            "requires": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "jsonparse": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-            "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
-        },
-        "jsprim": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-            "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-            "requires": {
-                "assert-plus": "1.0.0",
-                "extsprintf": "1.3.0",
-                "json-schema": "0.2.3",
-                "verror": "1.10.0"
-            }
-        },
-        "just-debounce": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-            "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
-            "dev": true
-        },
-        "jwa": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-            "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-            "requires": {
-                "buffer-equal-constant-time": "1.0.1",
-                "ecdsa-sig-formatter": "1.0.11",
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "jws": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-            "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
-            "requires": {
-                "jwa": "^1.4.1",
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "keyv": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-            "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-            "dev": true,
-            "requires": {
-                "json-buffer": "3.0.0"
-            },
-            "dependencies": {
-                "json-buffer": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-                    "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-                    "dev": true
-                }
-            }
-        },
-        "killable": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-            "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-            "dev": true
-        },
-        "kind-of": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-            "dev": true
-        },
-        "kleur": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-            "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-            "dev": true
-        },
-        "last-run": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-            "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-            "dev": true,
-            "requires": {
-                "default-resolution": "^2.0.0",
-                "es6-weak-map": "^2.0.1"
-            }
-        },
-        "latest-version": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-            "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-            "dev": true,
-            "requires": {
-                "package-json": "^4.0.0"
-            }
-        },
-        "lazystream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-            "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-            "dev": true,
-            "requires": {
-                "readable-stream": "^2.0.5"
-            }
-        },
-        "lcid": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-            "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-            "requires": {
-                "invert-kv": "^2.0.0"
-            }
-        },
-        "ldap-filter": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.3.3.tgz",
-            "integrity": "sha1-KxTGiiqdQQTb28kQocqF/Riel5c=",
-            "requires": {
-                "assert-plus": "^1.0.0"
-            }
-        },
-        "ldapjs": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-2.2.0.tgz",
-            "integrity": "sha512-9+ekbj97nxRYQMRgEm/HYFhFLWSRKah2PnReUfhfM5f62XBeUSFolB+AQ2Jij5tqowpksTnrdNCZLP6C+V3uag==",
-            "requires": {
-                "abstract-logging": "^2.0.0",
-                "asn1": "^0.2.4",
-                "assert-plus": "^1.0.0",
-                "backoff": "^2.5.0",
-                "ldap-filter": "^0.3.3",
-                "once": "^1.4.0",
-                "vasync": "^2.2.0",
-                "verror": "^1.8.1"
-            }
-        },
-        "lead": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-            "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-            "dev": true,
-            "requires": {
-                "flush-write-stream": "^1.0.2"
-            }
-        },
-        "leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true
-        },
-        "levenary": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-            "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-            "dev": true,
-            "requires": {
-                "leven": "^3.1.0"
-            }
-        },
-        "levn": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-            "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-            "dev": true,
-            "requires": {
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2"
-            }
-        },
-        "libbase64": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-1.2.1.tgz",
-            "integrity": "sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew=="
-        },
-        "libmime": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.0.0.tgz",
-            "integrity": "sha512-2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg==",
-            "requires": {
-                "encoding-japanese": "1.0.30",
-                "iconv-lite": "0.6.2",
-                "libbase64": "1.2.1",
-                "libqp": "1.1.0"
-            },
-            "dependencies": {
-                "iconv-lite": {
-                    "version": "0.6.2",
-                    "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-                    "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-                    "requires": {
-                        "safer-buffer": ">= 2.1.2 < 3.0.0"
-                    }
-                }
-            }
-        },
-        "liboneandone": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/liboneandone/-/liboneandone-1.2.0.tgz",
-            "integrity": "sha512-EB6Ak9qw+U4HAOnKqPtatxQ9pLclvtsBsggrvOuD4zclJ5xOeEASojsLKEC3O8KJ1Q4obE2JHhOeDuqWXvkoUQ==",
-            "requires": {
-                "mocha": "^2.5.3",
-                "request": "^2.74.0"
-            }
-        },
-        "libqp": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
-            "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
-        },
-        "liftoff": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-            "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-            "dev": true,
-            "requires": {
-                "extend": "^3.0.0",
-                "findup-sync": "^3.0.0",
-                "fined": "^1.0.1",
-                "flagged-respawn": "^1.0.0",
-                "is-plain-object": "^2.0.4",
-                "object.map": "^1.0.0",
-                "rechoir": "^0.6.2",
-                "resolve": "^1.1.7"
-            }
-        },
-        "lines-and-columns": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-            "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-            "dev": true
-        },
-        "linkify-it": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.2.tgz",
-            "integrity": "sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==",
-            "requires": {
-                "uc.micro": "^1.0.1"
-            }
-        },
-        "load-json-file": {
-            "version": "1.1.0",
-            "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-            "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "parse-json": "^2.2.0",
-                "pify": "^2.0.0",
-                "pinkie-promise": "^2.0.0",
-                "strip-bom": "^2.0.0"
-            },
-            "dependencies": {
-                "pify": {
-                    "version": "2.3.0",
-                    "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                    "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                    "dev": true
-                },
-                "strip-bom": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                    "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-                    "dev": true,
-                    "requires": {
-                        "is-utf8": "^0.2.0"
-                    }
-                }
-            }
-        },
-        "loader-runner": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-            "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-            "dev": true
-        },
-        "loader-utils": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-            "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-            "dev": true,
-            "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^2.0.0",
-                "json5": "^1.0.1"
-            },
-            "dependencies": {
-                "json5": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-                    "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-                    "dev": true,
-                    "requires": {
-                        "minimist": "^1.2.0"
-                    }
-                }
-            }
-        },
-        "locate-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-            "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-            "dev": true,
-            "requires": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
-            }
-        },
-        "lodash": {
-            "version": "4.17.20",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-            "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
-        },
-        "lodash._basecopy": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-            "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-            "dev": true
-        },
-        "lodash._basetostring": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-            "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-            "dev": true
-        },
-        "lodash._basevalues": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-            "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-            "dev": true
-        },
-        "lodash._getnative": {
-            "version": "3.9.1",
-            "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-            "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-            "dev": true
-        },
-        "lodash._isiterateecall": {
-            "version": "3.0.9",
-            "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-            "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-            "dev": true
-        },
-        "lodash._reescape": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-            "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-            "dev": true
-        },
-        "lodash._reevaluate": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-            "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-            "dev": true
-        },
-        "lodash._reinterpolate": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-            "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-            "dev": true
-        },
-        "lodash._root": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-            "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-            "dev": true
-        },
-        "lodash.escape": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-            "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-            "dev": true,
-            "requires": {
-                "lodash._root": "^3.0.0"
-            }
-        },
-        "lodash.groupby": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
-            "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=",
-            "dev": true
-        },
-        "lodash.isarguments": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-            "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-            "dev": true
-        },
-        "lodash.isarray": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-            "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-            "dev": true
-        },
-        "lodash.keys": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-            "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-            "dev": true,
-            "requires": {
-                "lodash._getnative": "^3.0.0",
-                "lodash.isarguments": "^3.0.0",
-                "lodash.isarray": "^3.0.0"
-            }
-        },
-        "lodash.mergewith": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
-            "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
-            "dev": true
-        },
-        "lodash.restparam": {
-            "version": "3.6.1",
-            "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-            "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-            "dev": true
-        },
-        "lodash.sortby": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-            "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-            "dev": true
-        },
-        "lodash.template": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-            "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-            "dev": true,
-            "requires": {
-                "lodash._basecopy": "^3.0.0",
-                "lodash._basetostring": "^3.0.0",
-                "lodash._basevalues": "^3.0.0",
-                "lodash._isiterateecall": "^3.0.0",
-                "lodash._reinterpolate": "^3.0.0",
-                "lodash.escape": "^3.0.0",
-                "lodash.keys": "^3.0.0",
-                "lodash.restparam": "^3.0.0",
-                "lodash.templatesettings": "^3.0.0"
-            }
-        },
-        "lodash.templatesettings": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-            "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-            "dev": true,
-            "requires": {
-                "lodash._reinterpolate": "^3.0.0",
-                "lodash.escape": "^3.0.0"
-            }
-        },
-        "loglevel": {
-            "version": "1.6.8",
-            "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
-            "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
-            "dev": true
-        },
-        "long": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-            "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==",
-            "dev": true
-        },
-        "loopback": {
-            "version": "3.26.0",
-            "resolved": "https://registry.npmjs.org/loopback/-/loopback-3.26.0.tgz",
-            "integrity": "sha512-QDREGpTTjLwMgteSIajFXMklW4slbVO5PvY2bPXBn3EUfPzmWXfaDiSlzwbbRbw+cyMUAr2EorL1r0+IsIslWg==",
-            "requires": {
-                "async": "^2.0.1",
-                "bcryptjs": "^2.1.0",
-                "bluebird": "^3.1.1",
-                "body-parser": "^1.12.0",
-                "canonical-json": "0.0.4",
-                "debug": "^2.1.2",
-                "depd": "^1.0.0",
-                "ejs": "^2.3.1",
-                "express": "^4.14.0",
-                "inflection": "^1.6.0",
-                "isemail": "^2.2.1",
-                "loopback-connector-remote": "^3.0.0",
-                "loopback-datasource-juggler": "^3.28.0",
-                "loopback-filters": "^1.0.0",
-                "loopback-phase": "^3.0.0",
-                "nodemailer": "^4.0.1",
-                "nodemailer-direct-transport": "^3.3.2",
-                "nodemailer-stub-transport": "^1.1.0",
-                "serve-favicon": "^2.2.0",
-                "stable": "^0.1.5",
-                "strong-globalize": "^4.1.1",
-                "strong-remoting": "^3.11.0",
-                "uid2": "0.0.3",
-                "underscore.string": "^3.3.5"
-            },
-            "dependencies": {
-                "async": {
-                    "version": "2.6.2",
-                    "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
-                    "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
-                    "requires": {
-                        "lodash": "^4.17.11"
-                    }
-                },
-                "depd": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-                    "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-                }
-            }
-        },
-        "loopback-boot": {
-            "version": "2.28.0",
-            "resolved": "https://registry.npmjs.org/loopback-boot/-/loopback-boot-2.28.0.tgz",
-            "integrity": "sha512-DTZnoWEMukgG2PrtguJ0Xk9HmIlHgcynGoxkDPa9oFiJ7l+8v92Ym8q7RQxOf8Nqws1kykPQ7PNuia+9AoeC7w==",
-            "requires": {
-                "async": "^0.9.2",
-                "commondir": "^1.0.1",
-                "debug": "^3.2.6",
-                "lodash": "^4.17.11",
-                "semver": "^5.6.0",
-                "strong-globalize": "^4.1.3",
-                "toposort": "^2.0.2"
-            },
-            "dependencies": {
-                "async": {
-                    "version": "0.9.2",
-                    "resolved": "http://registry.npmjs.org/async/-/async-0.9.2.tgz",
-                    "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
-                },
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "loopback-component-explorer": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmjs.org/loopback-component-explorer/-/loopback-component-explorer-6.5.0.tgz",
-            "integrity": "sha512-h3Smxz/bNm3lUspaLBe0daFVEvnvCcOHiHWKJHLcopiB8NKuZrveFhMfpcnv97OR9aqtCw8lhRoH0sMa840kJg==",
-            "requires": {
-                "debug": "^3.1.0",
-                "lodash": "^4.17.11",
-                "loopback-swagger": "^5.0.0",
-                "strong-globalize": "^4.1.1",
-                "swagger-ui": "^2.2.5"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "loopback-component-storage": {
-            "version": "3.6.1",
-            "resolved": "https://registry.npmjs.org/loopback-component-storage/-/loopback-component-storage-3.6.1.tgz",
-            "integrity": "sha512-KM+Q8XhaLtpUfCabeBxYDxs9ZuKyvWiP+iCLmnjem2UZvPp04B5MCLz4A3Rc1jqKQugAe3Ijk15hZQE+Zob8PQ==",
-            "requires": {
-                "async": "^2.6.1",
-                "debug": "^3.1.0",
-                "formidable": "^1.2.1",
-                "pkgcloud": "^2.0.0",
-                "strong-globalize": "^4.1.1",
-                "uuid": "^3.2.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "loopback-connector": {
-            "version": "4.11.0",
-            "resolved": "https://registry.npmjs.org/loopback-connector/-/loopback-connector-4.11.0.tgz",
-            "integrity": "sha512-kQH6wX4bf0NQOaeg87g9Uagn0LTIelCUdlcUV6XF29GTYs1D6tUfMwQZjELmTQ+C/jgnXHhpZdXb6D8PH6/IyA==",
-            "requires": {
-                "async": "^3.2.0",
-                "bluebird": "^3.7.2",
-                "debug": "^4.1.1",
-                "msgpack5": "^4.2.0",
-                "strong-globalize": "^5.1.0",
-                "uuid": "^7.0.3"
-            },
-            "dependencies": {
-                "async": {
-                    "version": "3.2.0",
-                    "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-                    "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="
-                },
-                "bluebird": {
-                    "version": "3.7.2",
-                    "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-                    "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-                },
-                "cross-spawn": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-                    "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-                    "requires": {
-                        "path-key": "^3.1.0",
-                        "shebang-command": "^2.0.0",
-                        "which": "^2.0.1"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "execa": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz",
-                    "integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==",
-                    "requires": {
-                        "cross-spawn": "^7.0.0",
-                        "get-stream": "^5.0.0",
-                        "human-signals": "^1.1.1",
-                        "is-stream": "^2.0.0",
-                        "merge-stream": "^2.0.0",
-                        "npm-run-path": "^4.0.0",
-                        "onetime": "^5.1.0",
-                        "signal-exit": "^3.0.2",
-                        "strip-final-newline": "^2.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-                    "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-                    "requires": {
-                        "pump": "^3.0.0"
-                    }
-                },
-                "globalize": {
-                    "version": "1.5.0",
-                    "resolved": "https://registry.npmjs.org/globalize/-/globalize-1.5.0.tgz",
-                    "integrity": "sha512-76fcPQO/WLthtSwjgIZ/Zv2XSXqv9ifvl1PwIxJNCZNFHigGCpg3fBZ0poJ30b2kdDgofPkYl478lVZA6esESQ==",
-                    "requires": {
-                        "cldrjs": "^0.5.0"
-                    }
-                },
-                "invert-kv": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz",
-                    "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="
-                },
-                "is-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-                    "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
-                },
-                "lcid": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/lcid/-/lcid-3.1.1.tgz",
-                    "integrity": "sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==",
-                    "requires": {
-                        "invert-kv": "^3.0.0"
-                    }
-                },
-                "mem": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
-                    "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
-                    "requires": {
-                        "map-age-cleaner": "^0.1.3",
-                        "mimic-fn": "^2.1.0",
-                        "p-is-promise": "^2.1.0"
-                    }
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                },
-                "npm-run-path": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-                    "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-                    "requires": {
-                        "path-key": "^3.0.0"
-                    }
-                },
-                "os-locale": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz",
-                    "integrity": "sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==",
-                    "requires": {
-                        "execa": "^4.0.0",
-                        "lcid": "^3.0.0",
-                        "mem": "^5.0.0"
-                    }
-                },
-                "path-key": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-                    "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-                },
-                "shebang-command": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-                    "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-                    "requires": {
-                        "shebang-regex": "^3.0.0"
-                    }
-                },
-                "shebang-regex": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-                    "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-                },
-                "strong-globalize": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/strong-globalize/-/strong-globalize-5.1.0.tgz",
-                    "integrity": "sha512-9cooAb6kNMDFmTDybkkch1x7b+LuzZNva8oIr+MxXnvx9jcvw4/4DTSXPc53mG68G0Q9YOTYZkhDkWe/DiJ1Qg==",
-                    "requires": {
-                        "accept-language": "^3.0.18",
-                        "debug": "^4.1.1",
-                        "globalize": "^1.5.0",
-                        "lodash": "^4.17.15",
-                        "md5": "^2.2.1",
-                        "mkdirp": "^0.5.5",
-                        "os-locale": "^5.0.0",
-                        "yamljs": "^0.3.0"
-                    }
-                },
-                "uuid": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-                    "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "loopback-connector-mysql": {
-            "version": "5.4.3",
-            "resolved": "https://registry.npmjs.org/loopback-connector-mysql/-/loopback-connector-mysql-5.4.3.tgz",
-            "integrity": "sha512-HQ0Nnscyhhk+4zsDhXyR8dYdkhxIBN8r8N1futX5xznWjCZ4dpkG5svoPOMUjoNaDEtZuLr1I2E4CKb6f5u9Mw==",
-            "requires": {
-                "async": "^2.6.1",
-                "debug": "^3.1.0",
-                "lodash": "^4.17.11",
-                "loopback-connector": "^4.0.0",
-                "mysql": "^2.11.1",
-                "strong-globalize": "^4.1.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "loopback-connector-remote": {
-            "version": "3.4.1",
-            "resolved": "https://registry.npmjs.org/loopback-connector-remote/-/loopback-connector-remote-3.4.1.tgz",
-            "integrity": "sha512-O22X2Gcq8YzZF9DvRjOCyktQlASw1/22i/zzqxJHNKSQA5aQYeTB0w5FttOiKxcw6Q/jzL476hUvUE/NaZVZ1Q==",
-            "requires": {
-                "loopback-datasource-juggler": "^3.0.0",
-                "strong-remoting": "^3.0.0"
-            }
-        },
-        "loopback-context": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/loopback-context/-/loopback-context-3.4.0.tgz",
-            "integrity": "sha512-Vd9bjgQlqQoG9dkb73waNvWqJFv8HVyrTSYh2JgnclTGEihijIJ4g/tGeOJ9Xwpe/0ZuGdHZN+iGFJRo1U7gdQ==",
-            "requires": {
-                "cls-hooked": "^4.2.0"
-            }
-        },
-        "loopback-datasource-juggler": {
-            "version": "3.35.0",
-            "resolved": "https://registry.npmjs.org/loopback-datasource-juggler/-/loopback-datasource-juggler-3.35.0.tgz",
-            "integrity": "sha512-Z4lxBxhNHJTro4M4tZgOrpi9/tmHyMsmquuKIFsgKJwQ3R7Zb6rMoaQ+VZoxmyFW+xLexVEM/tShOQbRjb8HVQ==",
-            "requires": {
-                "async": "^2.6.0",
-                "bluebird": "^3.1.1",
-                "debug": "^3.1.0",
-                "depd": "^1.0.0",
-                "inflection": "^1.6.0",
-                "lodash": "^4.17.4",
-                "loopback-connector": "^4.4.0",
-                "minimatch": "^3.0.3",
-                "qs": "^6.5.0",
-                "shortid": "^2.2.6",
-                "strong-globalize": "^4.1.1",
-                "traverse": "^0.6.6",
-                "uuid": "^3.0.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "depd": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-                    "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "loopback-datatype-geopoint": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/loopback-datatype-geopoint/-/loopback-datatype-geopoint-1.0.0.tgz",
-            "integrity": "sha1-/apcerjXMKmrflRVS+Fl8xzfYQA="
-        },
-        "loopback-filters": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/loopback-filters/-/loopback-filters-1.0.0.tgz",
-            "integrity": "sha512-uFQQLfj4T27CM6dzlWMH6aF1lf/Qj97VmXMlVnNWcG+Pd8R8ZbU4i/shArYXArXfis+ICD80YadrPbf9DYRbOA==",
-            "requires": {
-                "debug": "^3.1.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "loopback-phase": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/loopback-phase/-/loopback-phase-3.3.0.tgz",
-            "integrity": "sha512-0NAMtZ2P7VHtW2vgADmDFzFCeniCJwL4I3AdAxX5Ds8IFDQNbnRFnBQSvg+F50HcB7ZkKmR5gtOxtr7bXbqaAQ==",
-            "requires": {
-                "async": "^2.6.1",
-                "debug": "^3.1.0",
-                "strong-globalize": "^4.1.1"
-            },
-            "dependencies": {
-                "async": {
-                    "version": "2.6.2",
-                    "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
-                    "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
-                    "requires": {
-                        "lodash": "^4.17.11"
-                    }
-                },
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "loopback-swagger": {
-            "version": "5.8.0",
-            "resolved": "https://registry.npmjs.org/loopback-swagger/-/loopback-swagger-5.8.0.tgz",
-            "integrity": "sha512-KYui2ShRk0msuXnZUcIeZZpJVAP44Wak3YYeSjfGpj+tPlawFqXa38Fc9+C0/rlyX3x4hvtGf8W3UAb9pEjx0w==",
-            "requires": {
-                "async": "^2.1.4",
-                "debug": "^3.1.0",
-                "ejs": "^2.5.5",
-                "lodash": "^4.17.11",
-                "strong-globalize": "^4.1.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "loose-envify": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-            "dev": true,
-            "requires": {
-                "js-tokens": "^3.0.0 || ^4.0.0"
-            }
-        },
-        "loud-rejection": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-            "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-            "dev": true,
-            "requires": {
-                "currently-unhandled": "^0.4.1",
-                "signal-exit": "^3.0.0"
-            }
-        },
-        "lower-case": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-            "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-            "dev": true
-        },
-        "lowercase-keys": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-            "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-            "dev": true
-        },
-        "lru-cache": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-            "requires": {
-                "yallist": "^3.0.2"
-            }
-        },
-        "mailparser": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-2.8.0.tgz",
-            "integrity": "sha512-Ja5H6/I1NKIFdFJF5HdZkaMGCN8F+1lu3870ZmrabkHQshhrPk4OWeEMiF0OVo82+6XJqemJPCg6pqgXaj3B6Q==",
-            "requires": {
-                "encoding-japanese": "1.0.30",
-                "he": "1.2.0",
-                "html-to-text": "5.1.1",
-                "iconv-lite": "0.6.2",
-                "libmime": "5.0.0",
-                "linkify-it": "3.0.2",
-                "mailsplit": "5.0.0",
-                "nodemailer": "6.4.10",
-                "tlds": "1.207.0"
-            },
-            "dependencies": {
-                "iconv-lite": {
-                    "version": "0.6.2",
-                    "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-                    "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-                    "requires": {
-                        "safer-buffer": ">= 2.1.2 < 3.0.0"
-                    }
-                },
-                "nodemailer": {
-                    "version": "6.4.10",
-                    "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.10.tgz",
-                    "integrity": "sha512-j+pS9CURhPgk6r0ENr7dji+As2xZiHSvZeVnzKniLOw1eRAyM/7flP0u65tCnsapV8JFu+t0l/5VeHsCZEeh9g=="
-                }
-            }
-        },
-        "mailsplit": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.0.0.tgz",
-            "integrity": "sha512-HeXA0eyCKBtZqbr7uoeb3Nn2L7VV8Vm27x6/YBb0ZiNzRzLoNS2PqRgGYADwh0cBzLYtqddq40bSSirqLO2LGw==",
-            "requires": {
-                "libbase64": "1.2.1",
-                "libmime": "4.2.1",
-                "libqp": "1.1.0"
-            },
-            "dependencies": {
-                "iconv-lite": {
-                    "version": "0.5.0",
-                    "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz",
-                    "integrity": "sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==",
-                    "requires": {
-                        "safer-buffer": ">= 2.1.2 < 3"
-                    }
-                },
-                "libmime": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/libmime/-/libmime-4.2.1.tgz",
-                    "integrity": "sha512-09y7zjSc5im1aNsq815zgo4/G3DnIzym3aDOHsGq4Ee5vrX4PdgQRybAsztz9Rv0NhO+J5C0llEUloa3sUmjmA==",
-                    "requires": {
-                        "encoding-japanese": "1.0.30",
-                        "iconv-lite": "0.5.0",
-                        "libbase64": "1.2.1",
-                        "libqp": "1.1.0"
-                    }
-                }
-            }
-        },
-        "make-dir": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-            "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-            "dev": true,
-            "requires": {
-                "pify": "^4.0.1",
-                "semver": "^5.6.0"
-            }
-        },
-        "make-iterator": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-            "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-            "dev": true,
-            "requires": {
-                "kind-of": "^6.0.2"
-            }
-        },
-        "make-plural": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-6.0.1.tgz",
-            "integrity": "sha512-h0uBNi4tpDkiWUyYKrJNj8Kif6q3Ba5zp/8jnfPy3pQE+4XcTj6h3eZM5SYVUyDNX9Zk69Isr/dx0I+78aJUaQ=="
-        },
-        "makeerror": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-            "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-            "dev": true,
-            "requires": {
-                "tmpl": "1.0.x"
-            }
-        },
-        "mamacro": {
-            "version": "0.0.3",
-            "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-            "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-            "dev": true
-        },
-        "map-age-cleaner": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-            "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-            "requires": {
-                "p-defer": "^1.0.0"
-            }
-        },
-        "map-cache": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-            "dev": true
-        },
-        "map-obj": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-            "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-            "dev": true
-        },
-        "map-stream": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-            "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-            "dev": true
-        },
-        "map-visit": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-            "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-            "dev": true,
-            "requires": {
-                "object-visit": "^1.0.0"
-            }
-        },
-        "matchdep": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-            "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-            "dev": true,
-            "requires": {
-                "findup-sync": "^2.0.0",
-                "micromatch": "^3.0.4",
-                "resolve": "^1.4.0",
-                "stack-trace": "0.0.10"
-            },
-            "dependencies": {
-                "findup-sync": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-                    "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-                    "dev": true,
-                    "requires": {
-                        "detect-file": "^1.0.0",
-                        "is-glob": "^3.1.0",
-                        "micromatch": "^3.0.4",
-                        "resolve-dir": "^1.0.1"
-                    }
-                },
-                "is-glob": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-                    "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-                    "dev": true,
-                    "requires": {
-                        "is-extglob": "^2.1.0"
-                    }
-                }
-            }
-        },
-        "math-interval-parser": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-2.0.1.tgz",
-            "integrity": "sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA=="
-        },
-        "md5": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
-            "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
-            "requires": {
-                "charenc": "~0.0.1",
-                "crypt": "~0.0.1",
-                "is-buffer": "~1.1.1"
-            }
-        },
-        "md5.js": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-            "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-            "dev": true,
-            "requires": {
-                "hash-base": "^3.0.0",
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.1.2"
-            }
-        },
-        "media-typer": {
-            "version": "0.3.0",
-            "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-            "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-        },
-        "mem": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-            "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-            "requires": {
-                "map-age-cleaner": "^0.1.1",
-                "mimic-fn": "^2.0.0",
-                "p-is-promise": "^2.0.0"
-            }
-        },
-        "memory-fs": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-            "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-            "dev": true,
-            "requires": {
-                "errno": "^0.1.3",
-                "readable-stream": "^2.0.1"
-            }
-        },
-        "meow": {
-            "version": "3.7.0",
-            "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-            "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-            "dev": true,
-            "requires": {
-                "camelcase-keys": "^2.0.0",
-                "decamelize": "^1.1.2",
-                "loud-rejection": "^1.0.0",
-                "map-obj": "^1.0.1",
-                "minimist": "^1.1.3",
-                "normalize-package-data": "^2.3.4",
-                "object-assign": "^4.0.1",
-                "read-pkg-up": "^1.0.1",
-                "redent": "^1.0.0",
-                "trim-newlines": "^1.0.0"
-            }
-        },
-        "merge-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-            "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-        },
-        "merge-stream": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-            "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-            "dev": true,
-            "requires": {
-                "readable-stream": "^2.0.1"
-            }
-        },
-        "messageformat": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/messageformat/-/messageformat-2.3.0.tgz",
-            "integrity": "sha512-uTzvsv0lTeQxYI2y1NPa1lItL5VRI8Gb93Y2K2ue5gBPyrbJxfDi/EYWxh2PKv5yO42AJeeqblS9MJSh/IEk4w==",
-            "requires": {
-                "make-plural": "^4.3.0",
-                "messageformat-formatters": "^2.0.1",
-                "messageformat-parser": "^4.1.2"
-            },
-            "dependencies": {
-                "make-plural": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-4.3.0.tgz",
-                    "integrity": "sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA==",
-                    "requires": {
-                        "minimist": "^1.2.0"
-                    }
-                }
-            }
-        },
-        "messageformat-formatters": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz",
-            "integrity": "sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg=="
-        },
-        "messageformat-parser": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/messageformat-parser/-/messageformat-parser-4.1.2.tgz",
-            "integrity": "sha512-7dWuifeyldz7vhEuL96Kwq1fhZXBW+TUfbnHN4UCrCxoXQTYjHnR78eI66Gk9LaLLsAvzPNVJBaa66DRfFNaiA=="
-        },
-        "methods": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-            "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-        },
-        "micromatch": {
-            "version": "3.1.10",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-            "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-            "dev": true,
-            "requires": {
-                "arr-diff": "^4.0.0",
-                "array-unique": "^0.3.2",
-                "braces": "^2.3.1",
-                "define-property": "^2.0.2",
-                "extend-shallow": "^3.0.2",
-                "extglob": "^2.0.4",
-                "fragment-cache": "^0.2.1",
-                "kind-of": "^6.0.2",
-                "nanomatch": "^1.2.9",
-                "object.pick": "^1.3.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.2"
-            }
-        },
-        "miller-rabin": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-            "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-            "dev": true,
-            "requires": {
-                "bn.js": "^4.0.0",
-                "brorand": "^1.0.1"
-            }
-        },
-        "mime": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-        },
-        "mime-db": {
-            "version": "1.40.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-            "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-        },
-        "mime-types": {
-            "version": "2.1.24",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-            "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-            "requires": {
-                "mime-db": "1.40.0"
-            }
-        },
-        "mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-        },
-        "mimic-response": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-            "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-            "dev": true
-        },
-        "minimalistic-assert": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-            "dev": true
-        },
-        "minimalistic-crypto-utils": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-            "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-            "dev": true
-        },
-        "minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-            "requires": {
-                "brace-expansion": "^1.1.7"
-            }
-        },
-        "minimist": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
-        "mississippi": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-            "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-            "dev": true,
-            "requires": {
-                "concat-stream": "^1.5.0",
-                "duplexify": "^3.4.2",
-                "end-of-stream": "^1.1.0",
-                "flush-write-stream": "^1.0.0",
-                "from2": "^2.1.0",
-                "parallel-transform": "^1.1.0",
-                "pump": "^3.0.0",
-                "pumpify": "^1.3.3",
-                "stream-each": "^1.1.0",
-                "through2": "^2.0.0"
-            },
-            "dependencies": {
-                "concat-stream": {
-                    "version": "1.6.2",
-                    "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-                    "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-                    "dev": true,
-                    "requires": {
-                        "buffer-from": "^1.0.0",
-                        "inherits": "^2.0.3",
-                        "readable-stream": "^2.2.2",
-                        "typedarray": "^0.0.6"
-                    }
-                },
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-                    "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-                    "dev": true
-                }
-            }
-        },
-        "mixin-deep": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-            "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-            "dev": true,
-            "requires": {
-                "for-in": "^1.0.2",
-                "is-extendable": "^1.0.1"
-            },
-            "dependencies": {
-                "is-extendable": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-                    "dev": true,
-                    "requires": {
-                        "is-plain-object": "^2.0.4"
-                    }
-                }
-            }
-        },
-        "mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "requires": {
-                "minimist": "^1.2.5"
-            }
-        },
-        "mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-        },
-        "mktmpdir": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/mktmpdir/-/mktmpdir-0.1.1.tgz",
-            "integrity": "sha1-OKyCCVDXjvoLnN38A/99XFp4bbk=",
-            "requires": {
-                "rimraf": "~2.2.8"
-            }
-        },
-        "mocha": {
-            "version": "2.5.3",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-            "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
-            "requires": {
-                "commander": "2.3.0",
-                "debug": "2.2.0",
-                "diff": "1.4.0",
-                "escape-string-regexp": "1.0.2",
-                "glob": "3.2.11",
-                "growl": "1.9.2",
-                "jade": "0.26.3",
-                "mkdirp": "0.5.1",
-                "supports-color": "1.2.0",
-                "to-iso-string": "0.0.2"
-            },
-            "dependencies": {
-                "commander": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
-                    "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM="
-                },
-                "debug": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                    "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-                    "requires": {
-                        "ms": "0.7.1"
-                    }
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
-                    "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE="
-                },
-                "glob": {
-                    "version": "3.2.11",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                    "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
-                    "requires": {
-                        "inherits": "2",
-                        "minimatch": "0.3"
-                    }
-                },
-                "lru-cache": {
-                    "version": "2.7.3",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-                    "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
-                },
-                "minimatch": {
-                    "version": "0.3.0",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                    "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
-                    "requires": {
-                        "lru-cache": "2",
-                        "sigmund": "~1.0.0"
-                    }
-                },
-                "minimist": {
-                    "version": "0.0.8",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-                    "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-                },
-                "mkdirp": {
-                    "version": "0.5.1",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                    "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-                    "requires": {
-                        "minimist": "0.0.8"
-                    }
-                },
-                "ms": {
-                    "version": "0.7.1",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-                    "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
-                }
-            }
-        },
-        "move-concurrently": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-            "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-            "dev": true,
-            "requires": {
-                "aproba": "^1.1.1",
-                "copy-concurrently": "^1.0.0",
-                "fs-write-stream-atomic": "^1.0.8",
-                "mkdirp": "^0.5.1",
-                "rimraf": "^2.5.4",
-                "run-queue": "^1.0.3"
-            },
-            "dependencies": {
-                "rimraf": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-                    "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                }
-            }
-        },
-        "ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "msgpack-js": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/msgpack-js/-/msgpack-js-0.3.0.tgz",
-            "integrity": "sha1-Aw7AjFlW+cp9F9QKVy1Tlv7BCSM=",
-            "requires": {
-                "bops": "~0.0.6"
-            },
-            "dependencies": {
-                "base64-js": {
-                    "version": "0.0.2",
-                    "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz",
-                    "integrity": "sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q="
-                },
-                "bops": {
-                    "version": "0.0.7",
-                    "resolved": "https://registry.npmjs.org/bops/-/bops-0.0.7.tgz",
-                    "integrity": "sha1-tKClqDmkBkVK8P4FqLkaenZqVOI=",
-                    "requires": {
-                        "base64-js": "0.0.2",
-                        "to-utf8": "0.0.1"
-                    }
-                }
-            }
-        },
-        "msgpack-stream": {
-            "version": "0.0.13",
-            "resolved": "https://registry.npmjs.org/msgpack-stream/-/msgpack-stream-0.0.13.tgz",
-            "integrity": "sha1-UKZzrE6uyl43cBkk0JPUM1DB5Sw=",
-            "requires": {
-                "bops": "1.0.0",
-                "msgpack-js": "0.3.0",
-                "through": "2.3.4"
-            },
-            "dependencies": {
-                "through": {
-                    "version": "2.3.4",
-                    "resolved": "http://registry.npmjs.org/through/-/through-2.3.4.tgz",
-                    "integrity": "sha1-SV5A6Nio6uvHwnXqiMK4/BTFZFU="
-                }
-            }
-        },
-        "msgpack5": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/msgpack5/-/msgpack5-4.2.1.tgz",
-            "integrity": "sha512-Xo7nE9ZfBVonQi1rSopNAqPdts/QHyuSEUwIEzAkB+V2FtmkkLUbP6MyVqVVQxsZYI65FpvW3Bb8Z9ZWEjbgHQ==",
-            "requires": {
-                "bl": "^2.0.1",
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.3.6",
-                "safe-buffer": "^5.1.2"
-            }
-        },
-        "multicast-dns": {
-            "version": "6.2.3",
-            "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-            "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-            "dev": true,
-            "requires": {
-                "dns-packet": "^1.3.1",
-                "thunky": "^1.0.2"
-            }
-        },
-        "multicast-dns-service-types": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-            "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
-            "dev": true
-        },
-        "multipipe": {
-            "version": "0.1.2",
-            "resolved": "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-            "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-            "dev": true,
-            "requires": {
-                "duplexer2": "0.0.2"
-            }
-        },
-        "mustache": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz",
-            "integrity": "sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA=="
-        },
-        "mute-stdout": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-            "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-            "dev": true
-        },
-        "mux-demux": {
-            "version": "3.7.9",
-            "resolved": "http://registry.npmjs.org/mux-demux/-/mux-demux-3.7.9.tgz",
-            "integrity": "sha1-NTZ3GP02AcgLzi63YlMVdtekrO8=",
-            "requires": {
-                "duplex": "~1.0.0",
-                "json-buffer": "~2.0.4",
-                "msgpack-stream": "~0.0.10",
-                "stream-combiner": "0.0.2",
-                "stream-serializer": "~1.1.1",
-                "through": "~2.3.1",
-                "xtend": "~1.0.3"
-            }
-        },
-        "mysql": {
-            "version": "2.18.1",
-            "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
-            "integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==",
-            "requires": {
-                "bignumber.js": "9.0.0",
-                "readable-stream": "2.3.7",
-                "safe-buffer": "5.1.2",
-                "sqlstring": "2.3.1"
-            },
-            "dependencies": {
-                "bignumber.js": {
-                    "version": "9.0.0",
-                    "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
-                    "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
-                },
-                "readable-stream": {
-                    "version": "2.3.7",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-                    "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.3",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~2.0.0",
-                        "safe-buffer": "~5.1.1",
-                        "string_decoder": "~1.1.1",
-                        "util-deprecate": "~1.0.1"
-                    }
-                }
-            }
-        },
-        "mysql2": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-1.7.0.tgz",
-            "integrity": "sha512-xTWWQPjP5rcrceZQ7CSTKR/4XIDeH/cRkNH/uzvVGQ7W5c7EJ0dXeJUusk7OKhIoHj7uFKUxDVSCfLIl+jluog==",
-            "dev": true,
-            "requires": {
-                "denque": "^1.4.1",
-                "generate-function": "^2.3.1",
-                "iconv-lite": "^0.5.0",
-                "long": "^4.0.0",
-                "lru-cache": "^5.1.1",
-                "named-placeholders": "^1.1.2",
-                "seq-queue": "^0.0.5",
-                "sqlstring": "^2.3.1"
-            },
-            "dependencies": {
-                "iconv-lite": {
-                    "version": "0.5.0",
-                    "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz",
-                    "integrity": "sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==",
-                    "dev": true,
-                    "requires": {
-                        "safer-buffer": ">= 2.1.2 < 3"
-                    }
-                }
-            }
-        },
-        "named-placeholders": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz",
-            "integrity": "sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==",
-            "dev": true,
-            "requires": {
-                "lru-cache": "^4.1.3"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "4.1.5",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-                    "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-                    "dev": true,
-                    "requires": {
-                        "pseudomap": "^1.0.2",
-                        "yallist": "^2.1.2"
-                    }
-                },
-                "yallist": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-                    "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-                    "dev": true
-                }
-            }
-        },
-        "nan": {
-            "version": "2.14.0",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-            "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-            "dev": true
-        },
-        "nanoid": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.0.3.tgz",
-            "integrity": "sha512-NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw=="
-        },
-        "nanomatch": {
-            "version": "1.2.13",
-            "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-            "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-            "dev": true,
-            "requires": {
-                "arr-diff": "^4.0.0",
-                "array-unique": "^0.3.2",
-                "define-property": "^2.0.2",
-                "extend-shallow": "^3.0.2",
-                "fragment-cache": "^0.2.1",
-                "is-windows": "^1.0.2",
-                "kind-of": "^6.0.2",
-                "object.pick": "^1.3.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.1"
-            }
-        },
-        "napi-build-utils": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-            "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
-        },
-        "natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
-        },
-        "negotiator": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-            "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
-        },
-        "neo-async": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-            "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-            "dev": true
-        },
-        "next-tick": {
-            "version": "1.0.0",
-            "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-            "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-            "dev": true
-        },
-        "nice-try": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-        },
-        "no-case": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-            "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-            "dev": true,
-            "requires": {
-                "lower-case": "^1.1.1"
-            }
-        },
-        "nocache": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
-            "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
-        },
-        "node-abi": {
-            "version": "2.19.3",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
-            "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
-            "requires": {
-                "semver": "^5.4.1"
-            }
-        },
-        "node-addon-api": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz",
-            "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="
-        },
-        "node-fetch": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-            "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
-        },
-        "node-forge": {
-            "version": "0.8.5",
-            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz",
-            "integrity": "sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q=="
-        },
-        "node-gyp": {
-            "version": "3.8.0",
-            "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-            "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-            "dev": true,
-            "requires": {
-                "fstream": "^1.0.0",
-                "glob": "^7.0.3",
-                "graceful-fs": "^4.1.2",
-                "mkdirp": "^0.5.0",
-                "nopt": "2 || 3",
-                "npmlog": "0 || 1 || 2 || 3 || 4",
-                "osenv": "0",
-                "request": "^2.87.0",
-                "rimraf": "2",
-                "semver": "~5.3.0",
-                "tar": "^2.0.0",
-                "which": "1"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "5.3.0",
-                    "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-                    "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-                    "dev": true
-                }
-            }
-        },
-        "node-int64": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-            "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-            "dev": true
-        },
-        "node-libs-browser": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-            "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-            "dev": true,
-            "requires": {
-                "assert": "^1.1.1",
-                "browserify-zlib": "^0.2.0",
-                "buffer": "^4.3.0",
-                "console-browserify": "^1.1.0",
-                "constants-browserify": "^1.0.0",
-                "crypto-browserify": "^3.11.0",
-                "domain-browser": "^1.1.1",
-                "events": "^3.0.0",
-                "https-browserify": "^1.0.0",
-                "os-browserify": "^0.3.0",
-                "path-browserify": "0.0.1",
-                "process": "^0.11.10",
-                "punycode": "^1.2.4",
-                "querystring-es3": "^0.2.0",
-                "readable-stream": "^2.3.3",
-                "stream-browserify": "^2.0.1",
-                "stream-http": "^2.7.2",
-                "string_decoder": "^1.0.0",
-                "timers-browserify": "^2.0.4",
-                "tty-browserify": "0.0.0",
-                "url": "^0.11.0",
-                "util": "^0.11.0",
-                "vm-browserify": "^1.0.1"
-            },
-            "dependencies": {
-                "events": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-                    "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-                    "dev": true
-                },
-                "punycode": {
-                    "version": "1.4.1",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                    "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                    "dev": true
-                },
-                "url": {
-                    "version": "0.11.0",
-                    "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-                    "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-                    "dev": true,
-                    "requires": {
-                        "punycode": "1.3.2",
-                        "querystring": "0.2.0"
-                    },
-                    "dependencies": {
-                        "punycode": {
-                            "version": "1.3.2",
-                            "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-                            "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-                            "dev": true
-                        }
-                    }
-                }
-            }
-        },
-        "node-modules-regexp": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-            "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-            "dev": true
-        },
-        "node-notifier": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.1.tgz",
-            "integrity": "sha512-VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "growly": "^1.3.0",
-                "is-wsl": "^2.1.1",
-                "semver": "^7.2.1",
-                "shellwords": "^0.1.1",
-                "uuid": "^7.0.3",
-                "which": "^2.0.2"
-            },
-            "dependencies": {
-                "is-wsl": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-                    "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "is-docker": "^2.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "7.3.2",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-                    "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-                    "dev": true,
-                    "optional": true
-                },
-                "uuid": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-                    "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-                    "dev": true,
-                    "optional": true
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "node-releases": {
-            "version": "1.1.60",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
-            "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==",
-            "dev": true
-        },
-        "node-sass": {
-            "version": "4.14.1",
-            "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
-            "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
-            "dev": true,
-            "requires": {
-                "async-foreach": "^0.1.3",
-                "chalk": "^1.1.1",
-                "cross-spawn": "^3.0.0",
-                "gaze": "^1.0.0",
-                "get-stdin": "^4.0.1",
-                "glob": "^7.0.3",
-                "in-publish": "^2.0.0",
-                "lodash": "^4.17.15",
-                "meow": "^3.7.0",
-                "mkdirp": "^0.5.1",
-                "nan": "^2.13.2",
-                "node-gyp": "^3.8.0",
-                "npmlog": "^4.0.0",
-                "request": "^2.88.0",
-                "sass-graph": "2.2.5",
-                "stdout-stream": "^1.4.0",
-                "true-case-path": "^1.0.2"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "2.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-                    "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "1.1.3",
-                    "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-                    "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^2.2.1",
-                        "escape-string-regexp": "^1.0.2",
-                        "has-ansi": "^2.0.0",
-                        "strip-ansi": "^3.0.0",
-                        "supports-color": "^2.0.0"
-                    }
-                },
-                "cross-spawn": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-                    "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-                    "dev": true,
-                    "requires": {
-                        "lru-cache": "^4.0.1",
-                        "which": "^1.2.9"
-                    }
-                },
-                "lru-cache": {
-                    "version": "4.1.5",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-                    "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-                    "dev": true,
-                    "requires": {
-                        "pseudomap": "^1.0.2",
-                        "yallist": "^2.1.2"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-                    "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-                    "dev": true
-                },
-                "yallist": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-                    "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-                    "dev": true
-                }
-            }
-        },
-        "node-ssh": {
-            "version": "11.0.0",
-            "resolved": "https://registry.npmjs.org/node-ssh/-/node-ssh-11.0.0.tgz",
-            "integrity": "sha512-zC8TuZX82/x/ZsH4GzE5jmUGQAS2ajcDOoD352x6W56A7+4ChuGdGYi+t9NnLKEtRYvbvNH4HO+LvlQVENmxog==",
-            "requires": {
-                "make-dir": "^3.1.0",
-                "sb-promise-queue": "^2.1.0",
-                "sb-scandir": "^3.1.0",
-                "shell-escape": "^0.2.0",
-                "ssh2": "^0.8.9"
-            },
-            "dependencies": {
-                "make-dir": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-                    "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-                    "requires": {
-                        "semver": "^6.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-                }
-            }
-        },
-        "node.extend": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
-            "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
-            "dev": true,
-            "requires": {
-                "has": "^1.0.3",
-                "is": "^3.2.1"
-            }
-        },
-        "nodemailer": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.7.0.tgz",
-            "integrity": "sha512-IludxDypFpYw4xpzKdMAozBSkzKHmNBvGanUREjJItgJ2NYcK/s8+PggVhj7c2yGFQykKsnnmv1+Aqo0ZfjHmw=="
-        },
-        "nodemailer-direct-transport": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz",
-            "integrity": "sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=",
-            "requires": {
-                "nodemailer-shared": "1.1.0",
-                "smtp-connection": "2.12.0"
-            }
-        },
-        "nodemailer-fetch": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz",
-            "integrity": "sha1-ecSQihwPXzdbc/6IjamCj23JY6Q="
-        },
-        "nodemailer-shared": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz",
-            "integrity": "sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=",
-            "requires": {
-                "nodemailer-fetch": "1.6.0"
-            }
-        },
-        "nodemailer-stub-transport": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/nodemailer-stub-transport/-/nodemailer-stub-transport-1.1.0.tgz",
-            "integrity": "sha1-EUIdLWa07m9AU1T5FMH0ZB6ySw0="
-        },
-        "nodemon": {
-            "version": "1.19.4",
-            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.4.tgz",
-            "integrity": "sha512-VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ==",
-            "dev": true,
-            "requires": {
-                "chokidar": "^2.1.8",
-                "debug": "^3.2.6",
-                "ignore-by-default": "^1.0.1",
-                "minimatch": "^3.0.4",
-                "pstree.remy": "^1.1.7",
-                "semver": "^5.7.1",
-                "supports-color": "^5.5.0",
-                "touch": "^3.1.0",
-                "undefsafe": "^2.0.2",
-                "update-notifier": "^2.5.0"
-            },
-            "dependencies": {
-                "chokidar": {
-                    "version": "2.1.8",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-                    "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-                    "dev": true,
-                    "requires": {
-                        "anymatch": "^2.0.0",
-                        "async-each": "^1.0.1",
-                        "braces": "^2.3.2",
-                        "fsevents": "^1.2.7",
-                        "glob-parent": "^3.1.0",
-                        "inherits": "^2.0.3",
-                        "is-binary-path": "^1.0.0",
-                        "is-glob": "^4.0.0",
-                        "normalize-path": "^3.0.0",
-                        "path-is-absolute": "^1.0.0",
-                        "readdirp": "^2.2.1",
-                        "upath": "^1.1.1"
-                    }
-                },
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "fsevents": {
-                    "version": "1.2.13",
-                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                    "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "nan": "^2.12.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
-            }
-        },
-        "noop-logger": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
-            "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
-        },
-        "nopt": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-            "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-            "dev": true,
-            "requires": {
-                "abbrev": "1"
-            }
-        },
-        "normalize-package-data": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-            "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-            "dev": true,
-            "requires": {
-                "hosted-git-info": "^2.1.4",
-                "resolve": "^1.10.0",
-                "semver": "2 || 3 || 4 || 5",
-                "validate-npm-package-license": "^3.0.1"
-            }
-        },
-        "normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true
-        },
-        "normalize-url": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-            "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
-            "dev": true
-        },
-        "now-and-later": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-            "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-            "dev": true,
-            "requires": {
-                "once": "^1.3.2"
-            }
-        },
-        "npm-run-path": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-            "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-            "requires": {
-                "path-key": "^2.0.0"
-            }
-        },
-        "npmlog": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-            "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-            "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-            }
-        },
-        "nth-check": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-            "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-            "dev": true,
-            "requires": {
-                "boolbase": "~1.0.0"
-            }
-        },
-        "number-is-nan": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-        },
-        "nwsapi": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-            "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-            "dev": true
-        },
-        "oauth-sign": {
-            "version": "0.9.0",
-            "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-            "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-        },
-        "object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-        },
-        "object-copy": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-            "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-            "dev": true,
-            "requires": {
-                "copy-descriptor": "^0.1.0",
-                "define-property": "^0.2.5",
-                "kind-of": "^3.0.3"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "0.2.5",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "^0.1.0"
-                    }
-                },
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.1.5"
-                    }
-                }
-            }
-        },
-        "object-diff": {
-            "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/object-diff/-/object-diff-0.0.4.tgz",
-            "integrity": "sha1-2IOwRE/o/W4E5ZXXu2ZWgskWBH8="
-        },
-        "object-keys": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-            "dev": true
-        },
-        "object-visit": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-            "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-            "dev": true,
-            "requires": {
-                "isobject": "^3.0.0"
-            }
-        },
-        "object.assign": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-            "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.2",
-                "function-bind": "^1.1.1",
-                "has-symbols": "^1.0.0",
-                "object-keys": "^1.0.11"
-            }
-        },
-        "object.defaults": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-            "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-            "dev": true,
-            "requires": {
-                "array-each": "^1.0.1",
-                "array-slice": "^1.0.0",
-                "for-own": "^1.0.0",
-                "isobject": "^3.0.0"
-            }
-        },
-        "object.getownpropertydescriptors": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-            "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.2",
-                "es-abstract": "^1.5.1"
-            }
-        },
-        "object.map": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-            "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-            "dev": true,
-            "requires": {
-                "for-own": "^1.0.0",
-                "make-iterator": "^1.0.0"
-            }
-        },
-        "object.pick": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-            "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-            "requires": {
-                "isobject": "^3.0.1"
-            }
-        },
-        "object.reduce": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-            "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-            "dev": true,
-            "requires": {
-                "for-own": "^1.0.0",
-                "make-iterator": "^1.0.0"
-            }
-        },
-        "obuf": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-            "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-            "dev": true
-        },
-        "on-finished": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-            "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-            "requires": {
-                "ee-first": "1.1.1"
-            }
-        },
-        "on-headers": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-            "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-        },
-        "once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "requires": {
-                "wrappy": "1"
-            }
-        },
-        "onetime": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-            "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-            "requires": {
-                "mimic-fn": "^2.1.0"
-            }
-        },
-        "opn": {
-            "version": "5.5.0",
-            "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-            "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
-            "dev": true,
-            "requires": {
-                "is-wsl": "^1.1.0"
-            }
-        },
-        "optional": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz",
-            "integrity": "sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw=="
-        },
-        "optionator": {
-            "version": "0.8.2",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-            "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-            "dev": true,
-            "requires": {
-                "deep-is": "~0.1.3",
-                "fast-levenshtein": "~2.0.4",
-                "levn": "~0.3.0",
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2",
-                "wordwrap": "~1.0.0"
-            }
-        },
-        "options": {
-            "version": "0.0.6",
-            "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-            "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
-        },
-        "ordered-read-streams": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-            "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-            "dev": true,
-            "requires": {
-                "readable-stream": "^2.0.1"
-            }
-        },
-        "original": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-            "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-            "dev": true,
-            "requires": {
-                "url-parse": "^1.4.3"
-            }
-        },
-        "os-browserify": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-            "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-            "dev": true
-        },
-        "os-homedir": {
-            "version": "1.0.2",
-            "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-            "dev": true
-        },
-        "os-locale": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-            "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-            "requires": {
-                "execa": "^1.0.0",
-                "lcid": "^2.0.0",
-                "mem": "^4.0.0"
-            }
-        },
-        "os-tmpdir": {
-            "version": "1.0.2",
-            "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-            "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-            "dev": true
-        },
-        "osenv": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-            "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-            "dev": true,
-            "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-            }
-        },
-        "p-cancelable": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-            "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-            "dev": true
-        },
-        "p-defer": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-            "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-        },
-        "p-each-series": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-            "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
-            "dev": true
-        },
-        "p-finally": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-            "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-        },
-        "p-is-promise": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-            "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
-        },
-        "p-limit": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-            "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
-            "requires": {
-                "p-try": "^2.0.0"
-            }
-        },
-        "p-locate": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-            "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-            "dev": true,
-            "requires": {
-                "p-limit": "^2.0.0"
-            }
-        },
-        "p-map": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-            "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-            "dev": true
-        },
-        "p-queue": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-1.2.0.tgz",
-            "integrity": "sha1-Y5y4sHJwwVtx16ZEao4wQU88ltE=",
-            "dev": true
-        },
-        "p-retry": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-            "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
-            "dev": true,
-            "requires": {
-                "retry": "^0.12.0"
-            }
-        },
-        "p-try": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-        },
-        "package-json": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-            "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-            "dev": true,
-            "requires": {
-                "got": "^6.7.1",
-                "registry-auth-token": "^3.0.1",
-                "registry-url": "^3.0.3",
-                "semver": "^5.1.0"
-            },
-            "dependencies": {
-                "get-stream": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-                    "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-                    "dev": true
-                },
-                "got": {
-                    "version": "6.7.1",
-                    "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-                    "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-                    "dev": true,
-                    "requires": {
-                        "create-error-class": "^3.0.0",
-                        "duplexer3": "^0.1.4",
-                        "get-stream": "^3.0.0",
-                        "is-redirect": "^1.0.0",
-                        "is-retry-allowed": "^1.0.0",
-                        "is-stream": "^1.0.0",
-                        "lowercase-keys": "^1.0.0",
-                        "safe-buffer": "^5.0.1",
-                        "timed-out": "^4.0.0",
-                        "unzip-response": "^2.0.1",
-                        "url-parse-lax": "^1.0.0"
-                    }
-                },
-                "prepend-http": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-                    "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-                    "dev": true
-                },
-                "url-parse-lax": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-                    "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-                    "dev": true,
-                    "requires": {
-                        "prepend-http": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "pako": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-            "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
-            "dev": true
-        },
-        "parallel-transform": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-            "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-            "dev": true,
-            "requires": {
-                "cyclist": "^1.0.1",
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.1.5"
-            }
-        },
-        "param-case": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-            "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
-            "dev": true,
-            "requires": {
-                "no-case": "^2.2.0"
-            }
-        },
-        "parent-module": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-            "dev": true,
-            "requires": {
-                "callsites": "^3.0.0"
-            }
-        },
-        "parse-asn1": {
-            "version": "5.1.5",
-            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-            "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
-            "dev": true,
-            "requires": {
-                "asn1.js": "^4.0.0",
-                "browserify-aes": "^1.0.0",
-                "create-hash": "^1.1.0",
-                "evp_bytestokey": "^1.0.0",
-                "pbkdf2": "^3.0.3",
-                "safe-buffer": "^5.1.1"
-            }
-        },
-        "parse-filepath": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-            "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-            "dev": true,
-            "requires": {
-                "is-absolute": "^1.0.0",
-                "map-cache": "^0.2.0",
-                "path-root": "^0.1.1"
-            }
-        },
-        "parse-json": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-            "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-            "dev": true,
-            "requires": {
-                "error-ex": "^1.2.0"
-            }
-        },
-        "parse-node-version": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-            "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-            "dev": true
-        },
-        "parse-passwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-            "dev": true
-        },
-        "parse5": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-            "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-            "dev": true
-        },
-        "parseurl": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-        },
-        "pascalcase": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-            "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-            "dev": true
-        },
-        "path-browserify": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-            "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-            "dev": true
-        },
-        "path-dirname": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-            "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-            "dev": true
-        },
-        "path-exists": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-            "dev": true
-        },
-        "path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-        },
-        "path-is-inside": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-            "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-            "dev": true
-        },
-        "path-key": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-            "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
-        "path-parse": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-            "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-            "dev": true
-        },
-        "path-root": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-            "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-            "dev": true,
-            "requires": {
-                "path-root-regex": "^0.1.0"
-            }
-        },
-        "path-root-regex": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-            "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-            "dev": true
-        },
-        "path-to-regexp": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-            "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-        },
-        "path-type": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-            "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "pify": "^2.0.0",
-                "pinkie-promise": "^2.0.0"
-            },
-            "dependencies": {
-                "pify": {
-                    "version": "2.3.0",
-                    "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                    "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                    "dev": true
-                }
-            }
-        },
-        "pbkdf2": {
-            "version": "3.0.17",
-            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-            "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-            "dev": true,
-            "requires": {
-                "create-hash": "^1.1.2",
-                "create-hmac": "^1.1.4",
-                "ripemd160": "^2.0.1",
-                "safe-buffer": "^5.0.1",
-                "sha.js": "^2.4.8"
-            }
-        },
-        "pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-        },
-        "performance-now": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-            "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-        },
-        "picomatch": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-            "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-            "dev": true
-        },
-        "pify": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-            "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        },
-        "pinkie": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-            "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-            "dev": true
-        },
-        "pinkie-promise": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-            "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-            "dev": true,
-            "requires": {
-                "pinkie": "^2.0.0"
-            }
-        },
-        "pirates": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-            "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-            "dev": true,
-            "requires": {
-                "node-modules-regexp": "^1.0.0"
-            }
-        },
-        "pkg-dir": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-            "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-            "dev": true,
-            "requires": {
-                "find-up": "^3.0.0"
-            }
-        },
-        "pkgcloud": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/pkgcloud/-/pkgcloud-2.2.0.tgz",
-            "integrity": "sha512-ZbbGqJA8gMwR0peq57aNbjzgLbDj52oi59QJEShZmGUl3ckFBZ92j0h/C2L0tJeCb2VE12tnTwmftBgQ0f3gNw==",
-            "requires": {
-                "@google-cloud/storage": "^2.4.3",
-                "async": "^2.6.1",
-                "aws-sdk": "^2.382.0",
-                "errs": "^0.3.2",
-                "eventemitter2": "^5.0.1",
-                "fast-json-patch": "^2.1.0",
-                "filed-mimefix": "^0.1.3",
-                "ip": "^1.1.5",
-                "liboneandone": "^1.2.0",
-                "lodash": "^4.17.10",
-                "mime": "^2.4.1",
-                "qs": "^6.5.2",
-                "request": "^2.88.0",
-                "through2": "^3.0.1",
-                "url-join": "^4.0.0",
-                "xml2js": "^0.4.19"
-            },
-            "dependencies": {
-                "mime": {
-                    "version": "2.4.4",
-                    "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-                    "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
-                }
-            }
-        },
-        "plugin-error": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-            "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-            "dev": true,
-            "requires": {
-                "ansi-colors": "^1.0.1",
-                "arr-diff": "^4.0.0",
-                "arr-union": "^3.1.0",
-                "extend-shallow": "^3.0.2"
-            }
-        },
-        "pluralize": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-            "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-            "dev": true
-        },
-        "portfinder": {
-            "version": "1.0.26",
-            "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
-            "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
-            "dev": true,
-            "requires": {
-                "async": "^2.6.2",
-                "debug": "^3.1.1",
-                "mkdirp": "^0.5.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "posix-character-classes": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-            "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-            "dev": true
-        },
-        "posix-getopt": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/posix-getopt/-/posix-getopt-1.2.0.tgz",
-            "integrity": "sha1-Su7rfa3mb8qKk2XdqfawBXQctiE="
-        },
-        "postcss": {
-            "version": "7.0.17",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
-            "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
-            "dev": true,
-            "requires": {
-                "chalk": "^2.4.2",
-                "source-map": "^0.6.1",
-                "supports-color": "^6.1.0"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "6.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
-            }
-        },
-        "postcss-modules-extract-imports": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-            "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-            "dev": true,
-            "requires": {
-                "postcss": "^7.0.5"
-            }
-        },
-        "postcss-modules-local-by-default": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
-            "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
-            "dev": true,
-            "requires": {
-                "postcss": "^7.0.6",
-                "postcss-selector-parser": "^6.0.0",
-                "postcss-value-parser": "^3.3.1"
-            }
-        },
-        "postcss-modules-scope": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz",
-            "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
-            "dev": true,
-            "requires": {
-                "postcss": "^7.0.6",
-                "postcss-selector-parser": "^6.0.0"
-            }
-        },
-        "postcss-modules-values": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
-            "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
-            "dev": true,
-            "requires": {
-                "icss-replace-symbols": "^1.1.0",
-                "postcss": "^7.0.6"
-            }
-        },
-        "postcss-selector-parser": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-            "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
-            "dev": true,
-            "requires": {
-                "cssesc": "^3.0.0",
-                "indexes-of": "^1.0.1",
-                "uniq": "^1.0.1"
-            }
-        },
-        "postcss-value-parser": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-            "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-            "dev": true
-        },
-        "prebuild-install": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.1.tgz",
-            "integrity": "sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ==",
-            "requires": {
-                "detect-libc": "^1.0.3",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^2.7.0",
-                "noop-logger": "^0.1.1",
-                "npmlog": "^4.0.1",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^3.0.3",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0",
-                "which-pm-runs": "^1.0.0"
-            },
-            "dependencies": {
-                "decompress-response": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-                    "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-                    "requires": {
-                        "mimic-response": "^2.0.0"
-                    }
-                },
-                "mimic-response": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-                    "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
-                },
-                "simple-get": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
-                    "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
-                    "requires": {
-                        "decompress-response": "^4.2.0",
-                        "once": "^1.3.1",
-                        "simple-concat": "^1.0.0"
-                    }
-                }
-            }
-        },
-        "precond": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
-            "integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw="
-        },
-        "prelude-ls": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-            "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-            "dev": true
-        },
-        "prepend-http": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-            "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-            "dev": true
-        },
-        "pretty-error": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-            "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
-            "dev": true,
-            "requires": {
-                "renderkid": "^2.0.1",
-                "utila": "~0.4"
-            }
-        },
-        "pretty-format": {
-            "version": "24.9.0",
-            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-            "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^24.9.0",
-                "ansi-regex": "^4.0.0",
-                "ansi-styles": "^3.2.0",
-                "react-is": "^16.8.4"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                    "dev": true
-                }
-            }
-        },
-        "pretty-hrtime": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-            "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-            "dev": true
-        },
-        "private": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-            "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-            "dev": true
-        },
-        "process": {
-            "version": "0.11.10",
-            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-            "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-            "dev": true
-        },
-        "process-nextick-args": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-        },
-        "progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-        },
-        "promise-inflight": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-            "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-            "dev": true
-        },
-        "prompts": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-            "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
-            "dev": true,
-            "requires": {
-                "kleur": "^3.0.3",
-                "sisteransi": "^1.0.4"
-            }
-        },
-        "proxy-addr": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-            "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
-            "requires": {
-                "forwarded": "~0.1.2",
-                "ipaddr.js": "1.9.0"
-            }
-        },
-        "proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-        },
-        "prr": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-            "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-            "dev": true
-        },
-        "pseudomap": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-            "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
-        },
-        "psl": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
-            "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="
-        },
-        "pstree.remy": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.7.tgz",
-            "integrity": "sha512-xsMgrUwRpuGskEzBFkH8NmTimbZ5PcPup0LA8JJkHIm2IMUbQcpo3yeLNWVrufEYjh8YwtSVh0xz6UeWc5Oh5A==",
-            "dev": true
-        },
-        "public-encrypt": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-            "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-            "dev": true,
-            "requires": {
-                "bn.js": "^4.1.0",
-                "browserify-rsa": "^4.0.0",
-                "create-hash": "^1.1.0",
-                "parse-asn1": "^5.0.0",
-                "randombytes": "^2.0.1",
-                "safe-buffer": "^5.1.2"
-            }
-        },
-        "pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-            "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-            }
-        },
-        "pumpify": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-            "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-            "requires": {
-                "duplexify": "^3.6.0",
-                "inherits": "^2.0.3",
-                "pump": "^2.0.0"
-            },
-            "dependencies": {
-                "pump": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-                    "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-                    "requires": {
-                        "end-of-stream": "^1.1.0",
-                        "once": "^1.3.1"
-                    }
-                }
-            }
-        },
-        "punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-        },
-        "pupa": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
-            "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
-            "dev": true,
-            "requires": {
-                "escape-goat": "^2.0.0"
-            }
-        },
-        "puppeteer": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-7.1.0.tgz",
-            "integrity": "sha512-lqOLzqCKdh7yUAHvK6LxgOpQrL8Bv1/jvS8MLDXxcNms2rlM3E8p/Wlwc7efbRZ0twxTzUeqjN5EqrTwxOwc9g==",
-            "requires": {
-                "debug": "^4.1.0",
-                "devtools-protocol": "0.0.847576",
-                "extract-zip": "^2.0.0",
-                "https-proxy-agent": "^5.0.0",
-                "node-fetch": "^2.6.1",
-                "pkg-dir": "^4.2.0",
-                "progress": "^2.0.1",
-                "proxy-from-env": "^1.1.0",
-                "rimraf": "^3.0.2",
-                "tar-fs": "^2.0.0",
-                "unbzip2-stream": "^1.3.3",
-                "ws": "^7.2.3"
-            },
-            "dependencies": {
-                "agent-base": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-                    "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-                    "requires": {
-                        "debug": "4"
-                    }
-                },
-                "debug": {
-                    "version": "4.3.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                },
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "https-proxy-agent": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-                    "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-                    "requires": {
-                        "agent-base": "6",
-                        "debug": "4"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                },
-                "path-exists": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-                    "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-                },
-                "pkg-dir": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-                    "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-                    "requires": {
-                        "find-up": "^4.0.0"
-                    }
-                },
-                "rimraf": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                },
-                "ws": {
-                    "version": "7.4.3",
-                    "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz",
-                    "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="
-                }
-            }
-        },
-        "qs": {
-            "version": "6.7.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-            "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        },
-        "querystring": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-            "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-        },
-        "querystring-browser": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/querystring-browser/-/querystring-browser-1.0.4.tgz",
-            "integrity": "sha1-8uNYgYQKgZvHsb9Zf68JeeZiLcY="
-        },
-        "querystring-es3": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-            "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-            "dev": true
-        },
-        "querystringify": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-            "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
-            "dev": true
-        },
-        "randombytes": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "^5.1.0"
-            }
-        },
-        "randomfill": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-            "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-            "dev": true,
-            "requires": {
-                "randombytes": "^2.0.5",
-                "safe-buffer": "^5.1.0"
-            }
-        },
-        "range-parser": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-        },
-        "raw-body": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-            "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-            "requires": {
-                "bytes": "3.1.0",
-                "http-errors": "1.7.2",
-                "iconv-lite": "0.4.24",
-                "unpipe": "1.0.0"
-            },
-            "dependencies": {
-                "bytes": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-                    "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-                }
-            }
-        },
-        "raw-loader": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
-            "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
-            "dev": true,
-            "requires": {
-                "loader-utils": "^1.1.0",
-                "schema-utils": "^1.0.0"
-            }
-        },
-        "rc": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-            "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-            "requires": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-            },
-            "dependencies": {
-                "deep-extend": {
-                    "version": "0.6.0",
-                    "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-                    "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
-                }
-            }
-        },
-        "react-is": {
-            "version": "16.9.0",
-            "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
-            "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==",
-            "dev": true
-        },
-        "read-chunk": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
-            "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
-            "requires": {
-                "pify": "^4.0.1",
-                "with-open-file": "^0.1.6"
-            }
-        },
-        "read-pkg": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-            "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-            "dev": true,
-            "requires": {
-                "load-json-file": "^1.0.0",
-                "normalize-package-data": "^2.3.2",
-                "path-type": "^1.0.0"
-            }
-        },
-        "read-pkg-up": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-            "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-            "dev": true,
-            "requires": {
-                "find-up": "^1.0.0",
-                "read-pkg": "^1.0.0"
-            },
-            "dependencies": {
-                "find-up": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-                    "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-                    "dev": true,
-                    "requires": {
-                        "path-exists": "^2.0.0",
-                        "pinkie-promise": "^2.0.0"
-                    }
-                },
-                "path-exists": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-                    "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-                    "dev": true,
-                    "requires": {
-                        "pinkie-promise": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "readable-stream": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-            "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-            "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-            }
-        },
-        "readdirp": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-            "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.11",
-                "micromatch": "^3.1.10",
-                "readable-stream": "^2.0.2"
-            }
-        },
-        "recast": {
-            "version": "0.11.23",
-            "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
-            "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
-            "dev": true,
-            "requires": {
-                "ast-types": "0.9.6",
-                "esprima": "~3.1.0",
-                "private": "~0.1.5",
-                "source-map": "~0.5.0"
-            },
-            "dependencies": {
-                "esprima": {
-                    "version": "3.1.3",
-                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-                    "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-                    "dev": true
-                }
-            }
-        },
-        "rechoir": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-            "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-            "dev": true,
-            "requires": {
-                "resolve": "^1.1.6"
-            }
-        },
-        "redent": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-            "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-            "dev": true,
-            "requires": {
-                "indent-string": "^2.1.0",
-                "strip-indent": "^1.0.1"
-            }
-        },
-        "referrer-policy": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz",
-            "integrity": "sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA=="
-        },
-        "regenerate": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-            "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
-            "dev": true
-        },
-        "regenerate-unicode-properties": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-            "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
-            "dev": true,
-            "requires": {
-                "regenerate": "^1.4.0"
-            }
-        },
-        "regenerator-runtime": {
-            "version": "0.11.1",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-            "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-            "dev": true
-        },
-        "regenerator-transform": {
-            "version": "0.14.5",
-            "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-            "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
-            "dev": true,
-            "requires": {
-                "@babel/runtime": "^7.8.4"
-            }
-        },
-        "regex-not": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-            "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-            "dev": true,
-            "requires": {
-                "extend-shallow": "^3.0.2",
-                "safe-regex": "^1.1.0"
-            }
-        },
-        "regexpp": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-            "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-            "dev": true
-        },
-        "regexpu-core": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-            "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
-            "dev": true,
-            "requires": {
-                "regenerate": "^1.4.0",
-                "regenerate-unicode-properties": "^8.2.0",
-                "regjsgen": "^0.5.1",
-                "regjsparser": "^0.6.4",
-                "unicode-match-property-ecmascript": "^1.0.4",
-                "unicode-match-property-value-ecmascript": "^1.2.0"
-            }
-        },
-        "registry-auth-token": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
-            "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
-            "dev": true,
-            "requires": {
-                "rc": "^1.1.6",
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "registry-url": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-            "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-            "dev": true,
-            "requires": {
-                "rc": "^1.0.1"
-            }
-        },
-        "regjsgen": {
-            "version": "0.5.2",
-            "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-            "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
-            "dev": true
-        },
-        "regjsparser": {
-            "version": "0.6.4",
-            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-            "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
-            "dev": true,
-            "requires": {
-                "jsesc": "~0.5.0"
-            },
-            "dependencies": {
-                "jsesc": {
-                    "version": "0.5.0",
-                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-                    "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-                    "dev": true
-                }
-            }
-        },
-        "relateurl": {
-            "version": "0.2.7",
-            "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-            "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-            "dev": true
-        },
-        "remove-bom-buffer": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-            "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-            "dev": true,
-            "requires": {
-                "is-buffer": "^1.1.5",
-                "is-utf8": "^0.2.1"
-            }
-        },
-        "remove-bom-stream": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-            "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-            "dev": true,
-            "requires": {
-                "remove-bom-buffer": "^3.0.0",
-                "safe-buffer": "^5.1.0",
-                "through2": "^2.0.3"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "remove-trailing-separator": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-            "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-            "dev": true
-        },
-        "renderkid": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
-            "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
-            "dev": true,
-            "requires": {
-                "css-select": "^1.1.0",
-                "dom-converter": "^0.2",
-                "htmlparser2": "^3.3.0",
-                "strip-ansi": "^3.0.0",
-                "utila": "^0.4.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "repeat-element": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-            "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-            "dev": true
-        },
-        "repeat-string": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-            "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-            "dev": true
-        },
-        "repeating": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-            "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-            "dev": true,
-            "requires": {
-                "is-finite": "^1.0.0"
-            }
-        },
-        "replace-ext": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-            "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-            "dev": true
-        },
-        "replace-homedir": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-            "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.1",
-                "is-absolute": "^1.0.0",
-                "remove-trailing-separator": "^1.1.0"
-            }
-        },
-        "request": {
-            "version": "2.88.0",
-            "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-            "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-            "requires": {
-                "aws-sign2": "~0.7.0",
-                "aws4": "^1.8.0",
-                "caseless": "~0.12.0",
-                "combined-stream": "~1.0.6",
-                "extend": "~3.0.2",
-                "forever-agent": "~0.6.1",
-                "form-data": "~2.3.2",
-                "har-validator": "~5.1.0",
-                "http-signature": "~1.2.0",
-                "is-typedarray": "~1.0.0",
-                "isstream": "~0.1.2",
-                "json-stringify-safe": "~5.0.1",
-                "mime-types": "~2.1.19",
-                "oauth-sign": "~0.9.0",
-                "performance-now": "^2.1.0",
-                "qs": "~6.5.2",
-                "safe-buffer": "^5.1.2",
-                "tough-cookie": "~2.4.3",
-                "tunnel-agent": "^0.6.0",
-                "uuid": "^3.3.2"
-            },
-            "dependencies": {
-                "qs": {
-                    "version": "6.5.2",
-                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-                    "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-                }
-            }
-        },
-        "request-promise-core": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-            "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
-            "requires": {
-                "lodash": "^4.17.15"
-            }
-        },
-        "request-promise-native": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-            "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
-            "requires": {
-                "request-promise-core": "1.1.3",
-                "stealthy-require": "^1.1.1",
-                "tough-cookie": "^2.3.3"
-            }
-        },
-        "require-directory": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-            "dev": true
-        },
-        "require-main-filename": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-            "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-            "dev": true
-        },
-        "require-yaml": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/require-yaml/-/require-yaml-0.0.1.tgz",
-            "integrity": "sha1-LhsY2RPDuqcqWk03O28Tjd0sMr0=",
-            "requires": {
-                "js-yaml": "^4.0.0"
-            },
-            "dependencies": {
-                "argparse": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-                    "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-                },
-                "js-yaml": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
-                    "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
-                    "requires": {
-                        "argparse": "^2.0.1"
-                    }
-                }
-            }
-        },
-        "requires-port": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-            "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-            "dev": true
-        },
-        "resolve": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
-            "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
-            "dev": true,
-            "requires": {
-                "path-parse": "^1.0.6"
-            }
-        },
-        "resolve-cwd": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-            "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-            "dev": true,
-            "requires": {
-                "resolve-from": "^3.0.0"
-            },
-            "dependencies": {
-                "resolve-from": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-                    "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-                    "dev": true
-                }
-            }
-        },
-        "resolve-dir": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-            "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.0",
-                "global-modules": "^1.0.0"
-            }
-        },
-        "resolve-from": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true
-        },
-        "resolve-options": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-            "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-            "dev": true,
-            "requires": {
-                "value-or-function": "^3.0.0"
-            }
-        },
-        "resolve-url": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-            "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-            "dev": true
-        },
-        "responselike": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-            "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-            "dev": true,
-            "requires": {
-                "lowercase-keys": "^1.0.0"
-            }
-        },
-        "ret": {
-            "version": "0.1.15",
-            "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-            "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-            "dev": true
-        },
-        "retry": {
-            "version": "0.12.0",
-            "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-            "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-            "dev": true
-        },
-        "retry-request": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.1.tgz",
-            "integrity": "sha512-BINDzVtLI2BDukjWmjAIRZ0oglnCAkpP2vQjM3jdLhmT62h0xnQgciPwBRDAvHqpkPT2Wo1XuUyLyn6nbGrZQQ==",
-            "requires": {
-                "debug": "^4.1.1",
-                "through2": "^3.0.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "rimraf": {
-            "version": "2.2.8",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-            "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
-        },
-        "ripemd160": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-            "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-            "dev": true,
-            "requires": {
-                "hash-base": "^3.0.0",
-                "inherits": "^2.0.1"
-            }
-        },
-        "rsvp": {
-            "version": "4.8.5",
-            "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-            "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-            "dev": true
-        },
-        "run-queue": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-            "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-            "dev": true,
-            "requires": {
-                "aproba": "^1.1.1"
-            }
-        },
-        "safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        },
-        "safe-regex": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-            "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-            "dev": true,
-            "requires": {
-                "ret": "~0.1.10"
-            }
-        },
-        "safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-        },
-        "sane": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-            "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-            "dev": true,
-            "requires": {
-                "@cnakazawa/watch": "^1.0.3",
-                "anymatch": "^2.0.0",
-                "capture-exit": "^2.0.0",
-                "exec-sh": "^0.3.2",
-                "execa": "^1.0.0",
-                "fb-watchman": "^2.0.0",
-                "micromatch": "^3.1.4",
-                "minimist": "^1.1.1",
-                "walker": "~1.0.5"
-            }
-        },
-        "sass-graph": {
-            "version": "2.2.5",
-            "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
-            "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
-            "dev": true,
-            "requires": {
-                "glob": "^7.0.0",
-                "lodash": "^4.0.0",
-                "scss-tokenizer": "^0.2.3",
-                "yargs": "^13.3.2"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                    "dev": true
-                },
-                "cliui": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-                    "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^3.1.0",
-                        "strip-ansi": "^5.2.0",
-                        "wrap-ansi": "^5.1.0"
-                    }
-                },
-                "get-caller-file": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-                    "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-                    "dev": true
-                },
-                "require-main-filename": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-                    "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^4.1.0"
-                    }
-                },
-                "which-module": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-                    "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-                    "dev": true
-                },
-                "wrap-ansi": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-                    "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.0",
-                        "string-width": "^3.0.0",
-                        "strip-ansi": "^5.0.0"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "13.3.2",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-                    "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^5.0.0",
-                        "find-up": "^3.0.0",
-                        "get-caller-file": "^2.0.1",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^3.0.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^13.1.2"
-                    }
-                },
-                "yargs-parser": {
-                    "version": "13.1.2",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-                    "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-                    "dev": true,
-                    "requires": {
-                        "camelcase": "^5.0.0",
-                        "decamelize": "^1.2.0"
-                    }
-                }
-            }
-        },
-        "sass-loader": {
-            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
-            "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
-            "dev": true,
-            "requires": {
-                "clone-deep": "^4.0.1",
-                "loader-utils": "^1.0.1",
-                "neo-async": "^2.5.0",
-                "pify": "^4.0.1",
-                "semver": "^6.3.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
-            }
-        },
-        "sax": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-        },
-        "saxes": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-            "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-            "dev": true,
-            "requires": {
-                "xmlchars": "^2.2.0"
-            }
-        },
-        "sb-promise-queue": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/sb-promise-queue/-/sb-promise-queue-2.1.0.tgz",
-            "integrity": "sha512-zwq4YuP1FQFkGx2Q7GIkZYZ6PqWpV+bg0nIO1sJhWOyGyhqbj0MsTvK6lCFo5TQwX5pZr6SCQ75e8PCDCuNvkg=="
-        },
-        "sb-scandir": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/sb-scandir/-/sb-scandir-3.1.0.tgz",
-            "integrity": "sha512-70BVm2xz9jn94zSQdpvYrEG101/UV9TVGcfWr9T5iob3QhCK4lYXeculfBqPGFv3XTeKgx4dpWyYIDeZUqo4kg==",
-            "requires": {
-                "sb-promise-queue": "^2.1.0"
-            }
-        },
-        "schema-utils": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-            "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-            "dev": true,
-            "requires": {
-                "ajv": "^6.1.0",
-                "ajv-errors": "^1.0.0",
-                "ajv-keywords": "^3.1.0"
-            }
-        },
-        "scss-tokenizer": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-            "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-            "dev": true,
-            "requires": {
-                "js-base64": "^2.1.8",
-                "source-map": "^0.4.2"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.4.4",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-                    "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-                    "dev": true,
-                    "requires": {
-                        "amdefine": ">=0.0.4"
-                    }
-                }
-            }
-        },
-        "select-hose": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-            "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-            "dev": true
-        },
-        "selfsigned": {
-            "version": "1.10.8",
-            "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
-            "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
-            "dev": true,
-            "requires": {
-                "node-forge": "^0.10.0"
-            },
-            "dependencies": {
-                "node-forge": {
-                    "version": "0.10.0",
-                    "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-                    "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
-                    "dev": true
-                }
-            }
-        },
-        "semver": {
-            "version": "5.7.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-            "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
-        },
-        "semver-diff": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
-            "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-            "dev": true,
-            "requires": {
-                "semver": "^5.0.3"
-            }
-        },
-        "semver-greatest-satisfied-range": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-            "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-            "dev": true,
-            "requires": {
-                "sver-compat": "^1.5.0"
-            }
-        },
-        "send": {
-            "version": "0.17.1",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-            "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-            "requires": {
-                "debug": "2.6.9",
-                "depd": "~1.1.2",
-                "destroy": "~1.0.4",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "~1.7.2",
-                "mime": "1.6.0",
-                "ms": "2.1.1",
-                "on-finished": "~2.3.0",
-                "range-parser": "~1.2.1",
-                "statuses": "~1.5.0"
-            },
-            "dependencies": {
-                "depd": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-                    "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-                },
-                "ms": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-                    "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-                }
-            }
-        },
-        "seq-queue": {
-            "version": "0.0.5",
-            "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
-            "integrity": "sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=",
-            "dev": true
-        },
-        "serve-favicon": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz",
-            "integrity": "sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=",
-            "requires": {
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "ms": "2.1.1",
-                "parseurl": "~1.3.2",
-                "safe-buffer": "5.1.1"
-            },
-            "dependencies": {
-                "ms": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-                    "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-                },
-                "safe-buffer": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-                    "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-                }
-            }
-        },
-        "serve-index": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-            "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-            "dev": true,
-            "requires": {
-                "accepts": "~1.3.4",
-                "batch": "0.6.1",
-                "debug": "2.6.9",
-                "escape-html": "~1.0.3",
-                "http-errors": "~1.6.2",
-                "mime-types": "~2.1.17",
-                "parseurl": "~1.3.2"
-            },
-            "dependencies": {
-                "depd": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-                    "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-                    "dev": true
-                },
-                "http-errors": {
-                    "version": "1.6.3",
-                    "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-                    "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-                    "dev": true,
-                    "requires": {
-                        "depd": "~1.1.2",
-                        "inherits": "2.0.3",
-                        "setprototypeof": "1.1.0",
-                        "statuses": ">= 1.4.0 < 2"
-                    }
-                },
-                "inherits": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                    "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                    "dev": true
-                },
-                "setprototypeof": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-                    "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-                    "dev": true
-                }
-            }
-        },
-        "serve-static": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-            "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-            "requires": {
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "parseurl": "~1.3.3",
-                "send": "0.17.1"
-            }
-        },
-        "set-blocking": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-        },
-        "set-value": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-            "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-            "dev": true,
-            "requires": {
-                "extend-shallow": "^2.0.1",
-                "is-extendable": "^0.1.1",
-                "is-plain-object": "^2.0.3",
-                "split-string": "^3.0.1"
-            },
-            "dependencies": {
-                "extend-shallow": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                    "dev": true,
-                    "requires": {
-                        "is-extendable": "^0.1.0"
-                    }
-                }
-            }
-        },
-        "setimmediate": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-            "dev": true
-        },
-        "setprototypeof": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-            "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-        },
-        "sha.js": {
-            "version": "2.4.11",
-            "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-            "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "shallow-clone": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-            "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-            "dev": true,
-            "requires": {
-                "kind-of": "^6.0.2"
-            }
-        },
-        "sharp": {
-            "version": "0.27.1",
-            "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.27.1.tgz",
-            "integrity": "sha512-IQNXWdspb4nZcJemXa6cfgz+JvKONsuqP8Mwi1Oti23Uo7+J+UF2jihJDf6I1BQbrmhcZ0lagH/1WYG+ReAzyQ==",
-            "requires": {
-                "array-flatten": "^3.0.0",
-                "color": "^3.1.3",
-                "detect-libc": "^1.0.3",
-                "node-addon-api": "^3.1.0",
-                "npmlog": "^4.1.2",
-                "prebuild-install": "^6.0.0",
-                "semver": "^7.3.4",
-                "simple-get": "^4.0.0",
-                "tar-fs": "^2.1.1",
-                "tunnel-agent": "^0.6.0"
-            },
-            "dependencies": {
-                "array-flatten": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz",
-                    "integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA=="
-                },
-                "lru-cache": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-                    "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "7.3.4",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-                    "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                },
-                "yallist": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-                    "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-                }
-            }
-        },
-        "shebang-command": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-            "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-            "requires": {
-                "shebang-regex": "^1.0.0"
-            }
-        },
-        "shebang-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-            "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
-        "shell-escape": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/shell-escape/-/shell-escape-0.2.0.tgz",
-            "integrity": "sha1-aP0CXrBJC09WegJ/C/IkgLX4QTM="
-        },
-        "shellwords": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-            "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-            "dev": true,
-            "optional": true
-        },
-        "shimmer": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
-            "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
-        },
-        "shortid": {
-            "version": "2.2.14",
-            "resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.14.tgz",
-            "integrity": "sha512-4UnZgr9gDdA1kaKj/38IiudfC3KHKhDc1zi/HSxd9FQDR0VLwH3/y79tZJLsVYPsJgIjeHjqIWaWVRJUj9qZOQ==",
-            "requires": {
-                "nanoid": "^2.0.0"
-            }
-        },
-        "sigmund": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-            "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA="
-        },
-        "signal-exit": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-            "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-        },
-        "simple-concat": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
-            "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY="
-        },
-        "simple-get": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz",
-            "integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==",
-            "requires": {
-                "decompress-response": "^6.0.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
-            },
-            "dependencies": {
-                "decompress-response": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-                    "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-                    "requires": {
-                        "mimic-response": "^3.1.0"
-                    }
-                },
-                "mimic-response": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-                    "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
-                }
-            }
-        },
-        "simple-swizzle": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-            "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-            "requires": {
-                "is-arrayish": "^0.3.1"
-            },
-            "dependencies": {
-                "is-arrayish": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-                    "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-                }
-            }
-        },
-        "sisteransi": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-            "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-            "dev": true
-        },
-        "slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true
-        },
-        "slice-ansi": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-            "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^3.2.0",
-                "astral-regex": "^1.0.0",
-                "is-fullwidth-code-point": "^2.0.0"
-            }
-        },
-        "smbhash": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/smbhash/-/smbhash-0.0.1.tgz",
-            "integrity": "sha1-Pgtzz8bALUwMGamT6E5S4R/3oJk=",
-            "requires": {
-                "bigdecimal": ">= 0.6.0"
-            }
-        },
-        "smtp-connection": {
-            "version": "2.12.0",
-            "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz",
-            "integrity": "sha1-1275EnyyPCJZ7bHoNJwujV4tdME=",
-            "requires": {
-                "httpntlm": "1.6.1",
-                "nodemailer-shared": "1.1.0"
-            }
-        },
-        "snakeize": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz",
-            "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0="
-        },
-        "snapdragon": {
-            "version": "0.8.2",
-            "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-            "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-            "dev": true,
-            "requires": {
-                "base": "^0.11.1",
-                "debug": "^2.2.0",
-                "define-property": "^0.2.5",
-                "extend-shallow": "^2.0.1",
-                "map-cache": "^0.2.2",
-                "source-map": "^0.5.6",
-                "source-map-resolve": "^0.5.0",
-                "use": "^3.1.0"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "0.2.5",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "^0.1.0"
-                    }
-                },
-                "extend-shallow": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                    "dev": true,
-                    "requires": {
-                        "is-extendable": "^0.1.0"
-                    }
-                }
-            }
-        },
-        "snapdragon-node": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-            "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
-            "dev": true,
-            "requires": {
-                "define-property": "^1.0.0",
-                "isobject": "^3.0.0",
-                "snapdragon-util": "^3.0.1"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "^1.0.0"
-                    }
-                },
-                "is-accessor-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^6.0.0"
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "^6.0.0"
-                    }
-                },
-                "is-descriptor": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "^1.0.0",
-                        "is-data-descriptor": "^1.0.0",
-                        "kind-of": "^6.0.2"
-                    }
-                }
-            }
-        },
-        "snapdragon-util": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-            "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
-            "dev": true,
-            "requires": {
-                "kind-of": "^3.2.0"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.1.5"
-                    }
-                }
-            }
-        },
-        "soap": {
-            "version": "0.35.0",
-            "resolved": "https://registry.npmjs.org/soap/-/soap-0.35.0.tgz",
-            "integrity": "sha512-nRzW37ZdsdPKW8AtRKj6ibK+xVqgN8HFeowf+7NiJUtrHUbdiES3pFtRN0ZNU4q9Z1c75Epg77+9ENrtx9ulTw==",
-            "requires": {
-                "debug": "^4.1.1",
-                "get-stream": "^6.0.0",
-                "httpntlm": "^1.5.2",
-                "lodash": "^4.17.19",
-                "request": ">=2.9.0",
-                "sax": ">=0.6",
-                "strip-bom": "^3.0.0",
-                "uuid": "^8.3.0",
-                "xml-crypto": "^2.0.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.3.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                },
-                "get-stream": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
-                    "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg=="
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                },
-                "uuid": {
-                    "version": "8.3.2",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-                    "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-                }
-            }
-        },
-        "sockjs": {
-            "version": "0.3.20",
-            "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
-            "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
-            "dev": true,
-            "requires": {
-                "faye-websocket": "^0.10.0",
-                "uuid": "^3.4.0",
-                "websocket-driver": "0.6.5"
-            },
-            "dependencies": {
-                "uuid": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-                    "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-                    "dev": true
-                }
-            }
-        },
-        "sockjs-client": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
-            "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
-            "dev": true,
-            "requires": {
-                "debug": "^3.2.5",
-                "eventsource": "^1.0.7",
-                "faye-websocket": "~0.11.1",
-                "inherits": "^2.0.3",
-                "json3": "^3.3.2",
-                "url-parse": "^1.4.3"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.6",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                    "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "faye-websocket": {
-                    "version": "0.11.3",
-                    "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-                    "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
-                    "dev": true,
-                    "requires": {
-                        "websocket-driver": ">=0.5.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "source-list-map": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-            "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-            "dev": true
-        },
-        "source-map": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-            "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-            "dev": true
-        },
-        "source-map-resolve": {
-            "version": "0.5.2",
-            "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-            "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-            "dev": true,
-            "requires": {
-                "atob": "^2.1.1",
-                "decode-uri-component": "^0.2.0",
-                "resolve-url": "^0.2.1",
-                "source-map-url": "^0.4.0",
-                "urix": "^0.1.0"
-            }
-        },
-        "source-map-support": {
-            "version": "0.5.12",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-            "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
-            "dev": true,
-            "requires": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
-        "source-map-url": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-            "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-            "dev": true
-        },
-        "sparkles": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-            "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-            "dev": true
-        },
-        "spdx-correct": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-            "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-            "dev": true,
-            "requires": {
-                "spdx-expression-parse": "^3.0.0",
-                "spdx-license-ids": "^3.0.0"
-            }
-        },
-        "spdx-exceptions": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-            "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-            "dev": true
-        },
-        "spdx-expression-parse": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-            "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-            "dev": true,
-            "requires": {
-                "spdx-exceptions": "^2.1.0",
-                "spdx-license-ids": "^3.0.0"
-            }
-        },
-        "spdx-license-ids": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
-            "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
-            "dev": true
-        },
-        "spdy": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-            "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-            "dev": true,
-            "requires": {
-                "debug": "^4.1.0",
-                "handle-thing": "^2.0.0",
-                "http-deceiver": "^1.2.7",
-                "select-hose": "^2.0.0",
-                "spdy-transport": "^3.0.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                }
-            }
-        },
-        "spdy-transport": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-            "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-            "dev": true,
-            "requires": {
-                "debug": "^4.1.0",
-                "detect-node": "^2.0.4",
-                "hpack.js": "^2.1.6",
-                "obuf": "^1.1.2",
-                "readable-stream": "^3.0.6",
-                "wbuf": "^1.7.3"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "dev": true,
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "split-array-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz",
-            "integrity": "sha512-hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg==",
-            "requires": {
-                "is-stream-ended": "^0.1.4"
-            }
-        },
-        "split-string": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-            "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
-            "dev": true,
-            "requires": {
-                "extend-shallow": "^3.0.0"
-            }
-        },
-        "sprintf-js": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-            "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
-        },
-        "sqlstring": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
-            "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A="
-        },
-        "sse": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/sse/-/sse-0.0.8.tgz",
-            "integrity": "sha512-cviG7JH31TUhZeaEVhac3zTzA+2FwA7qvHziAHpb7mC7RNVJ/RbHN+6LIGsS2ugP4o2H15DWmrSMK+91CboIcg==",
-            "requires": {
-                "options": "0.0.6"
-            }
-        },
-        "ssh2": {
-            "version": "0.8.9",
-            "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-0.8.9.tgz",
-            "integrity": "sha512-GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw==",
-            "requires": {
-                "ssh2-streams": "~0.4.10"
-            }
-        },
-        "ssh2-streams": {
-            "version": "0.4.10",
-            "resolved": "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.4.10.tgz",
-            "integrity": "sha512-8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ==",
-            "requires": {
-                "asn1": "~0.2.0",
-                "bcrypt-pbkdf": "^1.0.2",
-                "streamsearch": "~0.1.2"
-            }
-        },
-        "sshpk": {
-            "version": "1.16.1",
-            "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-            "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-            "requires": {
-                "asn1": "~0.2.3",
-                "assert-plus": "^1.0.0",
-                "bcrypt-pbkdf": "^1.0.0",
-                "dashdash": "^1.12.0",
-                "ecc-jsbn": "~0.1.1",
-                "getpass": "^0.1.1",
-                "jsbn": "~0.1.0",
-                "safer-buffer": "^2.0.2",
-                "tweetnacl": "~0.14.0"
-            }
-        },
-        "ssri": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-            "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-            "dev": true,
-            "requires": {
-                "figgy-pudding": "^3.5.1"
-            }
-        },
-        "stable": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-            "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-        },
-        "stack-chain": {
-            "version": "1.3.7",
-            "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz",
-            "integrity": "sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU="
-        },
-        "stack-trace": {
-            "version": "0.0.10",
-            "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-            "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-            "dev": true
-        },
-        "static-extend": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-            "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-            "dev": true,
-            "requires": {
-                "define-property": "^0.2.5",
-                "object-copy": "^0.1.0"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "0.2.5",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "^0.1.0"
-                    }
-                }
-            }
-        },
-        "statuses": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-            "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-        },
-        "stdout-stream": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-            "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-            "dev": true,
-            "requires": {
-                "readable-stream": "^2.0.1"
-            }
-        },
-        "stealthy-require": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-            "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
-        },
-        "stream-browserify": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-            "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-            "dev": true,
-            "requires": {
-                "inherits": "~2.0.1",
-                "readable-stream": "^2.0.2"
-            }
-        },
-        "stream-combiner": {
-            "version": "0.0.2",
-            "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.2.tgz",
-            "integrity": "sha1-3+DnRnV0JWXnbGBWeI6lwjvZfbQ=",
-            "requires": {
-                "duplexer": "~0.0.3"
-            }
-        },
-        "stream-each": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-            "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-            "dev": true,
-            "requires": {
-                "end-of-stream": "^1.1.0",
-                "stream-shift": "^1.0.0"
-            }
-        },
-        "stream-events": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
-            "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
-            "requires": {
-                "stubs": "^3.0.0"
-            }
-        },
-        "stream-exhaust": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-            "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-            "dev": true
-        },
-        "stream-http": {
-            "version": "2.8.3",
-            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-            "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-            "dev": true,
-            "requires": {
-                "builtin-status-codes": "^3.0.0",
-                "inherits": "^2.0.1",
-                "readable-stream": "^2.3.6",
-                "to-arraybuffer": "^1.0.0",
-                "xtend": "^4.0.0"
-            },
-            "dependencies": {
-                "xtend": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-                    "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-                    "dev": true
-                }
-            }
-        },
-        "stream-serializer": {
-            "version": "1.1.2",
-            "resolved": "http://registry.npmjs.org/stream-serializer/-/stream-serializer-1.1.2.tgz",
-            "integrity": "sha1-wfl9FdolH1lK4n1B7IraCahG408="
-        },
-        "stream-shift": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-            "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
-        },
-        "streamsearch": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
-            "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
-        },
-        "string-length": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-            "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
-            "dev": true,
-            "requires": {
-                "char-regex": "^1.0.2",
-                "strip-ansi": "^6.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.0"
-                    }
-                }
-            }
-        },
-        "string-width": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-            "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-            "requires": {
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^4.0.0"
-            }
-        },
-        "string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "requires": {
-                "safe-buffer": "~5.1.0"
-            }
-        },
-        "strip-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-            "requires": {
-                "ansi-regex": "^3.0.0"
-            }
-        },
-        "strip-bom": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-            "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
-        "strip-eof": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-            "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-        },
-        "strip-final-newline": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-        },
-        "strip-indent": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-            "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-            "dev": true,
-            "requires": {
-                "get-stdin": "^4.0.1"
-            }
-        },
-        "strip-json-comments": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-            "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-        },
-        "strong-error-handler": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/strong-error-handler/-/strong-error-handler-2.3.2.tgz",
-            "integrity": "sha512-MT68SXVUPB1MNKEkIOUEgKOUCXWf3QV3TmgQRxJHyVplV/IbKFW/60UhAapViDt18cwr1XmgrNbtZ/2cF2qKdg==",
-            "requires": {
-                "accepts": "^1.3.3",
-                "debug": "^2.2.0",
-                "ejs": "^2.5.7",
-                "http-status": "^1.0.0",
-                "js2xmlparser": "^3.0.0",
-                "strong-globalize": "^3.1.0"
-            },
-            "dependencies": {
-                "async": {
-                    "version": "2.6.2",
-                    "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
-                    "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
-                    "requires": {
-                        "lodash": "^4.17.11"
-                    }
-                },
-                "cross-spawn": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-                    "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-                    "requires": {
-                        "lru-cache": "^4.0.1",
-                        "shebang-command": "^1.2.0",
-                        "which": "^1.2.9"
-                    }
-                },
-                "execa": {
-                    "version": "0.7.0",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-                    "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-                    "requires": {
-                        "cross-spawn": "^5.0.1",
-                        "get-stream": "^3.0.0",
-                        "is-stream": "^1.1.0",
-                        "npm-run-path": "^2.0.0",
-                        "p-finally": "^1.0.0",
-                        "signal-exit": "^3.0.0",
-                        "strip-eof": "^1.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-                    "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-                },
-                "invert-kv": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-                    "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-                },
-                "lcid": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-                    "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-                    "requires": {
-                        "invert-kv": "^1.0.0"
-                    }
-                },
-                "lru-cache": {
-                    "version": "4.1.5",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-                    "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-                    "requires": {
-                        "pseudomap": "^1.0.2",
-                        "yallist": "^2.1.2"
-                    }
-                },
-                "mem": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-                    "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-                    "requires": {
-                        "mimic-fn": "^1.0.0"
-                    }
-                },
-                "mimic-fn": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-                    "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                },
-                "os-locale": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-                    "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-                    "requires": {
-                        "execa": "^0.7.0",
-                        "lcid": "^1.0.0",
-                        "mem": "^1.1.0"
-                    }
-                },
-                "strong-globalize": {
-                    "version": "3.3.0",
-                    "resolved": "https://registry.npmjs.org/strong-globalize/-/strong-globalize-3.3.0.tgz",
-                    "integrity": "sha512-WrCZPABG/c4e55aH9S1mIW4054YL492cFwJFoF1WZZsJQ39gBYgGjdccTYI5Kj6uTlXH5hjepCQfwE5gCHJnKQ==",
-                    "requires": {
-                        "accept-language": "^3.0.18",
-                        "async": "^2.4.1",
-                        "debug": "^3.1.0",
-                        "esprima": "^4.0.0",
-                        "estraverse": "^4.2.0",
-                        "g11n-pipeline": "^2.0.1",
-                        "globalize": "^1.3.0",
-                        "htmlparser2": "^3.9.2",
-                        "lodash": "^4.17.4",
-                        "md5": "^2.2.1",
-                        "mkdirp": "^0.5.1",
-                        "mktmpdir": "^0.1.1",
-                        "optional": "^0.1.3",
-                        "os-locale": "^2.0.0",
-                        "posix-getopt": "^1.2.0",
-                        "word-count": "^0.2.2",
-                        "xtend": "^4.0.1",
-                        "yamljs": "^0.3.0"
-                    },
-                    "dependencies": {
-                        "debug": {
-                            "version": "3.2.6",
-                            "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-                            "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-                            "requires": {
-                                "ms": "^2.1.1"
-                            }
-                        }
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-                },
-                "yallist": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-                    "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-                }
-            }
-        },
-        "strong-globalize": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/strong-globalize/-/strong-globalize-4.1.3.tgz",
-            "integrity": "sha512-SJegV7w5D4AodEspZJtJ7rls3fmi+Zc0PdyJCqBsg4RN9B8TC80/uAI2fikC+s1Jp9FLvr2vDX8f0Fqc62M4OA==",
-            "requires": {
-                "accept-language": "^3.0.18",
-                "debug": "^4.1.1",
-                "globalize": "^1.4.2",
-                "lodash": "^4.17.4",
-                "md5": "^2.2.1",
-                "mkdirp": "^0.5.1",
-                "os-locale": "^3.1.0",
-                "yamljs": "^0.3.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                }
-            }
-        },
-        "strong-remoting": {
-            "version": "3.16.2",
-            "resolved": "https://registry.npmjs.org/strong-remoting/-/strong-remoting-3.16.2.tgz",
-            "integrity": "sha512-Kj8dZh6q0F3GQTil2rkEt6WuQoQbXFRZ2AJG36iBPmxcVEE9bVhWXUYxcJIxXaGekCprxp8kfdLLN67yp0J4Hg==",
-            "requires": {
-                "async": "^3.1.0",
-                "body-parser": "^1.12.4",
-                "debug": "^4.1.1",
-                "depd": "^2.0.0",
-                "escape-string-regexp": "^2.0.0",
-                "eventemitter2": "^5.0.1",
-                "express": "4.x",
-                "inflection": "^1.7.1",
-                "jayson": "^2.0.5",
-                "js2xmlparser": "^3.0.0",
-                "loopback-datatype-geopoint": "^1.0.0",
-                "loopback-phase": "^3.1.0",
-                "mux-demux": "^3.7.9",
-                "qs": "^6.2.1",
-                "request": "^2.83.0",
-                "sse": "0.0.8",
-                "strong-error-handler": "^3.0.0",
-                "strong-globalize": "^5.0.2",
-                "traverse": "^0.6.6",
-                "xml2js": "^0.4.8"
-            },
-            "dependencies": {
-                "async": {
-                    "version": "3.2.0",
-                    "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-                    "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="
-                },
-                "cross-spawn": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-                    "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-                    "requires": {
-                        "path-key": "^3.1.0",
-                        "shebang-command": "^2.0.0",
-                        "which": "^2.0.1"
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
-                },
-                "execa": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz",
-                    "integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==",
-                    "requires": {
-                        "cross-spawn": "^7.0.0",
-                        "get-stream": "^5.0.0",
-                        "human-signals": "^1.1.1",
-                        "is-stream": "^2.0.0",
-                        "merge-stream": "^2.0.0",
-                        "npm-run-path": "^4.0.0",
-                        "onetime": "^5.1.0",
-                        "signal-exit": "^3.0.2",
-                        "strip-final-newline": "^2.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-                    "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-                    "requires": {
-                        "pump": "^3.0.0"
-                    }
-                },
-                "globalize": {
-                    "version": "1.5.0",
-                    "resolved": "https://registry.npmjs.org/globalize/-/globalize-1.5.0.tgz",
-                    "integrity": "sha512-76fcPQO/WLthtSwjgIZ/Zv2XSXqv9ifvl1PwIxJNCZNFHigGCpg3fBZ0poJ30b2kdDgofPkYl478lVZA6esESQ==",
-                    "requires": {
-                        "cldrjs": "^0.5.0"
-                    }
-                },
-                "invert-kv": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz",
-                    "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="
-                },
-                "is-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-                    "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
-                },
-                "lcid": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/lcid/-/lcid-3.1.1.tgz",
-                    "integrity": "sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==",
-                    "requires": {
-                        "invert-kv": "^3.0.0"
-                    }
-                },
-                "mem": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
-                    "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
-                    "requires": {
-                        "map-age-cleaner": "^0.1.3",
-                        "mimic-fn": "^2.1.0",
-                        "p-is-promise": "^2.1.0"
-                    }
-                },
-                "merge-stream": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                    "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                },
-                "npm-run-path": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-                    "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-                    "requires": {
-                        "path-key": "^3.0.0"
-                    }
-                },
-                "os-locale": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz",
-                    "integrity": "sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==",
-                    "requires": {
-                        "execa": "^4.0.0",
-                        "lcid": "^3.0.0",
-                        "mem": "^5.0.0"
-                    }
-                },
-                "path-key": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-                    "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-                },
-                "shebang-command": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-                    "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-                    "requires": {
-                        "shebang-regex": "^3.0.0"
-                    }
-                },
-                "shebang-regex": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-                    "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-                },
-                "strong-error-handler": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/strong-error-handler/-/strong-error-handler-3.4.0.tgz",
-                    "integrity": "sha512-GbrDN/ACe3hlGgq7/001fc5TAo8tZxxudp7qqfCPXZzz8+h5tCHMZaotMeSyHDEEUFkyAUjdZva3BIBJIDdndw==",
-                    "requires": {
-                        "@types/express": "^4.16.0",
-                        "accepts": "^1.3.3",
-                        "debug": "^4.1.1",
-                        "ejs": "^2.6.1",
-                        "fast-safe-stringify": "^2.0.6",
-                        "http-status": "^1.1.2",
-                        "js2xmlparser": "^4.0.0",
-                        "strong-globalize": "^5.0.2"
-                    },
-                    "dependencies": {
-                        "js2xmlparser": {
-                            "version": "4.0.1",
-                            "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.1.tgz",
-                            "integrity": "sha512-KrPTolcw6RocpYjdC7pL7v62e55q7qOMHvLX1UCLc5AAS8qeJ6nukarEJAF2KL2PZxlbGueEbINqZR2bDe/gUw==",
-                            "requires": {
-                                "xmlcreate": "^2.0.3"
-                            }
-                        }
-                    }
-                },
-                "strong-globalize": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/strong-globalize/-/strong-globalize-5.1.0.tgz",
-                    "integrity": "sha512-9cooAb6kNMDFmTDybkkch1x7b+LuzZNva8oIr+MxXnvx9jcvw4/4DTSXPc53mG68G0Q9YOTYZkhDkWe/DiJ1Qg==",
-                    "requires": {
-                        "accept-language": "^3.0.18",
-                        "debug": "^4.1.1",
-                        "globalize": "^1.5.0",
-                        "lodash": "^4.17.15",
-                        "md5": "^2.2.1",
-                        "mkdirp": "^0.5.5",
-                        "os-locale": "^5.0.0",
-                        "yamljs": "^0.3.0"
-                    }
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                },
-                "xmlcreate": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.3.tgz",
-                    "integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ=="
-                }
-            }
-        },
-        "stubs": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-            "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
-        },
-        "style-loader": {
-            "version": "0.23.1",
-            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
-            "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
-            "dev": true,
-            "requires": {
-                "loader-utils": "^1.1.0",
-                "schema-utils": "^1.0.0"
-            }
-        },
-        "supports-color": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
-            "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4="
-        },
-        "supports-hyperlinks": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-            "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
-            "dev": true,
-            "requires": {
-                "has-flag": "^4.0.0",
-                "supports-color": "^7.0.0"
-            },
-            "dependencies": {
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "sver-compat": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-            "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-            "dev": true,
-            "requires": {
-                "es6-iterator": "^2.0.1",
-                "es6-symbol": "^3.1.1"
-            }
-        },
-        "swagger-client": {
-            "version": "3.11.0",
-            "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.11.0.tgz",
-            "integrity": "sha512-5cM2S8qDmA0fwpGW71384Bik7MXI5D8XJz6uVHeH3X3gy9hZo8SDc7MeNShnxSLKAGIUHs9gIqjSeCrUftMNPw==",
-            "requires": {
-                "@babel/runtime-corejs3": "^7.11.2",
-                "btoa": "^1.2.1",
-                "buffer": "^5.6.0",
-                "cookie": "~0.4.1",
-                "cross-fetch": "^3.0.6",
-                "deep-extend": "~0.6.0",
-                "fast-json-patch": "^2.2.1",
-                "isomorphic-form-data": "~2.0.0",
-                "js-yaml": "^3.14.0",
-                "lodash": "^4.17.19",
-                "qs": "^6.9.4",
-                "querystring-browser": "^1.0.4",
-                "traverse": "~0.6.6",
-                "url": "~0.11.0"
-            },
-            "dependencies": {
-                "buffer": {
-                    "version": "5.6.0",
-                    "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
-                    "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
-                    "requires": {
-                        "base64-js": "^1.0.2",
-                        "ieee754": "^1.1.4"
-                    }
-                },
-                "cookie": {
-                    "version": "0.4.1",
-                    "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-                    "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
-                },
-                "fast-json-patch": {
-                    "version": "2.2.1",
-                    "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.2.1.tgz",
-                    "integrity": "sha512-4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig==",
-                    "requires": {
-                        "fast-deep-equal": "^2.0.1"
-                    }
-                },
-                "js-yaml": {
-                    "version": "3.14.0",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-                    "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
-                    "requires": {
-                        "argparse": "^1.0.7",
-                        "esprima": "^4.0.0"
-                    }
-                },
-                "punycode": {
-                    "version": "1.3.2",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-                    "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-                },
-                "qs": {
-                    "version": "6.9.4",
-                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
-                    "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
-                },
-                "url": {
-                    "version": "0.11.0",
-                    "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-                    "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-                    "requires": {
-                        "punycode": "1.3.2",
-                        "querystring": "0.2.0"
-                    }
-                }
-            }
-        },
-        "swagger-ui": {
-            "version": "2.2.10",
-            "resolved": "https://registry.npmjs.org/swagger-ui/-/swagger-ui-2.2.10.tgz",
-            "integrity": "sha1-sl56IWZOXZC/OR2zDbCN5B6FLXs="
-        },
-        "symbol-tree": {
-            "version": "3.2.4",
-            "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-            "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-            "dev": true
-        },
-        "table": {
-            "version": "5.4.1",
-            "resolved": "https://registry.npmjs.org/table/-/table-5.4.1.tgz",
-            "integrity": "sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==",
-            "dev": true,
-            "requires": {
-                "ajv": "^6.9.1",
-                "lodash": "^4.17.11",
-                "slice-ansi": "^2.1.0",
-                "string-width": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^4.1.0"
-                    }
-                }
-            }
-        },
-        "tapable": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-            "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-            "dev": true
-        },
-        "tar": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-            "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-            "dev": true,
-            "requires": {
-                "block-stream": "*",
-                "fstream": "^1.0.12",
-                "inherits": "2"
-            }
-        },
-        "tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "requires": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
-            }
-        },
-        "tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "requires": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            },
-            "dependencies": {
-                "base64-js": {
-                    "version": "1.5.1",
-                    "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-                    "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-                },
-                "bl": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-                    "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-                    "requires": {
-                        "buffer": "^5.5.0",
-                        "inherits": "^2.0.4",
-                        "readable-stream": "^3.4.0"
-                    }
-                },
-                "buffer": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-                    "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-                    "requires": {
-                        "base64-js": "^1.3.1",
-                        "ieee754": "^1.1.13"
-                    }
-                },
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "teeny-request": {
-            "version": "3.11.3",
-            "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz",
-            "integrity": "sha512-CKncqSF7sH6p4rzCgkb/z/Pcos5efl0DmolzvlqRQUNcpRIruOhY9+T1FsIlyEbfWd7MsFpodROOwHYh2BaXzw==",
-            "requires": {
-                "https-proxy-agent": "^2.2.1",
-                "node-fetch": "^2.2.0",
-                "uuid": "^3.3.2"
-            }
-        },
-        "term-size": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
-            "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-            "dev": true,
-            "requires": {
-                "execa": "^0.7.0"
-            },
-            "dependencies": {
-                "cross-spawn": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-                    "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-                    "dev": true,
-                    "requires": {
-                        "lru-cache": "^4.0.1",
-                        "shebang-command": "^1.2.0",
-                        "which": "^1.2.9"
-                    }
-                },
-                "execa": {
-                    "version": "0.7.0",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-                    "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-                    "dev": true,
-                    "requires": {
-                        "cross-spawn": "^5.0.1",
-                        "get-stream": "^3.0.0",
-                        "is-stream": "^1.1.0",
-                        "npm-run-path": "^2.0.0",
-                        "p-finally": "^1.0.0",
-                        "signal-exit": "^3.0.0",
-                        "strip-eof": "^1.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-                    "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-                    "dev": true
-                },
-                "lru-cache": {
-                    "version": "4.1.5",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-                    "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-                    "dev": true,
-                    "requires": {
-                        "pseudomap": "^1.0.2",
-                        "yallist": "^2.1.2"
-                    }
-                },
-                "yallist": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-                    "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-                    "dev": true
-                }
-            }
-        },
-        "terminal-link": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-            "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-            "dev": true,
-            "requires": {
-                "ansi-escapes": "^4.2.1",
-                "supports-hyperlinks": "^2.0.0"
-            },
-            "dependencies": {
-                "ansi-escapes": {
-                    "version": "4.3.1",
-                    "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-                    "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-                    "dev": true,
-                    "requires": {
-                        "type-fest": "^0.11.0"
-                    }
-                },
-                "type-fest": {
-                    "version": "0.11.0",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-                    "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-                    "dev": true
-                }
-            }
-        },
-        "terser": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.1.tgz",
-            "integrity": "sha512-w0f2OWFD7ka3zwetgVAhNMeyzEbj39ht2Tb0qKflw9PmW9Qbo5tjTh01QJLkhO9t9RDDQYvk+WXqpECI2C6i2A==",
-            "dev": true,
-            "requires": {
-                "commander": "^2.20.0",
-                "source-map": "~0.6.1",
-                "source-map-support": "~0.5.12"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
-        "terser-webpack-plugin": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz",
-            "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==",
-            "dev": true,
-            "requires": {
-                "cacache": "^12.0.2",
-                "find-cache-dir": "^2.1.0",
-                "is-wsl": "^1.1.0",
-                "schema-utils": "^1.0.0",
-                "serialize-javascript": "^3.1.0",
-                "source-map": "^0.6.1",
-                "terser": "^4.1.2",
-                "webpack-sources": "^1.4.0",
-                "worker-farm": "^1.7.0"
-            },
-            "dependencies": {
-                "serialize-javascript": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-                    "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
-                    "dev": true,
-                    "requires": {
-                        "randombytes": "^2.1.0"
-                    }
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
-        "test-exclude": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-            "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-            "dev": true,
-            "requires": {
-                "@istanbuljs/schema": "^0.1.2",
-                "glob": "^7.1.4",
-                "minimatch": "^3.0.4"
-            }
-        },
-        "text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-            "dev": true
-        },
-        "throat": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
-            "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
-            "dev": true
-        },
-        "through": {
-            "version": "2.3.8",
-            "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-        },
-        "through2": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-            "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-            "requires": {
-                "readable-stream": "2 || 3"
-            }
-        },
-        "through2-filter": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-            "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-            "dev": true,
-            "requires": {
-                "through2": "~2.0.0",
-                "xtend": "~4.0.0"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "thunky": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-            "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-            "dev": true
-        },
-        "time-stamp": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-            "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-            "dev": true
-        },
-        "timed-out": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-            "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-            "dev": true
-        },
-        "timers-browserify": {
-            "version": "2.0.11",
-            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-            "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-            "dev": true,
-            "requires": {
-                "setimmediate": "^1.0.4"
-            }
-        },
-        "tlds": {
-            "version": "1.207.0",
-            "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.207.0.tgz",
-            "integrity": "sha512-k7d7Q1LqjtAvhtEOs3yN14EabsNO8ZCoY6RESSJDB9lst3bTx3as/m1UuAeCKzYxiyhR1qq72ZPhpSf+qlqiwg=="
-        },
-        "tmpl": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-            "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
-            "dev": true
-        },
-        "to-absolute-glob": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-            "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-            "dev": true,
-            "requires": {
-                "is-absolute": "^1.0.0",
-                "is-negated-glob": "^1.0.0"
-            }
-        },
-        "to-arraybuffer": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-            "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-            "dev": true
-        },
-        "to-fast-properties": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-            "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-            "dev": true
-        },
-        "to-iso-string": {
-            "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
-            "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE="
-        },
-        "to-object-path": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-            "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-            "dev": true,
-            "requires": {
-                "kind-of": "^3.0.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "^1.1.5"
-                    }
-                }
-            }
-        },
-        "to-readable-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-            "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-            "dev": true
-        },
-        "to-regex": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-            "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-            "dev": true,
-            "requires": {
-                "define-property": "^2.0.2",
-                "extend-shallow": "^3.0.2",
-                "regex-not": "^1.0.2",
-                "safe-regex": "^1.1.0"
-            }
-        },
-        "to-regex-range": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-            "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-            "dev": true,
-            "requires": {
-                "is-number": "^3.0.0",
-                "repeat-string": "^1.6.1"
-            }
-        },
-        "to-through": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-            "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-            "dev": true,
-            "requires": {
-                "through2": "^2.0.3"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "to-utf8": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz",
-            "integrity": "sha1-0Xrqcv8vujm55DYBvns/9y4ImFI="
-        },
-        "toidentifier": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-            "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-        },
-        "toposort": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
-            "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA="
-        },
-        "touch": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
-            "integrity": "sha1-/jZfX3XsntTlaCXgu3bSSrdK+Ds=",
-            "dev": true,
-            "requires": {
-                "nopt": "~1.0.10"
-            },
-            "dependencies": {
-                "nopt": {
-                    "version": "1.0.10",
-                    "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-                    "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
-                    "dev": true,
-                    "requires": {
-                        "abbrev": "1"
-                    }
-                }
-            }
-        },
-        "tough-cookie": {
-            "version": "2.4.3",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-            "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-            "requires": {
-                "psl": "^1.1.24",
-                "punycode": "^1.4.1"
-            },
-            "dependencies": {
-                "punycode": {
-                    "version": "1.4.1",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                    "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-                }
-            }
-        },
-        "tr46": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-            "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
-            "dev": true,
-            "requires": {
-                "punycode": "^2.1.1"
-            }
-        },
-        "traverse": {
-            "version": "0.6.6",
-            "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-            "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
-        },
-        "trim-newlines": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-            "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-            "dev": true
-        },
-        "trim-right": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-            "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-            "dev": true
-        },
-        "true-case-path": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-            "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-            "dev": true,
-            "requires": {
-                "glob": "^7.1.2"
-            }
-        },
-        "tryit": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-            "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-            "dev": true
-        },
-        "tslib": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-            "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
-            "dev": true
-        },
-        "tty-browserify": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-            "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-            "dev": true
-        },
-        "tunnel-agent": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-            "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-            "requires": {
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "tweetnacl": {
-            "version": "0.14.5",
-            "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-            "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-        },
-        "type": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/type/-/type-1.0.1.tgz",
-            "integrity": "sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw==",
-            "dev": true
-        },
-        "type-check": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-            "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-            "dev": true,
-            "requires": {
-                "prelude-ls": "~1.1.2"
-            }
-        },
-        "type-detect": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-            "dev": true
-        },
-        "type-fest": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-            "dev": true
-        },
-        "type-is": {
-            "version": "1.6.18",
-            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-            "requires": {
-                "media-typer": "0.3.0",
-                "mime-types": "~2.1.24"
-            }
-        },
-        "typedarray": {
-            "version": "0.0.6",
-            "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-            "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-        },
-        "typedarray-to-buffer": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-            "dev": true,
-            "requires": {
-                "is-typedarray": "^1.0.0"
-            }
-        },
-        "uc.micro": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-            "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
-        },
-        "uglify-js": {
-            "version": "3.4.10",
-            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-            "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-            "dev": true,
-            "requires": {
-                "commander": "~2.19.0",
-                "source-map": "~0.6.1"
-            },
-            "dependencies": {
-                "commander": {
-                    "version": "2.19.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-                    "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
-        "uid2": {
-            "version": "0.0.3",
-            "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz",
-            "integrity": "sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I="
-        },
-        "unbzip2-stream": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-            "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-            "requires": {
-                "buffer": "^5.2.1",
-                "through": "^2.3.8"
-            },
-            "dependencies": {
-                "base64-js": {
-                    "version": "1.5.1",
-                    "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-                    "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-                },
-                "buffer": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-                    "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-                    "requires": {
-                        "base64-js": "^1.3.1",
-                        "ieee754": "^1.1.13"
-                    }
-                }
-            }
-        },
-        "unc-path-regex": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-            "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-            "dev": true
-        },
-        "undefsafe": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz",
-            "integrity": "sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY=",
-            "dev": true,
-            "requires": {
-                "debug": "^2.2.0"
-            }
-        },
-        "underscore": {
-            "version": "1.7.0",
-            "resolved": "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
-            "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk="
-        },
-        "underscore.string": {
-            "version": "3.3.5",
-            "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
-            "integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
-            "requires": {
-                "sprintf-js": "^1.0.3",
-                "util-deprecate": "^1.0.2"
-            }
-        },
-        "undertaker": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-            "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
-            "dev": true,
-            "requires": {
-                "arr-flatten": "^1.0.1",
-                "arr-map": "^2.0.0",
-                "bach": "^1.0.0",
-                "collection-map": "^1.0.0",
-                "es6-weak-map": "^2.0.1",
-                "last-run": "^1.1.0",
-                "object.defaults": "^1.0.0",
-                "object.reduce": "^1.0.0",
-                "undertaker-registry": "^1.0.0"
-            }
-        },
-        "undertaker-registry": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-            "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-            "dev": true
-        },
-        "unicode-canonical-property-names-ecmascript": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-            "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
-            "dev": true
-        },
-        "unicode-match-property-ecmascript": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-            "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
-            "dev": true,
-            "requires": {
-                "unicode-canonical-property-names-ecmascript": "^1.0.4",
-                "unicode-property-aliases-ecmascript": "^1.0.4"
-            }
-        },
-        "unicode-match-property-value-ecmascript": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-            "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
-            "dev": true
-        },
-        "unicode-property-aliases-ecmascript": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-            "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
-            "dev": true
-        },
-        "union-value": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-            "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-            "dev": true,
-            "requires": {
-                "arr-union": "^3.1.0",
-                "get-value": "^2.0.6",
-                "is-extendable": "^0.1.1",
-                "set-value": "^2.0.1"
-            }
-        },
-        "uniq": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-            "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-            "dev": true
-        },
-        "unique-filename": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-            "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-            "dev": true,
-            "requires": {
-                "unique-slug": "^2.0.0"
-            }
-        },
-        "unique-slug": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-            "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-            "dev": true,
-            "requires": {
-                "imurmurhash": "^0.1.4"
-            }
-        },
-        "unique-stream": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-            "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-            "dev": true,
-            "requires": {
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "through2-filter": "^3.0.0"
-            }
-        },
-        "unique-string": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-            "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-            "requires": {
-                "crypto-random-string": "^1.0.0"
-            }
-        },
-        "universalify": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-        },
-        "unpipe": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-            "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-        },
-        "unset-value": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-            "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-            "dev": true,
-            "requires": {
-                "has-value": "^0.3.1",
-                "isobject": "^3.0.0"
-            },
-            "dependencies": {
-                "has-value": {
-                    "version": "0.3.1",
-                    "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-                    "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-                    "dev": true,
-                    "requires": {
-                        "get-value": "^2.0.3",
-                        "has-values": "^0.1.4",
-                        "isobject": "^2.0.0"
-                    },
-                    "dependencies": {
-                        "isobject": {
-                            "version": "2.1.0",
-                            "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-                            "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-                            "dev": true,
-                            "requires": {
-                                "isarray": "1.0.0"
-                            }
-                        }
-                    }
-                },
-                "has-values": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-                    "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-                    "dev": true
-                }
-            }
-        },
-        "unzip-response": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-            "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-            "dev": true
-        },
-        "upath": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-            "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
-            "dev": true
-        },
-        "update-notifier": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-            "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-            "dev": true,
-            "requires": {
-                "boxen": "^1.2.1",
-                "chalk": "^2.0.1",
-                "configstore": "^3.0.0",
-                "import-lazy": "^2.1.0",
-                "is-ci": "^1.0.10",
-                "is-installed-globally": "^0.1.0",
-                "is-npm": "^1.0.0",
-                "latest-version": "^3.0.0",
-                "semver-diff": "^2.0.0",
-                "xdg-basedir": "^3.0.0"
-            },
-            "dependencies": {
-                "configstore": {
-                    "version": "3.1.2",
-                    "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-                    "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-                    "dev": true,
-                    "requires": {
-                        "dot-prop": "^4.1.0",
-                        "graceful-fs": "^4.1.2",
-                        "make-dir": "^1.0.0",
-                        "unique-string": "^1.0.0",
-                        "write-file-atomic": "^2.0.0",
-                        "xdg-basedir": "^3.0.0"
-                    }
-                },
-                "make-dir": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-                    "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-                    "dev": true,
-                    "requires": {
-                        "pify": "^3.0.0"
-                    }
-                },
-                "pify": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-                    "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-                    "dev": true
-                }
-            }
-        },
-        "upper-case": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-            "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
-            "dev": true
-        },
-        "uri-js": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-            "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-            "requires": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "urix": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-            "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-            "dev": true
-        },
-        "url": {
-            "version": "0.10.3",
-            "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-            "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-            "requires": {
-                "punycode": "1.3.2",
-                "querystring": "0.2.0"
-            },
-            "dependencies": {
-                "punycode": {
-                    "version": "1.3.2",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-                    "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-                }
-            }
-        },
-        "url-join": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
-            "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
-        },
-        "url-parse": {
-            "version": "1.4.7",
-            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-            "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-            "dev": true,
-            "requires": {
-                "querystringify": "^2.1.1",
-                "requires-port": "^1.0.0"
-            }
-        },
-        "url-parse-lax": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-            "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-            "dev": true,
-            "requires": {
-                "prepend-http": "^2.0.0"
-            }
-        },
-        "use": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-            "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-            "dev": true
-        },
-        "utf7": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
-            "integrity": "sha1-lV9JCq5lO6IguUVqCod2wZk2CZE=",
-            "requires": {
-                "semver": "~5.3.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-                    "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-                }
-            }
-        },
-        "util": {
-            "version": "0.11.1",
-            "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-            "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-            "dev": true,
-            "requires": {
-                "inherits": "2.0.3"
-            },
-            "dependencies": {
-                "inherits": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                    "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                    "dev": true
-                }
-            }
-        },
-        "util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-        },
-        "util.promisify": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-            "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.2",
-                "object.getownpropertydescriptors": "^2.0.3"
-            }
-        },
-        "utila": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-            "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-            "dev": true
-        },
-        "utils-merge": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-            "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-        },
-        "uuid": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-            "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
-        },
-        "v8-compile-cache": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
-            "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
-            "dev": true
-        },
-        "v8-to-istanbul": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz",
-            "integrity": "sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==",
-            "dev": true,
-            "requires": {
-                "@types/istanbul-lib-coverage": "^2.0.1",
-                "convert-source-map": "^1.6.0",
-                "source-map": "^0.7.3"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.7.3",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                    "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-                    "dev": true
-                }
-            }
-        },
-        "v8flags": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
-            "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.1"
-            }
-        },
-        "validate-npm-package-license": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-            "dev": true,
-            "requires": {
-                "spdx-correct": "^3.0.0",
-                "spdx-expression-parse": "^3.0.0"
-            }
-        },
-        "value-or-function": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-            "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-            "dev": true
-        },
-        "vary": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-            "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-        },
-        "vasync": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/vasync/-/vasync-2.2.0.tgz",
-            "integrity": "sha1-z951GGChWCLbOxMrxZsRakra8Bs=",
-            "requires": {
-                "verror": "1.10.0"
-            }
-        },
-        "verror": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-            "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-            "requires": {
-                "assert-plus": "^1.0.0",
-                "core-util-is": "1.0.2",
-                "extsprintf": "^1.2.0"
-            }
-        },
-        "vinyl": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-            "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
-            "dev": true,
-            "requires": {
-                "clone": "^2.1.1",
-                "clone-buffer": "^1.0.0",
-                "clone-stats": "^1.0.0",
-                "cloneable-readable": "^1.0.0",
-                "remove-trailing-separator": "^1.0.1",
-                "replace-ext": "^1.0.0"
-            }
-        },
-        "vinyl-bufferstream": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz",
-            "integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=",
-            "dev": true,
-            "requires": {
-                "bufferstreams": "1.0.1"
-            }
-        },
-        "vinyl-fs": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-            "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-            "dev": true,
-            "requires": {
-                "fs-mkdirp-stream": "^1.0.0",
-                "glob-stream": "^6.1.0",
-                "graceful-fs": "^4.0.0",
-                "is-valid-glob": "^1.0.0",
-                "lazystream": "^1.0.0",
-                "lead": "^1.0.0",
-                "object.assign": "^4.0.4",
-                "pumpify": "^1.3.5",
-                "readable-stream": "^2.3.3",
-                "remove-bom-buffer": "^3.0.0",
-                "remove-bom-stream": "^1.2.0",
-                "resolve-options": "^1.1.0",
-                "through2": "^2.0.0",
-                "to-through": "^2.0.0",
-                "value-or-function": "^3.0.0",
-                "vinyl": "^2.0.0",
-                "vinyl-sourcemap": "^1.1.0"
-            },
-            "dependencies": {
-                "through2": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "~2.3.6",
-                        "xtend": "~4.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-                    "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-                    "dev": true
-                }
-            }
-        },
-        "vinyl-sourcemap": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-            "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-            "dev": true,
-            "requires": {
-                "append-buffer": "^1.0.2",
-                "convert-source-map": "^1.5.0",
-                "graceful-fs": "^4.1.6",
-                "normalize-path": "^2.1.1",
-                "now-and-later": "^2.0.0",
-                "remove-bom-buffer": "^3.0.0",
-                "vinyl": "^2.0.0"
-            },
-            "dependencies": {
-                "normalize-path": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-                    "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-                    "dev": true,
-                    "requires": {
-                        "remove-trailing-separator": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "vm-browserify": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-            "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-            "dev": true
-        },
-        "vn-loopback": {
-            "version": "file:loopback"
-        },
-        "w3c-hr-time": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-            "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-            "dev": true,
-            "requires": {
-                "browser-process-hrtime": "^1.0.0"
-            }
-        },
-        "w3c-xmlserializer": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-            "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-            "dev": true,
-            "requires": {
-                "xml-name-validator": "^3.0.0"
-            }
-        },
-        "walker": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-            "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-            "dev": true,
-            "requires": {
-                "makeerror": "1.0.x"
-            }
-        },
-        "watchpack": {
-            "version": "1.7.2",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
-            "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
-            "dev": true,
-            "requires": {
-                "chokidar": "^3.4.0",
-                "graceful-fs": "^4.1.2",
-                "neo-async": "^2.5.0",
-                "watchpack-chokidar2": "^2.0.0"
-            },
-            "dependencies": {
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "binary-extensions": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-                    "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-                    "dev": true,
-                    "optional": true
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "chokidar": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-                    "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "anymatch": "~3.1.1",
-                        "braces": "~3.0.2",
-                        "fsevents": "~2.1.2",
-                        "glob-parent": "~5.1.0",
-                        "is-binary-path": "~2.1.0",
-                        "is-glob": "~4.0.1",
-                        "normalize-path": "~3.0.0",
-                        "readdirp": "~3.4.0"
-                    }
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "fsevents": {
-                    "version": "2.1.3",
-                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-                    "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-                    "dev": true,
-                    "optional": true
-                },
-                "glob-parent": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-                    "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "is-glob": "^4.0.1"
-                    }
-                },
-                "is-binary-path": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-                    "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "binary-extensions": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true,
-                    "optional": true
-                },
-                "readdirp": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-                    "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "picomatch": "^2.2.1"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "is-number": "^7.0.0"
-                    }
-                }
-            }
-        },
-        "watchpack-chokidar2": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-            "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "chokidar": "^2.1.8"
-            },
-            "dependencies": {
-                "chokidar": {
-                    "version": "2.1.8",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-                    "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "anymatch": "^2.0.0",
-                        "async-each": "^1.0.1",
-                        "braces": "^2.3.2",
-                        "fsevents": "^1.2.7",
-                        "glob-parent": "^3.1.0",
-                        "inherits": "^2.0.3",
-                        "is-binary-path": "^1.0.0",
-                        "is-glob": "^4.0.0",
-                        "normalize-path": "^3.0.0",
-                        "path-is-absolute": "^1.0.0",
-                        "readdirp": "^2.2.1",
-                        "upath": "^1.1.1"
-                    }
-                },
-                "fsevents": {
-                    "version": "1.2.13",
-                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                    "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "nan": "^2.12.1"
-                    }
-                }
-            }
-        },
-        "wbuf": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-            "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-            "dev": true,
-            "requires": {
-                "minimalistic-assert": "^1.0.0"
-            }
-        },
-        "webidl-conversions": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-            "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-            "dev": true
-        },
-        "webpack": {
-            "version": "4.41.5",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz",
-            "integrity": "sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.8.5",
-                "@webassemblyjs/helper-module-context": "1.8.5",
-                "@webassemblyjs/wasm-edit": "1.8.5",
-                "@webassemblyjs/wasm-parser": "1.8.5",
-                "acorn": "^6.2.1",
-                "ajv": "^6.10.2",
-                "ajv-keywords": "^3.4.1",
-                "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^4.1.0",
-                "eslint-scope": "^4.0.3",
-                "json-parse-better-errors": "^1.0.2",
-                "loader-runner": "^2.4.0",
-                "loader-utils": "^1.2.3",
-                "memory-fs": "^0.4.1",
-                "micromatch": "^3.1.10",
-                "mkdirp": "^0.5.1",
-                "neo-async": "^2.6.1",
-                "node-libs-browser": "^2.2.1",
-                "schema-utils": "^1.0.0",
-                "tapable": "^1.1.3",
-                "terser-webpack-plugin": "^1.4.3",
-                "watchpack": "^1.6.0",
-                "webpack-sources": "^1.4.1"
-            },
-            "dependencies": {
-                "acorn": {
-                    "version": "6.4.1",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-                    "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-                    "dev": true
-                },
-                "ajv-keywords": {
-                    "version": "3.4.1",
-                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-                    "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
-                    "dev": true
-                }
-            }
-        },
-        "webpack-cli": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz",
-            "integrity": "sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==",
-            "dev": true,
-            "requires": {
-                "chalk": "2.4.2",
-                "cross-spawn": "6.0.5",
-                "enhanced-resolve": "4.1.0",
-                "findup-sync": "3.0.0",
-                "global-modules": "2.0.0",
-                "import-local": "2.0.0",
-                "interpret": "1.2.0",
-                "loader-utils": "1.2.3",
-                "supports-color": "6.1.0",
-                "v8-compile-cache": "2.0.3",
-                "yargs": "13.2.4"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                    "dev": true
-                },
-                "cliui": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-                    "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^3.1.0",
-                        "strip-ansi": "^5.2.0",
-                        "wrap-ansi": "^5.1.0"
-                    }
-                },
-                "enhanced-resolve": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-                    "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.1.2",
-                        "memory-fs": "^0.4.0",
-                        "tapable": "^1.0.0"
-                    }
-                },
-                "get-caller-file": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-                    "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-                    "dev": true
-                },
-                "global-modules": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-                    "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-                    "dev": true,
-                    "requires": {
-                        "global-prefix": "^3.0.0"
-                    }
-                },
-                "global-prefix": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-                    "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-                    "dev": true,
-                    "requires": {
-                        "ini": "^1.3.5",
-                        "kind-of": "^6.0.2",
-                        "which": "^1.3.1"
-                    }
-                },
-                "require-main-filename": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-                    "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^4.1.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "6.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                },
-                "which-module": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-                    "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-                    "dev": true
-                },
-                "wrap-ansi": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-                    "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.0",
-                        "string-width": "^3.0.0",
-                        "strip-ansi": "^5.0.0"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "13.2.4",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
-                    "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^5.0.0",
-                        "find-up": "^3.0.0",
-                        "get-caller-file": "^2.0.1",
-                        "os-locale": "^3.1.0",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^3.0.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^13.1.0"
-                    }
-                },
-                "yargs-parser": {
-                    "version": "13.1.2",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-                    "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-                    "dev": true,
-                    "requires": {
-                        "camelcase": "^5.0.0",
-                        "decamelize": "^1.2.0"
-                    }
-                }
-            }
-        },
-        "webpack-dev-middleware": {
-            "version": "3.7.2",
-            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
-            "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
-            "dev": true,
-            "requires": {
-                "memory-fs": "^0.4.1",
-                "mime": "^2.4.4",
-                "mkdirp": "^0.5.1",
-                "range-parser": "^1.2.1",
-                "webpack-log": "^2.0.0"
-            },
-            "dependencies": {
-                "mime": {
-                    "version": "2.4.6",
-                    "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-                    "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-                    "dev": true
-                }
-            }
-        },
-        "webpack-dev-server": {
-            "version": "3.11.0",
-            "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
-            "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
-            "dev": true,
-            "requires": {
-                "ansi-html": "0.0.7",
-                "bonjour": "^3.5.0",
-                "chokidar": "^2.1.8",
-                "compression": "^1.7.4",
-                "connect-history-api-fallback": "^1.6.0",
-                "debug": "^4.1.1",
-                "del": "^4.1.1",
-                "express": "^4.17.1",
-                "html-entities": "^1.3.1",
-                "http-proxy-middleware": "0.19.1",
-                "import-local": "^2.0.0",
-                "internal-ip": "^4.3.0",
-                "ip": "^1.1.5",
-                "is-absolute-url": "^3.0.3",
-                "killable": "^1.0.1",
-                "loglevel": "^1.6.8",
-                "opn": "^5.5.0",
-                "p-retry": "^3.0.1",
-                "portfinder": "^1.0.26",
-                "schema-utils": "^1.0.0",
-                "selfsigned": "^1.10.7",
-                "semver": "^6.3.0",
-                "serve-index": "^1.9.1",
-                "sockjs": "0.3.20",
-                "sockjs-client": "1.4.0",
-                "spdy": "^4.0.2",
-                "strip-ansi": "^3.0.1",
-                "supports-color": "^6.1.0",
-                "url": "^0.11.0",
-                "webpack-dev-middleware": "^3.7.2",
-                "webpack-log": "^2.0.0",
-                "ws": "^6.2.1",
-                "yargs": "^13.3.2"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "chokidar": {
-                    "version": "2.1.8",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-                    "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-                    "dev": true,
-                    "requires": {
-                        "anymatch": "^2.0.0",
-                        "async-each": "^1.0.1",
-                        "braces": "^2.3.2",
-                        "fsevents": "^1.2.7",
-                        "glob-parent": "^3.1.0",
-                        "inherits": "^2.0.3",
-                        "is-binary-path": "^1.0.0",
-                        "is-glob": "^4.0.0",
-                        "normalize-path": "^3.0.0",
-                        "path-is-absolute": "^1.0.0",
-                        "readdirp": "^2.2.1",
-                        "upath": "^1.1.1"
-                    }
-                },
-                "cliui": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-                    "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^3.1.0",
-                        "strip-ansi": "^5.2.0",
-                        "wrap-ansi": "^5.1.0"
-                    },
-                    "dependencies": {
-                        "ansi-regex": {
-                            "version": "4.1.0",
-                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                            "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                            "dev": true
-                        },
-                        "strip-ansi": {
-                            "version": "5.2.0",
-                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                            "dev": true,
-                            "requires": {
-                                "ansi-regex": "^4.1.0"
-                            }
-                        }
-                    }
-                },
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
-                "del": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-                    "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-                    "dev": true,
-                    "requires": {
-                        "@types/glob": "^7.1.1",
-                        "globby": "^6.1.0",
-                        "is-path-cwd": "^2.0.0",
-                        "is-path-in-cwd": "^2.0.0",
-                        "p-map": "^2.0.0",
-                        "pify": "^4.0.1",
-                        "rimraf": "^2.6.3"
-                    }
-                },
-                "fsevents": {
-                    "version": "1.2.13",
-                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                    "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "nan": "^2.12.1"
-                    }
-                },
-                "get-caller-file": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-                    "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-                    "dev": true
-                },
-                "globby": {
-                    "version": "6.1.0",
-                    "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-                    "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-                    "dev": true,
-                    "requires": {
-                        "array-union": "^1.0.1",
-                        "glob": "^7.0.3",
-                        "object-assign": "^4.0.1",
-                        "pify": "^2.0.0",
-                        "pinkie-promise": "^2.0.0"
-                    },
-                    "dependencies": {
-                        "pify": {
-                            "version": "2.3.0",
-                            "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                            "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                            "dev": true
-                        }
-                    }
-                },
-                "is-path-cwd": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-                    "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-                    "dev": true
-                },
-                "is-path-in-cwd": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-                    "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-                    "dev": true,
-                    "requires": {
-                        "is-path-inside": "^2.1.0"
-                    }
-                },
-                "is-path-inside": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-                    "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-                    "dev": true,
-                    "requires": {
-                        "path-is-inside": "^1.0.2"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                    "dev": true
-                },
-                "punycode": {
-                    "version": "1.3.2",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-                    "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-                    "dev": true
-                },
-                "require-main-filename": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-                    "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-                    "dev": true
-                },
-                "rimraf": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-                    "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    },
-                    "dependencies": {
-                        "ansi-regex": {
-                            "version": "4.1.0",
-                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                            "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                            "dev": true
-                        },
-                        "strip-ansi": {
-                            "version": "5.2.0",
-                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                            "dev": true,
-                            "requires": {
-                                "ansi-regex": "^4.1.0"
-                            }
-                        }
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "6.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                },
-                "url": {
-                    "version": "0.11.0",
-                    "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-                    "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-                    "dev": true,
-                    "requires": {
-                        "punycode": "1.3.2",
-                        "querystring": "0.2.0"
-                    }
-                },
-                "which-module": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-                    "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-                    "dev": true
-                },
-                "wrap-ansi": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-                    "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.0",
-                        "string-width": "^3.0.0",
-                        "strip-ansi": "^5.0.0"
-                    },
-                    "dependencies": {
-                        "ansi-regex": {
-                            "version": "4.1.0",
-                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                            "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                            "dev": true
-                        },
-                        "strip-ansi": {
-                            "version": "5.2.0",
-                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                            "dev": true,
-                            "requires": {
-                                "ansi-regex": "^4.1.0"
-                            }
-                        }
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "13.3.2",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-                    "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^5.0.0",
-                        "find-up": "^3.0.0",
-                        "get-caller-file": "^2.0.1",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^3.0.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^13.1.2"
-                    }
-                },
-                "yargs-parser": {
-                    "version": "13.1.2",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-                    "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-                    "dev": true,
-                    "requires": {
-                        "camelcase": "^5.0.0",
-                        "decamelize": "^1.2.0"
-                    }
-                }
-            }
-        },
-        "webpack-log": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-            "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-            "dev": true,
-            "requires": {
-                "ansi-colors": "^3.0.0",
-                "uuid": "^3.3.2"
-            },
-            "dependencies": {
-                "ansi-colors": {
-                    "version": "3.2.4",
-                    "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-                    "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-                    "dev": true
-                }
-            }
-        },
-        "webpack-merge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-            "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-            "dev": true,
-            "requires": {
-                "lodash": "^4.17.15"
-            }
-        },
-        "webpack-sources": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-            "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-            "dev": true,
-            "requires": {
-                "source-list-map": "^2.0.0",
-                "source-map": "~0.6.1"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
-        "websocket-driver": {
-            "version": "0.6.5",
-            "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-            "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
-            "dev": true,
-            "requires": {
-                "websocket-extensions": ">=0.1.1"
-            }
-        },
-        "websocket-extensions": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-            "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-            "dev": true
-        },
-        "whatwg-encoding": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-            "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-            "dev": true,
-            "requires": {
-                "iconv-lite": "0.4.24"
-            }
-        },
-        "whatwg-mimetype": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-            "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-            "dev": true
-        },
-        "whatwg-url": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz",
-            "integrity": "sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==",
-            "dev": true,
-            "requires": {
-                "lodash.sortby": "^4.7.0",
-                "tr46": "^2.0.2",
-                "webidl-conversions": "^5.0.0"
-            },
-            "dependencies": {
-                "webidl-conversions": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-                    "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-                    "dev": true
-                }
-            }
-        },
-        "which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "requires": {
-                "isexe": "^2.0.0"
-            }
-        },
-        "which-module": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-            "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-            "dev": true
-        },
-        "which-pm-runs": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
-            "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs="
-        },
-        "wide-align": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-            "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-            "requires": {
-                "string-width": "^1.0.2 || 2"
-            }
-        },
-        "widest-line": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
-            "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
-            "dev": true,
-            "requires": {
-                "string-width": "^2.1.1"
-            }
-        },
-        "with-open-file": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
-            "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
-            "requires": {
-                "p-finally": "^1.0.0",
-                "p-try": "^2.1.0",
-                "pify": "^4.0.1"
-            }
-        },
-        "word-count": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/word-count/-/word-count-0.2.2.tgz",
-            "integrity": "sha1-aZGS/KaCn+k21Byw2V25JIxXBFE="
-        },
-        "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true
-        },
-        "wordwrap": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-            "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-            "dev": true
-        },
-        "worker-farm": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-            "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-            "dev": true,
-            "requires": {
-                "errno": "~0.1.7"
-            }
-        },
-        "wrap-ansi": {
-            "version": "2.1.0",
-            "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-            "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-            "dev": true,
-            "requires": {
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-                    "dev": true,
-                    "requires": {
-                        "number-is-nan": "^1.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "1.0.2",
-                    "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                    "dev": true,
-                    "requires": {
-                        "code-point-at": "^1.0.0",
-                        "is-fullwidth-code-point": "^1.0.0",
-                        "strip-ansi": "^3.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
-        "write": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-            "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-            "dev": true,
-            "requires": {
-                "mkdirp": "^0.5.1"
-            }
-        },
-        "write-file-atomic": {
-            "version": "2.4.3",
-            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-            "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-            "requires": {
-                "graceful-fs": "^4.1.11",
-                "imurmurhash": "^0.1.4",
-                "signal-exit": "^3.0.2"
-            }
-        },
-        "ws": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-            "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-            "dev": true,
-            "requires": {
-                "async-limiter": "~1.0.0"
-            }
-        },
-        "x-xss-protection": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz",
-            "integrity": "sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg=="
-        },
-        "xdg-basedir": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-            "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
-        },
-        "xml": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-            "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
-            "dev": true
-        },
-        "xml-crypto": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.0.0.tgz",
-            "integrity": "sha512-/a04qr7RpONRZHOxROZ6iIHItdsQQjN3sj8lJkYDDss8tAkEaAs0VrFjb3tlhmS5snQru5lTs9/5ISSMdPDHlg==",
-            "requires": {
-                "xmldom": "0.1.27",
-                "xpath": "0.0.27"
-            }
-        },
-        "xml-name-validator": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-            "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-            "dev": true
-        },
-        "xml2js": {
-            "version": "0.4.23",
-            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-            "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-            "requires": {
-                "sax": ">=0.6.0",
-                "xmlbuilder": "~11.0.0"
-            },
-            "dependencies": {
-                "xmlbuilder": {
-                    "version": "11.0.1",
-                    "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-                    "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
-                }
-            }
-        },
-        "xmlbuilder": {
-            "version": "9.0.7",
-            "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-            "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
-        },
-        "xmlchars": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-            "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-            "dev": true
-        },
-        "xmlcreate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
-            "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8="
-        },
-        "xmldom": {
-            "version": "0.1.27",
-            "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-            "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
-        },
-        "xpath": {
-            "version": "0.0.27",
-            "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz",
-            "integrity": "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ=="
-        },
-        "xtend": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/xtend/-/xtend-1.0.3.tgz",
-            "integrity": "sha1-P12Tc1PM7Y4IU5mlY/2yJUHClgo="
-        },
-        "y18n": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-            "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-            "dev": true
-        },
-        "yallist": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-        },
-        "yaml-loader": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/yaml-loader/-/yaml-loader-0.5.0.tgz",
-            "integrity": "sha512-p9QIzcFSNm4mCw/m5NdyMfN4RE4aFZJWRRb01ERVNGCym8VNbKtw3OYZXnvUIkim6U/EjqE/2yIh9F/msShH9A==",
-            "dev": true,
-            "requires": {
-                "js-yaml": "^3.5.2"
-            }
-        },
-        "yamljs": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz",
-            "integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==",
-            "requires": {
-                "argparse": "^1.0.7",
-                "glob": "^7.0.5"
-            },
-            "dependencies": {
-                "glob": {
-                    "version": "7.1.4",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-                    "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.0.4",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                }
-            }
-        },
-        "yargs": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-            "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-            "dev": true,
-            "requires": {
-                "camelcase": "^3.0.0",
-                "cliui": "^3.2.0",
-                "decamelize": "^1.1.1",
-                "get-caller-file": "^1.0.1",
-                "os-locale": "^1.4.0",
-                "read-pkg-up": "^1.0.1",
-                "require-directory": "^2.1.1",
-                "require-main-filename": "^1.0.1",
-                "set-blocking": "^2.0.0",
-                "string-width": "^1.0.2",
-                "which-module": "^1.0.0",
-                "y18n": "^3.2.1",
-                "yargs-parser": "^5.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "camelcase": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-                    "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-                    "dev": true
-                },
-                "invert-kv": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-                    "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-                    "dev": true,
-                    "requires": {
-                        "number-is-nan": "^1.0.0"
-                    }
-                },
-                "lcid": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-                    "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-                    "dev": true,
-                    "requires": {
-                        "invert-kv": "^1.0.0"
-                    }
-                },
-                "os-locale": {
-                    "version": "1.4.0",
-                    "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-                    "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-                    "dev": true,
-                    "requires": {
-                        "lcid": "^1.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "1.0.2",
-                    "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                    "dev": true,
-                    "requires": {
-                        "code-point-at": "^1.0.0",
-                        "is-fullwidth-code-point": "^1.0.0",
-                        "strip-ansi": "^3.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "yargs-parser": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-            "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-            "dev": true,
-            "requires": {
-                "camelcase": "^3.0.0"
-            },
-            "dependencies": {
-                "camelcase": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-                    "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-                    "dev": true
-                }
-            }
-        },
-        "yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-            "requires": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        }
-    }
-}