export structure db

db/changes/10150-entry/00-acl.sql

@@ -1,3 +0,0 @@
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
-    VALUES ('TicketWeekly', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
-UPDATE salix.ACL SET accessType = 'READ' WHERE (id = '91');

db/dump/dumpedFixtures.sql

@@ -36,7 +36,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:39
+-- Dump completed on 2020-02-13  9:07:05
 USE `account`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -94,7 +94,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:39
+-- Dump completed on 2020-02-13  9:07:05
 USE `salix`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -142,7 +142,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:39
+-- Dump completed on 2020-02-13  9:07:05
 USE `vn`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -340,7 +340,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:40
+-- Dump completed on 2020-02-13  9:07:05
 USE `cache`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -378,7 +378,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:40
+-- Dump completed on 2020-02-13  9:07:05
 USE `hedera`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -436,7 +436,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:40
+-- Dump completed on 2020-02-13  9:07:06
 USE `postgresql`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -524,4 +524,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:40
+-- Dump completed on 2020-02-13  9:07:06

db/dump/structure.sql

@@ -17509,24 +17509,24 @@ BEGIN
 	SELECT * FROM
 	( 
 		SELECT
-				`db`,
-				`name`,
-				`type`,
-				`body`,
+				`routine_schema` `schema`,
+				`routine_name` `name`,
+				`routine_type` `type`,
+				`routine_definition` `definition`,
 				`created`,
-				`modified`
-			FROM `mysql`.`proc`
-			WHERE `body` LIKE vChain COLLATE utf8_general_ci
+				`last_altered`
+			FROM `information_schema`.`routines`
+			WHERE `routine_definition` LIKE vChain COLLATE utf8_general_ci
 		UNION ALL
 		SELECT
-				`db`,
-				`name`,
+				`event_schema`,
+				`event_name`,
 				'EVENT',
-				`body_utf8`,
+				`event_definition`,
 				`created`,
-				`modified`
-			FROM `mysql`.`event`
-			WHERE `body_utf8` LIKE vChain COLLATE utf8_general_ci
+				`last_altered`
+			FROM `information_schema`.`events`
+			WHERE `event_definition` LIKE vChain COLLATE utf8_general_ci
 		UNION ALL
 		SELECT
 				`EVENT_OBJECT_SCHEMA`,
@@ -17548,8 +17548,7 @@ BEGIN
 			FROM `information_schema`.`VIEWS`
 			WHERE `VIEW_DEFINITION` LIKE vChain COLLATE utf8_general_ci
 	) t
-	ORDER BY `db`, `name`;
-    
+	ORDER BY `schema`, `name`;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -26562,6 +26561,10 @@ BEGIN
 		SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T');
 		SET NEW.routeFk = NULL;
 	END IF;
+    
+    IF NEW.routeFk  AND NEW.isDeleted   THEN 
+		CALL util.throw ('This ticket is deleted');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -27930,7 +27933,6 @@ CREATE TABLE `worker` (
   `birthed` date NOT NULL,
   `maritalStatus` enum('soltero/a','casado/a') COLLATE utf8_unicode_ci NOT NULL,
   `phone` varchar(9) COLLATE utf8_unicode_ci NOT NULL,
-  `companyFk` smallint(5) unsigned DEFAULT NULL,
   `clientFk` int(11) DEFAULT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `bossFk` int(11) NOT NULL DEFAULT '2',
@@ -27943,7 +27945,6 @@ CREATE TABLE `worker` (
   UNIQUE KEY `Id_Cliente_Interno` (`clientFk`),
   KEY `sub` (`sub`),
   KEY `boss_idx` (`bossFk`),
-  KEY `empresa_id` (`companyFk`),
   CONSTRAINT `Clientes` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `worker_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -29651,14 +29652,15 @@ BEGIN
 				LIMIT 1;	     
                 
    -- Margen
-	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
+   -- No se aplica margen, cau 12589
+/*	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
 		SELECT vWarehouse, vItem, vComponentMargin, (vCost / ((100 - rate2) / 100)) - vCost 
 			FROM vn.rate
 				WHERE dated <= CURDATE()
 					AND warehouseFk = vWarehouse
 				ORDER BY dated DESC
 				LIMIT 1;	     
-        
+        */
    -- Recobro
 	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
 		SELECT vWarehouse, vItem, vComponentRecovery, ROUND(LEAST(recobro,0.25), 3) 
@@ -42947,7 +42949,9 @@ BEGIN
 
     UPDATE vn.itemShelving
     SET shelvingFk = shelvingFkD
-	 WHERE shelvingFk = shelvingFkO COLLATE utf8_unicode_ci AND itemFk = vItemFk;
+	WHERE shelvingFk = shelvingFkO COLLATE utf8_unicode_ci 
+		AND itemFk = vItemFk 
+		AND visible = ( vPacking * vQuantity );
      
 	/*CALL vn.itemShelvingMakeFromDate(shelvingFkD,vItemFk,'A',0,( vPacking * vQuantity ),'',0,vPacking,1,1,vDate); */
 
@@ -57711,4 +57715,4 @@ USE `vncontrol`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:31
+-- Dump completed on 2020-02-13  9:07:01