db/changes/10250-toqueDeQueda/00-ACL.sql

@@ -0,0 +1,8 @@
+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');

db/changes/10250-toqueDeQueda/00-claimState.sql

@@ -0,0 +1,3 @@
+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');

db/changes/10250-toqueDeQueda/00-observationType.sql

@@ -0,0 +1,9 @@
+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');

db/changes/10250-toqueDeQueda/00-supplierLog.sql

@@ -0,0 +1,20 @@
+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;
+
+

db/changes/10250-toqueDeQueda/00-ticket_beforeUpdate.sql

@@ -0,0 +1,25 @@
+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 ;

db/changes/10250-toqueDeQueda/00-ticket_componentPreview.sql

@@ -0,0 +1,107 @@
+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 ;
+

db/export-data.sh

@@ -87,5 +87,6 @@ TABLES=(
     sage
     TiposIva
     TiposTransacciones
+    TiposRetencion
 )
 dump_tables ${TABLES[@]}